gentoo auto-resync : 18:02:2024 - 11:39:02

4 files changed, 21 insertions, 341 deletions

diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index f7a35345da9f..ee3c8b45b4c8 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,9 +1,6 @@
-DIST bind-9.16.37.tar.xz 5109440 BLAKE2B 3b18f7c780ce04e296498e30c09628ad8eb89f38afdb032700455f193a3f8556029cd2e3d3c42861965d5fc776f56f761b8d21a74a0f95d82338e65fb519acfb SHA512 2c4b01f6cc598849688b5b2710caf48db47e1e860df785783ef2b140a25507b48357a9becf7911ba0feda285c4bca87764e21128fac5cf17efa47fd5134dc59f
-DIST bind-9.16.39.tar.xz 5120164 BLAKE2B d9fb51435dce11c8854084cc21de79df3ae6529baead76dcf27711bcff33469d1fd6fbd3366b61bc921f92850620c9b7464d4dbe08dd0c7e2f3e5e1c1100cb79 SHA512 6e2e30815222a289e94f6857fdb6b142558ca56ecf5f8291f843f8476da8e4011042f1dd2bed031e5d9924370ae0705ce5b3ea2ce10ae830f8980b669eb26328
-DIST bind-9.16.41.tar.xz 5121884 BLAKE2B 53ccc399acc98f79930f51314c1f4e1135370347f05c7a293ac416669c6125b2d56edda20b9ecd86e6ec3ccf05a95c3eb0b836c26b14cf7ee3d1869f578280e5 SHA512 93c374ef82ff36e222a790161942635d0b977813b5040f8895e1c032b4ca1925addc8ef3a06417445036dc35aeb708cc61bd589c6a9cb78980f77ab402c44bee
 DIST bind-9.16.42.tar.xz 5123476 BLAKE2B 7cda7df38beaa602fde0142b46c8bcf401cda8afdf00383724ccaa8f3e3f71d320bbd4b7f3be33bcc9c59465932caab1f8c62ca64b79a1470cbdaa01f0048b00 SHA512 cf29e72c9c979f3cf8ba0b17357fb09c37f1436a7f3a518f49ce4b4c682fb367dd3d8e71de6603c166c95a7c535a77a9f2a1393a59723294626acefebbc95fd6
-EBUILD bind-tools-9.16.37-r1.ebuild 3936 BLAKE2B 004e8038be46a12ec9a2b3b80f8e5cd9c159fe048023d254d12c483d92e3decc0af01e16a37bdfd9c357c8773169a5eeaee499b57ccc09afc2e2566616797b0d SHA512 7c0f53a7880852754bc622fe6eb25356617e6c58c2df4bf0d5d5200a372f67b36484917aa7c9ac351d858892dfc0cc13b1ff9cdf14f9ee283ca625a48965e207
-EBUILD bind-tools-9.16.39.ebuild 3943 BLAKE2B 070fdaf2905eec6061aa333cb69a77c23d00eba4d063e75791aaabf1f7d2e3477e28a86e03778422556aff8036dc50aeb2f01f15672441e97af10cfb194ba3ce SHA512 9d976832d1e9e5d91d659f0395ac70ff6cb669d834dc1a2c04dc278321217a21f96379019bbd39ec3fc8a3e2528e42ebdaf830ad041cb5bf7a3bb1343ad1c001
-EBUILD bind-tools-9.16.41.ebuild 4249 BLAKE2B ed31666c04df3d57fd78a9e0ce29e45def1add26d07e2d4b0a28b47af7ee3f20954921c75a791512b995947347e77332fd0d8d581bd005ff7ee9e339e891fb15 SHA512 7a9a27dee9ce97f96ba807090de96a081a36496e7e170a1973072e3febb421e814c1da27862435b867ed2144e71ac5e431a729b4036488e69e49ee193df0c19a
+DIST bind-9.16.48.tar.xz 5131176 BLAKE2B 4a503b45df412c435cb0f75b54ee1270140cccce7ecc159cdf3e0e3cbd3c0a0866b7472782f20aacf130f57df12d20a102ac6979498138ce00a2655806d003e7 SHA512 83829a5045e2a29dd2b491d3ab72b545f5664023fcd4aa205a44dbb7bcc5c737b4466c0d73f124b8d88fd33c56776871a07dde1ba0530d43eec8e7304a08d353
+DIST bind-9.16.48.tar.xz.asc 833 BLAKE2B 740ed58863ed3a7dee6ada4edd03cad5378ea0aa53cd6f071ca1911bb2d6b285ed292f32846790d42b97e8d9bb72588f1cd30c4e10557ac1e9f1df545923a9b1 SHA512 7bd813b5ab6f9677fc4ef21e0c3930f6319fa6c49d6869570794bc28212fe8935b72f9f217cfce692a2dec9ec29994f345d1b1145cef1ca976c5361f6ce0f75d
 EBUILD bind-tools-9.16.42.ebuild 4249 BLAKE2B ed31666c04df3d57fd78a9e0ce29e45def1add26d07e2d4b0a28b47af7ee3f20954921c75a791512b995947347e77332fd0d8d581bd005ff7ee9e339e891fb15 SHA512 7a9a27dee9ce97f96ba807090de96a081a36496e7e170a1973072e3febb421e814c1da27862435b867ed2144e71ac5e431a729b4036488e69e49ee193df0c19a
