7 files changed, 195 insertions, 2 deletions
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 6273b32bcbda..cf6bf2027a75 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/c-ares/Manifest b/net-dns/c-ares/Manifest
index 38d1a90bd7b2..d380528a85fe 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -4,7 +4,10 @@ DIST c-ares-1.29.0.tar.gz 1329299 BLAKE2B 7dd6a0dc85d3383087726cd48e75b481f4ef75
 DIST c-ares-1.29.0.tar.gz.asc 488 BLAKE2B 3d955b0a130dce562436d9629f1403e30ee5ebd2e981a9c2220b51d129222c3760d6bd8a681cab6115e3f2ef0bcf8e8d600792fc498bc0c05638ce7fcac0d509 SHA512 a379f3c5338073810b7bf932fecf0ce1f0b382cfbc75521f4b135cb78d0a9fd418b06f7affd747fa00d11479186db248fe8ef8120858de2b8f562b56cc41ecb2
 DIST c-ares-1.31.0.tar.gz 1012373 BLAKE2B d302862148998fbfb737e5f78826a3152b299fbbf04db4d80580daeaade77e4ea1a9513f4d194746733c33a35474f39dce43dd0562b3faa8673b366a2190c87c SHA512 571d2555b4aaf3bf9cd7b5c89be8448ca26fe0ea1f3d664b07a01b42d28af4f5412b30485ef01d4bacc4e08de487dc6eeda98acf212a6a08edec6805f17210cc
 DIST c-ares-1.31.0.tar.gz.asc 228 BLAKE2B 41d35804e4f5d0e11c2c6c192453a0d48f779be999a3f9c1bd8066c547e0ed9959083d953b7735ca15699444913bcdd7d43c3871e11a381e9c8ee508086fc3d8 SHA512 ea2decdec5913f25e690e6c7437fad1682b2df807397e4b764ebb2a8b010804f77b91a889e8aa00471cd1bba3b96c5f90d815ffa677598e9b516909e29b7f960
+DIST c-ares-1.32.0.tar.gz 1021855 BLAKE2B b60c924581ba7db1d87350929d22b5e15684484579e0a7d46068438ca8a953bfb7945cb38cad42f008631bb7ea51e10acb074053d485cd91a52eef742f09fdc1 SHA512 15b9dc967f66a355095f68ef84238776f6ed826fc9077702ffbb6b136be1befadcb9da1f07956079efe593434c1e912993f6e93e948291668b806be50f03136c
+DIST c-ares-1.32.0.tar.gz.asc 228 BLAKE2B d9cf726e42d79ccdaeca2aafc028c1d03aa56acd1cf03b118070968a31655046a3d609e8ea529f03465341d6decaa7f8eace4310487e7028e3a1ad355d25fa4c SHA512 7554b37e470a57ad0175050c1966e1b72bf67791aa860b113a66688ac28e525b93a633a472dd43c8a16bddb366e918b202760efab5ab311c4b6ee63e72869552
 EBUILD c-ares-1.28.1.ebuild 2469 BLAKE2B 3602700c7fbd2b32142f10a96cfb6d0918a7a9b532d5c9a3464b8e4f99d64bbe77248211628123fb7d29bff9642ff3f5630b9483d1c2f758dd988bdbf97ba448 SHA512 9a19121ff5d8b4290613e9db043824f5eca2879bd86f9e6a76f479af4190145966484dc60112323d881b7408db668912347346e8981dae021e56f2d8fca6906f
 EBUILD c-ares-1.29.0.ebuild 2477 BLAKE2B af7ef39d916bdf7fff30e9ed176699fb20abc10a51e69e56f9380e9b41d0831880eeecc438476c6d5709fb0d05360899a1c6ce271c65ae2cdd55f3c415778d6d SHA512 daf2ec88ced3df7ce2a112ec0b2c9562681fb11e2bedbceef636fd5d63be0bf0c3a2788a53635a208f93eb87356907058eac0ccbcbbcb4b8284270c1073fe6a6
 EBUILD c-ares-1.31.0.ebuild 2499 BLAKE2B a596da04d3c74feb78f2ebbbc82bd8b46668592931b0fa74de8f54e6a9fb093203aa5794d8d9761b2183e2bfdb2046abca927f3f3c2b4a468bf8746c771edafb SHA512 509712dbfdb6ce96e5fdafb73cc8b7d75c0f78b5d6383461230a4555545ad20708dc4c7636d1cacf141b99d3a79d77394a2680960b07bcf261c7b75a43922df1
