gentoo auto-resync : 10:11:2022 - 15:28:02

4 files changed, 157 insertions, 2 deletions

diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 345831aae6b7..0bc2fbc4a65f 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -1,3 +1,4 @@
+AUX nsd-4.6.1-incompatible-ptr-types.patch 791 BLAKE2B c1c4985203f95c59c0ad761ce6692b3669140e3928e97cdd08cbc42d12bfbd57594e4812af8fd942f29d654ee7cf1e0e8045e2b65bc9a60a98c8024919ef9276 SHA512 997d56676ac083516ca4ca5416fd655fc3462a0cb20ddf476a1f44a1785d64cf072a3b932ea2f60271cf855e0ab6ad366d13cf3b22174c8682b8fb6745957ea9
 AUX nsd.initd-r1 1383 BLAKE2B b90de2ebef09a4f9050f6e95f5faf659c62910462aba1179daccde4e63a3972124247e6e8ce725c4dbd34a7fcd4f14b40899d7b59ba4937bdc59c493f6f7e173 SHA512 f775c78b529c5c7f1130035ea9c6cf1c1e9c1790c5df84fafd86a41294748a46c82b66c58df8385f8f4bbca8113427c665051aeec5720073bd9823607c9f8ce1
 AUX nsd.munin-conf 23 BLAKE2B 0b08804b2218d77ea925d4c9e26e73649b453b923d6d7b1e1df39ceb58b92a44c48cb21583a480e622f72d07650f410f2e0703f1d16af08152aed16982ab8da2 SHA512 c06d0b035387e7be79cfa8fedf8afb3900772146c6d4090ac39ea2ef165772d875b222ef467bd73422078ef57818bcc931ca67fa290bd99a7a9456efa5448853
 AUX nsd.service 272 BLAKE2B 66a7d4132246589f71341afd98361f6b02082be3d4e230c86ae690876a797ea0a4580b29892d91feba2785ea933a053f862e0d00f2c8a8c09ab907386c39a03c SHA512 fbca86887bfc36d61af06992cc98b3f3cb33c39274fbdc1e53d489bdcc767993911fab27a20244c3878b36bacbd1644a552364b2f7bf4d48e6eb247d0eecdf0f
@@ -5,9 +6,11 @@ AUX nsd_munin_.patch 542 BLAKE2B 13ff49c41683d5bf505e257cd17bf5f3ad06662c00032d7
 DIST nsd-4.3.8.tar.gz 1225840 BLAKE2B 19d014f130844aab5b7c6224658c6e5a4a7d8d337ceb11e1641bceb367fe76b46be146c703296a12cec834020992eabec0e1ee8f3cb6211333ac8c4c7029fef5 SHA512 aec892f85a6757bfdf537c6f0b4bc3d60c564b3062b582af14df800b24261edc96bedcd0b6649444a46b198b9018397e356b919a871364032c8a2db6256b9268
 DIST nsd-4.5.0.tar.gz 1259059 BLAKE2B 5c90a17b2c2df3cf06bea2609fb02198b4fdde3e9ed7cc0a07526d43069f735458a0c1775fc7b45ac7bd1fba42ec329fe5b67378d6282bf86f6c520f73b00397 SHA512 0309e1ff083b6f2118ba6fd59425319c21f31558d30e17a40eb8f1e53dee9e3e766d7b53eb50462130ba17b454a3559dc786d344cb779468d255732bbc6bc5da
 DIST nsd-4.6.0.tar.gz 1273532 BLAKE2B 962bb93decb268d6958afad0e3182f256c91a9e78179db21458d00571df200faf23efe327b99a2bac423d092ad759dc678230bbdc45cfb95b75f2e7a271005c6 SHA512 e9f035e42f47ac115cb2c1d0ebdef8b13b1feebca91d4f840d36904efb5ab44a817584b28c9d0d3e236fde1581e8283bcdd554a5463d4b5788329f9245414cbb
+DIST nsd-4.6.1.tar.gz 1281583 BLAKE2B 5eff5560ce16451a57905bb9d979c81918b6b55f72e1f1b89ab8d2e479ac36bf4f95152c77b1f1b3ce0af90bde8f25d2cad7226450c5cbc879f112adea2b3a69 SHA512 cab557a20cf8564cbf6e38405ca28b00baa6e14105527c3b16f49f57fed5e39cdb2bcd62999bad4aff2c69e0967bdba66a1eaa7b73a0d4d99d97535cc5860bfe
 EBUILD nsd-4.3.8.ebuild 3049 BLAKE2B 3499602d7adbc789ceab25cf46d5006c3744589872774fb9a019d9353a457e221ba11e2c05e74c737f214b08f38abe2a85fcf3e4247896aea5ebc4d296f81f8f SHA512 d1be9bac66251d7f1a37b0ed62d162cbce93a5b483ebff88de50c3f1c87b6f20235874303a18ab26ae731a235fe7f4fb245e09f07272bdd3a0a8704c5c8e8796
