mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-28 17:11:34 +02:00
net-misc/ntp: Sync with Gentoo
It's from Gentoo commit a7bd82676b2820d4e334e7870adab185ded80aab.
This commit is contained in:
Flatcar Buildbot
Mathieu Tortuyaux
parent
ee9960a07f
commit
12900357b1
@ -1,3 +1,4 @@
|
||||
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
|
||||
DIST ntp-4.2.8p17.tar.gz 7120469 BLAKE2B 5c0e90a234cdeab76e7443b42dfd5a0c3c78693a11bdb0fa21c8def91adbdf9b9871498df9d211509632812a9107501da3470104122e9621577541ffd6cd1ab6 SHA512 e003bfe6f46065890663bc6791b02277f64318b692e49d8d678b76c23b245f357834eb483b0a44f1f47783166e5504686b36494af77f6eebe6f844cd3f2b6a8c
|
||||
DIST ntp-4.2.8p18.tar.gz 7210799 BLAKE2B 9a7bb767d2d8ae3a7224542df7978f8289cbdf28488c5e4dce4c549cdd1063259f69548898a352c0463ce83c4725bfd7c7dbf673ee3b74e490d7b1275760497c SHA512 c314f645d7d85e1028327657f30557cdfd86d417565b6c9fcbb40fca8a4c22a97b70908e8b73c6b31e14915b5b910ae0055fd42e819dd3cb48583b2a826c3fc4
|
||||
|
||||
19
sdk_container/src/third_party/portage-stable/net-misc/ntp/files/ntp-4.2.8_p18-ipc-caps.patch
vendored
Normal file
19
sdk_container/src/third_party/portage-stable/net-misc/ntp/files/ntp-4.2.8_p18-ipc-caps.patch
vendored
Normal file
@ -0,0 +1,19 @@
|
||||
https://bugs.ntp.org/show_bug.cgi?id=2646
|
||||
https://bugs.gentoo.org/533966
|
||||
|
||||
--- a/ntpd/ntpd.c
|
||||
+++ b/ntpd/ntpd.c
|
||||
@@ -1299,10 +1299,10 @@
|
||||
*/
|
||||
cap_t caps;
|
||||
char *captext;
|
||||
-
|
||||
+
|
||||
captext = (scan_addrs_once)
|
||||
- ? "cap_sys_time=pe"
|
||||
- : "cap_sys_time,cap_net_bind_service=pe";
|
||||
+ ? "cap_ipc_lock,cap_sys_time=pe"
|
||||
+ : "cap_ipc_lock,cap_sys_time,cap_net_bind_service=pe";
|
||||
caps = cap_from_text(captext);
|
||||
if (!caps) {
|
||||
msyslog(LOG_ERR,
|
||||
166
sdk_container/src/third_party/portage-stable/net-misc/ntp/ntp-4.2.8_p18.ebuild
vendored
Normal file
166
sdk_container/src/third_party/portage-stable/net-misc/ntp/ntp-4.2.8_p18.ebuild
vendored
Normal file
@ -0,0 +1,166 @@
|
||||
# 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_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
|
||||
)
|
||||
|
||||
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
|
||||
|
||||
# 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
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user