net-misc/ntp: Sync with Gentoo

It's from Gentoo commit 55b5e9ea732aa1e64a1cf20638139589c5ba9e58.

Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
This commit is contained in:
Flatcar Buildbot 2025-11-03 07:12:01 +00:00 committed by Krzesimir Nowak
parent 47f0e82639
commit 5eab355703
4 changed files with 221 additions and 4 deletions

View File

@ -0,0 +1,20 @@
Patch supplied by Nick Bowler on https://bugs.gentoo.org/962770
This avoids a NULL dereference in case ntp fails to bind() to a decided upon
address that should be bound.
--- ntp-4.2.8p18/ntpd/ntp_io.c.orig
+++ ntp-4.2.8p18/ntpd/ntp_io.c
@@ -1921,11 +1921,11 @@
}
else {
DPRINT_INTERFACE(3,
- (ep, "updating ", " new - FAILED"));
+ (ep2, "updating ", " new - FAILED"));
msyslog(LOG_ERR,
"cannot bind address %s",
- stoa(&ep->sin));
+ stoa(&ep2->sin));
}
free(ep2);
}

View File

@ -0,0 +1,31 @@
#!/sbin/openrc-run
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
depend() {
before cron portmap
after net
use dns logger
}
checkconfig() {
if ! command -v "${NTPCLIENT_CMD}" >/dev/null 2>&1 ; then
eerror "Please edit /etc/conf.d/ntp-client"
eerror "Unable to locate the client command ${NTPCLIENT_CMD}!"
return 1
fi
if [ -z "${NTPCLIENT_OPTS}" ] ; then
eerror "Please edit /etc/conf.d/ntp-client"
eerror "I need to know what server/options to use!"
return 1
fi
return 0
}
start() {
checkconfig || return $?
ebegin "Setting clock via the NTP client '${NTPCLIENT_CMD}'"
"${NTPCLIENT_CMD}" ${NTPCLIENT_OPTS}
eend $? "Failed to set clock"
}

View File

@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
<!-- maintainer-needed -->
<longdescription>
NTP is a protocol designed to synchronize the clocks of computers over a network. NTP
version 3 is an internet draft standard, formalized in RFC 1305. NTP version 4 is a

View File

@ -0,0 +1,169 @@
# Copyright 1999-2025 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 ~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_p18-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
"${FILESDIR}"/${PN}-4.2.8_p18-c99.patch # bug #956643
"${FILESDIR}"/${PN}-4.2.8_p18-r2-bind-fail-NULL-dereference.patch # bug #962770
)
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() {
# Ancient codebase, lto-type-mismatch in testsuite in packetProcesisng.c
# where patching it then needs Ruby.
filter-lto
# bug #264109
append-cppflags -D_GNU_SOURCE
append-cflags -fno-strict-overflow
# 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-r1 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
}