net-dns/nsd: Bump to versions 3.2.22 and 4.1.10 (bug #588100).

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

net-dns/nsd/Manifest

@@ -1,4 +1,6 @@
 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-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.7.tar.gz 1072576 SHA256 7ba8beb29b495ab795e927d9aa82a5bb1b66296a78f61ed47d6ccfe59e9b1a8a SHA512 c2bdb03a09ac06d70feef2183e2d777777ba7830777bac67ab974016f52791ad7ed9227a37a31325f5e4ab4baeacc4cb562d5af4cd85e5b6ddc83422ae5d0df8 WHIRLPOOL 4ba203a4f5e365f8f850436b9d721fa1d50dd180bfec14d6ab7ab3b89d2ff5a7fd5bc93c1f8b304a2fe5a070d4f3ae4f5786eeb8d9fbb159c53f12346d0342ba
 DIST nsd-4.1.9.tar.gz 1073120 SHA256 b811224d635331de741f1723aefc41adda0a0a3a499ec310aa01dd3b4b95c8f2 SHA512 4602dfd07f41dca80fb3b2af471305ad2baba45f7aa294bd3e50d673ec6cc3b1170b410a425796cef52b3af6eea6282dcb00c1f21d5642b0962b3d111dade940 WHIRLPOOL b747afb74e26f10b6170768dd46297356e7280021a33e94a0722963a60407d91eed63465c487d61db1cbe03de70f526a9a1657e6ede03eddf8d975ce81106beb

net-dns/nsd/files/nsd-4.1.10-r4644-build-without-ipv6.patch

@@ -0,0 +1,23 @@
+ 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,

net-dns/nsd/nsd-3.2.22.ebuild

@@ -0,0 +1,87 @@
+# 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."
+}

net-dns/nsd/nsd-4.1.10.ebuild

@@ -0,0 +1,100 @@
+# 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
+}