gentoo auto-resync : 20:01:2024 - 02:08:45

3 files changed, 165 insertions, 2 deletions

diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index cb313e8c217a..54c78de819e9 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -24,5 +24,6 @@ DIST ntp-4.2.8p15-manpages.tar.xz 25700 BLAKE2B 6a225bc19dcebee31cb8e0d621963863
 DIST ntp-4.2.8p15.tar.gz 7015970 BLAKE2B 5697d6623d79686f9ca9ad907172bf942383067d1e9817117d20db042e9f7410644f236f1a0d77ab6bf6ec468476e12ea65b494a28f0dd8674bf08fc8875cfef SHA512 f5ad765e45fc302263dd40e94c287698fd235b94f3684e49f1d5d09d7d8bdd6b8c0fb96ecdabffea3d233e1e79b3c9687b76dc204ba76bad3f554682f4a97794
 DIST ntp-4.2.8p17.tar.gz 7120469 BLAKE2B 5c0e90a234cdeab76e7443b42dfd5a0c3c78693a11bdb0fa21c8def91adbdf9b9871498df9d211509632812a9107501da3470104122e9621577541ffd6cd1ab6 SHA512 e003bfe6f46065890663bc6791b02277f64318b692e49d8d678b76c23b245f357834eb483b0a44f1f47783166e5504686b36494af77f6eebe6f844cd3f2b6a8c
 EBUILD ntp-4.2.8_p15-r6.ebuild 4629 BLAKE2B 1aa9260d9af3c3ebcd90dd6e2a31aa451d2da246169c18adee9b224aef366c0f9b8e545a6265aebc8f93632d19f2048f491bf40923a362815ed28d912d226070 SHA512 8885b65c869f6fbb325a07f2b4a2e752f3875042329c9e7420b8e24468873ebd58b66fe3c4f20079e4291154ef20bbe3df18e0f1c6ad43de7955c78de9b43be4
-EBUILD ntp-4.2.8_p17-r1.ebuild 4658 BLAKE2B 6984a64465ba973ea9819012f1b41e3910397c1e23cc1bdd93a8e4aef4e815846e67ce5b832f2df481c447260329c5b62d38d8ca82d14243efc963b1d6dc2b03 SHA512 853d697fab561a3559996e7000f0dc1c6738725f49f89fb45336e53ba7e76eb06f8cca96c22a2bf0764d0240942a084cf091b5b2b6e23eedc7219e67a338fd8e
+EBUILD ntp-4.2.8_p17-r1.ebuild 4657 BLAKE2B 8adca9f03e9522e9ee01bd2ae2d814ed144acfcaeee37776443c18713b105958f26c11b0299fee64a0cb4165ce46a6c87304b74ffe7ddfbb1e9980e2a2ab422d SHA512 a7e86267cafd30e7908a468deebee23d6772f565e26ec0d17886073c4a2b51645aadf727d2bd27574e385aae9abde5b5081250f5e6273e7359c3ee3a66f5253a
+EBUILD ntp-4.2.8_p17-r2.ebuild 4561 BLAKE2B 5b525dab8dd214f997ff31d5218e3503c0bc44356caca93d224199a960224cda7302efb2f7612af87127e800042cf013657e81e8b8a628264ae223c7beec0b6d SHA512 00b72ff03483ca2ab4663c693c3e68fddcfdb7b581888520d278e6c183a2bd13465dabdc5a7596cafc8e1bf37ac19dba5f297f3a5a0faf6d8ca9a14bfa955d7c
 MISC metadata.xml 1023 BLAKE2B 58da2b7578162aa1650d5a0bba7f3384a36dcfcdb4c52003b2aa3fd2ee89a1d01239a4e462b874dfa96b0913597cf0384f78d4da79148ca1e52e8aca29b583c3 SHA512 510fbd0761a097d214225640c0a60da8c77b06af41cb77748cd73c7c04add5e4651dd07f0eef9f083343570a6fe5f0bdcf84b38b5b65df815abd8bbaea048791
diff --git a/net-misc/ntp/ntp-4.2.8_p17-r1.ebuild b/net-misc/ntp/ntp-4.2.8_p17-r1.ebuild
index cb3736a895de..2fcce5d7239a 100644
--- a/net-misc/ntp/ntp-4.2.8_p17-r1.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p17-r1.ebuild
@@ -13,7 +13,7 @@ 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"
 
 DEPEND="
diff --git a/net-misc/ntp/ntp-4.2.8_p17-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p17-r2.ebuild
new file mode 100644
index 000000000000..3303e33398f6
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.8_p17-r2.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic systemd tmpfiles
+
+MY_P=${P/_p/p}
+DESCRIPTION="Network Time Protocol suite/programs"
+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"
+IUSE="caps debug openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
+
+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:= )
+	parse-clocks? ( net-misc/pps-tools )
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/ntp
+	acct-user/ntp
+	selinux? ( sec-policy/selinux-ntp )
+	vim-syntax? ( app-vim/ntp-syntax )
+	!net-misc/ntpsec
+	!openntpd? ( !net-misc/openntpd )
+"
+BDEPEND="
+	acct-group/ntp
+	acct-user/ntp
+	virtual/pkgconfig
+"
+PDEPEND="openntpd? ( net-misc/openntpd )"
+
+PATCHES=(
+	"${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
+
+	# Make sure every build uses the same install layout, bug #539092
+	find sntp/loc/ -type f '!' -name legacy -delete || die
+
+	# bug #622754
+	eautoreconf
+
+	# Disable pointless checks.
+	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck || die
+}
+
+src_configure() {
+	# bug #264109
+	append-cppflags -D_GNU_SOURCE
+
+	# https://bugs.gentoo.org/922508
+	append-lfs-flags
+
+	# 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=(
+		--cache-file="${S}"/config.cache
+
+		--with-lineeditlibs=readline,edit,editline
+		--with-yielding-select
+		--disable-local-libevent
+
+		# Increase the default memlimit from 32MiB to 128MiB, bug #533232
+		--with-memlock=256
+
+		# Avoid overriding the user's toolchain settings, bug #895802
+		--with-hardenfile=/dev/null
+
+		$(use_enable caps linuxcaps)
+		$(use_enable parse-clocks)
+		$(use_enable debug debugging)
+		$(use_with readline lineeditlibs readline)
+		$(use_enable samba ntp-signd)
+		$(use_with snmp ntpsnmpd)
+		$(use_with ssl crypto)
+		$(use_enable threads thread-support)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# 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
+
+	insinto /etc
+	doins "${FILESDIR}"/ntp.conf
+
+	newinitd "${FILESDIR}"/ntpd.rc-r2 ntpd
+	newconfd "${FILESDIR}"/ntpd.confd ntpd
+	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
+	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
+	newinitd "${FILESDIR}"/sntp.rc sntp
+	newconfd "${FILESDIR}"/sntp.confd sntp
+	if ! use caps ; then
+		sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
+	fi
+	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
+
+	if use openntpd ; then
+		cd "${ED}" || die
+		rm usr/sbin/ntpd || die
+		rm etc/{conf,init}.d/ntpd || die
+		rm usr/share/man/man1/ntpd.1 || 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|' \
+				"${D}$(systemd_get_systemunitdir)"/ntpd.service \
+				|| die
+		fi
+		systemd_enable_ntpunit 60-ntpd ntpd.service
+	fi
+
+	systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service
+	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
+	systemd_newunit "${FILESDIR}"/sntp.service-r3 sntp.service
+	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
+}
+
+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,"
+		ewarn "then make sure you have keys properly setup and see"
+		ewarn "https://bugs.gentoo.org/41827"
+	fi
+}