9 files changed, 164 insertions, 7 deletions
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 08a59643fa55..aab8342fd0fe 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 6e81251be256..32e3841d9357 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -1,9 +1,12 @@
 AUX nsd-4.6.1-incompatible-ptr-types.patch 791 BLAKE2B c1c4985203f95c59c0ad761ce6692b3669140e3928e97cdd08cbc42d12bfbd57594e4812af8fd942f29d654ee7cf1e0e8045e2b65bc9a60a98c8024919ef9276 SHA512 997d56676ac083516ca4ca5416fd655fc3462a0cb20ddf476a1f44a1785d64cf072a3b932ea2f60271cf855e0ab6ad366d13cf3b22174c8682b8fb6745957ea9
+AUX nsd-4.7.0-no-bind8-stats-no-ssl.patch 724 BLAKE2B ed9b6014a37e819f89624928a50499163f41cd65e881f5d835cbb9c7d9613dd9e24a790f69ae30135d95b8e5aefa10c606f6a47750254f3d89d0259ae780921f SHA512 3823eb145aa5c6b55992c498417d07643e85255d6033ae7444c51e2432475620f46750681ee9cf758fd7f2fc5336a9f7906d57fb8c78940641d88a1dff8311f1
 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
 AUX nsd_munin_.patch 542 BLAKE2B 13ff49c41683d5bf505e257cd17bf5f3ad06662c00032d79b36be3f96486eb89fdd62a42b5ed4816ad99835366864603568613e27504894340ebb64057e2b2c3 SHA512 6034086d6b6f6980468766c901e92291fea8a32df179561ede2add5918c37bfe3aabf122735d4ae2e28efece394fd3398f9a0cc4d8fdcc1e5da1ca709d2ba6ae
 DIST nsd-4.6.1.tar.gz 1281583 BLAKE2B 5eff5560ce16451a57905bb9d979c81918b6b55f72e1f1b89ab8d2e479ac36bf4f95152c77b1f1b3ce0af90bde8f25d2cad7226450c5cbc879f112adea2b3a69 SHA512 cab557a20cf8564cbf6e38405ca28b00baa6e14105527c3b16f49f57fed5e39cdb2bcd62999bad4aff2c69e0967bdba66a1eaa7b73a0d4d99d97535cc5860bfe
+DIST nsd-4.7.0.tar.gz 1289477 BLAKE2B d3949c8b65376ea78c700efaeb988acbfac5a5ba338f9bf29035176a7da6730ee8b7a2b6bfc5573ad178db80166ca74d71d313bf3d405acc666bf87f17dac63b SHA512 387e66993517c015ea49fc7a985c1f746623ae30a82bd01f224efbdb7c58d1d2f3e5a5a3574203959047876c632ec464b6682d1644f0e0f157ec0e6fb3f0cdbb
 EBUILD nsd-4.6.1-r1.ebuild 3209 BLAKE2B 389c985799ffa9042b6068090e361474ea3ed46d1e4011331db85b89260229801e7af8c6c0bbb00a086dec5598cc0b225ddf4546a7da5dc490146d54d7bde2ed SHA512 67cc70e82fa0c2b8bd236867b58eca15951c819c5446bb2d336e73458c193e4eae1f192c620b0eea6b7183fc1da012651abdc64bd363373a8cb12a8863ffb094
-EBUILD nsd-9999.ebuild 3162 BLAKE2B a506ee3a9304ced1bb2dc9d2705b30d0101a76d06780d3007eb404610ce95143ba1964c4516182de2b406ef3515c3cc1dc695ac0e118d52649b85e7f043a21a1 SHA512 0a20625bcd3e1fbf2563f16253d71b728603879a8bdbcea80bdee41bbc74a11ed2c15154b197f2e69b6b255cec452e0f22c082f640db4017c982dafdb5a4a793
+EBUILD nsd-4.7.0.ebuild 3219 BLAKE2B 9fefc6074f18fb77a7805ec97d2d3a64e7fcaf76b860314384e4c2fc3ef3e0b357f103f24cef4e734fba202c83b766826c74e5655f7bd60749cfdc7115f9c981 SHA512 9e179f85d6b6c95c14e26124484e5529fe9807cd015288ebaa059afa839803775f9f0837044b50027b97489bcb407caa16868343952f2dace95617d557315a9b
+EBUILD nsd-9999.ebuild 3156 BLAKE2B 6ed71c48f19645490d77a04d05325d235a19ee742bcbe51eb1af8d8db242b5ad5660e778b9bc052f48930a6dfde1427ef27b251a7246e039d3862509b62aa7fc SHA512 c4b82c928010a4ec5b57f736c0874f1b588dd1c3e2c9cb865e5fc94bf64888ab349b18a39819e1f60e45581397b037250cf72c1dc5efd4de6f6439c97f857182
 MISC metadata.xml 970 BLAKE2B bdadf7cb1a1a444aff44b9f1ad7ea64a5b01d72888d91662f55cb321a94f8b03ea9f050e78df9cc2a81e2c538a81d463c95f998b8c7f65c192425d3a5917a25e SHA512 bc769f335f452a8f81f83d8333bf3db11620212b156eac80ddd9622312605b80b56d4fa6ebdb609b7c1999cc995672350b0181666c012ee69e21ff5b511af48d
