commit: f940f574df69cacc323792c4545c65526472188b Author: Sam James (sam_c) <sam <AT> cmpct <DOT> info> AuthorDate: Sun Apr 19 20:50:43 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Sat May 2 10:43:26 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f940f574
net-misc/chrony: Remove broken versions Remove versions that were broken by previous USE=caps changes. Signed-off-by: Sam James (sam_c) <sam <AT> cmpct.info> Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> net-misc/chrony/chrony-3.5-r3.ebuild | 152 ----------------------------- net-misc/chrony/chrony-4.0_pre1-r1.ebuild | 155 ------------------------------ 2 files changed, 307 deletions(-) diff --git a/net-misc/chrony/chrony-3.5-r3.ebuild b/net-misc/chrony/chrony-3.5-r3.ebuild deleted file mode 100644 index a654a6eb489..00000000000 --- a/net-misc/chrony/chrony-3.5-r3.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2020 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/"; -SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"; -LICENSE="GPL-2" -SLOT="0" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE=" - +adns +caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc - +seccomp selinux -" -REQUIRED_USE=" - ?? ( libedit readline ) -" - -CDEPEND=" - caps? ( sys-libs/libcap ) - libedit? ( dev-libs/libedit ) - readline? ( >=sys-libs/readline-4.1-r4:= ) - seccomp? ( sys-libs/libseccomp ) -" -DEPEND=" - ${CDEPEND} - caps? ( acct-group/ntp acct-user/ntp ) - html? ( dev-ruby/asciidoctor ) - pps? ( net-misc/pps-tools ) -" -RDEPEND=" - ${CDEPEND} - selinux? ( sec-policy/selinux-chronyd ) -" - -RESTRICT=test - -S="${WORKDIR}/${P/_/-}" - -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 - - # Copy for potential user fixup - cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf - cp examples/chronyd.service "${T}"/chronyd.service - - # Set config for privdrop - if ! use caps; then - sed -i \ - -e 's/-u ntp//' \ - "${T}"/chronyd.conf "${T}"/chronyd.service || die - fi - - if ! use seccomp; then - sed -i \ - -e 's/-F 1//' \ - "${T}"/chronyd.conf "${T}"/chronyd.service || die - fi -} - -src_configure() { - tc-export CC - - local CHRONY_EDITLINE - # ./configure legend: - # --disable-readline : disable line editing entirely - # --without-readline : do not use sys-libs/readline (enabled by default) - # --without-editline : do not use dev-libs/libedit (enabled by default) - if ! use readline && ! use libedit; then - CHRONY_EDITLINE='--disable-readline' - else - CHRONY_EDITLINE+=" $(usex readline '' --without-readline)" - CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)" - fi - - # not an autotools generated script - local myconf=( - $(use_enable seccomp scfilter) - $(usex adns '' --disable-asyncdns) - $(usex caps '' --disable-linuxcaps) - $(usex cmdmon '' --disable-cmdmon) - $(usex ipv6 '' --disable-ipv6) - $(usex ntp '' --disable-ntp) - $(usex phc '' --disable-phc) - $(usex pps '' --disable-pps) - $(usex refclock '' --disable-refclock) - $(usex rtc '' --disable-rtc) - ${CHRONY_EDITLINE} - ${EXTRA_ECONF} - --chronysockdir="${EPREFIX}/run/chrony" - --disable-sechash - --docdir="${EPREFIX}/usr/share/doc/${PF}" - --mandir="${EPREFIX}/usr/share/man" - --prefix="${EPREFIX}/usr" - --sysconfdir="${EPREFIX}/etc/chrony" - --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" - --without-nss - --without-tomcrypt - ) - - # print the ./configure call to aid in future debugging - echo bash ./configure "${myconf[@]}" >&2 - bash ./configure "${myconf[@]}" || die -} - -src_compile() { - 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 - - insinto /etc/logrotate.d - newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony - - systemd_dounit "${T}"/chronyd.service - systemd_dounit examples/chrony-wait.service - systemd_enable_ntpunit 50-chrony chronyd.service -} - -pkg_postinst() { - tmpfiles_process chronyd.conf -} diff --git a/net-misc/chrony/chrony-4.0_pre1-r1.ebuild b/net-misc/chrony/chrony-4.0_pre1-r1.ebuild deleted file mode 100644 index 27386df7648..00000000000 --- a/net-misc/chrony/chrony-4.0_pre1-r1.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2020 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/"; -SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"; -LICENSE="GPL-2" -SLOT="0" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE=" - +adns +caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock +rtc - +seccomp +sechash selinux -" -REQUIRED_USE=" - ?? ( libedit readline ) - sechash? ( nettle ) -" - -CDEPEND=" - caps? ( sys-libs/libcap ) - libedit? ( dev-libs/libedit ) - nettle? ( dev-libs/nettle ) - readline? ( >=sys-libs/readline-4.1-r4:= ) - seccomp? ( sys-libs/libseccomp ) -" -DEPEND=" - ${CDEPEND} - caps? ( acct-group/ntp acct-user/ntp ) - html? ( dev-ruby/asciidoctor ) - pps? ( net-misc/pps-tools ) -" -RDEPEND=" - ${CDEPEND} - selinux? ( sec-policy/selinux-chronyd ) -" - -RESTRICT=test - -S="${WORKDIR}/${P/_/-}" - -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 - - # Copy for potential user fixup - cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf - cp examples/chronyd.service "${T}"/chronyd.service - - # Set config for privdrop - if ! use caps; then - sed -i \ - -e 's/-u ntp//' \ - "${T}"/chronyd.conf "${T}"/chronyd.service || die - fi - - if ! use seccomp; then - sed -i \ - -e 's/-F 1//' \ - "${T}"/chronyd.conf "${T}"/chronyd.service || die - fi -} - -src_configure() { - tc-export CC - - local CHRONY_EDITLINE - # ./configure legend: - # --disable-readline : disable line editing entirely - # --without-readline : do not use sys-libs/readline (enabled by default) - # --without-editline : do not use dev-libs/libedit (enabled by default) - if ! use readline && ! use libedit; then - CHRONY_EDITLINE='--disable-readline' - else - CHRONY_EDITLINE+=" $(usex readline '' --without-readline)" - CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)" - fi - - # not an autotools generated script - local myconf=( - $(use_enable seccomp scfilter) - $(usex adns '' --disable-asyncdns) - $(usex caps '' --disable-linuxcaps) - $(usex cmdmon '' --disable-cmdmon) - $(usex ipv6 '' --disable-ipv6) - $(usex nettle '' --without-nettle) - $(usex ntp '' --disable-ntp) - $(usex phc '' --disable-phc) - $(usex pps '' --disable-pps) - $(usex refclock '' --disable-refclock) - $(usex rtc '' --disable-rtc) - $(usex sechash '' --disable-sechash) - ${CHRONY_EDITLINE} - ${EXTRA_ECONF} - --chronysockdir="${EPREFIX}/run/chrony" - --docdir="${EPREFIX}/usr/share/doc/${PF}" - --mandir="${EPREFIX}/usr/share/man" - --prefix="${EPREFIX}/usr" - --sysconfdir="${EPREFIX}/etc/chrony" - --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" - --without-nss - --without-tomcrypt - ) - - # print the ./configure call to aid in future debugging - echo bash ./configure "${myconf[@]}" >&2 - bash ./configure "${myconf[@]}" || die -} - -src_compile() { - 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 - - insinto /etc/logrotate.d - newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony - - systemd_dounit "${T}"/chronyd.service - systemd_dounit examples/chrony-wait.service - systemd_enable_ntpunit 50-chrony chronyd.service -} - -pkg_postinst() { - tmpfiles_process chronyd.conf -}