+EBUILD c-ares-1.32.0.ebuild 2499 BLAKE2B a596da04d3c74feb78f2ebbbc82bd8b46668592931b0fa74de8f54e6a9fb093203aa5794d8d9761b2183e2bfdb2046abca927f3f3c2b4a468bf8746c771edafb SHA512 509712dbfdb6ce96e5fdafb73cc8b7d75c0f78b5d6383461230a4555545ad20708dc4c7636d1cacf141b99d3a79d77394a2680960b07bcf261c7b75a43922df1
 MISC metadata.xml 402 BLAKE2B ab03bca92ec4073f5a877993558552136f0ae673f98619aa1f30eb94b6d8f2103b1cf77d23a9f2b3d56ee33af23d626ee230e480a3e3e0bc174df879082466bd SHA512 e02d13db5d10b1aaaae5680247a6b47610dda28a13b7754d2b97f08a760ce732957c96fb6e88ce7fd2076bfec275e72bfbb3dec802940f0159122364ab21acda
diff --git a/net-dns/c-ares/c-ares-1.32.0.ebuild b/net-dns/c-ares/c-ares-1.32.0.ebuild
new file mode 100644
index 000000000000..d6ad901bd330
--- /dev/null
+++ b/net-dns/c-ares/c-ares-1.32.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Both Daniel and Brad are listed as possible signers on the homepage
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradhouse.asc
+inherit edo multilib-minimal verify-sig
+
+DESCRIPTION="C library that resolves names asynchronously"
+HOMEPAGE="https://c-ares.org/"
+SRC_URI="
+	https://github.com/c-ares/c-ares/releases/download/v${PV}/${P}.tar.gz
+	verify-sig? ( https://github.com/c-ares/c-ares/releases/download/v${PV}/${P}.tar.gz.asc )
+"
+
+# ISC for lib/{bitncmp.c,inet_ntop.c,inet_net_pton.c} (bug #912405)
+LICENSE="MIT ISC"
+# Subslot = SONAME of libcares.so.2
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? ( dev-cpp/gtest )
+	verify-sig? ( sec-keys/openpgp-keys-bradhouse )
+"
+
+DOCS=( AUTHORS README.md RELEASE-NOTES.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ares_build.h
+)
+
+A__QA_CONFIG_IMPL_DECL_SKIP=(
+	# Checking for obsolete headers
+	malloc
+	calloc
+	free
+
+	# Non-existent on Linux
+	closesocket
+	CloseSocket
+	ioctlsocket
+	bitncmp
+	ConvertInterfaceIndexToLuid
+	ConvertInterfaceLuidToNameA
+)
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-symbol-hiding
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+	)
+
+	# Needed for running unit tests only
+	# Violates sandbox and tests pass fine without
+	export ax_cv_uts_namespace=no
+	export ax_cv_user_namespace=no
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	cd "${BUILD_DIR}"/test || die
+
+	# We're skipping the "real" network tests with the filter
+	# see https://github.com/c-ares/c-ares/tree/main/test
+	local network_tests=(
+		# Most live tests have Live in the name
+		*Live*
+		# These don't but are still in ares-test-live.cc => live
+		*GetTCPSock*
+		*TimeoutValue*
+		*GetSock*
+		*GetSock_virtualized*
+		*VerifySocketFunctionCallback*
+		# Seems flaky, even run manually
+		# https://github.com/c-ares/c-ares/commit/9e542a8839f81c990bb0dff14beeaf9aa6bcc18d
+		*MockUDPMaxQueriesTest.GetHostByNameParallelLookups*
+	)
+
+	# The format for disabling test1, test2, and test3 looks like:
+	# -test1:test2:test3
+	edo ./arestest --gtest_filter=-$(echo $(IFS=:; echo "${network_tests[*]}"))
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index ad3c33582bd8..d988bfb13703 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -1,8 +1,9 @@
+AUX 0001-include-lots-of-headers-to-pass-the-basic-c99-sniff-.patch 2769 BLAKE2B 6ccc853c8999e97c6fb45eaa3bc6477b86a46bec8d71b2ca563e0f8ad51c81dcd7cf7dd2f90431c4fbafac1c6ff6cb09ad3530199b3205abcab48304447cddcc SHA512 17f0d8760d27484407b9ea718c6cb624b31e525f80468dc5992d70fce4f7b2c34400474648990087a1b3d120ac31841071a3a7578f65c138d2138603980b3281
 AUX opendnssec-fix-mysql.patch 1292 BLAKE2B 054de4eb88d89ebfdb3df79f72f6d5d47c35dcba760fd80f845724de8e461e7a1bab7b0afeb2220932abcced43d208d678ab3e232f8cf612a7c54f96b695df17 SHA512 2ae9e7228ff9d2def1cceae1da8c3bfb28d8241cf2a54ea74b0c476b81492be18d22c8961cbcf2d3647dc853314b6bad16da91ba93fc38cd1d48c01be3ac7a27
 AUX opendnssec-fix-run-dir-2.1.x.patch 1364 BLAKE2B be870fded9a3dfadfe2b131c7bf0dca3e8ec3b89f0baae469148e8c9ef81ceac1f6ace024373536fa34fa1fa31aa23b432ee97fce7d79c7324aee84eaa3014ec SHA512 c476a5808d914e2056c75d49a3297f4c9a6f9f20882734af21208d563d3a1f9b1aca387ea53159a7c91e6faacc38280ba7b72a3bd3d4a6dd7b4ffb3cfd749b33
 AUX opendnssec-use-system-trang.patch 618 BLAKE2B 32e1b6784f1666e0485e6109af40b06373fbdc974f90bf3a3d6fc564d7c69728151afc5a9f793c96a3be77593bb2679af9dee4456bf69e89367fa459f8b70435 SHA512 316b89a2c6ba56c4fe45d00ad1bc31316fa20ba7177a2cc0979c23f11aba4234cd2f0b8972f98e4f14be9535b704fdc3177a514a41c489eb43016f8ff878795c
 AUX opendnssec.confd 393 BLAKE2B 47f83e11292c01cb999fae36dbea2d0b45cb970493bfbab43c43682fe26e574e12bbe7f7096e71ff7bd0b8b49827f13e4de858a38868706fa769cc92ceb1f307 SHA512 17bd24efef9bd6b7a907c75126809a6012db23a6c8547169c41dbc62fc91775331f445905282bc6c2ef13357f92eccab5008d4605419d98acdb723806b63a924
 AUX opendnssec.initd 1854 BLAKE2B 358bcf513123f7a38b7795f142f56e6a186062d1ad80bb70bee46ba7ebe7a137b4d2830a6c27ae690add23e0296ed2bd3a7a5d7ee88e1ee7ee3a8a9631306916 SHA512 75bce27c152b55ba2ba7d0770c6f2149493ef4b145f2257328e7e4b6865ad2d644695a688c3e06be02705ac42752e031846551b80b560e19a73e595e5ad15def
 DIST opendnssec-2.1.13.tar.gz 1161140 BLAKE2B 964a612e191bf5feb09a8b214e3341fbe5fc03c847e22b33bfc64ec7712608fd0f944c3b089901f08d7e3d2a27cb47543b3d5d210de48708192bb87546dacfa3 SHA512 5f3926f0f144cf8819895da2ec81fce21e2a05cf0b83dd9174a72ebfdef99badc3bcff2d6685c498485113209e7c73ab9cf55b3e126009ce6cbcc3cde54d6051
