gentoo auto-resync : 23:05:2024 - 00:06:39

5 files changed, 61 insertions, 15 deletions

diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index bcb9950b591b..33c8eae5eac7 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -1,10 +1,11 @@
+AUX 0001-fix-incompatible-check-for-libc-compat.patch 1151 BLAKE2B 10a0c488825ee8e5058aa12260f9945d3f85e06b19cac6e66a776ebfd0b88ef7f46432a5ae3fe86ef51605688142d59d59283a0f6c79e058d54975246c8a7526 SHA512 37194e1269876150dcc109108f4f96ec600a4370f53375542b1dcba2708879148ebba0b53b6a53bcfb37673bd55b6d08d84cdc958e4d13248329e90c1c3735c1
 AUX openntpd-6.2p3-fno-common.patch 2084 BLAKE2B 3fbff2d88260f7dc5435c8f1ab7df1652842a48ba3a91eb9744b501e7a0f59a30d8af3d6d17f67bd0313cfc06588dd2fb7f449009b29ac8ac34de1744b997669 SHA512 00e5da8345d2deb2311dd15ac4800674329b182d0742021b2b746af49055a514684ec3872dffb337c8b7e8b3cc8126182530565241c5c223083cd99fd509aeeb
 AUX openntpd.conf.d-20080406-r6 255 BLAKE2B cdbfd0de5a238216efbf64c8ef9c5db891380d7352dd0864e631816411954e9b335b715f8bf6b66f0f2ce0c6f050e4c166b946f1d235509a130fc024c5b960b7 SHA512 016094e0ac80817c8c1eb8a52a527c8a673b3ee904f2c04bef0304b5dfe1c778a34a2d5321cc5540a1dfe2e14dc878c44a1e54fd0263aca3917600827c6d9059
 AUX openntpd.init.d-20080406-r6 292 BLAKE2B fb5620bcb40b476796cf5242ebec17f4f7f01bfd112bdeab3f7199775237c92726120ba7763f5584a21c4b3b18d7b27c4c28311202ee9c18b9259b0e853ee24d SHA512 eff7820dea7f79420ddc78fc744a34f6f5cedbf167d7ce98ed35d4ae0b1dab6cae026d5255a6cc428cdbc8f51784ed149c5ec8011ab72c31c65a5bfc6664b94f
 AUX openntpd.service-20080406-r4 196 BLAKE2B 7b55400bbc6b706f57eeb61370fea232237ce8e12a47bf5c681a9274acab9bcd5ad0e97708aa99f8d2df92a0fa57828fb747f220c038f83c54f30084a154c7bb SHA512 e76196c90696855ea41464df2aab7617d2447d4dbf82cd5d135c52cea2ae1ef131707ae7b4e7800fe91f8d42893a55848b95149d8f27aa03777205fe355e830e
 DIST openntpd-6.2p3.tar.gz 447586 BLAKE2B f81db876c01572f06b8fc24aabe8954b15287496e8c39c1ae81231ef01676fbe8c69c5cf517279e45510b6b1b5f4c5d0d09d7ce5fc220c7bf36763cf67623519 SHA512 56a04bfd8b161b365607673ac80086ff53ae943938fa49bf52edbc541432eca30730a46a4af581fe26ce3bbceb144cb25982a38959b7a3f9304c727fe60f9f50
 DIST openntpd-6.8p1.tar.gz 443997 BLAKE2B 5b86c79ff2f822aba652da92325ad18803233c8b1548203c82603b99d2c41dce012dfb2be67828cc892559f323b764cc1711202fd85bc1d5d755b5e677406b98 SHA512 200056bedb9c757aae1ce5d3f6655175ec058cb479429fe4704955f3a3fa15e8a9cb578ae4898ddb4cfc08c9742bbab6a7c92b5e569f06a148e40c448360b58f
