commit: fcb3491cce5f2b5980718eb67305e90b558658be Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Feb 18 00:47:06 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Feb 18 00:47:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcb3491c
net-misc/chrony: add glibc-2.35 seccomp patch We also add a mawk test patch. Signed-off-by: Sam James <sam <AT> gentoo.org> net-misc/chrony/chrony-4.2-r1.ebuild | 255 +++++++++++++++++++++ .../chrony/files/chrony-4.2-seccomp-rseq.patch | 30 +++ net-misc/chrony/files/chrony-4.2-test-mawk.patch | 30 +++ 3 files changed, 315 insertions(+) diff --git a/net-misc/chrony/chrony-4.2-r1.ebuild b/net-misc/chrony/chrony-4.2-r1.ebuild new file mode 100644 index 000000000000..9df110347a58 --- /dev/null +++ b/net-misc/chrony/chrony-4.2-r1.ebuild @@ -0,0 +1,255 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd tmpfiles toolchain-funcs + +DESCRIPTION="NTP client and server programs" +HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git"; + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"; + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/mlichvar.asc + inherit verify-sig + + SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"; + SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )" + + if [[ ${PV} != *_pre* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + fi +fi + +S="${WORKDIR}/${P/_/-}" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+caps +cmdmon debug html ipv6 libedit libtomcrypt +nettle nss +ntp +nts +phc pps +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? ( + acct-group/ntp + acct-user/ntp + sys-libs/libcap + ) + libedit? ( dev-libs/libedit ) + !libedit? ( sys-libs/readline:= ) + nettle? ( dev-libs/nettle:= ) + nss? ( dev-libs/nss:= ) + nts? ( net-libs/gnutls:= ) + pps? ( net-misc/pps-tools ) + seccomp? ( sys-libs/libseccomp ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-chronyd ) +" +BDEPEND=" + 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+=" virtual/w3m" +else + BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )" +fi + +PATCHES=( + "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch + "${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch + + "${FILESDIR}"/${P}-test-mawk.patch + "${FILESDIR}"/${P}-seccomp-rseq.patch +) + +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=( + $(use_enable seccomp scfilter) + + $(usex caps '' '--disable-linuxcaps') + $(usex cmdmon '' '--disable-cmdmon') + $(usex debug '--enable-debug' '') + $(usex ipv6 '' '--disable-ipv6') + $(usex libedit '' '--without-editline') + $(usex libtomcrypt '' '--without-tomcrypt') + $(usex nettle '' '--without-nettle') + $(usex nss '' '--without-nss') + $(usex ntp '' '--disable-ntp') + $(usex nts '' '--disable-nts') + $(usex nts '' '--without-gnutls') + $(usex phc '' '--disable-phc') + $(usex pps '' '--disable-pps') + $(usex refclock '' '--disable-refclock') + $(usex rtc '' '--disable-rtc') + $(usex samba '--enable-ntp-signd' '') + $(usex 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 + echo sh ./configure "${myconf[@]}" >&2 + sh ./configure "${myconf[@]}" || die +} + +src_compile() { + if [[ ${PV} == "9999" ]] ; then + # Uses w3m + emake -C doc man txt + fi + + emake all docs $(usex html '' 'ADOC=true') +} + +src_install() { + default + + 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 ntp:ntp /var/{lib,log}/chrony + fperms 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 "- /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 +} diff --git a/net-misc/chrony/files/chrony-4.2-seccomp-rseq.patch b/net-misc/chrony/files/chrony-4.2-seccomp-rseq.patch new file mode 100644 index 000000000000..e36a7b33186a --- /dev/null +++ b/net-misc/chrony/files/chrony-4.2-seccomp-rseq.patch @@ -0,0 +1,30 @@ +https://git.tuxfamily.org/chrony/chrony.git/patch/?id=8bb8f15a7d049ed26c69d95087065b381f76ec4d + +From: Michael Hudson-Doyle <[email protected]> +Date: Wed, 9 Feb 2022 09:06:13 +0100 +Subject: sys_linux: allow rseq in seccomp filter + +Libc 2.35 will use rseq syscalls [1][2] by default and thereby +break chrony in seccomp isolation. + +[1]: https://www.efficios.com/blog/2019/02/08/linux-restartable-sequences/ +[2]: https://sourceware.org/pipermail/libc-alpha/2022-February/136040.html + +Tested-by: Christian Ehrhardt <[email protected]> +Reviewed-by: Christian Ehrhardt <[email protected]> +Signed-off-by: Michael Hudson-Doyle <[email protected]> +Signed-off-by: Christian Ehrhardt <[email protected]> + +--- a/sys_linux.c ++++ b/sys_linux.c +@@ -497,6 +497,9 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) + SCMP_SYS(getrlimit), + SCMP_SYS(getuid), + SCMP_SYS(getuid32), ++#ifdef __NR_rseq ++ SCMP_SYS(rseq), ++#endif + SCMP_SYS(rt_sigaction), + SCMP_SYS(rt_sigreturn), + SCMP_SYS(rt_sigprocmask), +cgit v0.10.2 diff --git a/net-misc/chrony/files/chrony-4.2-test-mawk.patch b/net-misc/chrony/files/chrony-4.2-test-mawk.patch new file mode 100644 index 000000000000..3e9e2eeb422d --- /dev/null +++ b/net-misc/chrony/files/chrony-4.2-test-mawk.patch @@ -0,0 +1,30 @@ +https://git.tuxfamily.org/chrony/chrony.git/patch/?id=b61cbed6895fcd3eae4c8458a69995870a22a5e0 + +From: Vincent Blut <[email protected]> +Date: Wed, 12 Jan 2022 18:08:34 +0100 +Subject: test: ensure awk commands in 008-ntpera return an integer + +Some awk interpreters (e.g. mawk) print long integers in exponential +notation skewing the test result. + +--- a/test/simulation/008-ntpera ++++ b/test/simulation/008-ntpera +@@ -29,7 +29,7 @@ echo "$ntp_start" | grep -q '-' && test_skip + + for time_offset in -1e-1 1e-1; do + for start_offset in 0 "2^32 - $limit"; do +- export CLKNETSIM_START_DATE=$(awk "BEGIN {print $ntp_start + $start_offset}") ++ export CLKNETSIM_START_DATE=$(awk "BEGIN {printf \"%.0f\", $ntp_start + $start_offset}") + run_test || test_fail + check_chronyd_exit || test_fail + check_source_selection || test_fail +@@ -38,7 +38,7 @@ for time_offset in -1e-1 1e-1; do + done + + for start_offset in -$limit "2^32"; do +- export CLKNETSIM_START_DATE=$(awk "BEGIN {print $ntp_start + $start_offset}") ++ export CLKNETSIM_START_DATE=$(awk "BEGIN {printf \"%.0f\", $ntp_start + $start_offset}") + run_test || test_fail + check_chronyd_exit || test_fail + check_source_selection || test_fail +cgit v0.10.2
