public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-dns/nsd/files/, net-dns/nsd/
@ 2016-04-07 14:37 Lars Wendler
  0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2016-04-07 14:37 UTC (permalink / raw
  To: gentoo-commits

commit:     8713a559300c445253ba86715b0f7d3d6c7ac7d4
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 14:36:18 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 14:37:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8713a559

net-dns/nsd: Bump to versions 3.2.21 and 4.1.9

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-dns/nsd/Manifest               |  2 +
 net-dns/nsd/files/nsd.initd        |  4 +-
 net-dns/nsd/files/nsd3.initd-r1    |  4 +-
 net-dns/nsd/files/nsd_munin_.patch |  4 +-
 net-dns/nsd/nsd-3.2.21.ebuild      | 81 +++++++++++++++++++++++++++++++
 net-dns/nsd/nsd-4.1.9.ebuild       | 97 ++++++++++++++++++++++++++++++++++++++
 6 files changed, 186 insertions(+), 6 deletions(-)

diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index d339e70..477fbd3 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -1,4 +1,6 @@
 DIST nsd-3.2.18.tar.gz 924566 SHA256 541047c2114466d6fa7d7b9f397f632e542750475f1fcef5339da86a1ebdfcdb SHA512 888618b51f8ec85413a95a9733198a5affc420b1a8c3b00ed18c8f73f1a0d0654b334ff22076adab23bac56ccb3684cb551ebec426d3d0df939eee24ae66044f WHIRLPOOL 0d4ea8d6e26fc517404e6ebc427774a9c1f4ec7c7c096f7adc5ba51f3fa218215f666dd848a48650bba502ceb4d2795ecb264014f5f31409290937b089b4f062
 DIST nsd-3.2.20.tar.gz 925600 SHA256 cc3f04291a043d5350e67e1590003429ebf64975367858f70b3bf623ce609e16 SHA512 9decbdde984ec6b8d491f57a2a38441415721f108898f552a19740ed51c56e049cb01059952937841a2f8ea9574e3ee6a03177a4c23e827295c1fd6afbcd3d99 WHIRLPOOL 713d1d596c1176983e40a658f1033ba1275d23abcde9f3902c76823a2071ee3230baa21b9dc5af65c8abe270fbb242fb521b4246caee3d128dddd18fe530c69c
+DIST nsd-3.2.21.tar.gz 923043 SHA256 1a3a1ceebff7277e9632160575543e0648dc0d1dfb2ffe42ed23fabec7503501 SHA512 5bd37aff0fcb08b2ef3bf3c18281534be29941203483d9056c4fc733825879f9964a46d62ffd9b8fc5b9be2a2063e481810b4d169bfeee314be6ce217fce6798 WHIRLPOOL eb8788a3288f4cc66fd7f58ca3438bf0420baeb892e8960b8533bd6caebd5bef4596bb4d71d577434a0a14e5e9c595b2a9a2642144531e77d7e7e564441e9337
 DIST nsd-4.1.0.tar.gz 1056649 SHA256 ec3f6902f6f26a6b9248dcd7e9f42472fa52755740b4ba6b9d3bd08910b39b62 SHA512 1e49c14108b201ff8f14f58a9aae8ee4a69fba2e9494bdffc20ac079bff437ce91b069852d0aac639ec860a258b0b222b72269e62ad7b433c3df8d06afea8f03 WHIRLPOOL 6041ed2292412c91d3a7828727b5cf5f85cc6a0088e51cb791d2f56cfab2b8358627e1af7517091c3f119ce83218763dbd54279c88137c509bcf9e48c3049f94
 DIST nsd-4.1.7.tar.gz 1072576 SHA256 7ba8beb29b495ab795e927d9aa82a5bb1b66296a78f61ed47d6ccfe59e9b1a8a SHA512 c2bdb03a09ac06d70feef2183e2d777777ba7830777bac67ab974016f52791ad7ed9227a37a31325f5e4ab4baeacc4cb562d5af4cd85e5b6ddc83422ae5d0df8 WHIRLPOOL 4ba203a4f5e365f8f850436b9d721fa1d50dd180bfec14d6ab7ab3b89d2ff5a7fd5bc93c1f8b304a2fe5a070d4f3ae4f5786eeb8d9fbb159c53f12346d0342ba
+DIST nsd-4.1.9.tar.gz 1073120 SHA256 b811224d635331de741f1723aefc41adda0a0a3a499ec310aa01dd3b4b95c8f2 SHA512 4602dfd07f41dca80fb3b2af471305ad2baba45f7aa294bd3e50d673ec6cc3b1170b410a425796cef52b3af6eea6282dcb00c1f21d5642b0962b3d111dade940 WHIRLPOOL b747afb74e26f10b6170768dd46297356e7280021a33e94a0722963a60407d91eed63465c487d61db1cbe03de70f526a9a1657e6ede03eddf8d975ce81106beb

diff --git a/net-dns/nsd/files/nsd.initd b/net-dns/nsd/files/nsd.initd
index b6eced7..bbab4a6 100644
--- a/net-dns/nsd/files/nsd.initd
+++ b/net-dns/nsd/files/nsd.initd
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

diff --git a/net-dns/nsd/files/nsd3.initd-r1 b/net-dns/nsd/files/nsd3.initd-r1
index 46a7148..76db09d 100644
--- a/net-dns/nsd/files/nsd3.initd-r1
+++ b/net-dns/nsd/files/nsd3.initd-r1
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

diff --git a/net-dns/nsd/files/nsd_munin_.patch b/net-dns/nsd/files/nsd_munin_.patch
index 96902f4..36162f9 100644
--- a/net-dns/nsd/files/nsd_munin_.patch
+++ b/net-dns/nsd/files/nsd_munin_.patch
@@ -1,5 +1,5 @@
---- contrib/nsd_munin_.orig	2013-08-08 23:14:27.000000000 +0200
-+++ contrib/nsd_munin_	2013-08-08 23:41:24.000000000 +0200
+--- a/contrib/nsd_munin_
++++ b/contrib/nsd_munin_
 @@ -87,10 +87,10 @@
  
  =cut

diff --git a/net-dns/nsd/nsd-3.2.21.ebuild b/net-dns/nsd/nsd-3.2.21.ebuild
new file mode 100644
index 0000000..4733f0d
--- /dev/null
+++ b/net-dns/nsd/nsd-3.2.21.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="An authoritative only, high performance, open source name server"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
+MY_PV=${PV/_rc/rc}
+MY_PV=${MY_PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+S="${WORKDIR}/${MY_P}"
+SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bind8-stats ipv6 minimal-responses mmap +nsec3 ratelimit root-server runtime-checks zone-stats"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	virtual/yacc
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/flex
+"
+
+pkg_setup() {
+	enewgroup nsd
+	enewuser nsd -1 -1 -1 nsd
+}
+
+src_configure() {
+	# ebuild.sh sets localstatedir to /var/lib, but nsd expects /var in several locations
+	# some of these cannot be changed by arguments to econf/configure, f.i. logfile
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--with-pidfile="${EPREFIX}/var/run/nsd/nsd.pid" \
+		--with-zonesdir="${EPREFIX}/var/lib/nsd" \
+		--enable-largefile \
+		$(use_enable bind8-stats) \
+		$(use_enable ipv6) \
+		$(use_enable minimal-responses) \
+		$(use_enable mmap) \
+		$(use_enable nsec3) \
+		$(use_enable ratelimit) \
+		$(use_enable root-server) \
+		$(use_enable runtime-checks checking) \
+		$(use_enable zone-stats)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc doc/{ChangeLog,CREDITS,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
+
+	insinto /usr/share/nsd
+	doins contrib/nsd.zones2nsd.conf
+
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/nsd3-patch.cron nsd-patch.cron
+
+	newinitd "${FILESDIR}"/nsd3.initd-r1 nsd
+
+	# database directory, writable by nsd for database updates and zone transfers
+	dodir /var/db/nsd
+	fowners nsd:nsd /var/db/nsd
+	fperms 750 /var/db/nsd
+
+	# zones directory, writable by root for 'nsdc patch'
+	dodir /var/lib/nsd
+	fowners root:nsd /var/lib/nsd
+	fperms 750 /var/lib/nsd
+
+	# remove /var/run data created by Makefile, handled by initd script
+	rm -r "${ED}"/var/run || die "could not remove /var/run/ directory"
+
+}

diff --git a/net-dns/nsd/nsd-4.1.9.ebuild b/net-dns/nsd/nsd-4.1.9.ebuild
new file mode 100644
index 0000000..59948d2
--- /dev/null
+++ b/net-dns/nsd/nsd-4.1.9.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit user systemd
+
+DESCRIPTION="An authoritative only, high performance, open source name server"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
+# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
+MY_PV=${PV/_rc/rc}
+MY_PV=${MY_PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+S="${WORKDIR}/${MY_P}"
+SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl libressl"
+
+RDEPEND="
+	virtual/yacc
+	libevent? ( dev-libs/libevent )
+	ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
+	munin? ( net-analyzer/munin )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/flex
+"
+
+src_prepare() {
+	# Fix the paths in the munin plugin to match our install
+	eapply "${FILESDIR}"/nsd_munin_.patch
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		--enable-pie \
+		--enable-relro-now \
+		--enable-largefile \
+		--with-logfile="${EPREFIX}"/var/log/nsd.log \
+		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid \
+		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db \
+		--with-xfrdir="${EPREFIX}"/var/db/nsd \
+		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state \
+		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list \
+		--with-zonesdir="${EPREFIX}"/var/lib/nsd \
+		$(use_enable bind8-stats) \
+		$(use_enable bind8-stats zone-stats) \
+		$(use_enable ipv6) \
+		$(use_enable minimal-responses) \
+		$(use_enable mmap) \
+		$(use_enable nsec3) \
+		$(use_enable ratelimit) \
+		$(use_enable root-server) \
+		$(use_enable runtime-checks checking) \
+		$(use_with libevent) \
+		$(use_with ssl)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
+
+	newinitd "${FILESDIR}"/nsd.initd nsd
+
+	# install munin plugin and config
+	if use munin ; then
+		exeinto /usr/libexec/munin/plugins
+		doexe contrib/nsd_munin_
+		insinto /etc/munin/plugin-conf.d
+		newins "${FILESDIR}"/nsd.munin-conf nsd_munin
+	fi
+
+	systemd_dounit "${FILESDIR}"/nsd.service
+
+	# remove the /run directory that usually resides on tmpfs and is
+	# being taken care of by the nsd init script anyway (checkpath)
+	rm -r "${ED}"/run || die "Failed to remove /run"
+}
+
+pkg_postinst() {
+	# Do this in postinst to ensure the uid/gid is consistent for binpkgs
+	enewgroup nsd
+	enewuser nsd -1 -1 -1 nsd
+
+	# database directory, writable by nsd for database updates and zone transfers
+	install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/db/nsd
+
+	# zones directory, writable by nsd for zone file updates (nsd-control write)
+	install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/lib/nsd
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/nsd/files/, net-dns/nsd/
@ 2016-09-27 22:34 Lars Wendler
  0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2016-09-27 22:34 UTC (permalink / raw
  To: gentoo-commits

commit:     9ba90733adba1e11baa9d58396e0d6e566021000
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 22:33:59 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 22:34:23 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ba90733

net-dns/nsd: Removed old.

Package-Manager: portage-2.3.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-dns/nsd/Manifest                               |   2 -
 .../nsd-4.1.10-r4644-build-without-ipv6.patch      |  23 -----
 net-dns/nsd/files/nsd.initd                        |  53 -----------
 net-dns/nsd/nsd-4.1.10.ebuild                      | 100 ---------------------
 net-dns/nsd/nsd-4.1.11-r2.ebuild                   |  97 --------------------
 5 files changed, 275 deletions(-)

diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 62bfb39..a06b0fb 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -1,5 +1,3 @@
 DIST nsd-3.2.22.tar.gz 924627 SHA256 47c2b424c719a1535f709f4e82d796bca43cad86731f5f275c9367040a474a03 SHA512 2c0cbc97eaa376dcf496ed4323d9f7afb0dbf1852fa5fc9d8c7ecbcf8aaa1b025d56b5e439d19bc36b50deaf5f753fb08109d7e25dc1f8223fe85b7d017f81c3 WHIRLPOOL 271b47a331f2a63dd51bf642fed7083f27660f618fe0418c6b3a361d7b0a7ebda1a300d12d92c1c03e21cd17560ba4f2f2cdac76f7c6793d4befc71b66646f7d
-DIST nsd-4.1.10.tar.gz 1075892 SHA256 3a757014046752a0b0b11c1a2e22a36bb796f89f6939147ed3226556b4298727 SHA512 e77c858d34002e54085f3a39eda7c6229f21f980339beb9a9d5719245d6010e5435a13dba978ac1aed9b712ed49e5a8ca75cb216cb50dd590556077d32b97a96 WHIRLPOOL 8d04b8661e821ec49c93a00a088bec83b3ca3faf7c07d9d720cba1c5c71fc2db3aafc95b5d0d3a8e848c38f11bd9daeb1a53da752bcf8314722aefbd1d55c4d5
-DIST nsd-4.1.11.tar.gz 1080220 SHA256 c7712fd05eb0ab97040738e01d9369d02b89c0a7fa0943fd5bfc43b2111a92df SHA512 e5f4ad1d39bd75b086f3fc3281fa6ac31f4b6ba9c4a9e23bba527d1a1374dfaf0acaac24168bb5a3ad5a041829d1864331928f18ba49562a25e3f8651609a1f7 WHIRLPOOL 187088f8b1c4c92a7e67535b9f2d1520ff3d056c209535afa74079f4b680bf2afe7766e5a102b1481cfe11beb2169b4e1dedcec6d137ab3044e04cf5715fc579
 DIST nsd-4.1.12.tar.gz 1080273 SHA256 fd1979dff1fba55310fd4f439dc9f3f4701d435c0ec4fb9af533e12c7f27d5de SHA512 f78c0a24669ce8a0cf5640d90f5dfc8756009a840545feddd9c466a5f0b7441d470efb267f7ad38ed45321a6f8b75ad7db9b13bdaefab55b7614ebb3e9bd183b WHIRLPOOL 6304ff6b25a315cf3e340d9cf3cffee141abfdceaeb71ac94c97fe78d14698fe2164042db7785a254feeecd4170c4ad7a8fccdf165cfb5bbefbe1244fdbd4bea
 DIST nsd-4.1.13.tar.gz 1085701 SHA256 c45cd4ba2101a027e133b2be44db9378e27602e05f09a5ef25019e1ae45291af SHA512 f355402273480b2befe914ab2e933c37ec35e5c8e747f85ba03bf8928e42ab809bb6b21cf2b8bf11e8d422a795254e1d916b154156243bc94752a01fb540525e WHIRLPOOL f5d7d3386649b82bf2f7eb6ab2f0c50b2f11e4e545931d99352a63317cda127278e5d9219763dc51a5e3a73daa0ab04e45b037eea738cad20cabf284068e9c7c

diff --git a/net-dns/nsd/files/nsd-4.1.10-r4644-build-without-ipv6.patch b/net-dns/nsd/files/nsd-4.1.10-r4644-build-without-ipv6.patch
deleted file mode 100644
index cb59ca9..00000000
--- a/net-dns/nsd/files/nsd-4.1.10-r4644-build-without-ipv6.patch
+++ /dev/null
@@ -1,23 +0,0 @@
- 4.1.10
-Index: query.c
-===================================================================
-diff --git a/query.c b/query.c
---- a/query.c	(revision 4643)
-+++ b/query.c	(revision 4644)
-@@ -704,11 +704,16 @@
- 	result = answer_add_rrset(answer, section, owner, rrset);
- 	switch (rrset_rrtype(rrset)) {
- 	case TYPE_NS:
-+#if defined(INET6)
- 		/* if query over IPv6, swap A and AAAA; put AAAA first */
- 		add_additional_rrsets(query, answer, rrset, 0, 1,
- 			(query->addr.ss_family == AF_INET6)?
- 			swap_aaaa_additional_rr_types:
- 			default_additional_rr_types);
-+#else
-+		add_additional_rrsets(query, answer, rrset, 0, 1,
-+				      default_additional_rr_types);
-+#endif
- 		break;
- 	case TYPE_MB:
- 		add_additional_rrsets(query, answer, rrset, 0, 0,

diff --git a/net-dns/nsd/files/nsd.initd b/net-dns/nsd/files/nsd.initd
deleted file mode 100644
index bbab4a6..00000000
--- a/net-dns/nsd/files/nsd.initd
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-description="NSD is an authoritative-only, high performance, open source name server"
-extra_commands="configtest"
-
-# these can be overridden in /etc/conf.d/nsd if necessary
-NSD_CONFIG="${NSD_CONFIG:-/etc/nsd/nsd.conf}"
-NSD_BINARY="${NSD_BINARY:-/usr/sbin/nsd}"
-NSD_CHECKCONF="${NSD_CHECKCONF:-/usr/sbin/nsd-checkconf}"
-
-depend() {
-	need net
-	use logger
-}
-
-configtest() {
-	ebegin "Checking ${SVCNAME} configuration"
-	checkconfig
-	eend $?
-}
-
-checkconfig() {
-	if ! test -e "${NSD_CONFIG}"; then
-		eerror "You need to create an appropriate config file."
-		eerror "An example can be found in /etc/nsd/nsd.conf.sample"
-		return 1
-	elif ! "${NSD_CHECKCONF}" "${NSD_CONFIG}"; then
-		eerror "You have errors in your configfile (${NSD_CONFIG})"
-		return $?
-	fi
-	return 0
-}
-
-start() {
-	ebegin "Starting NSD"
-	checkconfig || return $?
-	local pidfile=$("${NSD_CHECKCONF}" -o pidfile "${NSD_CONFIG}")
-	checkpath --directory --owner nsd:nsd $(dirname "${pidfile}")
-	start-stop-daemon --start --pidfile "${pidfile}" \
-		--exec "${NSD_BINARY}" -- -c "${NSD_CONFIG}"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping NSD"
-	checkconfig || return $?
-	local pidfile=$("${NSD_CHECKCONF}" -o pidfile "${NSD_CONFIG}")
-	start-stop-daemon --stop --pidfile "${pidfile}"
-	eend $?
-}

diff --git a/net-dns/nsd/nsd-4.1.10.ebuild b/net-dns/nsd/nsd-4.1.10.ebuild
deleted file mode 100644
index bc175e8..00000000
--- a/net-dns/nsd/nsd-4.1.10.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit user systemd
-
-DESCRIPTION="An authoritative only, high performance, open source name server"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
-# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
-MY_PV=${PV/_rc/rc}
-MY_PV=${MY_PV/_beta/b}
-MY_P=${PN}-${MY_PV}
-S="${WORKDIR}/${MY_P}"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl libressl"
-
-RDEPEND="
-	virtual/yacc
-	libevent? ( dev-libs/libevent )
-	ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
-	munin? ( net-analyzer/munin )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-"
-
-src_prepare() {
-	# Fix for USE=-ipv6 compile bug in nsd 4.1.10 only, taken from upstream
-	eapply "${FILESDIR}/${P}-r4644-build-without-ipv6.patch"
-
-	# Fix the paths in the munin plugin to match our install
-	eapply "${FILESDIR}"/nsd_munin_.patch
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--enable-pie \
-		--enable-relro-now \
-		--enable-largefile \
-		--with-logfile="${EPREFIX}"/var/log/nsd.log \
-		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid \
-		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db \
-		--with-xfrdir="${EPREFIX}"/var/db/nsd \
-		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state \
-		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list \
-		--with-zonesdir="${EPREFIX}"/var/lib/nsd \
-		$(use_enable bind8-stats) \
-		$(use_enable bind8-stats zone-stats) \
-		$(use_enable ipv6) \
-		$(use_enable minimal-responses) \
-		$(use_enable mmap) \
-		$(use_enable nsec3) \
-		$(use_enable ratelimit) \
-		$(use_enable root-server) \
-		$(use_enable runtime-checks checking) \
-		$(use_with libevent) \
-		$(use_with ssl)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
-
-	newinitd "${FILESDIR}"/nsd.initd nsd
-
-	# install munin plugin and config
-	if use munin ; then
-		exeinto /usr/libexec/munin/plugins
-		doexe contrib/nsd_munin_
-		insinto /etc/munin/plugin-conf.d
-		newins "${FILESDIR}"/nsd.munin-conf nsd_munin
-	fi
-
-	systemd_dounit "${FILESDIR}"/nsd.service
-
-	# remove the /run directory that usually resides on tmpfs and is
-	# being taken care of by the nsd init script anyway (checkpath)
-	rm -r "${ED}"/run || die "Failed to remove /run"
-}
-
-pkg_postinst() {
-	# Do this in postinst to ensure the uid/gid is consistent for binpkgs
-	enewgroup nsd
-	enewuser nsd -1 -1 -1 nsd
-
-	# database directory, writable by nsd for database updates and zone transfers
-	install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/db/nsd
-
-	# zones directory, writable by nsd for zone file updates (nsd-control write)
-	install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/lib/nsd
-}

diff --git a/net-dns/nsd/nsd-4.1.11-r2.ebuild b/net-dns/nsd/nsd-4.1.11-r2.ebuild
deleted file mode 100644
index 3719d0f..00000000
--- a/net-dns/nsd/nsd-4.1.11-r2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit user systemd
-
-DESCRIPTION="An authoritative only, high performance, open source name server"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
-# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
-MY_PV=${PV/_rc/rc}
-MY_PV=${MY_PV/_beta/b}
-MY_P=${PN}-${MY_PV}
-S="${WORKDIR}/${MY_P}"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl libressl"
-
-RDEPEND="
-	virtual/yacc
-	libevent? ( dev-libs/libevent )
-	ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
-	munin? ( net-analyzer/munin )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-"
-
-src_prepare() {
-	# Fix the paths in the munin plugin to match our install
-	eapply "${FILESDIR}"/nsd_munin_.patch
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--enable-pie \
-		--enable-relro-now \
-		--enable-largefile \
-		--with-logfile="${EPREFIX}"/var/log/nsd.log \
-		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid \
-		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db \
-		--with-xfrdir="${EPREFIX}"/var/db/nsd \
-		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state \
-		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list \
-		--with-zonesdir="${EPREFIX}"/var/lib/nsd \
-		$(use_enable bind8-stats) \
-		$(use_enable bind8-stats zone-stats) \
-		$(use_enable ipv6) \
-		$(use_enable minimal-responses) \
-		$(use_enable mmap) \
-		$(use_enable nsec3) \
-		$(use_enable ratelimit) \
-		$(use_enable root-server) \
-		$(use_enable runtime-checks checking) \
-		$(use_with libevent) \
-		$(use_with ssl)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
-
-	newinitd "${FILESDIR}"/nsd.initd-r1 nsd
-
-	# install munin plugin and config
-	if use munin ; then
-		exeinto /usr/libexec/munin/plugins
-		doexe contrib/nsd_munin_
-		insinto /etc/munin/plugin-conf.d
-		newins "${FILESDIR}"/nsd.munin-conf nsd_munin
-	fi
-
-	systemd_dounit "${FILESDIR}"/nsd.service
-
-	# remove the /run directory that usually resides on tmpfs and is
-	# being taken care of by the nsd init script anyway (checkpath)
-	rm -r "${ED}"/run || die "Failed to remove /run"
-}
-
-pkg_postinst() {
-	# Do this in postinst to ensure the uid/gid is consistent for binpkgs
-	enewgroup nsd
-	enewuser nsd -1 -1 -1 nsd
-
-	# database directory, writable by nsd for database updates and zone transfers
-	install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/db/nsd
-
-	# zones directory, writable by nsd for zone file updates (nsd-control write)
-	install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/lib/nsd
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/nsd/files/, net-dns/nsd/
@ 2017-02-16 23:49 Lars Wendler
  0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2017-02-16 23:49 UTC (permalink / raw
  To: gentoo-commits

commit:     6b00ee80fe0fa7c5ec2bc008235bb0b1b4631112
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 23:47:39 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 23:49:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b00ee80

net-dns/nsd: Removed old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-dns/nsd/Manifest              |  2 -
 net-dns/nsd/files/nsd3-patch.cron |  9 ----
 net-dns/nsd/files/nsd3.initd-r1   | 66 --------------------------
 net-dns/nsd/metadata.xml          |  2 -
 net-dns/nsd/nsd-3.2.22.ebuild     | 87 -----------------------------------
 net-dns/nsd/nsd-4.1.13.ebuild     | 97 ---------------------------------------
 6 files changed, 263 deletions(-)

diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 27cea0e900..c60cfac674 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -1,4 +1,2 @@
-DIST nsd-3.2.22.tar.gz 924627 SHA256 47c2b424c719a1535f709f4e82d796bca43cad86731f5f275c9367040a474a03 SHA512 2c0cbc97eaa376dcf496ed4323d9f7afb0dbf1852fa5fc9d8c7ecbcf8aaa1b025d56b5e439d19bc36b50deaf5f753fb08109d7e25dc1f8223fe85b7d017f81c3 WHIRLPOOL 271b47a331f2a63dd51bf642fed7083f27660f618fe0418c6b3a361d7b0a7ebda1a300d12d92c1c03e21cd17560ba4f2f2cdac76f7c6793d4befc71b66646f7d
-DIST nsd-4.1.13.tar.gz 1085701 SHA256 c45cd4ba2101a027e133b2be44db9378e27602e05f09a5ef25019e1ae45291af SHA512 f355402273480b2befe914ab2e933c37ec35e5c8e747f85ba03bf8928e42ab809bb6b21cf2b8bf11e8d422a795254e1d916b154156243bc94752a01fb540525e WHIRLPOOL f5d7d3386649b82bf2f7eb6ab2f0c50b2f11e4e545931d99352a63317cda127278e5d9219763dc51a5e3a73daa0ab04e45b037eea738cad20cabf284068e9c7c
 DIST nsd-4.1.14.tar.gz 1086818 SHA256 bdfc61c5f3bf11febd8f4776eef1d4f2d95ed70f12f11d4eeee943c186ffd802 SHA512 25d16a6c3e4515129f0ad4f9ab0bf6ebe12bd817cd6107d66cb99aff6b6984f5153d9b502013492cfdd907d5fad9a284583c8436b559ef4c0cce5a1176a4aff3 WHIRLPOOL 64b14e53a13ff379b665c3d76298f4616b05777694b51aa3a6541be7b2c0d6b283fe6f069dec752241393b3e8795ce048ee935f614db39d221962a2d86a693f2
 DIST nsd-4.1.15.tar.gz 1087383 SHA256 494a862cfcd26a525a4bf06306eb7ab0387b34678ac6d37767507438e3a23a4b SHA512 1011e4805d43931dd1a7fed230dadd9eb9bdf7a6728cb5bbde2def462d3bdc2ed79529ef0c60a6530e6fb78ae88a03a50d8b75b27d9130966ca20a62d8a6615e WHIRLPOOL 85a01ecb7c25e557d73e40dfbc881453020fbc20eabb50ffb47d94128e86de3861053425635b438ef86ed261dacf03a040f90d4e143726b765abc790a1c5944c

diff --git a/net-dns/nsd/files/nsd3-patch.cron b/net-dns/nsd/files/nsd3-patch.cron
deleted file mode 100644
index ec27e4e95d..0000000000
--- a/net-dns/nsd/files/nsd3-patch.cron
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Cron job: merge zone transfer changes back to zone files
-# Needed for nsd3 only
-
-/etc/init.d/nsd --quiet status && /etc/init.d/nsd patch >/dev/null

diff --git a/net-dns/nsd/files/nsd3.initd-r1 b/net-dns/nsd/files/nsd3.initd-r1
deleted file mode 100644
index 76db09d63a..0000000000
--- a/net-dns/nsd/files/nsd3.initd-r1
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-description="NSD is an authoritative-only, high performance, open source name server"
-extra_commands="configtest patch"
-
-# these can be overridden in /etc/conf.d/nsd if necessary
-NSD_CONFIG="${NSD_CONFIG:-/etc/nsd/nsd.conf}"
-NSD_BINARY="${NSD_BINARY:-/usr/sbin/nsd}"
-NSD_CHECKCONF="${NSD_CHECKCONF:-/usr/sbin/nsd-checkconf}"
-NSDC_BINARY="${NSDC_BINARY:-/usr/sbin/nsdc}"
-
-depend() {
-	need net
-	use logger
-}
-
-configtest() {
-	ebegin "Checking ${SVCNAME} configuration"
-	checkconfig
-	eend $?
-}
-
-checkconfig() {
-	if ! test -e "${NSD_CONFIG}"; then
-		eerror "You need to create an appropriate config file."
-		eerror "An example can be found in /etc/nsd/nsd.conf.sample"
-		return 1
-	elif ! "${NSD_CHECKCONF}" "${NSD_CONFIG}"; then
-		eerror "You have errors in your configfile (${NSD_CONFIG})"
-		return $?
-	fi
-	return 0
-}
-
-patch() {
-	local difffile=$(${NSD_CHECKCONF} -o difffile "${NSD_CONFIG}")
-	if ! test -s "${difffile}"; then
-		# no difffile found or difffile empty, so no patching required
-		return 0
-	fi
-	ebegin "Patching NSD zone files"
-	"${NSDC_BINARY}" patch >/dev/null
-	eend $?
-}
-
-start() {
-	ebegin "Starting NSD"
-	checkconfig || return $?
-	local pidfile=$("${NSD_CHECKCONF}" -o pidfile "${NSD_CONFIG}")
-	checkpath --directory --owner nsd:nsd $(dirname "${pidfile}")
-	start-stop-daemon --start --pidfile "${pidfile}" \
-		--exec "${NSD_BINARY}" -- -c "${NSD_CONFIG}"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping NSD"
-	checkconfig || return $?
-	local pidfile=$("${NSD_CHECKCONF}" -o pidfile "${NSD_CONFIG}")
-	patch || return $?
-	start-stop-daemon --stop --pidfile "${pidfile}"
-	eend $?
-}

diff --git a/net-dns/nsd/metadata.xml b/net-dns/nsd/metadata.xml
index bbcd6ae4d6..0d66874728 100644
--- a/net-dns/nsd/metadata.xml
+++ b/net-dns/nsd/metadata.xml
@@ -21,7 +21,5 @@
 		<flag name="munin">
 			Install a plugin for <pkg>net-analyzer/munin</pkg> to graph
 			statistical data from nsd.</flag>
-		<flag name="zone-stats">Enable per-zone statistics logging, this 
-			could lead to a reduced service level</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-dns/nsd/nsd-3.2.22.ebuild b/net-dns/nsd/nsd-3.2.22.ebuild
deleted file mode 100644
index 314d1d751e..0000000000
--- a/net-dns/nsd/nsd-3.2.22.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="An authoritative only, high performance, open source name server"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
-MY_PV=${PV/_rc/rc}
-MY_PV=${MY_PV/_beta/b}
-MY_P=${PN}-${MY_PV}
-S="${WORKDIR}/${MY_P}"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bind8-stats ipv6 minimal-responses mmap +nsec3 ratelimit root-server runtime-checks zone-stats"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	virtual/yacc
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-"
-
-pkg_setup() {
-	enewgroup nsd
-	enewuser nsd -1 -1 -1 nsd
-}
-
-src_configure() {
-	# ebuild.sh sets localstatedir to /var/lib, but nsd expects /var in several locations
-	# some of these cannot be changed by arguments to econf/configure, f.i. logfile
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-pidfile="${EPREFIX}/var/run/nsd/nsd.pid" \
-		--with-zonesdir="${EPREFIX}/var/lib/nsd" \
-		--enable-largefile \
-		$(use_enable bind8-stats) \
-		$(use_enable ipv6) \
-		$(use_enable minimal-responses) \
-		$(use_enable mmap) \
-		$(use_enable nsec3) \
-		$(use_enable ratelimit) \
-		$(use_enable root-server) \
-		$(use_enable runtime-checks checking) \
-		$(use_enable zone-stats)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc doc/{ChangeLog,CREDITS,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
-
-	insinto /usr/share/nsd
-	doins contrib/nsd.zones2nsd.conf
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/nsd3-patch.cron nsd-patch.cron
-
-	newinitd "${FILESDIR}"/nsd3.initd-r1 nsd
-
-	# database directory, writable by nsd for database updates and zone transfers
-	dodir /var/db/nsd
-	fowners nsd:nsd /var/db/nsd
-	fperms 750 /var/db/nsd
-
-	# zones directory, writable by root for 'nsdc patch'
-	dodir /var/lib/nsd
-	fowners root:nsd /var/lib/nsd
-	fperms 750 /var/lib/nsd
-
-	# remove /var/run data created by Makefile, handled by initd script
-	rm -r "${ED}"/var/run || die "could not remove /var/run/ directory"
-
-}
-
-pkg_postinst() {
-	elog "This is the last official upstream release of the 3.2.x series."
-	elog "Please consider upgrading to the 4.1.x series as that will remain the only one"
-	elog "still receiving (security) updates from upstream."
-}

diff --git a/net-dns/nsd/nsd-4.1.13.ebuild b/net-dns/nsd/nsd-4.1.13.ebuild
deleted file mode 100644
index 3719d0f0ac..0000000000
--- a/net-dns/nsd/nsd-4.1.13.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit user systemd
-
-DESCRIPTION="An authoritative only, high performance, open source name server"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
-# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
-MY_PV=${PV/_rc/rc}
-MY_PV=${MY_PV/_beta/b}
-MY_P=${PN}-${MY_PV}
-S="${WORKDIR}/${MY_P}"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl libressl"
-
-RDEPEND="
-	virtual/yacc
-	libevent? ( dev-libs/libevent )
-	ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
-	munin? ( net-analyzer/munin )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-"
-
-src_prepare() {
-	# Fix the paths in the munin plugin to match our install
-	eapply "${FILESDIR}"/nsd_munin_.patch
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--enable-pie \
-		--enable-relro-now \
-		--enable-largefile \
-		--with-logfile="${EPREFIX}"/var/log/nsd.log \
-		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid \
-		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db \
-		--with-xfrdir="${EPREFIX}"/var/db/nsd \
-		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state \
-		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list \
-		--with-zonesdir="${EPREFIX}"/var/lib/nsd \
-		$(use_enable bind8-stats) \
-		$(use_enable bind8-stats zone-stats) \
-		$(use_enable ipv6) \
-		$(use_enable minimal-responses) \
-		$(use_enable mmap) \
-		$(use_enable nsec3) \
-		$(use_enable ratelimit) \
-		$(use_enable root-server) \
-		$(use_enable runtime-checks checking) \
-		$(use_with libevent) \
-		$(use_with ssl)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
-
-	newinitd "${FILESDIR}"/nsd.initd-r1 nsd
-
-	# install munin plugin and config
-	if use munin ; then
-		exeinto /usr/libexec/munin/plugins
-		doexe contrib/nsd_munin_
-		insinto /etc/munin/plugin-conf.d
-		newins "${FILESDIR}"/nsd.munin-conf nsd_munin
-	fi
-
-	systemd_dounit "${FILESDIR}"/nsd.service
-
-	# remove the /run directory that usually resides on tmpfs and is
-	# being taken care of by the nsd init script anyway (checkpath)
-	rm -r "${ED}"/run || die "Failed to remove /run"
-}
-
-pkg_postinst() {
-	# Do this in postinst to ensure the uid/gid is consistent for binpkgs
-	enewgroup nsd
-	enewuser nsd -1 -1 -1 nsd
-
-	# database directory, writable by nsd for database updates and zone transfers
-	install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/db/nsd
-
-	# zones directory, writable by nsd for zone file updates (nsd-control write)
-	install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/lib/nsd
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/nsd/files/, net-dns/nsd/
@ 2018-12-05 10:24 Lars Wendler
  0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2018-12-05 10:24 UTC (permalink / raw
  To: gentoo-commits

commit:     bf7c8daa7389acb3e77f1539ebe45f295af76544
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  5 10:24:20 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Dec  5 10:24:20 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf7c8daa

net-dns/nsd: Added upstream fix for USE="dnstap -ipv6" failure

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-dns/nsd/files/nsd-4.1.26-dnstap_noipv6_fix.patch | 13 +++++++++++++
 net-dns/nsd/nsd-4.1.26.ebuild                        |  9 +++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/net-dns/nsd/files/nsd-4.1.26-dnstap_noipv6_fix.patch b/net-dns/nsd/files/nsd-4.1.26-dnstap_noipv6_fix.patch
new file mode 100644
index 00000000000..be19e337f3d
--- /dev/null
+++ b/net-dns/nsd/files/nsd-4.1.26-dnstap_noipv6_fix.patch
@@ -0,0 +1,13 @@
+https://www.nlnetlabs.nl/bugs-script/show_bug.cgi?id=4213
+
+--- nsd-4.1.26/dnstap/dnstap.c
++++ nsd-4.1.26/dnstap/dnstap.c
+@@ -319,7 +319,7 @@
+ 		*has_port = 1;
+ 	} else if (ss->ss_family == AF_INET) {
+ #else
+-	if (ss->ss_family == AF_INET) {
++	if (ss->sin_family == AF_INET) {
+ #endif /* INET6 */
+ 		struct sockaddr_in *s = (struct sockaddr_in *) ss;
+ 

diff --git a/net-dns/nsd/nsd-4.1.26.ebuild b/net-dns/nsd/nsd-4.1.26.ebuild
index 5fe276b04a9..2d738583621 100644
--- a/net-dns/nsd/nsd-4.1.26.ebuild
+++ b/net-dns/nsd/nsd-4.1.26.ebuild
@@ -40,15 +40,12 @@ DEPEND="
 	systemd? ( virtual/pkgconfig )
 "
 
-# dnstap fails to build without ipv6
-# See https://www.nlnetlabs.nl/bugs-script/show_bug.cgi?id=4213
-REQUIRED_USE="
-	dnstap? ( ipv6 )
-"
-
 PATCHES=(
 	# Fix the paths in the munin plugin to match our install
 	"${FILESDIR}"/nsd_munin_.patch
+
+	# https://www.nlnetlabs.nl/bugs-script/show_bug.cgi?id=4213
+	"${FILESDIR}"/${P}-dnstap_noipv6_fix.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/nsd/files/, net-dns/nsd/
@ 2022-06-29 17:49 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-06-29 17:49 UTC (permalink / raw
  To: gentoo-commits

commit:     c8187366a1ddc5adbf4bae3d9d4a3b1944c7c320
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 17:30:43 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 17:49:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8187366

net-dns/nsd: drop 4.3.9, 4.4.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-dns/nsd/Manifest                     |   2 -
 net-dns/nsd/files/nsd-4.3.9-no_ssl.patch |  22 ------
 net-dns/nsd/nsd-4.3.9.ebuild             | 119 -------------------------------
 net-dns/nsd/nsd-4.4.0.ebuild             | 119 -------------------------------
 4 files changed, 262 deletions(-)

diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 4705886c0228..17df2b61cc13 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -1,4 +1,2 @@
 DIST nsd-4.3.8.tar.gz 1225840 BLAKE2B 19d014f130844aab5b7c6224658c6e5a4a7d8d337ceb11e1641bceb367fe76b46be146c703296a12cec834020992eabec0e1ee8f3cb6211333ac8c4c7029fef5 SHA512 aec892f85a6757bfdf537c6f0b4bc3d60c564b3062b582af14df800b24261edc96bedcd0b6649444a46b198b9018397e356b919a871364032c8a2db6256b9268
-DIST nsd-4.3.9.tar.gz 1222919 BLAKE2B 0b317c246f66476e95727d763bf7444cde14936c8a87036843458b89f8c79790130995db3f0f9ff33d8bfda756cf3ae4724b07f97ee2996f05a2dcd1c14bc0e5 SHA512 de170cbaf6e0be0a20941d9d6b2102a7dddb59a320c30566238447d5740e4497f751f54488f36c2b89f2c3cff6e3101df31a36d0d2d66db8d77cfb6e86124f32
-DIST nsd-4.4.0.tar.gz 1226433 BLAKE2B 8ead662c2ad87e9cfd9424898758cb7a7e6adc3c419583e0a4c3ced4d6bb8ae5005266af621ee4c138a06215652b60b65f075a875b6473dc92d1bef414901be1 SHA512 0fa32337246ccdaf9d6fe4257792cef8b6ce6de086fdee1024983da7b90a77b9039061cee87a2e0ad7eddf195411c57f4777469d973f2bdc10d3a51ee96d90bc
 DIST nsd-4.5.0.tar.gz 1259059 BLAKE2B 5c90a17b2c2df3cf06bea2609fb02198b4fdde3e9ed7cc0a07526d43069f735458a0c1775fc7b45ac7bd1fba42ec329fe5b67378d6282bf86f6c520f73b00397 SHA512 0309e1ff083b6f2118ba6fd59425319c21f31558d30e17a40eb8f1e53dee9e3e766d7b53eb50462130ba17b454a3559dc786d344cb779468d255732bbc6bc5da

diff --git a/net-dns/nsd/files/nsd-4.3.9-no_ssl.patch b/net-dns/nsd/files/nsd-4.3.9-no_ssl.patch
deleted file mode 100644
index 33553a0ec889..000000000000
--- a/net-dns/nsd/files/nsd-4.3.9-no_ssl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From c5e6a8e5e566380c8c6731e9feb7ac686a1c0735 Mon Sep 17 00:00:00 2001
-From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
-Date: Fri, 28 Jan 2022 16:38:53 +0100
-Subject: [PATCH] - Fix #206: build with --without-ssl fails.
-
-diff --git a/edns.c b/edns.c
-index c7fc39d9..478ec681 100644
---- a/edns.c
-+++ b/edns.c
-@@ -21,6 +21,12 @@
- #include "nsd.h"
- #include "query.h"
- 
-+#if !defined(HAVE_SSL) || !defined(HAVE_CRYPTO_MEMCMP)
-+/* we need fixed time compare, pull it in from tsig.c */
-+#define CRYPTO_memcmp memcmp_fixedtime
-+int memcmp_fixedtime(const void *s1, const void *s2, size_t n);
-+#endif
-+
- void
- edns_init_data(edns_data_type *data, uint16_t max_length)
- {

diff --git a/net-dns/nsd/nsd-4.3.9.ebuild b/net-dns/nsd/nsd-4.3.9.ebuild
deleted file mode 100644
index e4f824b01061..000000000000
--- a/net-dns/nsd/nsd-4.3.9.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools systemd
-
-# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
-MY_PV="${PV/_beta/b}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An authoritative only, high performance, open source name server"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64 ~x86"
-IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="
-	acct-group/nsd
-	acct-user/nsd
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c
-	)
-	libevent? ( dev-libs/libevent )
-	munin? ( net-analyzer/munin )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	systemd? ( virtual/pkgconfig )
-"
-
-PATCHES=(
-	# Fix the paths in the munin plugin to match our install
-	"${FILESDIR}"/nsd_munin_.patch
-
-	"${FILESDIR}/${P}-no_ssl.patch" #832213
-)
-
-src_prepare() {
-	default
-	# Required to get correct pkg-config macros with USE="systemd"
-	# see bugs #663618 and #758050
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-largefile
-		--enable-pie
-		--enable-relro-now
-		--enable-tcp-fastopen
-		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db
-		--with-logfile="${EPREFIX}"/var/log/nsd.log
-		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid
-		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state
-		--with-xfrdir="${EPREFIX}"/var/db/nsd
-		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list
-		--with-zonesdir="${EPREFIX}"/var/lib/nsd
-		$(use_enable bind8-stats)
-		$(use_enable bind8-stats zone-stats)
-		$(use_enable dnstap)
-		$(use_enable ipv6)
-		$(use_enable minimal-responses)
-		$(use_enable mmap)
-		$(use_enable nsec3)
-		$(use_enable ratelimit)
-		$(use_enable root-server)
-		$(use_enable runtime-checks checking)
-		$(use_enable systemd)
-		$(use_with libevent)
-		$(use_with ssl)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
-
-	newinitd "${FILESDIR}"/nsd.initd-r1 nsd
-
-	# install munin plugin and config
-	if use munin ; then
-		exeinto /usr/libexec/munin/plugins
-		doexe contrib/nsd_munin_
-		insinto /etc/munin/plugin-conf.d
-		newins "${FILESDIR}"/nsd.munin-conf nsd_munin
-	fi
-
-	systemd_dounit "${FILESDIR}"/nsd.service
-
-	# remove the /run directory that usually resides on tmpfs and is
-	# being taken care of by the nsd init script anyway (checkpath)
-	rm -r "${ED}"/run || die "Failed to remove /run"
-
-	keepdir /var/db/${PN}
-}
-
-pkg_postinst() {
-	# database directory, writable by nsd for database updates and zone transfers
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd
-
-	# zones directory, writable by nsd for zone file updates (nsd-control write)
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd
-}

diff --git a/net-dns/nsd/nsd-4.4.0.ebuild b/net-dns/nsd/nsd-4.4.0.ebuild
deleted file mode 100644
index a41057e6300d..000000000000
--- a/net-dns/nsd/nsd-4.4.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools systemd
-
-DESCRIPTION="An authoritative only, high performance, open source name server"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
-LICENSE="BSD"
-SLOT="0"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/NLnetLabs/nsd.git"
-else
-	# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
-	MY_PV="${PV/_beta/b}"
-	MY_PV="${MY_PV/_rc/rc}"
-	MY_P="${PN}-${MY_PV}"
-
-	[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-fi
-IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd"
-
-RDEPEND="
-	acct-group/nsd
-	acct-user/nsd
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c
-	)
-	libevent? ( dev-libs/libevent )
-	munin? ( net-analyzer/munin )
-	ssl? ( dev-libs/openssl:0= )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	systemd? ( virtual/pkgconfig )
-"
-
-PATCHES=(
-	# Fix the paths in the munin plugin to match our install
-	"${FILESDIR}"/nsd_munin_.patch
-)
-
-src_prepare() {
-	default
-	# Required to get correct pkg-config macros with USE="systemd"
-	# see bugs #663618 and #758050
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-largefile
-		--enable-pie
-		--enable-relro-now
-		--enable-tcp-fastopen
-		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db
-		--with-logfile="${EPREFIX}"/var/log/nsd.log
-		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid
-		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state
-		--with-xfrdir="${EPREFIX}"/var/db/nsd
-		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list
-		--with-zonesdir="${EPREFIX}"/var/lib/nsd
-		$(use_enable bind8-stats)
-		$(use_enable bind8-stats zone-stats)
-		$(use_enable dnstap)
-		$(use_enable ipv6)
-		$(use_enable minimal-responses)
-		$(use_enable mmap)
-		$(use_enable nsec3)
-		$(use_enable ratelimit)
-		$(use_enable root-server)
-		$(use_enable runtime-checks checking)
-		$(use_enable systemd)
-		$(use_with libevent)
-		$(use_with ssl)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
-
-	newinitd "${FILESDIR}"/nsd.initd-r1 nsd
-
-	# install munin plugin and config
-	if use munin ; then
-		exeinto /usr/libexec/munin/plugins
-		doexe contrib/nsd_munin_
-		insinto /etc/munin/plugin-conf.d
-		newins "${FILESDIR}"/nsd.munin-conf nsd_munin
-	fi
-
-	systemd_dounit "${FILESDIR}"/nsd.service
-
-	# remove the /run directory that usually resides on tmpfs and is
-	# being taken care of by the nsd init script anyway (checkpath)
-	rm -r "${ED}"/run || die "Failed to remove /run"
-
-	keepdir /var/db/${PN}
-}
-
-pkg_postinst() {
-	# database directory, writable by nsd for database updates and zone transfers
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd
-
-	# zones directory, writable by nsd for zone file updates (nsd-control write)
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/nsd/files/, net-dns/nsd/
@ 2022-11-10  9:10 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-11-10  9:10 UTC (permalink / raw
  To: gentoo-commits

commit:     b7347f602b97d59931c7f42987b277a1757ef7bb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 10 09:06:51 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 10 09:06:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7347f60

net-dns/nsd: fix -Wincompatible-pointer-types

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/nsd-4.6.1-incompatible-ptr-types.patch   | 24 ++++++++++++++++++++++
 .../nsd/{nsd-4.6.1.ebuild => nsd-4.6.1-r1.ebuild}  |  1 +
 2 files changed, 25 insertions(+)

diff --git a/net-dns/nsd/files/nsd-4.6.1-incompatible-ptr-types.patch b/net-dns/nsd/files/nsd-4.6.1-incompatible-ptr-types.patch
new file mode 100644
index 000000000000..4b87be966eb0
--- /dev/null
+++ b/net-dns/nsd/files/nsd-4.6.1-incompatible-ptr-types.patch
@@ -0,0 +1,24 @@
+https://github.com/NLnetLabs/nsd/issues/239
+https://github.com/NLnetLabs/nsd/commit/7162600301205c3c62a1695c0b29e079694b65ae
+
+From 7162600301205c3c62a1695c0b29e079694b65ae Mon Sep 17 00:00:00 2001
+From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
+Date: Thu, 10 Nov 2022 09:47:59 +0100
+Subject: [PATCH] - Fix #239: -Wincompatible-pointer-types warning in remote.c.
+
+--- a/remote.c
++++ b/remote.c
+@@ -1212,8 +1212,11 @@ do_stats(struct daemon_remote* rc, int peek, struct rc_state* rs)
+ 	/* force a reload */
+ 	xfrd_set_reload_now(xfrd);
+ #else
++	RES res;
++	res.ssl = rs->ssl;
++	res.fd = rs->fd;
+ 	(void)rc; (void)peek;
+-	(void)ssl_printf(rs->ssl, "error no stats enabled at compile time\n");
++	(void)ssl_printf(&res, "error no stats enabled at compile time\n");
+ #endif /* BIND8_STATS */
+ }
+ 
+

diff --git a/net-dns/nsd/nsd-4.6.1.ebuild b/net-dns/nsd/nsd-4.6.1-r1.ebuild
similarity index 98%
rename from net-dns/nsd/nsd-4.6.1.ebuild
rename to net-dns/nsd/nsd-4.6.1-r1.ebuild
index d3d5d3b51e9d..07c863ace2f5 100644
--- a/net-dns/nsd/nsd-4.6.1.ebuild
+++ b/net-dns/nsd/nsd-4.6.1-r1.ebuild
@@ -51,6 +51,7 @@ BDEPEND="
 PATCHES=(
 	# Fix the paths in the munin plugin to match our install
 	"${FILESDIR}"/nsd_munin_.patch
+	"${FILESDIR}"/${P}-incompatible-ptr-types.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/nsd/files/, net-dns/nsd/
@ 2024-02-18 10:48 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2024-02-18 10:48 UTC (permalink / raw
  To: gentoo-commits

commit:     d1a4e2715cabf9ac1230d296eab23d44132bf078
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 18 10:29:50 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 18 10:48:23 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1a4e271

net-dns/nsd: backport stats fix for 4.8.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../nsd/files/nsd-4.8.0-implausible-stats.patch    |  22 ++++
 net-dns/nsd/nsd-4.8.0-r1.ebuild                    | 128 +++++++++++++++++++++
 2 files changed, 150 insertions(+)

diff --git a/net-dns/nsd/files/nsd-4.8.0-implausible-stats.patch b/net-dns/nsd/files/nsd-4.8.0-implausible-stats.patch
new file mode 100644
index 000000000000..318f2a5e2f55
--- /dev/null
+++ b/net-dns/nsd/files/nsd-4.8.0-implausible-stats.patch
@@ -0,0 +1,22 @@
+https://github.com/NLnetLabs/nsd/issues/313
+https://github.com/NLnetLabs/nsd/commit/ccc1bbc28abd3a723c25cb8dcc735731926979d0
+
+From ccc1bbc28abd3a723c25cb8dcc735731926979d0 Mon Sep 17 00:00:00 2001
+From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
+Date: Tue, 6 Feb 2024 11:44:24 +0100
+Subject: [PATCH] - Fix #313: nsd 4.8 stats with implausible spikes.
+
+--- a/remote.c
++++ b/remote.c
+@@ -2932,7 +2932,9 @@ process_stats(RES* ssl, xfrd_state_type* xfrd, int peek)
+ 	process_stats_manage_clear(xfrd, stats, peek);
+ 	process_stats_add_total(xfrd, &total, stats);
+ 	print_stats(ssl, xfrd, &stattime, !peek, &total, zonestats);
+-	xfrd->nsd->rc->stats_time = stattime;
++	if(!peek) {
++		xfrd->nsd->rc->stats_time = stattime;
++	}
+ 
+ 	free(stats);
+ #ifdef USE_ZONE_STATS
+

diff --git a/net-dns/nsd/nsd-4.8.0-r1.ebuild b/net-dns/nsd/nsd-4.8.0-r1.ebuild
new file mode 100644
index 000000000000..52ac334d942c
--- /dev/null
+++ b/net-dns/nsd/nsd-4.8.0-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="An authoritative only, high performance, open source name server"
+HOMEPAGE="https://www.nlnetlabs.nl/projects/nsd"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/NLnetLabs/nsd.git"
+else
+	# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
+	MY_PV="${PV/_beta/b}"
+	MY_PV="${MY_PV/_rc/rc}"
+	MY_P="${PN}-${MY_PV}"
+
+	if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
+		SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
+		S="${WORKDIR}"/${MY_P}
+
+		KEYWORDS="~amd64 ~x86"
+	fi
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="bind8-stats debug dnstap libevent minimal-responses mmap munin +nsec3 ratelimit root-server ssl systemd"
+
+RDEPEND="
+	acct-group/nsd
+	acct-user/nsd
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c
+	)
+	libevent? ( dev-libs/libevent )
+	munin? ( net-analyzer/munin )
+	ssl? ( dev-libs/openssl:0= )
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-alternatives/lex
+	app-alternatives/yacc
+	systemd? ( virtual/pkgconfig )
+"
+
+PATCHES=(
+	# Fix the paths in the munin plugin to match our install
+	"${FILESDIR}"/nsd_munin_.patch
+	"${FILESDIR}"/${P}-implausible-stats.patch
+)
+
+src_prepare() {
+	default
+
+	# Required to get correct pkg-config macros with USE="systemd"
+	# See bugs #663618 and #758050
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-ipv6
+		--enable-largefile
+		--enable-pie
+		--enable-relro-now
+		--enable-tcp-fastopen
+
+		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db
+		--with-logfile="${EPREFIX}"/var/log/nsd.log
+		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid
+		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state
+		--with-xfrdir="${EPREFIX}"/var/db/nsd
+		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list
+		--with-zonesdir="${EPREFIX}"/var/lib/nsd
+
+		$(use_enable bind8-stats)
+		$(use_enable bind8-stats zone-stats)
+		$(use_enable debug checking)
+		$(use_enable dnstap)
+		$(use_enable minimal-responses)
+		$(use_enable mmap)
+		$(use_enable nsec3)
+		$(use_enable ratelimit)
+		$(use_enable root-server)
+		$(use_enable systemd)
+		$(use_with libevent)
+		$(use_with ssl)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
+
+	newinitd "${FILESDIR}"/nsd.initd-r1 nsd
+
+	# Install munin plugin and config
+	if use munin ; then
+		exeinto /usr/libexec/munin/plugins
+		doexe contrib/nsd_munin_
+		insinto /etc/munin/plugin-conf.d
+		newins "${FILESDIR}"/nsd.munin-conf nsd_munin
+	fi
+
+	systemd_dounit "${FILESDIR}"/nsd.service
+
+	# Remove the /run directory that usually resides on tmpfs and is
+	# being taken care of by the nsd init script anyway (checkpath)
+	rm -r "${ED}"/run || die "Failed to remove /run"
+
+	keepdir /var/db/${PN}
+}
+
+pkg_postinst() {
+	# database directory, writable by nsd for database updates and zone transfers
+	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd
+
+	# zones directory, writable by nsd for zone file updates (nsd-control write)
+	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2024-02-18 10:48 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-27 22:34 [gentoo-commits] repo/gentoo:master commit in: net-dns/nsd/files/, net-dns/nsd/ Lars Wendler
  -- strict thread matches above, loose matches on Subject: below --
2024-02-18 10:48 Sam James
2022-11-10  9:10 Sam James
2022-06-29 17:49 Sam James
2018-12-05 10:24 Lars Wendler
2017-02-16 23:49 Lars Wendler
2016-04-07 14:37 Lars Wendler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox