summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Kinard <kumba@gentoo.org>2024-08-04 07:50:57 -0400
committerJoshua Kinard <kumba@gentoo.org>2024-08-04 07:50:57 -0400
commitb9e54e24f73b5500fccf3d62711b8a2bcd04cef1 (patch)
treeb3a3436ef08efae09f8dce9a48db6d1259dcf9d3 /net-dns
parentmedia-sound/musescore: dropped obsolete 4.2.1-r2 (diff)
downloadgentoo-b9e54e24f73b5500fccf3d62711b8a2bcd04cef1.tar.gz
gentoo-b9e54e24f73b5500fccf3d62711b8a2bcd04cef1.tar.bz2
gentoo-b9e54e24f73b5500fccf3d62711b8a2bcd04cef1.zip
net-dns/nsd: Copy correct files from source contrib
Copy the correct OpenRC init.d file from source contrib. Also use the tmpfiles.d config in contrib. Fixes: 9bdd082a7cd1 ("net-dns/nsd: Cleanups, add 4.10.1") Signed-off-by: Joshua Kinard <kumba@gentoo.org>
Diffstat (limited to 'net-dns')
-rw-r--r--net-dns/nsd/nsd-4.10.1-r1.ebuild (renamed from net-dns/nsd/nsd-4.10.1.ebuild)6
-rw-r--r--net-dns/nsd/nsd-9999.ebuild6
2 files changed, 4 insertions, 8 deletions
diff --git a/net-dns/nsd/nsd-4.10.1.ebuild b/net-dns/nsd/nsd-4.10.1-r1.ebuild
index 3d6930329889..099b81460652 100644
--- a/net-dns/nsd/nsd-4.10.1.ebuild
+++ b/net-dns/nsd/nsd-4.10.1-r1.ebuild
@@ -52,8 +52,6 @@ PATCHES=(
"${FILESDIR}/${PN}-munin-gentoo-paths.patch"
)
-NSD_TMPFILESD_VER="1" # Cur version of NSD's tmpfiles.d config.
-
NSD_DBDIR="/var/db/nsd" # Default dir for NSD's databases.
NSD_ZNDIR="/var/lib/nsd" # Default dir for NSD's zone files.
@@ -125,9 +123,9 @@ src_install() {
emake DESTDIR="${D}" install
dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
- newinitd "contrib/nsd.openrc.in" nsd
+ newinitd "contrib/nsd.openrc" nsd
newconfd "contrib/nsd.openrc.conf" nsd
- newtmpfiles "${FILESDIR}/nsd.tmpfilesd-r${NSD_TMPFILESD_VER}" nsd.conf
+ newtmpfiles "contrib/nsd-tmpfiles.conf" nsd.conf
# Install munin plugin and config, if requested.
if use munin ; then
diff --git a/net-dns/nsd/nsd-9999.ebuild b/net-dns/nsd/nsd-9999.ebuild
index 3d6930329889..099b81460652 100644
--- a/net-dns/nsd/nsd-9999.ebuild
+++ b/net-dns/nsd/nsd-9999.ebuild
@@ -52,8 +52,6 @@ PATCHES=(
"${FILESDIR}/${PN}-munin-gentoo-paths.patch"
)
-NSD_TMPFILESD_VER="1" # Cur version of NSD's tmpfiles.d config.
-
NSD_DBDIR="/var/db/nsd" # Default dir for NSD's databases.
NSD_ZNDIR="/var/lib/nsd" # Default dir for NSD's zone files.
@@ -125,9 +123,9 @@ src_install() {
emake DESTDIR="${D}" install
dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
- newinitd "contrib/nsd.openrc.in" nsd
+ newinitd "contrib/nsd.openrc" nsd
newconfd "contrib/nsd.openrc.conf" nsd
- newtmpfiles "${FILESDIR}/nsd.tmpfilesd-r${NSD_TMPFILESD_VER}" nsd.conf
+ newtmpfiles "contrib/nsd-tmpfiles.conf" nsd.conf
# Install munin plugin and config, if requested.
if use munin ; then