commit: c1451383d43e7a3cec646dd097309dd595601726 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat Sep 4 17:34:00 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Sep 4 17:34:00 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1451383
net-misc/chrony: drop 4.0-r2 Signed-off-by: David Seifert <soap <AT> gentoo.org> net-misc/chrony/Manifest | 2 - net-misc/chrony/chrony-4.0-r2.ebuild | 217 --------------------- .../files/chrony-3.5-r3-systemd-gentoo.patch | 12 -- net-misc/chrony/files/chronyd.conf | 12 -- 4 files changed, 243 deletions(-) diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest index 74b5ad8efb9..ee8a90b57aa 100644 --- a/net-misc/chrony/Manifest +++ b/net-misc/chrony/Manifest @@ -1,4 +1,2 @@ -DIST chrony-4.0.tar.gz 546939 BLAKE2B 1d4035977be3603b34024c5c1c2aa5f2b4aca03fe7dc1eb41be2e9aeefa06e20a5f74776c50bdadaffba10ae25e7980bcbd9cf2b999bd73087728afe7a80253e SHA512 a1c11a386c43f495910f7f2e9b5fbb1652c3631471d182b9b8203dfef98611d11535ad547a879856551263aed0ae2e30e4135b8ed89553684706166bc1c725c9 -DIST chrony-4.0.tar.gz.asc 195 BLAKE2B 1947a73f35eb5c58f91775d76473210a7b5edff5b808e360eb0c3724351c54ac4f187a2aa4450830130da718c6a0c488baa170ca87e7e6eac781d85c67b3773f SHA512 c3156d91f4fdb6f9e2fdbc83b1399afb0ecdfa9b7bc92648c5bce477c3f0f921d2a13aa21ac6c281f18b008c60f08e3db6d82b642b646f064aea1dbe19295c4c DIST chrony-4.1.tar.gz 564648 BLAKE2B f9c4b44c521ee592c109b8a3d500b9cb3ea4fbf0d7dce9d8754498ad41ce2ac87c913cf72a38557ce5f28208672163b21b067307f723fd91cc91d71f69e739ef SHA512 5e283d6a56e6852606c681a7c29c5786b102d584178cbd7033ebbc95a8e95533605631363b850a3087cca438a5878db7a317f120aab2fd856487d02fccfbcb1f DIST chrony-4.1.tar.gz.asc 833 BLAKE2B 6d800ae436523f61cd713cdd12cf0246db53e732554433d5ef6cf1a437296ee9d0da3b2e9e72d1ccb0e3a6b1ee1227e5d1626bf031b0491670ee0712e17c57ff SHA512 82faf9171d782c18224d2d44b340994b0ddab141e88cc803dea83d0ffbb6468bc51e8b11c8dd9bd327220cae04f7d789b58ab23141a2bdf038ce628f9adeb57a diff --git a/net-misc/chrony/chrony-4.0-r2.ebuild b/net-misc/chrony/chrony-4.0-r2.ebuild deleted file mode 100644 index 693ea18334e..00000000000 --- a/net-misc/chrony/chrony-4.0-r2.ebuild +++ /dev/null @@ -1,217 +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 )" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86" -fi - -S="${WORKDIR}/${P/_/-}" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+caps +cmdmon debug html ipv6 libedit +nettle nss +ntp +phc +nts pps +refclock +rtc samba +seccomp +sechash selinux libtomcrypt" -# nettle > nss > libtomcrypt in configure -REQUIRED_USE=" - sechash? ( || ( nettle nss libtomcrypt ) ) - nettle? ( !nss ) - nss? ( !nettle ) - libtomcrypt? ( !nettle !nss ) - !sechash? ( !nss ) - !sechash? ( !nts? ( !nettle ) ) - nts? ( nettle ) -" - -BDEPEND=" - nettle? ( virtual/pkgconfig ) -" - -if [[ ${PV} == "9999" ]]; then - # Needed for doc generation in 9999 - REQUIRED_USE+=" html" - BDEPEND+=" virtual/w3m" -else - BDEPEND+=" verify-sig? ( <=app-crypt/openpgp-keys-mlichvar-20210416 )" -fi - -DEPEND=" - caps? ( - acct-group/ntp - acct-user/ntp - sys-libs/libcap - ) - nts? ( net-libs/gnutls:= ) - libedit? ( dev-libs/libedit ) - nettle? ( dev-libs/nettle:= ) - nss? ( dev-libs/nss:= ) - seccomp? ( sys-libs/libseccomp ) - html? ( dev-ruby/asciidoctor ) - pps? ( net-misc/pps-tools ) -" -RDEPEND=" - ${DEPEND} - selinux? ( sec-policy/selinux-chronyd ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch - "${FILESDIR}"/${PN}-3.5-r3-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 "${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 0//' \ - "${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 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) - $(usex libtomcrypt '' --without-tomcrypt) - --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 - 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=false - HAD_SECCOMP=false - - if has_version 'net-misc/chrony[caps]' ; then - HAD_CAPS=true - fi - - if has_version 'net-misc/chrony[seccomp]' ; then - HAD_SECCOMP=true - fi - -} - -pkg_postinst() { - tmpfiles_process chronyd.conf - - if [[ -n "${REPLACING_VERSIONS}" ]] ; then - if use caps && ! ${HAD_CAPS} ; then - 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} ; then - ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root" - fi - fi - - if [[ ! ${HAD_SECCOMP} ]] && use seccomp ; then - elog "To enable seccomp in enforcing 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 0 (see man chronyd)" - fi -} diff --git a/net-misc/chrony/files/chrony-3.5-r3-systemd-gentoo.patch b/net-misc/chrony/files/chrony-3.5-r3-systemd-gentoo.patch deleted file mode 100644 index a3a2962ddd1..00000000000 --- a/net-misc/chrony/files/chrony-3.5-r3-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 0 - PrivateTmp=yes - ProtectHome=yes - ProtectSystem=full diff --git a/net-misc/chrony/files/chronyd.conf b/net-misc/chrony/files/chronyd.conf deleted file mode 100644 index d017660d599..00000000000 --- a/net-misc/chrony/files/chronyd.conf +++ /dev/null @@ -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=" -u ntp -F 0"