-EBUILD nsd-4.5.0-r1.ebuild 3153 BLAKE2B d9edcc348716fddc9c776d8f77889532100719d218b8d8662dd68023d340064c8b97f74da15b56b1d3474334b96821cb879305042562df978c9b8b18e058fa83 SHA512 a071cfb2135c75131a4c05180ada77ea30915adc0276831f9f1861347bd7a9978662d07d1c541cf2ca59f98a3d9edcf46b00ac305193e785b8b6fecc0bcc80ac
+EBUILD nsd-4.5.0-r1.ebuild 3151 BLAKE2B db15ac9c44d3ef7d08bcfbd2d7c8eb46c33f0dd32a6da5adc1c6a6262f365aadc0fe91087b7885e89e8f45cb4cf68440b4fa7832baac27626ee1ed291a91f929 SHA512 f22b98c7a9966eff7cf065d68c0f7194d51947a3b2b5eb93b4733e252e339047deadd621be420402f24e779c115b7fdd86c68cd69c13a6aaefc2ccc4f95593a6
 EBUILD nsd-4.5.0.ebuild 3164 BLAKE2B f7e5de846b7dd78f2d95c40dfed9ce694f8773976929760ca9667d3209a5aa35bc909edce689d6ceae18faf73364775ae1b8df1cb7d09fe42e39d72b39b1b60d SHA512 d77bd9baae67acac772692cf26392e39fd6a4afb4f01dca399b015e19631d267e7cff32442f1d9e8dde83951b8587ca91d23f66505d743440bdcf20819b90807
 EBUILD nsd-4.6.0.ebuild 3153 BLAKE2B d9edcc348716fddc9c776d8f77889532100719d218b8d8662dd68023d340064c8b97f74da15b56b1d3474334b96821cb879305042562df978c9b8b18e058fa83 SHA512 a071cfb2135c75131a4c05180ada77ea30915adc0276831f9f1861347bd7a9978662d07d1c541cf2ca59f98a3d9edcf46b00ac305193e785b8b6fecc0bcc80ac
+EBUILD nsd-4.6.1-r1.ebuild 3202 BLAKE2B 96b5c68eeb07d33ee8346110d22407bb290b505c4f49974e38d322d629ae1cdaf5152a39299c539a0fe2854624036c14b177c045abe8fb2a72351d66b4de3c5a SHA512 ae5e0d977fb29056e7edf46a003b55dd8bf9b345399405c5efab32a70716169f59532892818586e3af749440b6c88aff550f2fc6a1726cddfbd0fb8e39990acf
 EBUILD nsd-9999.ebuild 3153 BLAKE2B d9edcc348716fddc9c776d8f77889532100719d218b8d8662dd68023d340064c8b97f74da15b56b1d3474334b96821cb879305042562df978c9b8b18e058fa83 SHA512 a071cfb2135c75131a4c05180ada77ea30915adc0276831f9f1861347bd7a9978662d07d1c541cf2ca59f98a3d9edcf46b00ac305193e785b8b6fecc0bcc80ac
 MISC metadata.xml 1077 BLAKE2B 81ba4f798150f077bf01a0c901f6552ce3b56dd54efa5c988206c956c58674d2f4fd9e046e4cddb5ad798aea1c5cb59ad1e6d7b0ea250fe297167fd1dcc5c3a5 SHA512 8c105314e496ec71c847a1768cefa12b2bcdad2f00e38fca0e90a1b2f2a66b26b271a17c883a5d1be9dd66190477c0e0e67b0412699c2ca34a2f6655e3e55b36
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.5.0-r1.ebuild b/net-dns/nsd/nsd-4.5.0-r1.ebuild
index d3d5d3b51e9d..eefcee308187 100644
--- a/net-dns/nsd/nsd-4.5.0-r1.ebuild
+++ b/net-dns/nsd/nsd-4.5.0-r1.ebuild
@@ -21,7 +21,7 @@ else
 		SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
 		S="${WORKDIR}"/${MY_P}
 
-		KEYWORDS="~amd64 ~x86"
+		KEYWORDS="amd64 x86"
 	fi
 fi
 
diff --git a/net-dns/nsd/nsd-4.6.1-r1.ebuild b/net-dns/nsd/nsd-4.6.1-r1.ebuild
new file mode 100644
index 000000000000..07c863ace2f5
--- /dev/null
+++ b/net-dns/nsd/nsd-4.6.1-r1.ebuild
@@ -0,0 +1,128 @@
+# 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="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="
+	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}-incompatible-ptr-types.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
+}