commit: 5f665dd049c43ec5b57d7bf16e9e983ef2602f4b parent 826ef16168e77f027d47276340f6d161c5483ce4 Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me> Date: Sat, 17 Sep 2022 09:28:36 +0200 net-misc/chrony: Switched to ::gentoo branchDiffstat:
| D | net-misc/chrony/Manifest | 2 | -- |
| D | net-misc/chrony/chrony-4.2-r2.ebuild | 225 | ------------------------------------------------------------------------------- |
| D | net-misc/chrony/files/chrony-2.4-r1.logrotate | 7 | ------- |
| D | net-misc/chrony/files/chrony-3.5-pool-vendor-gentoo.patch | 16 | ---------------- |
| D | net-misc/chrony/files/chrony-4.2-seccomp-rseq.patch | 30 | ------------------------------ |
| D | net-misc/chrony/files/chrony-4.2-systemd-gentoo.patch | 13 | ------------- |
| D | net-misc/chrony/files/chrony-4.2-test-mawk.patch | 30 | ------------------------------ |
| D | net-misc/chrony/files/chronyd.conf-r3 | 12 | ------------ |
| D | net-misc/chrony/files/chronyd.init-r3 | 24 | ------------------------ |
| D | net-misc/chrony/metadata.xml | 35 | ----------------------------------- |
10 files changed, 0 insertions(+), 394 deletions(-)diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest@@ -1,2 +0,0 @@ -DIST chrony-4.2.tar.gz 578411 BLAKE2B 6eac4f144f5811d0f83a9827e2b5113dead1ff96952f6e6d32dcea9858e04512f635d70237fe6faced095991204b0f62bcb0e9d1a4b34e8778f205058afdfb45 SHA512 7f946b27de605b3ebea62cf23916dfad77c99e8b2338ba239ede6b8216ce436b3d4d87770f371c8d8e006507c51d5c831b51f067957abd2935adfdec3f5aa67d -DIST chrony-4.2.tar.gz.asc 833 BLAKE2B 41cb83f62dd58489313438672d209cc65fdbb5f8f595ea38f990d5e15194f91532d3f3221c6c38581467d62e95d23853a4fc438d32b99606def5f06db0031969 SHA512 d8ae4b540ce3529a5a72e10c14765a33ca6fc41529b6fdc9928fb171f25bd6fb87f930b7783638892f42f4cbcfaab4cb1064c930bae1d5204a71babad72b6e10diff --git a/net-misc/chrony/chrony-4.2-r2.ebuild b/net-misc/chrony/chrony-4.2-r2.ebuild@@ -1,225 +0,0 @@ -# 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="+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=" - acct-group/ntp - acct-user/ntp - 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 ) - >=sys-apps/openrc-0.45 -" -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 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) - - --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" - --with-user="ntp" - - ${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-r3 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 ntp ntp" - - if use html ; then - docinto html - dodoc doc/*.html - fi - - keepdir /var/{lib,log}/chrony - - fowners ntp:ntp /var/{lib,log}/chrony - fperms 770 /var/lib/chrony - - 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_SECCOMP=0 - HAD_PRE_NEW_SECCOMP_LEVEL=0 - - 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 - - # 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-2.4-r1.logrotate b/net-misc/chrony/files/chrony-2.4-r1.logrotate@@ -1,7 +0,0 @@ -/var/log/chrony/*.log { - missingok - sharedscripts - postrotate - /usr/bin/chronyc cyclelogs |grep -v '^200 OK'; exit 0 - endscript -}diff --git a/net-misc/chrony/files/chrony-3.5-pool-vendor-gentoo.patch b/net-misc/chrony/files/chrony-3.5-pool-vendor-gentoo.patch@@ -1,16 +0,0 @@ -- Use the Gentoo pool -- Use the server directive instead of the pool directive so we get four time - sources and not twelve. - ---- a/examples/chrony.conf.example1 -+++ b/examples/chrony.conf.example1 -@@ -1,5 +1,8 @@ - # Use public NTP servers from the pool.ntp.org project. --pool pool.ntp.org iburst -+server 0.gentoo.pool.ntp.org iburst -+server 1.gentoo.pool.ntp.org iburst -+server 2.gentoo.pool.ntp.org iburst -+server 3.gentoo.pool.ntp.org iburst - - # Record the rate at which the system clock gains/losses time. - driftfile /var/lib/chrony/driftdiff --git a/net-misc/chrony/files/chrony-4.2-seccomp-rseq.patch b/net-misc/chrony/files/chrony-4.2-seccomp-rseq.patch@@ -1,30 +0,0 @@ -https://git.tuxfamily.org/chrony/chrony.git/patch/?id=8bb8f15a7d049ed26c69d95087065b381f76ec4d - -From: Michael Hudson-Doyle <michael.hudson@canonical.com> -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 <christian.ehrhardt@canonical.com> -Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com> -Signed-off-by: Michael Hudson-Doyle <michael.hudson@canonical.com> -Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com> - ---- 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.2diff --git a/net-misc/chrony/files/chrony-4.2-systemd-gentoo.patch b/net-misc/chrony/files/chrony-4.2-systemd-gentoo.patch@@ -1,13 +0,0 @@ -diff --git a/examples/chronyd.service b/examples/chronyd.service -index 4fb930e..8df627a 100644 ---- a/examples/chronyd.service -+++ b/examples/chronyd.service -@@ -9,7 +9,7 @@ ConditionCapability=CAP_SYS_TIME - Type=forking - PIDFile=/run/chrony/chronyd.pid - EnvironmentFile=-/etc/sysconfig/chronyd --ExecStart=/usr/sbin/chronyd $OPTIONS -+ExecStart=/usr/sbin/chronyd $OPTIONS -u ntp -F 2 - - CapabilityBoundingSet=~CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE - CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_KILL CAP_LEASE CAP_LINUX_IMMUTABLEdiff --git a/net-misc/chrony/files/chrony-4.2-test-mawk.patch b/net-misc/chrony/files/chrony-4.2-test-mawk.patch@@ -1,30 +0,0 @@ -https://git.tuxfamily.org/chrony/chrony.git/patch/?id=b61cbed6895fcd3eae4c8458a69995870a22a5e0 - -From: Vincent Blut <vincent.debian@free.fr> -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.2diff --git a/net-misc/chrony/files/chronyd.conf-r3 b/net-misc/chrony/files/chronyd.conf-r3@@ -1,12 +0,0 @@ -# /etc/conf.d/chronyd - -CFGFILE="/etc/chrony/chrony.conf" - -# Configuration dependant options : -# -s - Set system time from RTC if rtcfile directive present -# -r - Reload sample histories if dumponexit directive present -# -# The combination of "-s -r" allows chronyd to perform long term averaging of -# the gain or loss rate across system reboots and shutdowns. - -ARGS=" -F 2"diff --git a/net-misc/chrony/files/chronyd.init-r3 b/net-misc/chrony/files/chronyd.init-r3@@ -1,24 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -command="/usr/sbin/chronyd" -command_user="ntp" -command_args="-f \"${CFGFILE}\" ${ARGS}" -pidfile="/run/chrony/chrony.pid" -capabilities="^cap_sys_time" -no_new_privs="yes" - -depend() { - use dns -} - -start_pre() { - if [ -c /dev/rtc ]; then - grep -q '^rtcfile' "${CFGFILE}" && ARGS="${ARGS} -s" - fi - grep -q '^dumponexit$' "${CFGFILE}" && ARGS="${ARGS} -r" - grep -q '^cmdport *0$' "${CFGFILE}" || capabilities="${capabilities},^cap_net_bind_service" - - checkpath -d -o "${command_user}" /run/chrony || return $? -}diff --git a/net-misc/chrony/metadata.xml b/net-misc/chrony/metadata.xml@@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <longdescription> - Chrony is a pair of programs (chronyd and chronyc) which are used to maintain - the accuracy of the system clock on a computer. chronyd has been specifically - written to work well for systems which have only an intermittent (e.g. dial-up) - connection to the network where the NTP servers are. It still works well - in a "permanently connected" mode. - </longdescription> - <longdescription lang="ja"> - Chrony はコンピュータのシステム・クロックの精度を保つために使われるプログラムの - ペア(chronyd と chronyc)です。chronyd は NTP サーバがあるネットワークと断続的な - 接続(e.g. dial-up)しか持たないシステムで機能するよう書かれています。ですが永続的 - な接続でも機能します。 - </longdescription> - <use> - <flag name="cmdmon">Support for command and monitoring</flag> - <flag name="debug">Get DEBUG_LOG output from chronyd when passing -dd parameter</flag> - <flag name="html">Install HTML documentation</flag> - <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> for hash functions or nts</flag> - <flag name="nss">Use <pkg>dev-libs/nss</pkg> for hash functions</flag> - <flag name="ntp">Support for the Network Time Protocol (NTP)</flag> - <flag name="nts">Support for Network Time Security (NTS). Uses <pkg>net-libs/gnutls</pkg></flag> - <flag name="phc">Support for the PTP (Precision Time Protocol) Hardware Clock (PHC) interface</flag> - <flag name="pps">Support for the Linux Pulse Per Second (PPS) interface</flag> - <flag name="refclock">Support for reference clocks</flag> - <flag name="rtc">Support for the Linux Real Time Clock interface</flag> - <flag name="sechash">Enable support for hashes other than MD5</flag> - <flag name="libtomcrypt">Support different hashes via <pkg>dev-libs/libtomcrypt</pkg></flag> - </use> - <upstream> - <remote-id type="cpe">cpe:/a:chrony_project:chrony</remote-id> - </upstream> -</pkgmetadata>