From 5a165c60b9b8c4847067cb83b4be7da785d01f93 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 28 Sep 2019 08:17:07 +0100 Subject: gentoo resync : 28.09.2019 --- net-misc/chrony/Manifest | 5 +- net-misc/chrony/chrony-3.5-r2.ebuild | 127 +++++++++++++++++++++ net-misc/chrony/chrony-3.5.ebuild | 126 -------------------- net-misc/chrony/chrony-9999.ebuild | 51 +++++---- .../files/chrony-3.5-pool-vendor-gentoo.patch | 16 +++ 5 files changed, 172 insertions(+), 153 deletions(-) create mode 100644 net-misc/chrony/chrony-3.5-r2.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/Manifest b/net-misc/chrony/Manifest index d73f2cc908c9..724ecaa3f52c 100644 --- a/net-misc/chrony/Manifest +++ b/net-misc/chrony/Manifest @@ -1,5 +1,6 @@ AUX chrony-2.4-r1.logrotate 131 BLAKE2B 4e649ce1c126639ea73c4e03d42175d1715b1c321544376ff2e48d67ee13bebcf04a8fea56326bf5efe66f568913dc92ff7f16a641ffb39a456e9cdac6004a6c SHA512 e6febb744476be6c83ac086f2054dc2c190b6e1abd2cf20d4187f222b2485817f06c4ad62b8d40fcea3e18a771cf21899fe0a1dafbfb31f5c99da9092d24d79b AUX chrony-3.4-systemd-gentoo.patch 765 BLAKE2B 541cf597dcecb800f569847e813edfbfaa13130fee2d1b991de710ff2936cc593aad65497505e99da3f563288e0d52d52432f392817a45c5fcf123a5af370d7b SHA512 0662ab22428d221f62e76e97217c8f5589b54d12deac7d4fc2f9359987b57f39d7c42e6a10c3b97ae0c17b57d63cd11e8e586110194249f7ed2d5dd0fb9a8041 +AUX chrony-3.5-pool-vendor-gentoo.patch 544 BLAKE2B 5ef7fcea43c59d1da8f3b3a735f1e70565a8437f142f317abe81531c31e934af05eda5e3043f7874bc9b4592d44579ae1827ddba06c514b4b8124c899931ed0f SHA512 0a109e1b8367def620f5089b3fcb92d84e592eb1a2fced2b60f6c9295159a605d9605e837a06e118c8ba8095208da68592fb9cd537937a153d6eecfa0eb35eb4 AUX chrony-3.5-systemd-gentoo.patch 297 BLAKE2B b7a8502ede5886b7e51fbaf43d62b59bdb43d8c5059d1ee0c8a14de843d58d576efd6b5c53cb3cbdd1c4583b787a8c180bea93a97a997349d97f652b7b4f1fbb SHA512 ecf0eda8de2c36f14a6d3dac8b7b688b06f46516ae064513314cc46323962147b29f13a57beb34cc7d2664b967b5f0eee26a00ddeac63d88dda59fc196f1aec1 AUX chronyd.conf 378 BLAKE2B b5c07f873640d78e26d23206b253b8c85ceb2a3d89f1dfb3686ea0012fb38ae30b323ceceffac43c0a8168b3e2d288714297a0905e60779d00161e93d8f5773b SHA512 6919c7bddce2a8f81c0f2759c7c58506e97f89102bfeb7b5c19c6da5ed4cbd9070faddd4f3fb411bb4c653fffbdcc93a7f7dc810f38b199f038b1d4072f57640 AUX chronyd.init 1634 BLAKE2B f67d3e2b8aaca19e1c9f86434e8a1ba757babebe8b39fe26be98b7d1d40b259fde5313dcb840c86a7d409ac811a5d854178af66ab82d851b66d27a2acf5f7575 SHA512 1712775c133c4e7f1e869806be2a0723d171c344fc18473606397c74103bb70990302b475ed3629adb5277deed8e892f1ad48d5ee339cf112f425d9209cc3872 @@ -13,6 +14,6 @@ DIST chrony-3.5.tar.gz 458226 BLAKE2B 611f21e36c6e745208e00eba988519fcd912c6c0c3 EBUILD chrony-3.1.ebuild 2825 BLAKE2B c3af56079c3130002499dda974bb5117a2cce988f8a1aaca7cb6f9f11a0aa011fefe3f600262939b72b4f41d7e096a94dd1305572a04aabe96519cff36ec0165 SHA512 f97265a0a7006c1f8fc07f4a25f27ff0f78b123fdeabe2329a0e48ba33409e16a8373d6c114c2d25f463f560b47e8ef5510c140e5e045a02ccfd4eb669f463b3 EBUILD chrony-3.3.ebuild 2909 BLAKE2B 2d314e96402839948b95e9f8650e8523676f201deab27230ac9d006a0a73c878239c23c7118d0698bec9d7c2796b3a08be9cfa695c21b84ee333c23161d963ad SHA512 0ef1db3668f626dc07057728f7d33d9a200f1e4fcb93e6fb3b69e874b8d5d0e3bbb2d57c21513d7825151b08b0a86a36ef1838c44f27e536aa7abd5b9e973cdf EBUILD chrony-3.4.ebuild 2912 BLAKE2B 0b8948414c95862295efec709f2f4467974c2955fc03153d5d2bfa15a74fcee2714f012425b4b1002b90cafe9008fa7ce02f0f40582b7b4b0917d82363cc9c77 SHA512 13c6caf8f3d813e1caa515d1ab00f1e5c1539198ee51913f649ee2ef2562bffee15b0f78c78ff5419728740a867d02a90eb889f2711a32db85f7756c3bdda3b3 -EBUILD chrony-3.5.ebuild 2909 BLAKE2B 7aa6ed3307387d3be48b0f215a1ffa28eafe89cb4856d89f2f2613738e6415c88adc2bc0e384b8cf28fb1ce76fcbab1a553fc3790c2883e21950d648cdd70024 SHA512 e9ebfbb5d22296bad677cb6c1372e6fc866f8eb2c3b3b0fe5166862560d8b9d9f11552271129cafd07e09c7791b64f92b4a0b740aa8d3982f7228e77bbd6afb4 -EBUILD chrony-9999.ebuild 2801 BLAKE2B eb782d5490812e898b6d660cb7b49eaccd610dd3dfc6afba21676effcf9a9ada57b4e2d6fb96ffa4474439215e32e0bcefeff0b5b686d21e63fa95e289d8c59a SHA512 87f76580a6dbd2fa2aa81225f7e0b0262f1b4030a9e2905f5e0e159265808836a6af5081b8461a7f3e7c7c48e5933d0dc192c58a9d334f5dde0ef0ee445ac59e +EBUILD chrony-3.5-r2.ebuild 3042 BLAKE2B e5cb16eb143b4ea9db59ae163b77d4ee20e31dfdcffae283f9effa5945b81fb5f49002e384fca0a6d7fdaf15d5211d7794f25d270c6e7077e72e000ffcbdae43 SHA512 72865b3925c98ef17af7a761bfa0528ede5ba716f177b609ac4b7f2c04093df3d3d43c1fbd8059bb12b3397f5340504e51fbfff901383aef679adf75c70b1741 +EBUILD chrony-9999.ebuild 2934 BLAKE2B 325fccb1baf09e65dee2fd3d4a7f1fa1e665ae95daf36a8b9a00ffa9770f69bf29940584595c9cb13bd32ef8695169dc3d19c6d2f34812da00540efc67b6a57a SHA512 2414c0b1f95ae47de1ec308dabacc4a791982af9dad4fa8a45297c336695298df826bca0a5a565adc6667a69166a41910aa093bd4c120827aba4a1d533fe0a9c MISC metadata.xml 1566 BLAKE2B 88bf43a72fed47580395641d87651a7828fa3fb443a36568bc8ee44f2d09117aa296f8b214f1560279cce2e9bad189a3d941708fe37c1760b053f3669f25ed8e SHA512 acdca169396f72dbbfd3c2ca781024818133ec4af07661a0c8b5a619ca6a43713910aadc28e6d8e5b3d0d8da960ac1bfba05ec5cb5c49d80b17fdf9c1c5d1b1d diff --git a/net-misc/chrony/chrony-3.5-r2.ebuild b/net-misc/chrony/chrony-3.5-r2.ebuild new file mode 100644 index 000000000000..c1d5a7b717e3 --- /dev/null +++ b/net-misc/chrony/chrony-3.5-r2.ebuild @@ -0,0 +1,127 @@ +# 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,chrony-wait}.service + systemd_enable_ntpunit 50-chrony 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 21c96f642157..000000000000 --- a/net-misc/chrony/chrony-3.5.ebuild +++ /dev/null @@ -1,126 +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 CHRONY_CONFIGURE=" - ./configure \ - $(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=/run/chrony \ - --disable-sechash \ - --docdir=/usr/share/doc/${PF} \ - --mandir=/usr/share/man \ - --prefix=/usr \ - --sysconfdir=/etc/chrony \ - --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" - --without-nss \ - --without-tomcrypt - " - - # print the ./configure call to aid in future debugging - einfo ${CHRONY_CONFIGURE} - bash ${CHRONY_CONFIGURE} || 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 a9bf2fae2782..e939129a01ac 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 ) @@ -64,34 +65,33 @@ src_configure() { fi # not an autotools generated script - local CHRONY_CONFIGURE=" - ./configure \ - $(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=/run/chrony \ - --disable-sechash \ - --docdir=/usr/share/doc/${PF} \ - --mandir=/usr/share/man \ - --prefix=/usr \ - --sysconfdir=/etc/chrony \ + 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-nss --without-tomcrypt - " + ) # print the ./configure call to aid in future debugging - einfo ${CHRONY_CONFIGURE} - bash ${CHRONY_CONFIGURE} || die + echo bash ./configure "${myconf[@]}" >&2 + bash ./configure "${myconf[@]}" || die } src_compile() { @@ -118,5 +118,6 @@ src_install() { insinto /etc/logrotate.d newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony - systemd_dounit examples/chronyd.service + systemd_dounit examples/{chronyd,chrony-wait}.service + systemd_enable_ntpunit 50-chrony chronyd.service } 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