-EBUILD opendnssec-2.1.13.ebuild 6751 BLAKE2B 9c56b73e2ae4a5cc49af5d1761694c2df9df132051a5c39113e9254eff76464f6340ba7b13377bf776b99339c04f988dc777f46a61adb6e595c9a8ad2fd99d0d SHA512 93895cb4ea3e2a3f6848cf0c756d1586f2f56417f89728474cff20879f742385862fef68dc97df6ff4ad8f6dbcc1156f70b7b9a46095a0796323f6ab816648ac
-MISC metadata.xml 667 BLAKE2B d32db6dbcfebdb81a5b1289f4630034e6277cfc52c96cd6c5d4e361b30570659852ce168f62fb85aafdd187b3db5e7f946f2cb28317154f7767530d3737105c6 SHA512 bf88072975ccb44724c55fcb8543b2626710a7f50fd820ccfb09dbc627e42db0dea19bbb77d763cd39394a14a01d07902811b56e3ff86c1a0f686828050e911c
+EBUILD opendnssec-2.1.13-r1.ebuild 7018 BLAKE2B f1434e7f1278bce09c39a2c66be10b5e6d597b5c6befac15467f490401bf0ad8216cbc146579d021059303131d002582546055e653ee48748cc0f5f687f86f43 SHA512 675f519c0f4267f368dccdf98c01f5cd4f33681fb7f8af483469703c0b6c17587cbde94e83c03cd4f02736c72e8a0619d31630bd3d3bbd4f123e47a9679932ac
+MISC metadata.xml 753 BLAKE2B 0f1a885e7a40b2d1dd268f9dd313eda9022061313f7629de0ae6865e8ea6bc1bf97e3ce51a6904dd9e63f46e98d1602bc0e8b5c74ee017bd2b5ac8990044db5d SHA512 2893886f21d3302f4ab3960632d3186e4f8c05096870e538517cd8065bc7f6ad5d1f640f0208a04754c000b0e118525eb68316bfb28c2abc786ec0d5a0018bca
diff --git a/net-dns/opendnssec/files/0001-include-lots-of-headers-to-pass-the-basic-c99-sniff-.patch b/net-dns/opendnssec/files/0001-include-lots-of-headers-to-pass-the-basic-c99-sniff-.patch
new file mode 100644
index 000000000000..3d0f1b8e73ef
--- /dev/null
+++ b/net-dns/opendnssec/files/0001-include-lots-of-headers-to-pass-the-basic-c99-sniff-.patch
@@ -0,0 +1,89 @@
+From cd5e920572eabc54dc7350c41ca172b49e48ac1a Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 7 Jul 2024 21:38:29 -0400
+Subject: [PATCH] include lots of headers to pass the basic c99 sniff test
+
+Including configure checks, which currently emit broken results.
+
+And in one case, include config.h early enough to do something.
+---
+ common/scheduler/task.c             | 1 +
+ enforcer/src/daemon/time_leap_cmd.c | 2 +-
+ enforcer/src/utils/kaspcheck.c      | 1 +
+ enforcer/src/utils/kc_helper.c      | 1 +
+ m4/acx_broken_setres.m4             | 2 ++
+ 5 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/common/scheduler/task.c b/common/scheduler/task.c
+index 4dcf9e9..0dfa496 100644
+--- a/common/scheduler/task.c
++++ b/common/scheduler/task.c
+@@ -40,6 +40,7 @@
+ #include "duration.h"
+ #include "file.h"
+ #include "log.h"
++#include "utilities.h"
+ 
+ static const char* task_str = "task";
+ static pthread_mutex_t worklock = PTHREAD_MUTEX_INITIALIZER;
+diff --git a/enforcer/src/daemon/time_leap_cmd.c b/enforcer/src/daemon/time_leap_cmd.c
+index af41c8d..b17773c 100644
+--- a/enforcer/src/daemon/time_leap_cmd.c
++++ b/enforcer/src/daemon/time_leap_cmd.c
+@@ -26,8 +26,8 @@
+  *
+  */
+ 
+-#include <getopt.h>
+ #include "config.h"
++#include <getopt.h>
+ 
+ #include "file.h"
+ #include "duration.h"
+diff --git a/enforcer/src/utils/kaspcheck.c b/enforcer/src/utils/kaspcheck.c
+index 9bac3b7..fcdb36d 100644
+--- a/enforcer/src/utils/kaspcheck.c
++++ b/enforcer/src/utils/kaspcheck.c
+@@ -25,6 +25,7 @@
+ 
+ #define _GNU_SOURCE
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <getopt.h>
+ #include <string.h>
+ #include <syslog.h>
+diff --git a/enforcer/src/utils/kc_helper.c b/enforcer/src/utils/kc_helper.c
+index 72d181f..7f1278e 100644
+--- a/enforcer/src/utils/kc_helper.c
++++ b/enforcer/src/utils/kc_helper.c
+@@ -27,6 +27,7 @@
+ #include <syslog.h>
+ #include <stdarg.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <errno.h>
+diff --git a/m4/acx_broken_setres.m4 b/m4/acx_broken_setres.m4
+index 374cee0..c9eda46 100644
+--- a/m4/acx_broken_setres.m4
++++ b/m4/acx_broken_setres.m4
+@@ -4,6 +4,7 @@ AC_DEFUN([ACX_BROKEN_SETRES],[
+ 		AC_MSG_CHECKING(if setresuid seems to work)
+ 		AC_RUN_IFELSE(
+ 			[AC_LANG_SOURCE([[
++#include <unistd.h>
+ #include <stdlib.h>
+ #include <errno.h>
+ int main(){errno=0; setresuid(0,0,0); if (errno==ENOSYS) exit(1); else exit(0);}
+@@ -20,6 +21,7 @@ int main(){errno=0; setresuid(0,0,0); if (errno==ENOSYS) exit(1); else exit(0);}
+ 		AC_MSG_CHECKING(if setresgid seems to work)
+ 		AC_RUN_IFELSE(
+ 			[AC_LANG_SOURCE([[
++#include <unistd.h>
+ #include <stdlib.h>
+ #include <errno.h>
+ int main(){errno=0; setresgid(0,0,0); if (errno==ENOSYS) exit(1); else exit(0);}
+-- 
+2.44.2
+
diff --git a/net-dns/opendnssec/metadata.xml b/net-dns/opendnssec/metadata.xml
index 142c2461b8ff..dacff87f9bec 100644
--- a/net-dns/opendnssec/metadata.xml
+++ b/net-dns/opendnssec/metadata.xml
@@ -8,4 +8,7 @@
 		<flag name="softhsm">Enables support for storing DNSSEC keys in a <pkg>dev-libs/softhsm</pkg> PKCS#11 object</flag>
 		<flag name="external-hsm">Enables support for storing DNSSEC keys through an arbitrary non-portage PKCS#11 interface, specified through an environment variable</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">opendnssec/opendnssec</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-dns/opendnssec/opendnssec-2.1.13.ebuild b/net-dns/opendnssec/opendnssec-2.1.13-r1.ebuild
index 36ea2b040912..7ae289d49c92 100644
--- a/net-dns/opendnssec/opendnssec-2.1.13.ebuild
+++ b/net-dns/opendnssec/opendnssec-2.1.13-r1.ebuild
@@ -59,6 +59,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-fix-run-dir-2.1.x.patch"
 	"${FILESDIR}/${PN}-use-system-trang.patch"
 	"${FILESDIR}/${PN}-fix-mysql.patch"
+	# fix some modern C errors due to missing includes. Not forwarded upstream,
+	# since upstream's website appears to be in a state of disarray and the
+	# "Bug Reporting" link doesn't work.
+	"${FILESDIR}"/0001-include-lots-of-headers-to-pass-the-basic-c99-sniff-.patch
 )
 
 DOCS=( MIGRATION NEWS )