diff --git a/net-dns/nsd/files/nsd-4.7.0-no-bind8-stats-no-ssl.patch b/net-dns/nsd/files/nsd-4.7.0-no-bind8-stats-no-ssl.patch
new file mode 100644
index 000000000000..402a42e19e0c
--- /dev/null
+++ b/net-dns/nsd/files/nsd-4.7.0-no-bind8-stats-no-ssl.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/907997
+https://github.com/NLnetLabs/nsd/issues/283
+https://github.com/NLnetLabs/nsd/commit/f31d31ab1d45d615ebd192beaacac66746e0ff80
+
+From f31d31ab1d45d615ebd192beaacac66746e0ff80 Mon Sep 17 00:00:00 2001
+From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
+Date: Wed, 7 Jun 2023 13:07:53 +0200
+Subject: [PATCH] - Fix #283: Compile failure in remote.c when
+ --disable-bind8-stats
+
+--- a/remote.c
++++ b/remote.c
+@@ -1246,7 +1246,9 @@ do_stats(struct daemon_remote* rc, int peek, struct rc_state* rs)
+ 	xfrd_set_reload_now(xfrd);
+ #else
+ 	RES res;
++#ifdef HAVE_SSL
+ 	res.ssl = rs->ssl;
++#endif
+ 	res.fd = rs->fd;
+ 	(void)rc; (void)peek;
+ 	(void)ssl_printf(&res, "error no stats enabled at compile time\n");
+
diff --git a/net-dns/nsd/nsd-4.7.0.ebuild b/net-dns/nsd/nsd-4.7.0.ebuild
new file mode 100644
index 000000000000..6c6eb84db034
--- /dev/null
+++ b/net-dns/nsd/nsd-4.7.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2023 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
+	app-alternatives/yacc
+	systemd? ( virtual/pkgconfig )
+"
+
+PATCHES=(
+	# Fix the paths in the munin plugin to match our install
+	"${FILESDIR}"/nsd_munin_.patch
+	# bug #907997
+	"${FILESDIR}"/${P}-no-bind8-stats-no-ssl.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
+}
diff --git a/net-dns/nsd/nsd-9999.ebuild b/net-dns/nsd/nsd-9999.ebuild
index 9a17b4f46b26..d9028ba457da 100644
--- a/net-dns/nsd/nsd-9999.ebuild
+++ b/net-dns/nsd/nsd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ else
 	MY_PV="${MY_PV/_rc/rc}"
 	MY_P="${PN}-${MY_PV}"
 
-	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+	if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
 		SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
 		S="${WORKDIR}"/${MY_P}
 
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index 8f9ffc9465cc..6c764561bd69 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -1,5 +1,5 @@
 DIST openresolv-3.12.0.tar.xz 21008 BLAKE2B 1609d8e97a9abe82f9ead7179727dd4323571e92b36aa2ca2a1177972f3a61946f612dd0cf81a804087f1c71bda25e78dab8b085ad2be55ce21214dc9870fdf6 SHA512 60348ca35114b105c8b3121e5f2d301311fcc7251a9be60c45fedc27267cfd94e413e77c7d5c91d0a0ccb8f1b4288bc147582b0ac9be64afcaa96ad3d833f26f
 DIST openresolv-3.13.1.tar.xz 21336 BLAKE2B 9794bd2af2af68dcd08383e0613a6ada0d1f49d1514226911d49318a85d7c5a4d1b216d4d9e101161a442ea2e3d2fce5208a1cd2c393ec0560df0dcc136165ec SHA512 200ad330ddeeead83f7338f75edec5bfbed7e0fddfab601f490e175b46948c504abd9ce70c015d97328da397536a2fd7f8c55e3906a5f8ac7ab32201d02f98a1
 EBUILD openresolv-3.12.0-r1.ebuild 1104 BLAKE2B b82e4d1ce251fb14179a56528c777d015df8842715a774e8c8496ab0f015939bcb7ae9449d0609edf1af8e78460226585df30556ae4bf74046dde53d293db590 SHA512 3b0ff65863a04b59e8c0107e4d0185b8f471e75cecd0788ff65e373b55c5edf109c4e06eaa57a5ab139d27faf50c7016f7a12c5ec46b1d2d08d1f676bc55826b
