[gentoo-commits] repo/gentoo:master commit in: net-dns/nsd/

["Joshua Kinard" <kumba@gentoo.org>]

commit:     b9e54e24f73b5500fccf3d62711b8a2bcd04cef1
Author:     Joshua Kinard <kumba <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  4 11:50:57 2024 +0000
Commit:     Joshua Kinard <kumba <AT> gentoo <DOT> org>
CommitDate: Sun Aug  4 11:50:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9e54e24

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 <AT> gentoo.org>

 net-dns/nsd/{nsd-4.10.1.ebuild => nsd-4.10.1-r1.ebuild} | 6 ++----
 net-dns/nsd/nsd-9999.ebuild                             | 6 ++----
 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
similarity index 96%
rename from net-dns/nsd/nsd-4.10.1.ebuild
rename to 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