From eafdb1971ecba1906f3f9e586623d134f6d064c5 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Thu, 26 Sep 2019 10:19:13 +0200 Subject: net-misc/chrony: Use Gentoo vendor pool Package-Manager: Portage-2.3.76, Repoman-2.3.17 Fixes: https://bugs.gentoo.org/621702 Signed-off-by: Jeroen Roovers --- net-misc/chrony/chrony-3.5-r1.ebuild | 126 +++++++++++++++++++++ net-misc/chrony/chrony-3.5.ebuild | 125 -------------------- net-misc/chrony/chrony-9999.ebuild | 1 + .../files/chrony-3.5-pool-vendor-gentoo.patch | 16 +++ 4 files changed, 143 insertions(+), 125 deletions(-) create mode 100644 net-misc/chrony/chrony-3.5-r1.ebuild delete mode 100644 net-misc/chrony/chrony-3.5.ebuild create mode 100644 net-misc/chrony/files/chrony-3.5-pool-vendor-gentoo.patch (limited to 'net-misc/chrony') diff --git a/net-misc/chrony/chrony-3.5-r1.ebuild b/net-misc/chrony/chrony-3.5-r1.ebuild new file mode 100644 index 000000000000..e280760fd28c --- /dev/null +++ b/net-misc/chrony/chrony-3.5-r1.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit systemd 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 ~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} + 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-systemd-gentoo.patch +) + +src_prepare() { + default + sed -i \ + -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ + doc/* examples/* || die +} + +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 "${FILESDIR}"/chronyd.conf chronyd + + insinto /etc/${PN} + newins examples/chrony.conf.example1 chrony.conf + + docinto examples + dodoc examples/*.example* + + 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 examples/chronyd.service +} diff --git a/net-misc/chrony/chrony-3.5.ebuild b/net-misc/chrony/chrony-3.5.ebuild deleted file mode 100644 index c74eea646f90..000000000000 --- a/net-misc/chrony/chrony-3.5.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit systemd 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 ~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} - 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-systemd-gentoo.patch -) - -src_prepare() { - default - sed -i \ - -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ - doc/* examples/* || die -} - -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 "${FILESDIR}"/chronyd.conf chronyd - - insinto /etc/${PN} - newins examples/chrony.conf.example1 chrony.conf - - docinto examples - dodoc examples/*.example* - - 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 examples/chronyd.service -} diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild index 53dd5de5b8a0..5cac01a6dee7 100644 --- a/net-misc/chrony/chrony-9999.ebuild +++ b/net-misc/chrony/chrony-9999.ebuild @@ -38,6 +38,7 @@ RESTRICT=test S="${WORKDIR}/${P/_/-}" PATCHES=( + "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch "${FILESDIR}"/${PN}-3.5-systemd-gentoo.patch ) 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 new file mode 100644 index 000000000000..817a41067382 --- /dev/null +++ b/net-misc/chrony/files/chrony-3.5-pool-vendor-gentoo.patch @@ -0,0 +1,16 @@ +- 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/drift -- cgit v1.2.3-65-gdbad