gentoo auto-resync : 08:07:2024 - 12:25:03

4 files changed, 99 insertions, 2 deletions

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 )