+EBUILD bind-tools-9.16.48.ebuild 4450 BLAKE2B 7e8b64cf2372a890917dc72f36e2738d6ad2a4ae733988467be5a35eb59966d41688fbc8e8ff40bf307a60d68d876db987a5ecf92e0c9d2523f5046bcd91945e SHA512 b819f38c97322cdcd0b9f52153697e8b43b135fa8ad51f51933826b926a2e83cd8b8032b522d34dd6b3366a4f204c9244b991d1cee0ec2b9bdf6d9a5ddf2c62a
 MISC metadata.xml 393 BLAKE2B 90453ff0da1ce62c68dbe5c2f8ad99747388e8476afb02fc3794705d9acebbde1fb1d0c1f282a5e3fec62211b02af74c05783ebc2353dbdee3f2f0ba51541430 SHA512 d4e6b6f90058fedc771b2ecde5fb8cb8b3aa4069bded3a7a1ffe01766ca05b08a25b2a7f6d3f9cfa796868b9b290b20d2531ad25b7548427807125a2b8ea5bad
diff --git a/net-dns/bind-tools/bind-tools-9.16.37-r1.ebuild b/net-dns/bind-tools/bind-tools-9.16.37-r1.ebuild
deleted file mode 100644
index c2b97cf39596..000000000000
--- a/net-dns/bind-tools/bind-tools-9.16.37-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic multiprocessing toolchain-funcs
-
-MY_PN=${PN//-tools}
-MY_PV=${PV/_p/-P}
-MY_PV=${MY_PV/_rc/rc}
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
-HOMEPAGE="https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9"
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+caps doc gssapi idn libedit readline test xml"
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687
-RESTRICT="!test? ( test )"
-
-# libuv lower bound should be the highest value seen at
-# https://gitlab.isc.org/isc-projects/bind9/-/blob/v9_16/lib/isc/netmgr/netmgr.c#L244
-# to avoid issues with matching stable/testing, etc
-COMMON_DEPEND="
-	>=dev-libs/libuv-1.42.0:=
-	dev-libs/openssl:=
-	caps? ( sys-libs/libcap )
-	xml? ( dev-libs/libxml2 )
-	idn? ( net-dns/libidn2:= )
-	gssapi? ( virtual/krb5 )
-	libedit? ( dev-libs/libedit )
-	!libedit? (
-		readline? ( sys-libs/readline:= )
-	)
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-# sphinx required for man-page and html creation
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-	test? (
-		dev-util/cmocka
-		dev-util/kyua
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# Do not disable thread local storage on Solaris, it works with our
-	# toolchain, and it breaks further configure checks
-	sed -i -e '/LDFLAGS=/s/-zrelax=transtls//' configure.ac configure || die
-
-	# bug #220361
-	rm aclocal.m4 || die
-	rm -rf libtool.m4/ || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}"/var
-		--without-python
-		--without-libjson
-		--without-zlib
-		--without-lmdb
-		--without-maxminddb
-		--disable-geoip
-		--with-openssl="${ESYSROOT}"/usr
-		$(use_with idn libidn2 "${ESYSROOT}"/usr)
-		$(use_with xml libxml2)
-		$(use_with gssapi)
-		$(use_with readline)
-		$(use_enable caps linux-caps)
-		AR="$(type -P $(tc-getAR))"
-	)
-
-	# bug 607400
-	if use libedit ; then
-		myeconfargs+=( --with-readline=-ledit )
-	elif use readline ; then
-		myeconfargs+=( --with-readline=-lreadline )
-	else
-		myeconfargs+=( --without-readline )
-	fi
-
-	# bug #344029
-	append-cflags "-DDIG_SIGCHASE"
-
-	# to expose CMSG_* macros from sys/sockets.h
-	[[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600"
-
-	# localstatedir for nsupdate -l, bug #395785
-	tc-export BUILD_CC
-	econf "${myeconfargs[@]}"
-
-	# bug #151839
-	echo '#undef SO_BSDCOMPAT' >> config.h || die
-}
-
-src_compile() {
-	local AR="$(tc-getAR)"
-
-	emake AR="${AR}" -C lib/
-	emake AR="${AR}" -C bin/delv/
-	emake AR="${AR}" -C bin/dig/
-	emake AR="${AR}" -C bin/nsupdate/
-	emake AR="${AR}" -C bin/dnssec/
-	emake -C doc/man/ man $(usev doc)
-}
-
-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() {
-	local man_dir="${S}/doc/man"
-	local html_dir="${man_dir}/_build/html"
-
-	dodoc README CHANGES
-
-	cd "${S}"/bin/delv || die
-	dobin delv
-	doman ${man_dir}/delv.1
-
-	cd "${S}"/bin/dig || die
-	dobin dig host nslookup
-	doman ${man_dir}/{dig,host,nslookup}.1
-
-	cd "${S}"/bin/nsupdate || die
-	dobin nsupdate
-	doman ${man_dir}/nsupdate.1
-	if use doc; then
-		docinto html
-		dodoc ${html_dir}/nsupdate.html
-	fi
-
-	cd "${S}"/bin/dnssec || die
-	for tool in dsfromkey importkey keyfromlabel keygen \
-		revoke settime signzone verify; do
-		dobin dnssec-"${tool}"
-		doman ${man_dir}/dnssec-"${tool}".8
-		if use doc; then
-			docinto html
-			dodoc ${html_dir}/dnssec-"${tool}".html
-		fi
-	done
-}
diff --git a/net-dns/bind-tools/bind-tools-9.16.39.ebuild b/net-dns/bind-tools/bind-tools-9.16.39.ebuild
deleted file mode 100644
index 7aaf1b1a1ceb..000000000000
--- a/net-dns/bind-tools/bind-tools-9.16.39.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic multiprocessing toolchain-funcs
-
-MY_PN=${PN//-tools}
-MY_PV=${PV/_p/-P}
-MY_PV=${MY_PV/_rc/rc}
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
-HOMEPAGE="https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9"
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+caps doc gssapi idn libedit readline test xml"
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687
-RESTRICT="!test? ( test )"
-
-# libuv lower bound should be the highest value seen at
-# https://gitlab.isc.org/isc-projects/bind9/-/blob/v9_16/lib/isc/netmgr/netmgr.c#L244
-# to avoid issues with matching stable/testing, etc
-COMMON_DEPEND="
-	>=dev-libs/libuv-1.42.0:=
-	dev-libs/openssl:=
-	caps? ( sys-libs/libcap )
-	xml? ( dev-libs/libxml2 )
-	idn? ( net-dns/libidn2:= )
-	gssapi? ( virtual/krb5 )
-	libedit? ( dev-libs/libedit )
-	!libedit? (
-		readline? ( sys-libs/readline:= )
-	)
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-# sphinx required for man-page and html creation
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-	test? (
-		dev-util/cmocka
-		dev-util/kyua
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# Do not disable thread local storage on Solaris, it works with our
-	# toolchain, and it breaks further configure checks
-	sed -i -e '/LDFLAGS=/s/-zrelax=transtls//' configure.ac configure || die
-
-	# bug #220361
-	rm aclocal.m4 || die
-	rm -rf libtool.m4/ || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}"/var
-		--without-python
-		--without-libjson
-		--without-zlib
-		--without-lmdb
-		--without-maxminddb
-		--disable-geoip
-		--with-openssl="${ESYSROOT}"/usr
-		$(use_with idn libidn2 "${ESYSROOT}"/usr)
-		$(use_with xml libxml2)
-		$(use_with gssapi)
-		$(use_with readline)
-		$(use_enable caps linux-caps)
-		AR="$(type -P $(tc-getAR))"
-	)
-
-	# bug 607400
-	if use libedit ; then
-		myeconfargs+=( --with-readline=-ledit )
-	elif use readline ; then
-		myeconfargs+=( --with-readline=-lreadline )
-	else
-		myeconfargs+=( --without-readline )
-	fi
-
-	# bug #344029
-	append-cflags "-DDIG_SIGCHASE"
-
-	# to expose CMSG_* macros from sys/sockets.h
-	[[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600"
-
-	# localstatedir for nsupdate -l, bug #395785
-	tc-export BUILD_CC
-	econf "${myeconfargs[@]}"
-
-	# bug #151839
-	echo '#undef SO_BSDCOMPAT' >> config.h || die
-}
-
-src_compile() {
-	local AR="$(tc-getAR)"
-
-	emake AR="${AR}" -C lib/
-	emake AR="${AR}" -C bin/delv/
-	emake AR="${AR}" -C bin/dig/
-	emake AR="${AR}" -C bin/nsupdate/
-	emake AR="${AR}" -C bin/dnssec/
-	emake -C doc/man/ man $(usev doc)
-}
-
-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() {
-	local man_dir="${S}/doc/man"
-	local html_dir="${man_dir}/_build/html"
-
-	dodoc README CHANGES
-
-	cd "${S}"/bin/delv || die
-	dobin delv
-	doman ${man_dir}/delv.1
-
-	cd "${S}"/bin/dig || die
-	dobin dig host nslookup
-	doman ${man_dir}/{dig,host,nslookup}.1
-
-	cd "${S}"/bin/nsupdate || die
-	dobin nsupdate
-	doman ${man_dir}/nsupdate.1
-	if use doc; then
-		docinto html
-		dodoc ${html_dir}/nsupdate.html
-	fi
-
-	cd "${S}"/bin/dnssec || die
-	for tool in dsfromkey importkey keyfromlabel keygen \
-		revoke settime signzone verify; do
-		dobin dnssec-"${tool}"
-		doman ${man_dir}/dnssec-"${tool}".8
-		if use doc; then
-			docinto html
-			dodoc ${html_dir}/dnssec-"${tool}".html
-		fi
-	done
-}
diff --git a/net-dns/bind-tools/bind-tools-9.16.41.ebuild b/net-dns/bind-tools/bind-tools-9.16.48.ebuild
index 1d420730c56f..53c0494bb5a5 100644
--- a/net-dns/bind-tools/bind-tools-9.16.41.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.16.48.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic multiprocessing toolchain-funcs
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/isc.asc
+inherit autotools flag-o-matic multiprocessing toolchain-funcs verify-sig
 
 MY_PN=${PN//-tools}
 MY_PV=${PV/_p/-P}
@@ -12,19 +13,23 @@ MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
 HOMEPAGE="https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9"
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
+SRC_URI="
+	https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz
+	verify-sig? ( https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz.asc )
+"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+caps doc gssapi idn libedit readline test xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687
 RESTRICT="!test? ( test )"
 
 # libuv lower bound should be the highest value seen at
-# https://gitlab.isc.org/isc-projects/bind9/-/blob/v9_16/lib/isc/netmgr/netmgr.c#L244
+# https://gitlab.isc.org/isc-projects/bind9/-/blob/bind-9.16/lib/isc/netmgr/netmgr.c?ref_type=heads#L244
 # to avoid issues with matching stable/testing, etc
-COMMON_DEPEND="
+RDEPEND="
 	>=dev-libs/libuv-1.42.0:=
 	dev-libs/openssl:=
 	caps? ( sys-libs/libcap )
@@ -36,9 +41,7 @@ COMMON_DEPEND="
 		readline? ( sys-libs/readline:= )
 	)
 "
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
+DEPEND="${RDEPEND}"
 # sphinx required for man-page and html creation
 BDEPEND="
 	virtual/pkgconfig
@@ -47,15 +50,12 @@ BDEPEND="
 		dev-util/cmocka
 		dev-util/kyua
 	)
+	verify-sig? ( sec-keys/openpgp-keys-isc )
 "
 
-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
 	default
 
-	append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)"
-
 	# Do not disable thread local storage on Solaris, it works with our
 	# toolchain, and it breaks further configure checks
 	sed -i -e '/LDFLAGS=/s/-zrelax=transtls//' configure.ac configure || die