-EBUILD openntpd-6.2_p3-r2.ebuild 1764 BLAKE2B 4be3dc75452421f17fe5315d8ba57edc6efd6a450b864c3c77132fdac64e0666c4a2d5b6a6f70bc6fa68aca4c3460f5c8a7c95abfcc39fc3cc585cbeff86914d SHA512 ffb777978441b85a93720d28c40fcb96850b5185f0fc9d30f86a157cf37e08ea72c99e93dc4d67bf7449ceccaf3329ddc76cda4770ebc3fd4458de2c86c13255
-EBUILD openntpd-6.8_p1-r1.ebuild 1714 BLAKE2B 1a0035e8a2384aa22e39de64ade40007894b92360aafccd0ccff70e89bc432de25a6827bcf1da0b1df54beab2d7cb52ad2eb13fe9136ba7475b0d00d5a607af0 SHA512 faec17895118bd72eea72f9137383c46a9b9e584763b8d3cf5026c36435d958272fbc351f83c8bb1f3bed1f6a7c0b6400a5f54a50eb5ba63538217e7eaaf6c21
-EBUILD openntpd-6.8_p1.ebuild 1621 BLAKE2B 685e978d396f9306453d5f7a66c0727039b0084252d347995d94c45128fcd6af636b954f93e7dffe07acca4518a4fec3b2c3554b1b53d729975920cfa4654cb3 SHA512 2c9fc6b72fe8e690f43cf7b3e77803325b1b021fab58f403b59f83ec86e5cde135ad1ed45279c75f458c95ec42c58f1804e7a7827d381b4d2d4b67918cf2c673
+EBUILD openntpd-6.2_p3-r2.ebuild 1765 BLAKE2B 7a19ff4e644e008c350211d638fca5b6cdd679e9c70d94d9502db543be923ccd2869fb71814d941b3ad7e08b7dba70256adb71c55f37e70cb59ced12bc71fd1d SHA512 68c8dec26e15f6fcda5f7287b12fcfc36334b0fb7608c3a0565e03e04c75be8e277c9c4a8acc09accae404ff3f5996266049fa5f488257c69d224ea33f94e0dd
+EBUILD openntpd-6.2_p3-r3.ebuild 1926 BLAKE2B ecc434f98c2adae9fc3e65a49327c79b5cdd166d66aead9d89af873d989156a5c55ab4ab8d0ee59d088059a188e4b5e339f2a32a97e8cffe843249e63c21abe7 SHA512 81a8b91b74febd556e96cbd78d44c299da6aa3a605b0be029dd6b9da6842c7fc7b22deaaf47531099b364eb7fd3f6d7ede204635d3af5ce183c442148157a8e6
+EBUILD openntpd-6.8_p1-r2.ebuild 1882 BLAKE2B efadf7bf231db9af27cd11fc007fa1e1b5637a2773f1a4ea1f2efefca7d9eab4fe8227e97f5bf8623c59a737849b934a24a3b696c5edbb3d17e11bfcbcb96cc8 SHA512 e38ae1d17534a8d7f72ac4320076c4d471eb0e27bf2f4364cad2344672eb56dafb90eccdbc74480e064ad3d7862d6c2e06722bab5e9087e7957537a5921fb3fd
 MISC metadata.xml 852 BLAKE2B c312b9abb37945299cdcf264fce2003032f385c72e09bdc5803751991ded8c1ece183a15fd92d62ed4a441705a35e2359d90e222636876edae69a0f4daf67ac3 SHA512 e06d361e0ea7e03c59555c1804cac448c9450a5cf1dcfc388b313820e433ae9bddc68e425478e0a6d8bd9494b6707fd022468576ffa54bff3e31117629aca63a
