From 20b6ab983b55b022c6e4af317154089e18ad41cb Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 2 Sep 2024 12:28:17 +0100
Subject: gentoo auto-resync : 02:09:2024 - 12:28:17

---
 net-dns/bind/Manifest               |   4 +-
 net-dns/bind/bind-9.18.29-r1.ebuild | 260 ++++++++++++++++++++++++++++++++++++
 net-dns/bind/bind-9.18.29.ebuild    | 249 ----------------------------------
 net-dns/bind/files/named.conf-r9    |  33 -----
 net-dns/bind/files/named.conf.auth  |  33 +++++
 5 files changed, 295 insertions(+), 284 deletions(-)
 create mode 100644 net-dns/bind/bind-9.18.29-r1.ebuild
 delete mode 100644 net-dns/bind/bind-9.18.29.ebuild
 delete mode 100644 net-dns/bind/files/named.conf-r9
 create mode 100644 net-dns/bind/files/named.conf.auth

(limited to 'net-dns/bind')

diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 767af37c1725..b45a49d7f4ab 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -5,7 +5,7 @@ AUX localhost.zone-r3 426 BLAKE2B d34cf12d484c6bb705d3bd8bfbf93514e504497a99da98
 AUX named.cache-r4 3313 BLAKE2B 768056568cb440329234b335de5d5571901a272f70a13490f33b53d5b50e1af0c0b9115a15b81a0d93d61f23862dfb7f18ccf3362965cf401928fbb16f3cd3ae SHA512 eddbd04aa031ae6f87930107fb7a4995295f798f399d24e35ae1291188449f67291fddf2cc23624bbc09aa3993041eeac233e926770c4d4f553bdd52dd7c8592
 AUX named.conf 32 BLAKE2B 15548145717b526be3d7898a0c2144a13e29b0595a3c27d220cc45646156cc8ddae954cb3b3907ca845765fc8ce30508d8e570c0a492b965027531a0f6df43ac SHA512 c344fd4949eb80114d0c157517ece3f4b9505b94e3de00489d4b2b23beb74612f38cf3443f2f3b98fe01d98ad1842f45ff1d1826d67937e72e4629bbdf683a59
 AUX named.conf-r8 4020 BLAKE2B beb900a89be0f2acc1b08a8d29443c87b098e5ac1f1de9c63b22f6f50df2644d583d4fc504f55710f6549142bf6bfaa7c9fb3097202276135b9bbdb69af32f90 SHA512 60ab117e488604810a6e42a627eae465f6241208e726e763127f84102d05a661cceeddd00bc9d8d92c3da7d73d034ef876ace6744a0516b2bcadbaff1d9c82ad
-AUX named.conf-r9 625 BLAKE2B 492bc2381d0740d454f9aed0d37eb5c5ddd610fac09d0eae834fef9ffc7a5a86d055ed85247fd4aa2188e92f5f23e14a16de19512483895b269248727fc42b29 SHA512 9f9cb297c366cbb209eff66a6aa7ca2833c606077302df98e767c126897b2c249567141c03931708abfe609d4e05b28faa047a51339a293c8b8d2b923ebb28e6
+AUX named.conf.auth 625 BLAKE2B 492bc2381d0740d454f9aed0d37eb5c5ddd610fac09d0eae834fef9ffc7a5a86d055ed85247fd4aa2188e92f5f23e14a16de19512483895b269248727fc42b29 SHA512 9f9cb297c366cbb209eff66a6aa7ca2833c606077302df98e767c126897b2c249567141c03931708abfe609d4e05b28faa047a51339a293c8b8d2b923ebb28e6
 AUX named.confd-r7 1364 BLAKE2B cfb72f221bc6657c5a8ef8b9cd804afeaf5f642d2046880f5bae6c2313485808b99a1a46fc10431913d187ed67cc1e6bad019a9192638bc7fdf97c951e2326ce SHA512 68fa7c8963ac59349de3d05972c07aa0123b7bebbe0ba9604463ccfd1b377c2babe01eed4745cbe0f7d3831d1b47c2fa620f8092c67465fb771cae4932b0861a
 AUX named.confd-r8 1075 BLAKE2B 8a8080cfff035cfc04cd2c8e18a689c50b95637102ee640f7cdb4bb9213908642ce31e2354ef9252e91b1e3e81fe19c6278b2ca97cfc13764043ba1a4569ea66 SHA512 29f90cb3f8c53a0376f113cf3eccac667791613cbb56db5dd0fa56b4d193d8da77494b4bdd095d89348b62941d65894c5ee906860266999830d77002403cd063
 AUX named.init-r14 6167 BLAKE2B 7c3deb3492a50d2655814f9fb492706b671e08ccdc406be0fe9ef5e55de19f2e1ee3abe2c0f9fbff0a958ce751361c5faa690970d31a935aa2854a765a224c03 SHA512 65c65f261b950559487a6ac1d589cc51e6a4800aa9801c84aeb18083b7f587ff0ca6ce9e2994b1c58586d96a9181c05ca47ffef93fa210ffc53f4e9af21f4d1b