@@ -76,6 +76,7 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
+		# localstatedir for nsupdate -l, bug #395785
 		--localstatedir="${EPREFIX}"/var
 		--without-python
 		--without-libjson
@@ -92,7 +93,7 @@ src_configure() {
 		AR="$(type -P $(tc-getAR))"
 	)
 
-	# bug 607400
+	# bug #607400
 	if use libedit ; then
 		myeconfargs+=( --with-readline=-ledit )
 	elif use readline ; then
@@ -104,10 +105,11 @@ src_configure() {
 	# bug #344029
 	append-cflags "-DDIG_SIGCHASE"
 
+	append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)"
+
 	# to expose CMSG_* macros from sys/sockets.h
 	[[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600"
 
-	# localstatedir for nsupdate -l, bug #395785
 	tc-export BUILD_CC
 	econf "${myeconfargs[@]}"
 
@@ -129,7 +131,7 @@ src_compile() {
 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
+	TEST_PARALLEL_JOBS="$(makeopts_jobs)" emake -Onone unit
 }
 
 src_install() {
@@ -155,6 +157,7 @@ src_install() {
 	fi
 
 	cd "${S}"/bin/dnssec || die
+	local tool
 	for tool in dsfromkey importkey keyfromlabel keygen \
 		revoke settime signzone verify; do
 		dobin dnssec-"${tool}"