gentoo auto-resync : 02:06:2023 - 03:27:54

3 files changed, 53 insertions, 37 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 3272ac9b31bf..9dc9a18a22a8 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 079c2ad266c4..3d331c8ada93 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -22,6 +22,7 @@ AUX sntp.service-r3 320 BLAKE2B b47a7a4dab78c0ea9f85b861d7f5f2926e5302839db34b92
 AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8
 DIST ntp-4.2.8p15-manpages.tar.xz 25700 BLAKE2B 6a225bc19dcebee31cb8e0d621963863d567a882655b57be8b65a16f9d3dd138787c7c6b9ff08853306f2e9b11d65cb76e3215cc5b2262a91c411d437974fc18 SHA512 21721550864b4e7e91bf20ca894109253439b737799dfc803e1496b3454199f34646f40e0156c08a39d5914e5a92f35908cec0245e1e2627c75c0e64939ba028
 DIST ntp-4.2.8p15.tar.gz 7015970 BLAKE2B 5697d6623d79686f9ca9ad907172bf942383067d1e9817117d20db042e9f7410644f236f1a0d77ab6bf6ec468476e12ea65b494a28f0dd8674bf08fc8875cfef SHA512 f5ad765e45fc302263dd40e94c287698fd235b94f3684e49f1d5d09d7d8bdd6b8c0fb96ecdabffea3d233e1e79b3c9687b76dc204ba76bad3f554682f4a97794
-EBUILD ntp-4.2.8_p15-r2.ebuild 4452 BLAKE2B 0bf9938ef9509eddebac35edd67eb6f3fe5eea5b38bf9e01f11d4f89fcdeb6dcee2faf78b8f5c6871f8540f8eeea843532a2432a18e98dd36eff764a72924f31 SHA512 9ed7f41b4407cf45fea06e70fcc1a01bf1af317e3e8d507c2cbd1f1a51c88ff20ae30afb2e1b888c8f61809c27fcda0e900a8b247c537be729ba2ed6327704fd
+DIST ntp-4.2.8p16.tar.gz 7084978 BLAKE2B a6cd6f56da7fda85be70f1293674fdab76140608407b5bda422049a49133694803cf3d38174a329d75f599fcce0ff899c00b47a18b22a1b801e495b476445a3e SHA512 0b4a3336def620d3ab2f06dacf8621e848167e35657c0a1206eca178a7541dd8730071bd7a0a8dea2c4682c4f38d31c3772d01093c26fd5a4395e37a86e770e2
 EBUILD ntp-4.2.8_p15-r6.ebuild 4629 BLAKE2B 1aa9260d9af3c3ebcd90dd6e2a31aa451d2da246169c18adee9b224aef366c0f9b8e545a6265aebc8f93632d19f2048f491bf40923a362815ed28d912d226070 SHA512 8885b65c869f6fbb325a07f2b4a2e752f3875042329c9e7420b8e24468873ebd58b66fe3c4f20079e4291154ef20bbe3df18e0f1c6ad43de7955c78de9b43be4
+EBUILD ntp-4.2.8_p16.ebuild 4477 BLAKE2B 4674e10bb8055f1c938b6a1a991e47cf189be5c657932468ee338bd8daec96e9f81a25ac7ebe7cdd045f3ea443456993889c72af440559fe4aa7a4ea90536a1e SHA512 5519dca30e5f6254822a94c1adb48290020ab529ef7657e2a72bb151fdce1efdb2164a800666ac4c66360106d6efd88a5e000b297047e516ba5d08a4654109a4
 MISC metadata.xml 1023 BLAKE2B 58da2b7578162aa1650d5a0bba7f3384a36dcfcdb4c52003b2aa3fd2ee89a1d01239a4e462b874dfa96b0913597cf0384f78d4da79148ca1e52e8aca29b583c3 SHA512 510fbd0761a097d214225640c0a60da8c77b06af41cb77748cd73c7c04add5e4651dd07f0eef9f083343570a6fe5f0bdcf84b38b5b65df815abd8bbaea048791
diff --git a/net-misc/ntp/ntp-4.2.8_p15-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p16.ebuild
index cb0fcdd63097..89ee3f382279 100644
--- a/net-misc/ntp/ntp-4.2.8_p15-r2.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p16.ebuild
@@ -1,35 +1,32 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools flag-o-matic systemd
+inherit autotools flag-o-matic systemd tmpfiles
 
 MY_P=${P/_p/p}
 DESCRIPTION="Network Time Protocol suite/programs"
-HOMEPAGE="http://www.ntp.org/"
-SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
+HOMEPAGE="https://www.ntp.org/"
+SRC_URI="https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND BSD ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
 
