From 02ae36bb47b73f6a400f448d75ba9ebcb4a37a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Mon, 21 Apr 2025 17:29:49 +0200
Subject: [PATCH] [net-dns/bind] bump

---
 net-dns/bind/Manifest                         |  4 +-
 ...d-9.18.31-r1.ebuild => bind-9.20.8.ebuild} | 37 ++++++++++++-------
 2 files changed, 25 insertions(+), 16 deletions(-)
 rename net-dns/bind/{bind-9.18.31-r1.ebuild => bind-9.20.8.ebuild} (90%)

diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 287249c..1e473c7 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,2 +1,2 @@
-DIST bind-9.18.31.tar.xz 5385812 BLAKE2B e069ab3caab887a87220b54804e5b19a4c21b8d3e4e8f1bc6a7135b3990a228d6c48b1ca4a22c75242485275eff1de145a9aff89addf81124e7dfcafd8ab30cf SHA512 e51873484be3ee367eb1e601b8e0adc45abcdb16df04021ea42ffcc51b99821f8b30f67b2a693a90ad3efa51698a651c8da9d7947ee8fa19680f627afe1f7034
-DIST bind-9.18.31.tar.xz.asc 833 BLAKE2B 77ec5895e1c2ec7325d5cf0f8dd96c40d1554c99d89b4855333d017f5490e89658c4125b2e29c9b20ee574080d7fdb239421a40c8747f28dd46649bce35b665a SHA512 2c17d9a9f153264ed18b287e081b432b5310746964be3e35dfd31597622182e822e62fc3cc4034c0e1c7041949e624c43ffb10d134145d6300f8135f86e38cc6
+DIST bind-9.20.8.tar.xz 5661928 BLAKE2B cc8f9de7cff23af113c48d365d41774f5141f937091b2f97e682104be03e64c86eb6f00a5f2e43ac4a3472c24b2909ca0d4cb82194cf4e8e510d5dded40ddd5a SHA512 daf18ff41f36ac747051b032ce4afa426882edba7d040712f3b424dfae96b9f8de3a13a1f53c061bc7be603e6db3aace83ab7c96621b790bb45f8e158b14c47b
+DIST bind-9.20.8.tar.xz.asc 833 BLAKE2B 8e1517bbbf081f2cc3651488550af22a8414eba63f87cd3b4b2f2928563fb640c404d6e535b3c36d2c26e5ff79966620ec0dc6405da757a11d25f79201b1879b SHA512 d18e6e61305f6bfb8a56ce50e05016f370593f85f0a6535465a189eaaf2f5578c0988a47ed9b99cf3a795dfb39b37a4ae986f1d21e2116a74a49ee74727c3bef
diff --git a/net-dns/bind/bind-9.18.31-r1.ebuild b/net-dns/bind/bind-9.20.8.ebuild
similarity index 90%
rename from net-dns/bind/bind-9.18.31-r1.ebuild
rename to net-dns/bind/bind-9.20.8.ebuild
index 6f6858f..4d3f91a 100644
--- a/net-dns/bind/bind-9.18.31-r1.ebuild
+++ b/net-dns/bind/bind-9.20.8.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/isc.asc
-inherit systemd tmpfiles verify-sig
+inherit eapi9-ver systemd tmpfiles verify-sig
 
 MY_PV="${PV/_p/-P}"
 MY_PV="${MY_PV/_rc/rc}"
 
 DESCRIPTION="Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="https://www.isc.org/software/bind"
+HOMEPAGE="https://www.isc.org/bind/"
 SRC_URI="
 	https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz
 	verify-sig? ( https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz.asc )
@@ -20,17 +20,18 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+caps dnstap doc doh fixed-rrset idn jemalloc geoip gssapi lmdb selinux static-libs test xml"
+IUSE="dnstap doc doh fixed-rrset idn jemalloc geoip gssapi lmdb selinux static-libs test xml"
 RESTRICT="!test? ( test )"
 
 DEPEND="
 	acct-group/named
 	acct-user/named
 	dev-libs/json-c:=
+	dev-libs/userspace-rcu:=
 	>=dev-libs/libuv-1.37.0:=
 	sys-libs/zlib:=
 	dev-libs/openssl:=[-bindist(-)]
-	caps? ( >=sys-libs/libcap-2.1.0 )
+	>=sys-libs/libcap-2.1.0
 	dnstap? (
 		dev-libs/fstrm
 		dev-libs/protobuf-c
@@ -64,9 +65,6 @@ src_prepare() {
 
 	# Don't clobber our toolchain defaults
 	sed -i -e '/FORTIFY_SOURCE=/d' configure || die
-
-	# Test is (notoriously) slow/resource intensive
-	sed -i -e 's:ISC_TEST_MAIN:int main(void) { exit(77); }:' tests/isc/netmgr_test.c || die
 }
 
 src_configure() {
@@ -79,12 +77,10 @@ src_configure() {
 		--with-openssl="${ESYSROOT}"/usr
 		--with-json-c
 		--with-zlib
-		$(use_enable caps linux-caps)
 		--disable-dnsrps
 		$(use_enable dnstap)
 		$(use_enable doh)
 		$(use_with doh libnghttp2)
-		$(use_enable fixed-rrset)
 		$(use_enable static-libs static)
 		$(use_enable geoip)
 		$(use_with test cmocka)
@@ -112,7 +108,7 @@ src_test() {
 src_install() {
 	default
 
-	dodoc CHANGES README.md
+	dodoc README.md
 
 	if use doc; then
 		docinto misc
@@ -142,6 +138,19 @@ src_install() {
 		find "${ED}"/usr/lib* -name '*.la' -delete || die
 	fi
 
+	#
+	# /var/bind
+	#
+	# These need to remain for now because CONFIG_PROTECT won't
+	# save them and we shipped configs for years containing references
+	# to them.
+	#
+	# ftp://ftp.rs.internic.net/domain/named.cache:
+	insinto /var/bind
+	newins "${FILESDIR}"/named.cache-r4 named.cache
+	# bug #450406
+	dosym named.cache /var/bind/root.cache
+	#
 	insinto /var/bind/pri
 	doins "${FILESDIR}"/redhat/named.{empty,localhost,loopback}
 
@@ -194,7 +203,7 @@ pkg_postinst() {
 	fi
 
 	# show only when upgrading to 9.18
-	if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 9.18; then
+	if ver_replacing -lt 9.18; then
 		elog "As this is a major bind version upgrade, please read:"
 		elog "   https://kb.isc.org/docs/changes-to-be-aware-of-when-moving-from-bind-916-to-918"
 		elog "for differences in functionality."
@@ -234,11 +243,11 @@ pkg_config() {
 	mkdir -m 0750 -p "${CHROOT}" || die
 	mkdir -m 0755 -p "${CHROOT}"/{dev,etc,var/log,run} || die
 	mkdir -m 0750 -p "${CHROOT}"/etc/bind || die
-	mkdir -m 0770 -p "${CHROOT}"/var/{bind,log/named} "${CHROOT}"/run/named/ || die
+	mkdir -m 0770 -p "${CHROOT}"/var/{bind,log/named,run/named} "${CHROOT}"/run/named/ || die
 
 	chown root:named \
 		"${CHROOT}" \
-		"${CHROOT}"/var/{bind,log/named} \
+		"${CHROOT}"/var/{bind,log/named,run/named} \
 		"${CHROOT}"/run/named/ \
 		"${CHROOT}"/etc/bind \
 		|| die