mirror of
https://github.com/flatcar/scripts.git
synced 2025-10-19 19:31:01 +02:00
net-misc/chrony: Sync with Gentoo
It's from Gentoo commit 6eb510bdeb3338a79be84cfbd5894c07d619b090. Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
This commit is contained in:
parent
b4dabb1973
commit
166ecb8a89
@ -2,3 +2,5 @@ DIST chrony-4.6.1.tar.gz 636076 BLAKE2B cc1299ba680eae158da9ebc6d4451ffc8b352b9b
|
||||
DIST chrony-4.6.1.tar.gz.asc 833 BLAKE2B 19e7359220beb93ede262cad7fec4963b15873510530690eefcdc28c69222ac40e41849487b9514665443dff888fbeeea1a2cbef0517da38a210a6573f4e9c99 SHA512 992b706636bf3a7eb6d502562a4990c9d8e20e5f3011d2cdb2ceb32220e9a1c2bfa6eca767212cee49b811823872602dc33f9e7201a7f9a93cc9c90e81b1db49
|
||||
DIST chrony-4.7.tar.gz 644610 BLAKE2B a1a951ea925c183c97d6b934d85d4cb35b15db555d64a4f7abe75a5a5cf69d4747ccbd9d09be403187991745dd38fc4eea994a7c4488cab44c11c6600596ec22 SHA512 419594ab8ff0fd42acaf6e4ca1a011d5cf87c8d90ab040e90bb004b43570888329531593f073fb7c5a1093b5754d61c1ae6034d0b86660e4dc37d42ee0f30623
|
||||
DIST chrony-4.7.tar.gz.asc 833 BLAKE2B 67facf41c41b729794f2cb0ce63402b91b5915cec53997f22327687d951be0b677274567bc99c03c6d2702de7c2a69becb0cf88c22147528ce0e86a823ff3af8 SHA512 c2351e6e624f60e82973bddd5cb1d84c90ee5e862d7d24dfc2b7a8f60a6a948f7446c9b7d68c5e72be4afccbd5d8f572141a4e0bde9cfeefc59aebb7e4fc74e1
|
||||
DIST chrony-4.8.tar.gz 649368 BLAKE2B d84e9911d33b59af3022e4b01e46ad26c33b0feb5b99975dba9b88d15b4e0f51c6fecbc44bb77b3027008d203d5cee7e6a4afe0d4ab97a9f6fc1609742972dfe SHA512 949b796bb34db32a5c1b9e6b53be6a22e51c59f24a316d585b8a52a52ab1f61bdf0378dc58b282bb0ba4fac1f05e1e99fbe37cb4259aa2b359e7bf679c176aab
|
||||
DIST chrony-4.8.tar.gz.asc 833 BLAKE2B b4bf02e67294ebdcba875787fdca5dfcae890d6e1b464c6f351d05f29ef403541bc90c120e446a2c270d968a2de0092f362229ae7c436297bc481b7aed606ae6 SHA512 df7f4e06f74a4b8c9a49e8fe57ea02e0324c5683d036412c32192a09f08e08f33537609cef8df0b4302bfcd63332b3092f33f40c8d02857c93ecea13822b5b47
|
||||
|
273
sdk_container/src/third_party/portage-stable/net-misc/chrony/chrony-4.8.ebuild
vendored
Normal file
273
sdk_container/src/third_party/portage-stable/net-misc/chrony/chrony-4.8.ebuild
vendored
Normal file
@ -0,0 +1,273 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit edo systemd tmpfiles toolchain-funcs
|
||||
|
||||
DESCRIPTION="NTP client and server programs"
|
||||
HOMEPAGE="https://chrony-project.org/"
|
||||
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
EGIT_REPO_URI="https://gitlab.com/chrony/chrony.git"
|
||||
inherit git-r3
|
||||
else
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mlichvar.asc
|
||||
inherit verify-sig
|
||||
|
||||
SRC_URI="https://chrony-project.org/releases/${P/_/-}.tar.gz"
|
||||
SRC_URI+=" verify-sig? ( https://chrony-project.org/releases/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
|
||||
|
||||
if [[ ${PV} != *_pre* ]] ; then
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
|
||||
fi
|
||||
fi
|
||||
|
||||
S="${WORKDIR}/${P/_/-}"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="+caps +cmdmon debug html libtomcrypt +nettle nss +nts +phc pps +readline +refclock +rtc samba +seccomp +sechash selinux"
|
||||
# nettle > nss > libtomcrypt in configure
|
||||
REQUIRED_USE="
|
||||
sechash? ( || ( nettle nss libtomcrypt ) )
|
||||
nettle? ( !nss )
|
||||
nss? ( !nettle )
|
||||
libtomcrypt? ( !nettle !nss )
|
||||
!sechash? ( !nss )
|
||||
!sechash? ( !nts? ( !nettle ) )
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
caps? (
|
||||
sys-libs/libcap
|
||||
)
|
||||
libtomcrypt? ( dev-libs/libtomcrypt:= )
|
||||
nettle? ( dev-libs/nettle:= )
|
||||
nss? ( dev-libs/nss:= )
|
||||
nts? ( net-libs/gnutls:= )
|
||||
pps? ( net-misc/pps-tools )
|
||||
readline? ( dev-libs/libedit )
|
||||
seccomp? ( sys-libs/libseccomp )
|
||||
"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
caps? (
|
||||
acct-group/ntp
|
||||
acct-user/ntp
|
||||
)
|
||||
selinux? ( sec-policy/selinux-chronyd )
|
||||
"
|
||||
BDEPEND="
|
||||
caps? (
|
||||
acct-group/ntp
|
||||
acct-user/ntp
|
||||
)
|
||||
html? ( dev-ruby/asciidoctor )
|
||||
nts? ( virtual/pkgconfig )
|
||||
sechash? (
|
||||
nettle? ( virtual/pkgconfig )
|
||||
nss? ( virtual/pkgconfig )
|
||||
)
|
||||
"
|
||||
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
# Needed for doc generation in 9999
|
||||
REQUIRED_USE+=" html"
|
||||
BDEPEND+="
|
||||
app-alternatives/yacc
|
||||
virtual/w3m
|
||||
"
|
||||
else
|
||||
BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )"
|
||||
fi
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-4.7-pool-vendor-gentoo.patch
|
||||
"${FILESDIR}"/${PN}-4.7-systemd-gentoo.patch
|
||||
)
|
||||
|
||||
QA_CONFIG_IMPL_DECL_SKIP=(
|
||||
# FP, checks with macro afterwards (bug #907877)
|
||||
recvmmsg
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
sed -i \
|
||||
-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
|
||||
doc/* examples/* || die
|
||||
|
||||
cp "${FILESDIR}"/chronyd.conf-r3 "${T}"/chronyd.conf || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
if ! use caps ; then
|
||||
sed -i \
|
||||
-e 's/ -u ntp//' \
|
||||
"${T}"/chronyd.conf examples/chronyd.service || die
|
||||
fi
|
||||
|
||||
if ! use seccomp ; then
|
||||
sed -i \
|
||||
-e 's/ -F 2//' \
|
||||
"${T}"/chronyd.conf examples/chronyd.service || die
|
||||
fi
|
||||
|
||||
tc-export CC PKG_CONFIG
|
||||
|
||||
# Update from time to time with output from "date +%s"
|
||||
# on a system that is time-synced.
|
||||
export SOURCE_DATE_EPOCH=1607976314
|
||||
|
||||
# Not an autotools generated script
|
||||
local myconf=(
|
||||
# TODO: Do we want to wire up --with-user= and --with-chronyc-user?
|
||||
# Need to check how it interacts with the init script & systemd unit.
|
||||
$(use_enable seccomp scfilter)
|
||||
|
||||
$(usev !caps '--disable-linuxcaps')
|
||||
$(usev !cmdmon '--disable-cmdmon')
|
||||
$(usev debug '--enable-debug')
|
||||
|
||||
# USE=readline here means "readline-like functionality"
|
||||
# chrony only supports libedit in terms of the library providing
|
||||
# it.
|
||||
$(usev !readline '--without-editline --disable-readline')
|
||||
|
||||
$(usev !libtomcrypt '--without-tomcrypt')
|
||||
$(usev !nettle '--without-nettle')
|
||||
$(usev !nss '--without-nss')
|
||||
$(usev !nts '--disable-nts')
|
||||
$(usev !nts '--without-gnutls')
|
||||
$(usev !phc '--disable-phc')
|
||||
$(usev !pps '--disable-pps')
|
||||
$(usev !refclock '--disable-refclock')
|
||||
$(usev !rtc '--disable-rtc')
|
||||
$(usev samba '--enable-ntp-signd')
|
||||
$(usev !sechash '--disable-sechash')
|
||||
|
||||
--chronysockdir="${EPREFIX}/run/chrony"
|
||||
--docdir="${EPREFIX}/usr/share/doc/${PF}"
|
||||
--mandir="${EPREFIX}/usr/share/man"
|
||||
--prefix="${EPREFIX}/usr"
|
||||
--sysconfdir="${EPREFIX}/etc/chrony"
|
||||
--with-hwclockfile="${EPREFIX}/etc/adjtime"
|
||||
--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
|
||||
|
||||
${EXTRA_ECONF}
|
||||
)
|
||||
|
||||
# Print the ./configure call
|
||||
edo ./configure "${myconf[@]}" || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
# Uses w3m
|
||||
emake -C doc man txt
|
||||
fi
|
||||
|
||||
emake all docs $(usev !html 'ADOC=true')
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
# Compatibility with other distributions who install to /etc/chrony.conf (bug #835461)
|
||||
dosym -r /etc/chrony/chrony.conf /etc/chrony.conf
|
||||
|
||||
newinitd "${FILESDIR}"/chronyd.init-r2 chronyd
|
||||
newconfd "${T}"/chronyd.conf chronyd
|
||||
|
||||
insinto /etc/${PN}
|
||||
newins examples/chrony.conf.example1 chrony.conf
|
||||
|
||||
docinto examples
|
||||
dodoc examples/*.example*
|
||||
|
||||
newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')"
|
||||
|
||||
if use html ; then
|
||||
docinto html
|
||||
dodoc doc/*.html
|
||||
fi
|
||||
|
||||
keepdir /var/{lib,log}/chrony
|
||||
|
||||
if use caps ; then
|
||||
# Prepare a directory for the chrony.drift file (a la ntpsec)
|
||||
# Ensures the environment is sane on new installs
|
||||
# bug #711058
|
||||
fowners -R ntp:ntp /var/{lib,log}/chrony
|
||||
fperms -R 770 /var/lib/chrony
|
||||
fi
|
||||
|
||||
insinto /etc/logrotate.d
|
||||
newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
|
||||
|
||||
systemd_dounit examples/chronyd.service
|
||||
systemd_dounit examples/chrony-wait.service
|
||||
systemd_enable_ntpunit 50-chrony chronyd.service
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
HAD_CAPS=0
|
||||
HAD_SECCOMP=0
|
||||
HAD_PRE_NEW_SECCOMP_LEVEL=0
|
||||
|
||||
# See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5
|
||||
# in "Ebuild Phases" for an explanation of why we need to save the variable beforehand
|
||||
if has_version 'net-misc/chrony[caps]' ; then
|
||||
HAD_CAPS=1
|
||||
fi
|
||||
|
||||
if has_version 'net-misc/chrony[seccomp]' ; then
|
||||
HAD_SECCOMP=1
|
||||
fi
|
||||
|
||||
if has_version '>=net-misc/chrony-4.1[seccomp]' ; then
|
||||
# This version introduced a new filter level: -F 2
|
||||
# It's a limited set of seccomp filters designed to be 'bare minimum'
|
||||
HAD_PRE_NEW_SECCOMP_LEVEL=1
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
tmpfiles_process chronyd.conf
|
||||
|
||||
if [[ -n "${REPLACING_VERSIONS}" ]] ; then
|
||||
if use caps && ! [[ ${HAD_CAPS} -eq 1 ]] ; then
|
||||
# bug #719876
|
||||
ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp"
|
||||
ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony"
|
||||
ewarn "This is necessary for chrony to drop privileges"
|
||||
elif ! use caps && [[ ${HAD_CAPS} -eq 0 ]] ; then
|
||||
ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root"
|
||||
fi
|
||||
fi
|
||||
|
||||
# See bug #783915 for general discussion on enabling seccomp filtering
|
||||
# by default.
|
||||
local show_seccomp_enable_msg=0
|
||||
|
||||
# Was seccomp disabled before and now enabled?
|
||||
if [[ ${HAD_SECCOMP} -eq 0 ]] && use seccomp ; then
|
||||
show_seccomp_enable_msg=1
|
||||
fi
|
||||
|
||||
# Are we coming from an old version without the new 'minimal' filter?
|
||||
# (-F 2)
|
||||
if [[ ${HAD_PRE_NEW_SECCOMP_LEVEL} -eq 0 ]] ; then
|
||||
show_seccomp_enable_msg=1
|
||||
fi
|
||||
|
||||
if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then
|
||||
elog "To enable seccomp in a stricter mode, please modify:"
|
||||
elog "- ${EROOT}/etc/conf.d/chronyd for OpenRC"
|
||||
elog "- systemctl edit chronyd for systemd"
|
||||
elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)"
|
||||
elog "By default, we now use -F 2 which is a baseline/minimal filter."
|
||||
fi
|
||||
}
|
@ -123,6 +123,8 @@ src_configure() {
|
||||
|
||||
# Not an autotools generated script
|
||||
local myconf=(
|
||||
# TODO: Do we want to wire up --with-user= and --with-chronyc-user?
|
||||
# Need to check how it interacts with the init script & systemd unit.
|
||||
$(use_enable seccomp scfilter)
|
||||
|
||||
$(usev !caps '--disable-linuxcaps')
|
||||
|
Loading…
x
Reference in New Issue
Block a user