From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Sep 2020 09:32:48 +0100 Subject: gentoo resync : 16.09.2020 --- net-misc/chrony/Manifest | 17 +- net-misc/chrony/chrony-3.5-r2.ebuild | 127 --------------- net-misc/chrony/chrony-3.5-r4.ebuild | 172 --------------------- net-misc/chrony/chrony-3.5.1-r1.ebuild | 18 +-- net-misc/chrony/chrony-4.0_pre3.ebuild | 16 +- net-misc/chrony/chrony-9999.ebuild | 16 +- .../files/chrony-3.5-r3-systemd-gentoo.patch | 2 +- .../chrony/files/chrony-3.5-systemd-gentoo.patch | 12 -- net-misc/chrony/files/chronyd.conf | 2 +- net-misc/chrony/files/chronyd.conf-r1 | 12 -- net-misc/chrony/metadata.xml | 1 - 11 files changed, 27 insertions(+), 368 deletions(-) delete mode 100644 net-misc/chrony/chrony-3.5-r2.ebuild delete mode 100644 net-misc/chrony/chrony-3.5-r4.ebuild delete mode 100644 net-misc/chrony/files/chrony-3.5-systemd-gentoo.patch delete mode 100644 net-misc/chrony/files/chronyd.conf-r1 (limited to 'net-misc/chrony') diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest index 958d694219de..c259fd33830f 100644 --- a/net-misc/chrony/Manifest +++ b/net-misc/chrony/Manifest @@ -1,17 +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-3.5-r3-systemd-gentoo.patch 309 BLAKE2B 933a8fb5dc5225d86aa1a97083755607df76e767c38c58ead1e1ed5e4c180502b31edfbc8c045f976d0b511d60d35562b53d1f0a5ab0ba8b306843cd95b8a9f7 SHA512 e2be0c5cf68cd899a3fd15bf129e664e795883f9912b300e2a1fa0a01f7ca9faea32edd3f1232c9be91e629d5fbbc3a58ec793bf6a73108fa0e58e40c861a0c9 -AUX chrony-3.5-systemd-gentoo.patch 297 BLAKE2B b7a8502ede5886b7e51fbaf43d62b59bdb43d8c5059d1ee0c8a14de843d58d576efd6b5c53cb3cbdd1c4583b787a8c180bea93a97a997349d97f652b7b4f1fbb SHA512 ecf0eda8de2c36f14a6d3dac8b7b688b06f46516ae064513314cc46323962147b29f13a57beb34cc7d2664b967b5f0eee26a00ddeac63d88dda59fc196f1aec1 -AUX chronyd.conf 378 BLAKE2B b5c07f873640d78e26d23206b253b8c85ceb2a3d89f1dfb3686ea0012fb38ae30b323ceceffac43c0a8168b3e2d288714297a0905e60779d00161e93d8f5773b SHA512 6919c7bddce2a8f81c0f2759c7c58506e97f89102bfeb7b5c19c6da5ed4cbd9070faddd4f3fb411bb4c653fffbdcc93a7f7dc810f38b199f038b1d4072f57640 -AUX chronyd.conf-r1 389 BLAKE2B e8048c21f025ea04478f824aee39d1e6f18e94845775e99d20a15a0f5dacf01e3c795eef8b3e52aecd544011dc957075f0ee1af125341d0ac52ef3f725f9f0f2 SHA512 7829f7766749f14de834f633b41483545f7a75e7a039daeef695da9268307957a483f42896ca7967ec98d393140b90e6868642eed43f6daa392c6e88d9871c08 +AUX chrony-3.5-r3-systemd-gentoo.patch 309 BLAKE2B 4e441ea854dda077c68f05b420f50d5374436670270eca6ff5cde50c68ac4060ffd752628dc664eac5a1fc6c21ad42c4bae7df07f9a4963d186dfc41a68f3a77 SHA512 0e6c1ef2b346fa2a722e67d8cf1cbc5e4413c65bba8301e3d0d87590fd9b73489a23807e0f17fa365a66ed1dbf03d86d8c617d54d609bf435816b1266f30f170 +AUX chronyd.conf 390 BLAKE2B a0058c72ae04371aa273d71f01349a00dfc0d66c016e6c2d977b9499e2ded3072942bb21c468ca9263263d55f1cc35cca4a3a72ee058cc31cf982648552bc77d SHA512 6798d40da70921b95430371459a4b276a88c57ec79f99d0efd214770f5fffee5d80d20baf4313f210b6af46c4aafbb038920cd774d6c03ffbb0849229c431bdc AUX chronyd.init 1634 BLAKE2B f67d3e2b8aaca19e1c9f86434e8a1ba757babebe8b39fe26be98b7d1d40b259fde5313dcb840c86a7d409ac811a5d854178af66ab82d851b66d27a2acf5f7575 SHA512 1712775c133c4e7f1e869806be2a0723d171c344fc18473606397c74103bb70990302b475ed3629adb5277deed8e892f1ad48d5ee339cf112f425d9209cc3872 AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da DIST chrony-3.5.1.tar.gz 459902 BLAKE2B 503402c0dd68a340eb5ecd8b57dcb83d90124f31e8deb6e20bd1e9ed19b5dc952fa7f40a697d0d0cb77c349c9f3297dcd32265d77670a71836ba8709dcc83053 SHA512 489cf614bfb2c1e024343af1316c339b287ed5c7b6cec15b44ef3d90512036fb1da3fd627d291a193c59d9c5c095afa66c529eeb6fd0c1bbc8256ed8873b7984 -DIST chrony-3.5.tar.gz 458226 BLAKE2B 611f21e36c6e745208e00eba988519fcd912c6c0c3518c953591f43224dc3da79f627027a6cd4bf9c4227e9f8659a69adbdb634252ff3920d2ef677e32012456 SHA512 c4f6376a44d71b6ac2b6d86e3d6fb4348642faeef7f3f3a4d6431627b5645efcc868b005cc398c8292bc3b63a1161fbd1a042c6ac2a0595843f908fe32eed90c DIST chrony-4.0-pre3.tar.gz 539117 BLAKE2B f26fcac8e29322151251e60b385a815c53155f163d7ed1e1269f90f3418c59ec8f4952b1bba1203549607c63bb373cbaab17af933e02e659eced91827519bc6b SHA512 e52f2454b0cbe60ab7c8975deba499f1ff2e84cd1c3d0a0fb208f11f12ca762f2d0cd74af7aacc8022e628cdeaa4ac388fdd134715cc3e274b3818d5c12da460 -EBUILD chrony-3.5-r2.ebuild 3035 BLAKE2B 3567ca621e71777dc34c90b77005e192f564bb8dba5f0705711eaa720262bebafde656da678b2d47130dee19caf8d2e52106ae27a0ee81e292b2defe1dadf5fa SHA512 2c8799bc3ac6e1759e048e37e6e4765d5a199fff043954e19a2640a060609c6281b397dc2834d10ecb34e5bb09b7b80c55b5bc96d0fa10a43b451799a1d53f3a -EBUILD chrony-3.5-r4.ebuild 4241 BLAKE2B c56c8d39161dec4ce49c3685e191c70efa5b0b9d82f42066cdcb41345126782e7c1ecaadba13967d6364b5b00bc949cb1e8cf2c2ebd57525b24c0f68ae022442 SHA512 617ab48f3792344be704e90808b53d1af30829678fa9644de03a43bcc693d54979010d30415d6ef5c9dc626fa55554bc3b0a4a9ef0a41151b1a3a7925aee5fd6 -EBUILD chrony-3.5.1-r1.ebuild 4846 BLAKE2B 4b07ee8134c845659bba38e0e1a69ee2a4395bfe2ccc930e694960cb0a1d7e1615f420aabca51842f015b9f4dd3969730a1d21cd7f627a6096b22eac8b579945 SHA512 8937a0924efc6f82c23c1e9089efff081b975ce59621cbb6f46adb73089e41793ef1d7d4d9c6ccdc677395d295a2d207426bf13df1e466acb734d3fd35c66ec3 -EBUILD chrony-4.0_pre3.ebuild 4852 BLAKE2B c633edfa6531237729c9b23459b8041f2c0bb531c9c3f8c028df8023657014b40b4f670e056a72e5daa6f71c8e0c4943b982dd756be775dc7e0df5bfb6cb9a91 SHA512 b87e4bc35673d31a137aec94487f24f9defae1ca253d18d3fd58bc93728688274061d27008c48b8fe12f29270d18d2d8b54d24190ed17f8eabc47448410e0472 -EBUILD chrony-9999.ebuild 4852 BLAKE2B c633edfa6531237729c9b23459b8041f2c0bb531c9c3f8c028df8023657014b40b4f670e056a72e5daa6f71c8e0c4943b982dd756be775dc7e0df5bfb6cb9a91 SHA512 b87e4bc35673d31a137aec94487f24f9defae1ca253d18d3fd58bc93728688274061d27008c48b8fe12f29270d18d2d8b54d24190ed17f8eabc47448410e0472 -MISC metadata.xml 1798 BLAKE2B c301fd829833515a78800677c498632a46ea968ad82f726b288ee3ec6bf79c733fcaea0b9a1777cf93e2a858da40beb105a301dca580e37e01b91111a38bdc17 SHA512 8609f9cb055d5de0a293cc78060101cbc30be4d3db6d7a8d751fa2bf416758e4c9d6509ce1890861c87d2e863e325051e68aadb4d621937f586e83ef585145e7 +EBUILD chrony-3.5.1-r1.ebuild 4761 BLAKE2B d0bf0aa6403b9f4d691d41a4fd77de3b2de15783ebb445c403ffd3777e3888ecc659e05f131a2b0465e20c5f64c4f6e9084680ed01bc75f410b93caf13b84f49 SHA512 b2cfbab377cc697cd8903708dd870b7bda141a32b9a5f4f4a155efa93dd6ccd5af815c98005a074e039b3645938c3c684ee9d0afb418de6236ddf8db903394df +EBUILD chrony-4.0_pre3.ebuild 4768 BLAKE2B c61ef9e4e476be7a7a430452d74ce21cb7581a95beeaf435e83bfc0f5f75dd5740698d5f70ea9622e8a2fb253d6add17918407ce0ed0256dff9e86ad305e1c09 SHA512 75fd0d5aa18d630b5e3ce7c80696b51d3ca70780250ef718e2e4dc71bcc37b99aa235a20b59aad493dbd8ff9c3855831e2dc2a56453534917b01be497c7ca335 +EBUILD chrony-9999.ebuild 4768 BLAKE2B c61ef9e4e476be7a7a430452d74ce21cb7581a95beeaf435e83bfc0f5f75dd5740698d5f70ea9622e8a2fb253d6add17918407ce0ed0256dff9e86ad305e1c09 SHA512 75fd0d5aa18d630b5e3ce7c80696b51d3ca70780250ef718e2e4dc71bcc37b99aa235a20b59aad493dbd8ff9c3855831e2dc2a56453534917b01be497c7ca335 +MISC metadata.xml 1744 BLAKE2B a30c56ac26aca1450ed5654e496132b47eb498694a2c5da6bcdd55f974f9379835aca68dc4293cf07a13aae0d1507b3b1db473bbb5fe32e02f82f403ae069420 SHA512 4bf5ef57e61ac80f7c45662125a6b5000072edf698be5c48333ce2a286950627381afad062df12268eb4e628a00d48f37e401aa79bd6e43a7e87a74c605a7176 diff --git a/net-misc/chrony/chrony-3.5-r2.ebuild b/net-misc/chrony/chrony-3.5-r2.ebuild deleted file mode 100644 index 3bc2bacb2838..000000000000 --- a/net-misc/chrony/chrony-3.5-r2.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2020 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-r4.ebuild b/net-misc/chrony/chrony-3.5-r4.ebuild deleted file mode 100644 index fa28cf690097..000000000000 --- a/net-misc/chrony/chrony-3.5-r4.ebuild +++ /dev/null @@ -1,172 +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? ( acct-group/ntp acct-user/ntp 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-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-r1 "${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 - - 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 "${T}"/chronyd.service - systemd_dounit examples/chrony-wait.service - systemd_enable_ntpunit 50-chrony chronyd.service -} - -pkg_preinst() { - HAD_CAPS=false - - if has_version 'net-misc/chrony[caps]'; then - HAD_CAPS=true - fi -} - -pkg_postinst() { - tmpfiles_process chronyd.conf - - if [[ -n ${REPLACING_VERSIONS} ]] && 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" - fi -} diff --git a/net-misc/chrony/chrony-3.5.1-r1.ebuild b/net-misc/chrony/chrony-3.5.1-r1.ebuild index ed8ec05dd522..9a2af1bd3eab 100644 --- a/net-misc/chrony/chrony-3.5.1-r1.ebuild +++ b/net-misc/chrony/chrony-3.5.1-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86" + KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86" fi LICENSE="GPL-2" @@ -68,24 +68,20 @@ src_prepare() { -e 's|pkg-config|${PKG_CONFIG}|g' \ configure || die - sed \ - -e 's/-F 1/-F 0/' \ - examples/chronyd.service > "${T}"/chronyd.service || die - - cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf || die + cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die } src_configure() { if ! use caps; then sed -i \ - -e 's/-u ntp//' \ - "${T}"/chronyd.conf "${T}"/chronyd.service || die + -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 "${T}"/chronyd.service || die + -e 's/ -F 0//' \ + "${T}"/chronyd.conf examples/chronyd.service || die fi tc-export CC PKG_CONFIG @@ -176,7 +172,7 @@ src_install() { insinto /etc/logrotate.d newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony - systemd_dounit "${T}"/chronyd.service + systemd_dounit examples/chronyd.service systemd_dounit examples/chrony-wait.service systemd_enable_ntpunit 50-chrony chronyd.service } diff --git a/net-misc/chrony/chrony-4.0_pre3.ebuild b/net-misc/chrony/chrony-4.0_pre3.ebuild index 8ff387f448ec..b5c97cbbd863 100644 --- a/net-misc/chrony/chrony-4.0_pre3.ebuild +++ b/net-misc/chrony/chrony-4.0_pre3.ebuild @@ -68,24 +68,20 @@ src_prepare() { -e 's|pkg-config|${PKG_CONFIG}|g' \ configure || die - sed \ - -e 's/-F 1/-F 0/' \ - examples/chronyd.service > "${T}"/chronyd.service || die - - cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf || die + cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die } src_configure() { if ! use caps; then sed -i \ - -e 's/-u ntp//' \ - "${T}"/chronyd.conf "${T}"/chronyd.service || die + -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 "${T}"/chronyd.service || die + -e 's/ -F 0//' \ + "${T}"/chronyd.conf examples/chronyd.service || die fi tc-export CC PKG_CONFIG @@ -176,7 +172,7 @@ src_install() { insinto /etc/logrotate.d newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony - systemd_dounit "${T}"/chronyd.service + systemd_dounit examples/chronyd.service systemd_dounit examples/chrony-wait.service systemd_enable_ntpunit 50-chrony chronyd.service } diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild index 8ff387f448ec..b5c97cbbd863 100644 --- a/net-misc/chrony/chrony-9999.ebuild +++ b/net-misc/chrony/chrony-9999.ebuild @@ -68,24 +68,20 @@ src_prepare() { -e 's|pkg-config|${PKG_CONFIG}|g' \ configure || die - sed \ - -e 's/-F 1/-F 0/' \ - examples/chronyd.service > "${T}"/chronyd.service || die - - cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf || die + cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die } src_configure() { if ! use caps; then sed -i \ - -e 's/-u ntp//' \ - "${T}"/chronyd.conf "${T}"/chronyd.service || die + -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 "${T}"/chronyd.service || die + -e 's/ -F 0//' \ + "${T}"/chronyd.conf examples/chronyd.service || die fi tc-export CC PKG_CONFIG @@ -176,7 +172,7 @@ src_install() { insinto /etc/logrotate.d newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony - systemd_dounit "${T}"/chronyd.service + systemd_dounit examples/chronyd.service systemd_dounit examples/chrony-wait.service systemd_enable_ntpunit 50-chrony chronyd.service } 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 index 0ea3c921980b..a3a2962ddd18 100644 --- a/net-misc/chrony/files/chrony-3.5-r3-systemd-gentoo.patch +++ b/net-misc/chrony/files/chrony-3.5-r3-systemd-gentoo.patch @@ -6,7 +6,7 @@ PIDFile=/run/chrony/chronyd.pid -EnvironmentFile=-/etc/sysconfig/chronyd -ExecStart=/usr/sbin/chronyd $OPTIONS -+ExecStart=/usr/sbin/chronyd -u ntp -F 1 ++ExecStart=/usr/sbin/chronyd -u ntp -F 0 PrivateTmp=yes ProtectHome=yes ProtectSystem=full diff --git a/net-misc/chrony/files/chrony-3.5-systemd-gentoo.patch b/net-misc/chrony/files/chrony-3.5-systemd-gentoo.patch deleted file mode 100644 index addba4ca1a9d..000000000000 --- a/net-misc/chrony/files/chrony-3.5-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 - PrivateTmp=yes - ProtectHome=yes - ProtectSystem=full diff --git a/net-misc/chrony/files/chronyd.conf b/net-misc/chrony/files/chronyd.conf index fc43a95c40fe..d017660d5998 100644 --- a/net-misc/chrony/files/chronyd.conf +++ b/net-misc/chrony/files/chronyd.conf @@ -9,4 +9,4 @@ CFGFILE="/etc/chrony/chrony.conf" # The combination of "-s -r" allows chronyd to perform long term averaging of # the gain or loss rate across system reboots and shutdowns. -ARGS="" +ARGS=" -u ntp -F 0" diff --git a/net-misc/chrony/files/chronyd.conf-r1 b/net-misc/chrony/files/chronyd.conf-r1 deleted file mode 100644 index 2783f29e6844..000000000000 --- a/net-misc/chrony/files/chronyd.conf-r1 +++ /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" diff --git a/net-misc/chrony/metadata.xml b/net-misc/chrony/metadata.xml index d13933dc6d53..9b7e225c3ada 100644 --- a/net-misc/chrony/metadata.xml +++ b/net-misc/chrony/metadata.xml @@ -18,7 +18,6 @@ Chrony はコンピュータのシステム・クロックの精度を保つた な接続でも機能します。 -Support for asynchronous DNS Support for command and monitoring Install HTML documentation Use dev-libs/nettle for hash functions -- cgit v1.2.3