@@ -19,5 +19,5 @@ DIST bind-9.18.29.tar.xz 5562720 BLAKE2B f3e7de6936362bcce4993e401ed8fdd9d597459
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
 EBUILD bind-9.16.48.ebuild 11767 BLAKE2B 25623859c196a70b2f32726d187e3d6d041add334d89ab69a9ab97e0d5bf3bd70bef147d45704273a927871b74c14f6e15cc3d9e2f8a1b385eb91b5ac60b4146 SHA512 d5535d9e56c2bf8db6101d0618c7da1f899b2a41b39b85455102202f5a693c6bde2058993808d8633578c9a14d9a9944fc2a3db7a78f37829a97fd2417d61444
 EBUILD bind-9.16.50.ebuild 11774 BLAKE2B ab24d2f2d762add29472d74766573ae533932e615623e7345a23eda7c643740e6f1c44ac5fa67f63eadb1f47769011cd09d81078627319921e8628ce7cf71c93 SHA512 dcb43005b9cffaf79b232b1256ae13de678db10dfbad2837c43b9673acdf3d017ea086728675791d46b80d30e139385aa9c35935ffcb82152df8df34a09a5f23
-EBUILD bind-9.18.29.ebuild 6861 BLAKE2B 192e85690fd83109e06b9eb709f344a0f26c5dc1f4d1bf5a3afb2d67d704ce93f57683d5d11aaee5f7efc15b8b25782628fdaeb6ca86259b67c4094ebaf8f8ce SHA512 a3ed04138c601a853a9676335aa26a3448106b4ebd6ddf5f476f2498d50bdc8a8a550efa0108e31ee3c291c41f1474cadce283f84077d841446f15bb61ec55d3
+EBUILD bind-9.18.29-r1.ebuild 7699 BLAKE2B 96d13da3199012ca71ec7e689082c3716d9abfa7a49caa13d873eba2f998176ab4254eb03f07b3f603fef60bf31d6c5c261a8450a10214fc497d2524a278a72d SHA512 2380b9e062893a803dc95e1d3beef9cf74ff3614bd9cef71534da682b8adf3892e75ce71041bd7cd67462a87cd6f6fd5cbe75d82bc9fb82f3c6f4239c97cf4c7
 MISC metadata.xml 915 BLAKE2B e415b3c30f15ba3e3d367dd28ed8dac1e6791fbec6b90ebd5881e217db11987365a8eb574b5e6f008e1228fb38aa461a85e7c45c3521e0a48fb6a4808b3b82ce SHA512 575d7c9992c1b3fd82a28cd5bbb585f568240f90dff5e00384c8ff4f937f582d37d2121fa35664b812192b20a16f2a44c196fb841e4fa3d4fd2c725900ac7d51
