summaryrefslogtreecommitdiff
path: root/net-misc/chrony
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-05-12 16:42:50 +0300
committerV3n3RiX <venerix@koprulu.sector>2022-05-12 16:42:50 +0300
commit752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree330d16e6362a49cbed8875a777fe641a43376cd3 /net-misc/chrony
parent0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)
gentoo resync : 12.05.2022
Diffstat (limited to 'net-misc/chrony')
-rw-r--r--net-misc/chrony/Manifest6
-rw-r--r--net-misc/chrony/chrony-4.1-r2.ebuild253
-rw-r--r--net-misc/chrony/chrony-4.2.ebuild252
-rw-r--r--net-misc/chrony/files/chrony-4.1-seccomp-glibc-2-3-4.patch30
-rw-r--r--net-misc/chrony/files/chrony-4.1-systemd-gentoo.patch12
5 files changed, 0 insertions, 553 deletions
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index e9ce084169be..6b880206794b 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1,18 +1,12 @@
AUX chrony-2.4-r1.logrotate 131 BLAKE2B 4e649ce1c126639ea73c4e03d42175d1715b1c321544376ff2e48d67ee13bebcf04a8fea56326bf5efe66f568913dc92ff7f16a641ffb39a456e9cdac6004a6c SHA512 e6febb744476be6c83ac086f2054dc2c190b6e1abd2cf20d4187f222b2485817f06c4ad62b8d40fcea3e18a771cf21899fe0a1dafbfb31f5c99da9092d24d79b
AUX chrony-3.5-pool-vendor-gentoo.patch 544 BLAKE2B 5ef7fcea43c59d1da8f3b3a735f1e70565a8437f142f317abe81531c31e934af05eda5e3043f7874bc9b4592d44579ae1827ddba06c514b4b8124c899931ed0f SHA512 0a109e1b8367def620f5089b3fcb92d84e592eb1a2fced2b60f6c9295159a605d9605e837a06e118c8ba8095208da68592fb9cd537937a153d6eecfa0eb35eb4
-AUX chrony-4.1-seccomp-glibc-2-3-4.patch 932 BLAKE2B 89f6f1ee4ece8ce021dd35f20c44749f613049f3aee1007fcbad1f123767e73ebd5567d4aeffd04938d75788b6b42c332903b93cf5c76fdfc404c3c918f52bd8 SHA512 7315f6e08a418b574fc5c9c1100b2fd39320f38d7c20117e5d8e902f71a99ad8f3e743e1cf18a0223710c6321fbac5baae05b1201f156275af404bc81c32796a
-AUX chrony-4.1-systemd-gentoo.patch 309 BLAKE2B 4824abf9130c6861f2966c4cdec93313429df499c14cd75897ffebdcc1bb9dd4058aa4889f17e4549ed5d0c581208c316bc3bd28cbed96030303f401a4dd7bff SHA512 ae5d80bcf16554a22b624c2def7ccabc72cc3dba5dc0fc8096eeb7367b388d02ad2d3ce6119980fc12d573ea0803eeb58cb5b409b0c475f70e75c8d112553245
AUX chrony-4.2-seccomp-rseq.patch 1111 BLAKE2B 625d93528c11d4fc37a6ec4f7d32c80940ea33976e9b351c519cccfa1de81b3ddef74cad5a85f28c7196ff169cf14f3ff91704c7278444a6abca0e679d9ca0f4 SHA512 bcb9d17345043049c9990a3939d97100a4be6d17ff23851b3a61b929dd9ea4421ad9f5e7e3adb79675dab8a854a9a2a7f9ddbefc8dea294c7d5639c19e6169b1
AUX chrony-4.2-systemd-gentoo.patch 538 BLAKE2B 70d3bb2a190aa2401ff566dd88d1cace1d3573261819d082863fe310bb16507fcc1497fd31ec24033cb9dbe8356aef416d91b36df6067fd37f4273e59bc4e330 SHA512 62e54e1c16380812b3cf11a84091e134401341a4a64dda806af1a52dfa4158912adc4c2524388956f67a44e095e893ed714a2eee15650080c38ce44d2bc279ec
AUX chrony-4.2-test-mawk.patch 1219 BLAKE2B 7cc8d36de7879a500006e6a31d6dde77343616358e6d135efc80181f97fed5e81ada2b5d0ee4ac2d125cf828ac94a0894ffe40ec09ffb5328bf9b8cb71addd24 SHA512 69a9e1bd7c632ecf98992840d2b8aa5bd6e9ac3e7a67485ad9b59286414509001e71c47638059ebfcb952d17e7b6e754d74950dd0ebbdb265c8127e06bb94f34
AUX chronyd.conf-r3 390 BLAKE2B aa193e6bcf62cc305620139b7c198d39358feea7106356083cf1a20bdb8fd4b85bd8cce8cf20ce6839e8788fedc1f94e912ec512193988f83283ceef86d6cfc7 SHA512 ab0bbd07c17e391d068c5a37d5f8d9c8fc2c42add2700869217a95784666bd3f23bebd70942cf11b42c124e0947f68c101153998e89bc61ccb71b30a0187cf0c
AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da
-DIST chrony-4.1.tar.gz 564648 BLAKE2B f9c4b44c521ee592c109b8a3d500b9cb3ea4fbf0d7dce9d8754498ad41ce2ac87c913cf72a38557ce5f28208672163b21b067307f723fd91cc91d71f69e739ef SHA512 5e283d6a56e6852606c681a7c29c5786b102d584178cbd7033ebbc95a8e95533605631363b850a3087cca438a5878db7a317f120aab2fd856487d02fccfbcb1f
-DIST chrony-4.1.tar.gz.asc 833 BLAKE2B 6d800ae436523f61cd713cdd12cf0246db53e732554433d5ef6cf1a437296ee9d0da3b2e9e72d1ccb0e3a6b1ee1227e5d1626bf031b0491670ee0712e17c57ff SHA512 82faf9171d782c18224d2d44b340994b0ddab141e88cc803dea83d0ffbb6468bc51e8b11c8dd9bd327220cae04f7d789b58ab23141a2bdf038ce628f9adeb57a
DIST chrony-4.2.tar.gz 578411 BLAKE2B 6eac4f144f5811d0f83a9827e2b5113dead1ff96952f6e6d32dcea9858e04512f635d70237fe6faced095991204b0f62bcb0e9d1a4b34e8778f205058afdfb45 SHA512 7f946b27de605b3ebea62cf23916dfad77c99e8b2338ba239ede6b8216ce436b3d4d87770f371c8d8e006507c51d5c831b51f067957abd2935adfdec3f5aa67d
DIST chrony-4.2.tar.gz.asc 833 BLAKE2B 41cb83f62dd58489313438672d209cc65fdbb5f8f595ea38f990d5e15194f91532d3f3221c6c38581467d62e95d23853a4fc438d32b99606def5f06db0031969 SHA512 d8ae4b540ce3529a5a72e10c14765a33ca6fc41529b6fdc9928fb171f25bd6fb87f930b7783638892f42f4cbcfaab4cb1064c930bae1d5204a71babad72b6e10
-EBUILD chrony-4.1-r2.ebuild 6684 BLAKE2B b366d69c4a2068b512bd7cbb14b7387ccd02947a7cb94f21bfc552ecc904829abc6dee333c4bbc11b9a3cdc97aa6c95d7a1c662fea22cc7df9b1c83f566873d9 SHA512 621e244dbaa0bff3bb74d5d7f92c9db85104f4c7ec02e774cd96fb1a7012141699c711e06b8b5a92be8ac70876ee933280bcabbea7a6f35593eec5d41b203028
EBUILD chrony-4.2-r1.ebuild 6719 BLAKE2B 9dbf927768234a5e9f4a38463815395ae78b982c784cf25be1d6e78c0b268a6b9ed327d9de71505a4c1c4f158be50c15e6ecdff691369fb25f6ff664d73dce55 SHA512 12c3470d09c3b98f81649b8d16c58b53f9a2721540ae4fb376f4aea9a1f144540e0e415f94d08aceee9d69afddf1571855798c7ee175a278096f63fc32dcb0ab
-EBUILD chrony-4.2.ebuild 6643 BLAKE2B 42de896b755ab3992c620c440adcfbf088e6b325085fdaa7bf1d2798c5219781b5741052d605541054536925524f78734f8c4cb0ad04d5b4d279422212ecd2a5 SHA512 7843e59659e2c1fdc381c0e2995e198e21e180abbe11faa7425c13348950c2f997d2caef1ee899d3f7e38666f21224e969493a2167e967c6d6ce8445215e8499
EBUILD chrony-9999.ebuild 6645 BLAKE2B 36e2fa322fd75673afe913a472ba65d6aa6610700a149545107e381106950fcddcf0e30e077f95d169b12d550faad8c8526e8c2f782b75126ce7aaea4cac87ee SHA512 5817e255eb667f7bf788bf7b42d99851583cca22178c4a5301b071fdb30e0c53dbc9f4c6951f36aea2b9de6bb6352265920450455103234be8fe711c8e428fb9
MISC metadata.xml 2300 BLAKE2B 8d0e8822361fef70945eab4eb365fee2f0c278fb36ad0641520310bf895d04202fce88d485149d021ebf577ee848b408cf46f4141f8606ff020d2483370c3b16 SHA512 57c813c655fa7a5083f26f908d7476dd165284feef014c750e845c60830af7baffe91e9444915d3994b053498714b4e717bfe7a2af34e90de50d823542c913d0
diff --git a/net-misc/chrony/chrony-4.1-r2.ebuild b/net-misc/chrony/chrony-4.1-r2.ebuild
deleted file mode 100644
index eefd2899e047..000000000000
--- a/net-misc/chrony/chrony-4.1-r2.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2021 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 ~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.1-systemd-gentoo.patch
- "${FILESDIR}"/${P}-seccomp-glibc-2-3-4.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/chrony-4.2.ebuild b/net-misc/chrony/chrony-4.2.ebuild
deleted file mode 100644
index 51af47377ea6..000000000000
--- a/net-misc/chrony/chrony-4.2.ebuild
+++ /dev/null
@@ -1,252 +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="+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
-)
-
-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.1-seccomp-glibc-2-3-4.patch b/net-misc/chrony/files/chrony-4.1-seccomp-glibc-2-3-4.patch
deleted file mode 100644
index 56dd89b3ffdc..000000000000
--- a/net-misc/chrony/files/chrony-4.1-seccomp-glibc-2-3-4.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://git.tuxfamily.org/chrony/chrony.git/patch/?id=bbbd80bf03223f181d4abf5c8e5fe6136ab6129a
-
-From bbbd80bf03223f181d4abf5c8e5fe6136ab6129a Mon Sep 17 00:00:00 2001
-From: Miroslav Lichvar <mlichvar@redhat.com>
-Date: Mon, 9 Aug 2021 11:48:21 +0200
-Subject: sys_linux: allow clone3 and pread64 in seccomp filter
-
-These seem to be needed with the latest glibc.
-
---- a/sys_linux.c
-+++ b/sys_linux.c
-@@ -503,6 +503,9 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context)
-
- /* Process */
- SCMP_SYS(clone),
-+#ifdef __NR_clone3
-+ SCMP_SYS(clone3),
-+#endif
- SCMP_SYS(exit),
- SCMP_SYS(exit_group),
- SCMP_SYS(getpid),
-@@ -595,6 +598,7 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context)
- #ifdef __NR_ppoll_time64
- SCMP_SYS(ppoll_time64),
- #endif
-+ SCMP_SYS(pread64),
- SCMP_SYS(pselect6),
- #ifdef __NR_pselect6_time64
- SCMP_SYS(pselect6_time64),
-cgit v0.10.2
diff --git a/net-misc/chrony/files/chrony-4.1-systemd-gentoo.patch b/net-misc/chrony/files/chrony-4.1-systemd-gentoo.patch
deleted file mode 100644
index ff3b320d1e47..000000000000
--- a/net-misc/chrony/files/chrony-4.1-systemd-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/examples/chronyd.service
-+++ b/examples/chronyd.service
-@@ -8,8 +8,7 @@
- [Service]
- Type=forking
- PIDFile=/run/chrony/chronyd.pid
--EnvironmentFile=-/etc/sysconfig/chronyd
--ExecStart=/usr/sbin/chronyd $OPTIONS
-+ExecStart=/usr/sbin/chronyd -u ntp -F 2
- PrivateTmp=yes
- ProtectHome=yes
- ProtectSystem=full