commit:     251ca17adcbbeaba954e266c1a2d59d1902ceeaf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  1 06:00:29 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun  1 06:09:34 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=251ca17a

net-dns/bind: add 9.18.37

Bug: https://bugs.gentoo.org/949125
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-dns/bind/Manifest            |   1 +
 net-dns/bind/bind-9.18.37.ebuild | 282 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 283 insertions(+)

diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 630ce7424563..247c6d46160c 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,3 +1,4 @@
 DIST bind-9.18.29.tar.xz 5562720 BLAKE2B 
f3e7de6936362bcce4993e401ed8fdd9d597459e82ad908a918fff1da619f91ef4896595ea210b43f2b492d763d7be2b71105495858da55431b60874c7fd2312
 SHA512 
6c2676e2e2cb90f3bd73afb367813c54d1c961e12df1e12e41b9d0ee5a1d5cdf368d81410469753eaef37e43358b56796f078f3b2f20c3b247c4bef91d56c716
 DIST bind-9.18.31.tar.xz 5385812 BLAKE2B 
e069ab3caab887a87220b54804e5b19a4c21b8d3e4e8f1bc6a7135b3990a228d6c48b1ca4a22c75242485275eff1de145a9aff89addf81124e7dfcafd8ab30cf
 SHA512 
e51873484be3ee367eb1e601b8e0adc45abcdb16df04021ea42ffcc51b99821f8b30f67b2a693a90ad3efa51698a651c8da9d7947ee8fa19680f627afe1f7034
+DIST bind-9.18.37.tar.xz 5358128 BLAKE2B 
59753a594e1e8249b9104377260701a9453eeecb6a233a94a33c6a134a6368c5c0b9473c4e08d956d0746a331dc7b121550f5e426a521d6c8d0441d9164f0547
 SHA512 
9789cb3fa7739cc7e1b137d1642861d9517adc4391e2f8c526bfa271e13f7489794ed20cb5f64c26e432d7b79cfe7aa1f7d59c476fd2749bc2dccfb85c514943
 DIST bind-9.20.7.tar.xz 5655168 BLAKE2B 
c5198939382e7295b4dfcb2ddbd86e5bccc10047d5e963dab2381404eb7a14543218e3caa438b395a2982cb607da84012f3a76a41c790a48ed615238bc080b5c
 SHA512 
b9570c0c6588819108017d30dc7fb5e2f34361f941186d29da3d2830bbe3333c8c16bdb6581f5bec4786d90b74db860a9cad5f66d4f1c65168eae69f401a9df0

diff --git a/net-dns/bind/bind-9.18.37.ebuild b/net-dns/bind/bind-9.18.37.ebuild
new file mode 100644
index 000000000000..0a4c293f4a67
--- /dev/null
+++ b/net-dns/bind/bind-9.18.37.ebuild
@@ -0,0 +1,282 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit eapi9-ver systemd tmpfiles toolchain-funcs
+
+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 ~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"
+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="
+       dev-lang/perl
+       virtual/pkgconfig
+       doc? ( dev-python/sphinx )
+       test? (
+               dev-util/cmocka
+       )
+"
+
+src_prepare() {
+       default
+
+       # 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
+
+       # Relies on -Wl,--wrap (bug #877741)
+       if tc-is-lto ; then
+               sed -i -e 's:ISC_TEST_MAIN:int main(void) { exit(77); }:' 
tests/ns/query_test.c || die
+       fi
+}
+
+src_configure() {
+       # configure automagically uses sphinx even if prebuilt man pages
+       # are available. Force fallback to prebuilt ones.
+       use doc || export ac_cv_path_SPHINX_BUILD= SPHINX_BUILD=
+
+       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)
+               --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)
+               $(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.
+       CI=1 emake unit V=1
+
+       # libtest is an internal test helper library, it has no tests,
+       # so suppress the QA warning.
+       rm tests/libtest/test-suite.log || die
+}
+
+src_install() {
+       default
+
+       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-r2" named.service
+       dotmpfiles "${FILESDIR}"/named.conf
+       exeinto /usr/libexec
+       doexe "${FILESDIR}/generate-rndc-key.sh"
+}
+
+pkg_postinst() {
+       tmpfiles_process named.conf
+
+       if [[ -z ${ROOT} && ! -f ${EPREFIX}/etc/bind/rndc.key && ! -f 
${EPREFIX}/etc/bind/rndc.conf ]]; then
+               einfo "Generating rndc.key"
+               "${EPREFIX}"/usr/sbin/rndc-confgen -a || die
+               chown root:named "${EPREFIX}"/etc/bind/rndc.key || die
+               chmod 0640 "${EPREFIX}"/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 "${EROOT}"/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 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."
+               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 "${EROOT}"/etc/conf.d/named; echo ${CHROOT})
+       CHROOT_NOMOUNT=$(source "${EROOT}"/etc/conf.d/named; echo 
${CHROOT_NOMOUNT})
+       CHROOT_GEOIP=$(source "${EROOT}"/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\"); };"
+}

Reply via email to