-EBUILD openresolv-3.13.1.ebuild 1147 BLAKE2B 4e2c91421d77a021b8308111ce155690b64863551cb26a2f5899400921f7deeea43cd0eebb96cf572fbd051e07aa5aba1ae913cc2e232dd479ffa4596d856d54 SHA512 fb5d9cf6d4eea14c88237eaba437cd45545b567786b641481911f36108088f0a2d72c2965e241ab6b2a0856c468ad29808a84a4b9cb9c7b46d206d7e4d764775
+EBUILD openresolv-3.13.1.ebuild 1185 BLAKE2B 8967f7cbc861d0c366e9fb1286eabea7fa5d7b156c9c52f167330bac57b2fe51b4cb3067084246ea544c3c30e47665d2b9c3e205bff78516cff27e725ba8f607 SHA512 b53dc34c39f09ac7639d7b2028792b2f777a1faa1a62be1a26b5d3732fa9c9061468ecdcf8e4cd137556becd026d2455eec30ac9e72ca1015709720f97efb4dd
 MISC metadata.xml 365 BLAKE2B 9cc7281443f4a25a8ab82240a0bf751482aa0ddbcd30c466835d78a21bab92fae99a707220af0b8e31f3e03e0a1e7ea9812c9e64b139c41c2b13dbeb33105ef1 SHA512 5a08078078d6d10ea0c5439dc8de670d1f65268eaa65d89642fd525ea2a4321f1674d3ec2ffca59a574f562eb8e6d112e8728220f84785f64e735284c207ce3e
diff --git a/net-dns/openresolv/openresolv-3.13.1.ebuild b/net-dns/openresolv/openresolv-3.13.1.ebuild
index e5581277cc04..da057b7d5a47 100644
--- a/net-dns/openresolv/openresolv-3.13.1.ebuild
+++ b/net-dns/openresolv/openresolv-3.13.1.ebuild
@@ -15,6 +15,8 @@ IUSE="selinux"
 RDEPEND="!sys-apps/systemd[resolvconf]
 	selinux? ( sec-policy/selinux-resolvconf )"
 
+PDEPEND="net-dns/resolvconf-symlink"
+
 src_configure() {
 	local myeconfargs=(
 		--prefix="${EPREFIX}"
diff --git a/net-dns/resolvconf-symlink/Manifest b/net-dns/resolvconf-symlink/Manifest
index eb55a0ff5c2d..a351e7a83e00 100644
--- a/net-dns/resolvconf-symlink/Manifest
+++ b/net-dns/resolvconf-symlink/Manifest
@@ -1,2 +1,2 @@
-EBUILD resolvconf-symlink-0.ebuild 1609 BLAKE2B eb65aee36d912cc5c22ce48be7c5691a68fab3f16134c10416bed2ee1a54439f21abe64ddb4515c1bf0ef4706011ba186bee364ac0018f6f2fe9ad8bbc12a663 SHA512 28f2e715d801488ee5ad34e9f6e63750ab546fbfdb46278dc8c6b1a0e8c9f2ceb5e68d28c018affa56f3df2f583a5f1671a6740dcb03d67efbbd122bf48de1f2
+EBUILD resolvconf-symlink-0.ebuild 1616 BLAKE2B 71d65b9c1b2546ab2c041d950b141cfa7cd0d744eb6539f5fee06a1328906f260a5c2406be8c8816f3f90e584d16b38c4bb96d850cb8a9f5eeeefbe5d179e6e2 SHA512 36397d81f0469fe812ee6cb8bce20b408585110ba6c6f851d06b0f8c6b4c16b4295239bfd8363c7a0c90d431244dfdb850d5f47961bd903db424e8a4a677c412
 MISC metadata.xml 412 BLAKE2B 573ec609cd5c55d76ecf18837090d70cdc679eb9e781bff7b812f4138af84b353004842d50571183fa99dd1e7e287dbbb2d409769d3642fa4d90d744583f46cc SHA512 2a738a8cbaabfbdd17168f71c8be20aa9bd2240db340ededf46ed4ac9f295b3684a171e1696cd7bf59cb37b2843e93ea0f330243cbf134eb79cf5829236a40d7
diff --git a/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild b/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild
index fae0e1958df1..c657ee83055f 100644
--- a/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild
+++ b/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+symlink"
 
 pkg_preinst() {