-COMMON_DEPEND="readline? ( >=sys-libs/readline-4.1:0= )
+DEPEND="
 	>=dev-libs/libevent-2.0.9:=[threads(+)?]
+	readline? ( >=sys-libs/readline-4.1:= )
 	kernel_linux? ( caps? ( sys-libs/libcap ) )
 	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 	snmp? ( net-analyzer/net-snmp )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	parse-clocks? ( net-misc/pps-tools )"
-BDEPEND="virtual/pkgconfig
-	acct-group/ntp
-	acct-user/ntp"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
+	ssl? ( dev-libs/openssl:= )
+	parse-clocks? ( net-misc/pps-tools )
+"
+RDEPEND="
+	${DEPEND}
 	acct-group/ntp
 	acct-user/ntp
 	selinux? ( sec-policy/selinux-ntp )
@@ -37,41 +34,54 @@ RDEPEND="${COMMON_DEPEND}
 	!net-misc/ntpsec
 	!openntpd? ( !net-misc/openntpd )
 "
+BDEPEND="
+	acct-group/ntp
+	acct-user/ntp
+	virtual/pkgconfig
+"
 PDEPEND="openntpd? ( net-misc/openntpd )"
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
-	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
-	"${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530
-	"${FILESDIR}"/${PN}-4.2.8_p15-gcc10.patch #759409
-	"${FILESDIR}"/${PN}-4.2.8_p15-glibc-2.34.patch
+	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch # bug #533966
+	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch # bug #563922
+	"${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch # bug #711530
+	"${FILESDIR}"/${PN}-4.2.8_p15-configure-clang16.patch
 )
 
 src_prepare() {
 	default
-	append-cppflags -D_GNU_SOURCE #264109
-	# Make sure every build uses the same install layout. #539092
+
+	# Make sure every build uses the same install layout, bug #539092
 	find sntp/loc/ -type f '!' -name legacy -delete || die
-	eautoreconf #622754
+
+	# bug #622754
+	eautoreconf
+
 	# Disable pointless checks.
-	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
+	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck || die
 }
 
 src_configure() {
+	# bug #264109
+	append-cppflags -D_GNU_SOURCE
+
 	# avoid libmd5/libelf
 	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
 	export ac_cv_lib_elf_nlist=no
 	# blah, no real configure options #176333
 	export ac_cv_header_dns_sd_h=$(usex zeroconf)
 	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
+	# Unity builds, we don't really need support for it, bug #804109
+	export PATH_RUBY=/bin/false
+
 	local myeconfargs=(
 		--with-lineeditlibs=readline,edit,editline
 		--with-yielding-select
 		--disable-local-libevent
-		# Increase the default memlimit from 32MiB to 128MiB.  #533232
+
+		# Increase the default memlimit from 32MiB to 128MiB, bug #533232
 		--with-memlock=256
+
 		$(use_enable caps linuxcaps)
 		$(use_enable parse-clocks)
 		$(use_enable ipv6)
@@ -82,21 +92,25 @@ src_configure() {
 		$(use_with ssl crypto)
 		$(use_enable threads thread-support)
 	)
+
 	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
-	# move ntpd/ntpdate to sbin #66671
+
+	# Move ntpd/ntpdate to sbin, bug #66671
 	dodir /usr/sbin
 	mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
 
 	dodoc INSTALL WHERE-TO-START
-	doman "${WORKDIR}"/man/*.[58]
 
 	insinto /etc
 	doins "${FILESDIR}"/ntp.conf
-	use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726
+
+	#bug #524726
+	use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf
+
 	newinitd "${FILESDIR}"/ntpd.rc-r2 ntpd
 	newconfd "${FILESDIR}"/ntpd.confd ntpd
 	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
@@ -108,16 +122,13 @@ src_install() {
 	fi
 	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
 
-	keepdir /var/lib/ntp
-	use prefix || fowners ntp:ntp /var/lib/ntp
-
 	if use openntpd ; then
 		cd "${ED}" || die
 		rm usr/sbin/ntpd || die
-		rm -r var/lib || die
 		rm etc/{conf,init}.d/ntpd || die
 		rm usr/share/man/*/ntpd.8 || die
 	else
+		newtmpfiles "${FILESDIR}"/ntp.tmpfiles ntp.conf
 		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
 		if use caps ; then
 			sed -i '/ExecStart/ s|$| -u ntp:ntp|' \
@@ -134,6 +145,10 @@ src_install() {
 }
 
 pkg_postinst() {
+	if ! use openntpd; then
+		tmpfiles_process ntp.conf
+	fi
+
 	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
 		eerror "The notrust option was found in your /etc/ntp.conf!"
 		ewarn "If your ntpd starts sending out weird responses,"