diff --git a/net-dns/bind/bind-9.18.29-r1.ebuild b/net-dns/bind/bind-9.18.29-r1.ebuild
new file mode 100644
index 000000000000..268786e54053
--- /dev/null
+++ b/net-dns/bind/bind-9.18.29-r1.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing systemd tmpfiles
+
+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"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+caps dnsrps 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/libuv-1.37.0:=
+	sys-libs/zlib:=
+	dev-libs/openssl:=[-bindist(-)]
+	caps? ( >=sys-libs/libcap-2.1.0 )
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c
+	)
+	doh? ( net-libs/nghttp2:= )
+	geoip? ( dev-libs/libmaxminddb )
+	gssapi? ( virtual/krb5 )
+	idn? ( net-dns/libidn2 )
+	jemalloc? ( dev-libs/jemalloc:= )
+	lmdb? ( dev-db/lmdb )
+	xml? ( dev-libs/libxml2 )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-bind )
+	sys-process/psmisc
+	!<net-dns/bind-tools-9.18.0
+"
+# sphinx required for man-page and html creation
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+	test? (
+		dev-util/cmocka
+		dev-util/kyua
+	)
+"
+
+src_configure() {
+	local myeconfargs=(
+		--prefix="${EPREFIX}"/usr
+		--sysconfdir="${EPREFIX}"/etc/bind
+		--localstatedir="${EPREFIX}"/var
+		--enable-full-report
+		--without-readline
+		--with-openssl="${ESYSROOT}"/usr
+		--with-json-c
+		--with-zlib
+		$(use_enable caps linux-caps)
+		$(use_enable 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 geoip maxminddb)
+		$(use_with gssapi)
+		$(use_with idn libidn2)
+		$(use_with jemalloc)
+		$(use_with lmdb)
+		$(use_with xml libxml2)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# system tests ('emake test') require network configuration for IPs etc
+	# so we run the unit tests instead.
+	TEST_PARALLEL_JOBS="$(makeopts_jobs)" emake unit
+}
+
+src_install() {
+	default
+
+	dodoc CHANGES README.md
+
+	if use doc; then
+		docinto misc
+		dodoc -r doc/misc/
+
+		docinto html
+		dodoc -r doc/arm/
+
+		docinto dnssec-guide
+		dodoc -r doc/dnssec-guide/
+
+		docinto contrib
+		dodoc contrib/scripts/nanny.pl
+	fi
+
+	insinto /etc/bind
+	newins "${FILESDIR}"/named.conf-r8 named.conf
+	newins "${FILESDIR}"/named.conf.auth named.conf.auth
+
+	newinitd "${FILESDIR}"/named.init-r15 named
+	newconfd "${FILESDIR}"/named.confd-r8 named
+
+	newenvd "${FILESDIR}"/10bind.env 10bind
+
+	if ! use static-libs ; then
+		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
+	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
+
+	dosym -r /var/bind/pri /etc/bind/pri
+	dosym -r /var/bind/sec /etc/bind/sec
+	dosym -r /var/bind/dyn /etc/bind/dyn
+	keepdir /var/bind/{pri,sec,dyn} /var/log/named
+
+	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
+	fowners root:named /etc/bind/{bind.keys,named.conf,named.conf.auth}
+	fperms 0640 /etc/bind/{bind.keys,named.conf,named.conf.auth}
+	fperms 0750 /etc/bind /var/bind/pri
+	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
+
+	systemd_newunit "${FILESDIR}/named.service-r1" named.service
+	dotmpfiles "${FILESDIR}"/named.conf
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/generate-rndc-key.sh"
+}
+
+pkg_postinst() {
+	tmpfiles_process named.conf
+
+	if [[ ! -f '/etc/bind/rndc.key' && ! -f '/etc/bind/rndc.conf' ]]; then
+		einfo "Generating rndc.key"
+		/usr/sbin/rndc-confgen -a
+		chown root:named /etc/bind/rndc.key || die
+		chmod 0640 /etc/bind/rndc.key || die
+	fi
+
+	einfo
+	einfo "You can edit /etc/conf.d/named to customize named settings"
+	einfo
+
+	einfo "If you'd like to run bind in a chroot AND this is a new"
+	einfo "install OR your bind doesn't already run in a chroot:"
+	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
+	einfo
+
+	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
+	if [[ -n ${CHROOT} ]]; then
+		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		elog "To enable the old behaviour (without using mount) uncomment the"
+		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		elog "If you decide to use the new/default method, ensure to make backup"
+		elog "first and merge your existing configs/zones to /etc/bind and"
+		elog "/var/bind because bind will now mount the needed directories into"
+		elog "the chroot dir."
+	fi
+
+	# show only when upgrading to 9.18
+	if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -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."
+		elog ""
+		ewarn "In particular, please note that bind-9.18 does not need a root hints file anymore"
+		ewarn "and we only ship with one as a stop-gap. If your current configuration specifies a"
+		ewarn "root hints file - usually called named.cache - bind will not start as it will not be able"
+		ewarn "to find the specified file. Best practice is to delete the offending lines that"
+		ewarn "reference named.cache file from your configuration."
+	fi
+}
+
+pkg_config() {
+	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
+	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
+	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
+
+	if [[ -z "${CHROOT}" ]]; then
+		eerror "This config script is designed to automate setting up"
+		eerror "a chrooted bind/named. To do so, please first uncomment"
+		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
+		die "Unset CHROOT"
+	fi
+
+	if [[ -d "${CHROOT}" ]]; then
+		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		ewarn "To enable the old behaviour (without using mount) uncomment the"
+		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		ewarn
+		ewarn "${CHROOT} already exists... some things might become overridden"
+		ewarn "press CTRL+C if you don't want to continue"
+		sleep 10
+	fi
+
+	echo; einfo "Setting up the chroot directory..."
+
+	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
+
+	chown root:named \
+		${CHROOT} \
+		${CHROOT}/var/{bind,log/named} \
+		${CHROOT}/run/named/ \
+		${CHROOT}/etc/bind \
+		|| die
+
+	mknod ${CHROOT}/dev/null c 1 3 || die
+	chmod 0666 ${CHROOT}/dev/null || die
+
+	mknod ${CHROOT}/dev/zero c 1 5 || die
+	chmod 0666 ${CHROOT}/dev/zero || die
+
+	if [[ "${CHROOT_NOMOUNT:-0}" -ne 0 ]]; then
+		cp -a /etc/bind ${CHROOT}/etc/ || die
+		cp -a /var/bind ${CHROOT}/var/ || die
+	fi
+
+	if [[ "${CHROOT_GEOIP:-0}" -eq 1 ]]; then
+		if use geoip; then
+			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die
+		elif use geoip2; then
+			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP2 || die
+		fi
+	fi
+
+	elog "You may need to add the following line to your syslog-ng.conf:"
+	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
+}
diff --git a/net-dns/bind/bind-9.18.29.ebuild b/net-dns/bind/bind-9.18.29.ebuild
deleted file mode 100644
index f2f369fcaef3..000000000000
--- a/net-dns/bind/bind-9.18.29.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multiprocessing systemd tmpfiles
-
-MY_PV="${PV/_p/-P}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-RRL_PV="${MY_PV}"
-
-DESCRIPTION="Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="https://www.isc.org/software/bind"
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+caps dnsrps 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/libuv-1.37.0:=
-	sys-libs/zlib
-	dev-libs/openssl:=[-bindist(-)]
-	caps? ( >=sys-libs/libcap-2.1.0 )
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c
-	)
-	doh? ( net-libs/nghttp2:= )
-	geoip? ( dev-libs/libmaxminddb )
-	gssapi? ( virtual/krb5 )
-	idn? ( net-dns/libidn2 )
-	jemalloc? ( dev-libs/jemalloc:= )
-	lmdb? ( dev-db/lmdb )
-	xml? ( dev-libs/libxml2 )
-"
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-bind )
-	sys-process/psmisc
-	!<net-dns/bind-tools-9.18.0
-"
-# sphinx required for man-page and html creation
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-	test? (
-		dev-util/cmocka
-		dev-util/kyua
-	)
-"
-
-src_configure() {
-	local myeconfargs=(
-		--prefix="${EPREFIX}"/usr
-		--sysconfdir=/etc/bind
-		--localstatedir=/var
-		--enable-full-report
-		--without-readline
-		--with-openssl="${ESYSROOT}"/usr
-		--with-json-c
-		--with-zlib
-		$(use_enable caps linux-caps)
-		$(use_enable 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 geoip maxminddb)
-		$(use_with gssapi)
-		$(use_with idn libidn2)
-		$(use_with jemalloc)
-		$(use_with lmdb)
-		$(use_with xml libxml2)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# system tests ('emake test') require network configuration for IPs etc
-	# so we run the unit tests instead.
-	TEST_PARALLEL_JOBS="$(makeopts_jobs)" emake unit
-}
-
-src_install() {
-	default
-
-	dodoc CHANGES README.md
-
-	if use doc; then
-		docinto misc
-		dodoc -r doc/misc/
-
-		docinto html
-		dodoc -r doc/arm/
-
-		docinto dnssec-guide
-		dodoc -r doc/dnssec-guide/
-
-		docinto contrib
-		dodoc contrib/scripts/nanny.pl
-	fi
-
-	insinto /etc/bind
-	newins "${FILESDIR}"/named.conf-r9 named.conf.auth
-
-	newinitd "${FILESDIR}"/named.init-r15 named
-	newconfd "${FILESDIR}"/named.confd-r8 named
-
-	newenvd "${FILESDIR}"/10bind.env 10bind
-
-	if ! use static-libs ; then
-		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
-	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
-
-	dosym -r /var/bind/pri /etc/bind/pri
-	dosym -r /var/bind/sec /etc/bind/sec
-	dosym -r /var/bind/dyn /etc/bind/dyn
-	keepdir /var/bind/{pri,sec,dyn} /var/log/named
-
-	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
-	fowners root:named /etc/bind/{bind.keys,named.conf.auth}
-	fperms 0640 /etc/bind/{bind.keys,named.conf.auth}
-	fperms 0750 /etc/bind /var/bind/pri
-	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
-
-	systemd_newunit "${FILESDIR}/named.service-r1" named.service
-	dotmpfiles "${FILESDIR}"/named.conf
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/generate-rndc-key.sh"
-}
-
-pkg_postinst() {
-	tmpfiles_process named.conf
-
-	if [[ ! -f '/etc/bind/rndc.key' && ! -f '/etc/bind/rndc.conf' ]]; then
-		einfo "Generating rndc.key"
-		/usr/sbin/rndc-confgen -a
-		chown root:named /etc/bind/rndc.key || die
-		chmod 0640 /etc/bind/rndc.key || die
-	fi
-
-	einfo
-	einfo "You can edit /etc/conf.d/named to customize named settings"
-	einfo
-
-	einfo "If you'd like to run bind in a chroot AND this is a new"
-	einfo "install OR your bind doesn't already run in a chroot:"
-	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
-	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
-	einfo
-
-	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
-	if [[ -n ${CHROOT} ]]; then
-		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		elog "To enable the old behaviour (without using mount) uncomment the"
-		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		elog "If you decide to use the new/default method, ensure to make backup"
-		elog "first and merge your existing configs/zones to /etc/bind and"
-		elog "/var/bind because bind will now mount the needed directories into"
-		elog "the chroot dir."
-	fi
-}
-
-pkg_config() {
-	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
-	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
-	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
-
-	if [[ -z "${CHROOT}" ]]; then
-		eerror "This config script is designed to automate setting up"
-		eerror "a chrooted bind/named. To do so, please first uncomment"
-		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
-		die "Unset CHROOT"
-	fi
-
-	if [[ -d "${CHROOT}" ]]; then
-		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		ewarn "To enable the old behaviour (without using mount) uncomment the"
-		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		ewarn
-		ewarn "${CHROOT} already exists... some things might become overridden"
-		ewarn "press CTRL+C if you don't want to continue"
-		sleep 10
-	fi
-
-	echo; einfo "Setting up the chroot directory..."
-
-	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
-
-	chown root:named \
-		${CHROOT} \
-		${CHROOT}/var/{bind,log/named} \
-		${CHROOT}/run/named/ \
-		${CHROOT}/etc/bind \
-		|| die
-
-	mknod ${CHROOT}/dev/null c 1 3 || die
-	chmod 0666 ${CHROOT}/dev/null || die
-
-	mknod ${CHROOT}/dev/zero c 1 5 || die
-	chmod 0666 ${CHROOT}/dev/zero || die
-
-	if [[ "${CHROOT_NOMOUNT:-0}" -ne 0 ]]; then
-		cp -a /etc/bind ${CHROOT}/etc/ || die
-		cp -a /var/bind ${CHROOT}/var/ || die
-	fi
-
-	if [[ "${CHROOT_GEOIP:-0}" -eq 1 ]]; then
-		if use geoip; then
-			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die
-		elif use geoip2; then
-			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP2 || die
-		fi
-	fi
-
-	elog "You may need to add the following line to your syslog-ng.conf:"
-	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
-}
diff --git a/net-dns/bind/files/named.conf-r9 b/net-dns/bind/files/named.conf-r9
deleted file mode 100644
index 373a77b96018..000000000000
--- a/net-dns/bind/files/named.conf-r9
+++ /dev/null
@@ -1,33 +0,0 @@
-//http local {
-//	endpoints { "/dns-query"; };
-//};
-
-options {
-	directory "/var/cache/bind";
-	pid-file "/run/named/named.pid";
-
-	listen-on { 127.0.0.1; };
-	listen-on-v6 { ::1; };
-	// dns-over-tls
-	listen-on port 853 tls ephemeral { 127.0.0.1; };
-	listen-on-v6 port 853 tls ephemeral { ::1; };
-	// dns-over-https
-	//listen-on port 443 tls ephemeral http local { 127.0.0.1; };
-	//listen-on-v6 port 443 tls ephemeral http local { ::1; };
-
-	allow-recursion {
-		none;
-	};
-	allow-transfer {
-		none;
-	};
-	allow-update {
-		none;
-	};
-};
-
-zone "example.com." {
-	type primary;
-	file "/var/bind/pri/db.example.com";
-	notify explicit;
-};
diff --git a/net-dns/bind/files/named.conf.auth b/net-dns/bind/files/named.conf.auth
new file mode 100644
index 000000000000..373a77b96018
--- /dev/null
+++ b/net-dns/bind/files/named.conf.auth
@@ -0,0 +1,33 @@
+//http local {
+//	endpoints { "/dns-query"; };
+//};
+
+options {
+	directory "/var/cache/bind";
+	pid-file "/run/named/named.pid";
+
+	listen-on { 127.0.0.1; };
+	listen-on-v6 { ::1; };
+	// dns-over-tls
+	listen-on port 853 tls ephemeral { 127.0.0.1; };
+	listen-on-v6 port 853 tls ephemeral { ::1; };
+	// dns-over-https
+	//listen-on port 443 tls ephemeral http local { 127.0.0.1; };
+	//listen-on-v6 port 443 tls ephemeral http local { ::1; };
+
+	allow-recursion {
+		none;
+	};
+	allow-transfer {
+		none;
+	};
+	allow-update {
+		none;
+	};
+};
+
+zone "example.com." {
+	type primary;
+	file "/var/bind/pri/db.example.com";
+	notify explicit;
+};
-- 
cgit v1.2.3