diff --git a/net-misc/openntpd/files/0001-fix-incompatible-check-for-libc-compat.patch b/net-misc/openntpd/files/0001-fix-incompatible-check-for-libc-compat.patch
new file mode 100644
index 000000000000..ee676d6f9935
--- /dev/null
+++ b/net-misc/openntpd/files/0001-fix-incompatible-check-for-libc-compat.patch
@@ -0,0 +1,30 @@
+From 8e4fdc1c2794e861cd026864607fa6b04c5237cb Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Tue, 21 May 2024 16:10:45 -0400
+Subject: [PATCH] fix incompatible check for libc compat
+
+It relied on implicit function declarations, which are banned starting
+in c99. Result: the check always failed.
+
+See: https://wiki.gentoo.org/wiki/Modern_C_porting#How_do_I_reproduce_these_bugs.3F
+Bug: https://bugs.gentoo.org/900296
+Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
+---
+ m4/check-libc-compat.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/m4/check-libc-compat.m4 b/m4/check-libc-compat.m4
+index a806cbe..3bb859a 100644
+--- a/m4/check-libc-compat.m4
++++ b/m4/check-libc-compat.m4
+@@ -1,6 +1,6 @@
+ AC_DEFUN([CHECK_PROGNAME], [
+ AC_CACHE_CHECK([if libc defines __progname], ac_cv_libc_defines___progname, [
+-       AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
++       AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]],
+                 [[ extern char *__progname; printf("%s", __progname); ]])],
+         [ ac_cv_libc_defines___progname="yes" ],
+         [ ac_cv_libc_defines___progname="no"
+-- 
+2.44.1
+
diff --git a/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild b/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild
index 23529b8fd7d4..a4562387dfad 100644
--- a/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild
+++ b/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit systemd
 MY_P="${P/_p/p}"
 
 DESCRIPTION="Lightweight NTP server ported from OpenBSD"
-HOMEPAGE="http://www.openntpd.org/"
+HOMEPAGE="https://www.openntpd.org/"
 SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
diff --git a/net-misc/openntpd/openntpd-6.8_p1.ebuild b/net-misc/openntpd/openntpd-6.2_p3-r3.ebuild
index ee0f69ce5392..77e63f5456df 100644
--- a/net-misc/openntpd/openntpd-6.8_p1.ebuild
+++ b/net-misc/openntpd/openntpd-6.2_p3-r3.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit systemd
+inherit autotools systemd
 
 MY_P="${P/_p/p}"
 
 DESCRIPTION="Lightweight NTP server ported from OpenBSD"
-HOMEPAGE="http://www.openntpd.org/"
+HOMEPAGE="https://www.openntpd.org/"
 SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="selinux"
 
 DEPEND="
 	!net-misc/ntp[-openntpd]"
+
 RDEPEND="
 	${DEPEND}
 	acct-group/openntpd
@@ -26,8 +27,15 @@ RDEPEND="
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}/openntpd-6.2p3-fno-common.patch"
+	# https://github.com/openntpd-portable/openntpd-portable/pull/75
+	"${FILESDIR}"/0001-fix-incompatible-check-for-libc-compat.patch
+)
+
 src_prepare() {
 	default
+	eautoreconf
 
 	# fix /run path
 	sed -i 's:/var/run/ntpd:/run/ntpd:g' src/ntpctl.8 src/ntpd.8 || die
@@ -38,7 +46,7 @@ src_prepare() {
 	sed -i 's:"/db/ntpd.drift":"/openntpd/ntpd.drift":' src/ntpd.h || die
 
 	# fix default config to use gentoo pool
-	sed -i 's:^server:#server:g' ntpd.conf || die
+	sed -i 's:servers pool.ntp.org:#servers pool.ntp.org:' ntpd.conf || die
 	printf "\n# Choose servers announced from Gentoo NTP Pool\nservers 0.gentoo.pool.ntp.org\nservers 1.gentoo.pool.ntp.org\nservers 2.gentoo.pool.ntp.org\nservers 3.gentoo.pool.ntp.org\n" >> ntpd.conf || die
 
 	sed -ie 's/^constraints/#constraints/g' ntpd.conf || die
@@ -47,6 +55,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		--with-privsep-user=openntpd \
+		--with-privsep-path=/var/lib/openntpd/chroot \
 		--disable-https-constraint
 }
 
diff --git a/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild b/net-misc/openntpd/openntpd-6.8_p1-r2.ebuild
index c203e2a4f687..1b00a44a6fdf 100644
--- a/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild
+++ b/net-misc/openntpd/openntpd-6.8_p1-r2.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit systemd
+inherit autotools systemd
 
 MY_P="${P/_p/p}"
 
 DESCRIPTION="Lightweight NTP server ported from OpenBSD"
-HOMEPAGE="http://www.openntpd.org/"
+HOMEPAGE="https://www.openntpd.org/"
 SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
@@ -28,8 +28,14 @@ RDEPEND="
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	# https://github.com/openntpd-portable/openntpd-portable/pull/75
+	"${FILESDIR}"/0001-fix-incompatible-check-for-libc-compat.patch
+)
+
 src_prepare() {
 	default
+	eautoreconf
 
 	# fix /run path
 	sed -i 's:/var/run/ntpd:/run/ntpd:g' src/ntpctl.8 src/ntpd.8 || die