diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /net-misc/chrony | |
parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) |
gentoo resync : 28.04.2021
Diffstat (limited to 'net-misc/chrony')
-rw-r--r-- | net-misc/chrony/Manifest | 9 | ||||
-rw-r--r-- | net-misc/chrony/chrony-4.0-r2.ebuild (renamed from net-misc/chrony/chrony-4.0-r1.ebuild) | 19 | ||||
-rw-r--r-- | net-misc/chrony/chrony-4.0.ebuild | 182 | ||||
-rw-r--r-- | net-misc/chrony/chrony-4.1_pre1.ebuild | 231 | ||||
-rw-r--r-- | net-misc/chrony/chrony-9999.ebuild | 97 |
5 files changed, 309 insertions, 229 deletions
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest index d3924e3c7a54..8ff3bef91a3d 100644 --- a/net-misc/chrony/Manifest +++ b/net-misc/chrony/Manifest @@ -4,7 +4,10 @@ AUX chrony-3.5-r3-systemd-gentoo.patch 309 BLAKE2B 4e441ea854dda077c68f05b420f50 AUX chronyd.conf 390 BLAKE2B a0058c72ae04371aa273d71f01349a00dfc0d66c016e6c2d977b9499e2ded3072942bb21c468ca9263263d55f1cc35cca4a3a72ee058cc31cf982648552bc77d SHA512 6798d40da70921b95430371459a4b276a88c57ec79f99d0efd214770f5fffee5d80d20baf4313f210b6af46c4aafbb038920cd774d6c03ffbb0849229c431bdc AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da DIST chrony-4.0.tar.gz 546939 BLAKE2B 1d4035977be3603b34024c5c1c2aa5f2b4aca03fe7dc1eb41be2e9aeefa06e20a5f74776c50bdadaffba10ae25e7980bcbd9cf2b999bd73087728afe7a80253e SHA512 a1c11a386c43f495910f7f2e9b5fbb1652c3631471d182b9b8203dfef98611d11535ad547a879856551263aed0ae2e30e4135b8ed89553684706166bc1c725c9 -EBUILD chrony-4.0-r1.ebuild 5215 BLAKE2B 42b24a96d932a28a481dfeb8c27425e100b7b305cf55c65ba81359ff5dd301b7cc541dc0f999bb8e7fce3836788b00adb7c44840deab5541b570d4dd3610ae63 SHA512 d1befbff09f1d8a588997f85bfdd1ad726f27ccd64cc0821a9b3b1cb97355e068af8a291e05a969ad47de792101466cab2f8af9f6bb5fcc6a98caeae804b6efa -EBUILD chrony-4.0.ebuild 4324 BLAKE2B c6e4eef917c334681564f974323f503d088fe0aeac43e5c88f302f5e6f29fdb0d45fd2862d768621a23110deb53e907597efb44d361a794b2e37181ae3c19208 SHA512 be89d10a76643ad8c46d005f3ddc49dc60485a7b5954445a7ddc4468c142d31100465c0222231da43f338f621fc11de2bd20ecc42bde43424b85b48f01b84d1f -EBUILD chrony-9999.ebuild 5222 BLAKE2B c688ee6af7aaf0a68488510a5f4d739b67bcbf7f6fd013dd5128fbc69cfe0316cb7cd29140c43ef13bea0a6700ba2a724f5229a0a0163e047fe1d8631c6a6149 SHA512 cb668189ca505659c3ef75f6a9838eaca432302075967d6b80cf91e01f87774d60aaa94e99ade646fb8c94db6ed8afcd938c20eb249a8ea9608bafeaee702bee +DIST chrony-4.0.tar.gz.asc 195 BLAKE2B 1947a73f35eb5c58f91775d76473210a7b5edff5b808e360eb0c3724351c54ac4f187a2aa4450830130da718c6a0c488baa170ca87e7e6eac781d85c67b3773f SHA512 c3156d91f4fdb6f9e2fdbc83b1399afb0ecdfa9b7bc92648c5bce477c3f0f921d2a13aa21ac6c281f18b008c60f08e3db6d82b642b646f064aea1dbe19295c4c +DIST chrony-4.1-pre1.tar.gz 563277 BLAKE2B 474d27d0e402d83bda52125940b8205119519b93571e6b8df3fea5eeb5f1f3babbcc40bc81db77bc345830d5e9528ad087ff539026a1a585ce220feeb851e978 SHA512 03e28e6651d6aa3c99333b94ee503843c3a69b8c8366bf647c41a3a9e34e987c440e289ec16e5c62c2a7405271bddc533efbd59d6c6ab43712c8908dfb86322e +DIST chrony-4.1-pre1.tar.gz.asc 195 BLAKE2B 4a06b35be3257a52cc824e2acfdff32b6598d1744bc23418e89291d71d6d9a86c35559eab26034ce2e05c4152ffb691b5ec4104dc339821e93523c33c8cbdd72 SHA512 8eb695c3f85f90d02b22b1202c8766347289a6da1d0658a3d89eed90202799bcfc647b96e5f931fb862011e85feed5f4914b39e45a3e20f01827509fe271a2d7 +EBUILD chrony-4.0-r2.ebuild 5467 BLAKE2B 3ce0ad6ccb8e6477b4b7e615e7c19fa8f492253730f185ddf127fffccdf18b9f23b55b2a5acbc06ca19e1deb328d01b477a50a70984f8f4ac968d48f8ab57e08 SHA512 6d7c2c61527da60511bf62a3133fd717faad3a4a970f898687bd14806427229012defc36713fb70b8ae4fedde3b4c9b48eea0c8124003f5866299a3e0717b12d +EBUILD chrony-4.1_pre1.ebuild 5947 BLAKE2B fabbdc7c71fefc3ecbf125b39300b282087759077174e6b789b5644cdc37909cc86e469db67241d8b9012344b06e69f971a22e7f9bae428485ce3d654e526c45 SHA512 7d6f66c7737bb0639e3b08afaf2018b0c2fc165df2d69ccb4b6abc5ae689a6954c2253817072876ec4a7bd057b5e4b78d4c88b01c4df9984463f594bfd50aa31 +EBUILD chrony-9999.ebuild 5947 BLAKE2B fabbdc7c71fefc3ecbf125b39300b282087759077174e6b789b5644cdc37909cc86e469db67241d8b9012344b06e69f971a22e7f9bae428485ce3d654e526c45 SHA512 7d6f66c7737bb0639e3b08afaf2018b0c2fc165df2d69ccb4b6abc5ae689a6954c2253817072876ec4a7bd057b5e4b78d4c88b01c4df9984463f594bfd50aa31 MISC metadata.xml 2299 BLAKE2B f5e8667a5fdeb86395d773eaf6e7d80c2133fe945565d7d6005f156a0a4763f1434ba887627fba63dd0f0a15663d7fa194d91699f6961ad21b9afa40576cd1fd SHA512 370e06edf9df22a327ff8b528f8a810c731af4615d740331ac737af8cbc5af265f7592ec22bf844301c5089185bc4f7de102f87378f85cf276d4f550933e519a diff --git a/net-misc/chrony/chrony-4.0-r1.ebuild b/net-misc/chrony/chrony-4.0-r2.ebuild index 1f2f0ba26279..2c76d583d7c4 100644 --- a/net-misc/chrony/chrony-4.0-r1.ebuild +++ b/net-misc/chrony/chrony-4.0-r2.ebuild @@ -9,11 +9,15 @@ DESCRIPTION="NTP client and server programs" HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git" if [[ ${PV} == "9999" ]]; then - inherit git-r3 EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git" + inherit git-r3 else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mlichvar.asc + inherit verify-sig + SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86" + 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/_/-}" @@ -31,14 +35,17 @@ REQUIRED_USE=" !sechash? ( !nts? ( !nettle ) ) nts? ( nettle ) " -RESTRICT="test" -BDEPEND="nettle? ( virtual/pkgconfig )" +BDEPEND=" + nettle? ( virtual/pkgconfig ) +" if [[ ${PV} == "9999" ]]; then # Needed for doc generation in 9999 - BDEPEND+=" virtual/w3m" REQUIRED_USE+=" html" + BDEPEND+=" virtual/w3m" +else + BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-mlichvar )" fi DEPEND=" @@ -113,7 +120,7 @@ src_configure() { $(usex rtc '' --disable-rtc) $(usex samba --enable-ntp-signd '') $(usex sechash '' --disable-sechash) - $(usex libtomcrypt '' --disable-tomcrypt) + $(usex libtomcrypt '' --without-tomcrypt) --chronysockdir="${EPREFIX}/run/chrony" --docdir="${EPREFIX}/usr/share/doc/${PF}" --mandir="${EPREFIX}/usr/share/man" diff --git a/net-misc/chrony/chrony-4.0.ebuild b/net-misc/chrony/chrony-4.0.ebuild deleted file mode 100644 index 3926d6b0f383..000000000000 --- a/net-misc/chrony/chrony-4.0.ebuild +++ /dev/null @@ -1,182 +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 - inherit git-r3 - EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git" -else - SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86" -fi - -S="${WORKDIR}/${P/_/-}" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps +refclock +rtc samba +seccomp +sechash selinux" -REQUIRED_USE="sechash? ( nettle )" -RESTRICT="test" - -BDEPEND="nettle? ( virtual/pkgconfig )" - -if [[ ${PV} == "9999" ]]; then - # Needed for doc generation in 9999 - BDEPEND+=" virtual/w3m" - REQUIRED_USE+=" html" -fi - -DEPEND=" - caps? ( - acct-group/ntp - acct-user/ntp - sys-libs/libcap - ) - libedit? ( dev-libs/libedit ) - nettle? ( dev-libs/nettle:= ) - 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 - - sed -i \ - -e 's|RELOADDNS||g' \ - -e 's|pkg-config|${PKG_CONFIG}|g' \ - configure || 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 - - # Note: ncurses and nss switches are mentioned in the configure script but - # do nothing - # not an autotools generated script - local myconf=( - $(use_enable seccomp scfilter) - $(usex caps '' --disable-linuxcaps) - $(usex cmdmon '' --disable-cmdmon) - $(usex ipv6 '' --disable-ipv6) - $(usex libedit '' --without-editline) - $(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 samba --enable-ntp-signd '') - $(usex sechash '' --disable-sechash) - ${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-hwclockfile="${EPREFIX}/etc/adjtime" - --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" - --without-nss - --without-tomcrypt - ) - - # 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 - - 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-4.1_pre1.ebuild b/net-misc/chrony/chrony-4.1_pre1.ebuild new file mode 100644 index 000000000000..eb58830becb9 --- /dev/null +++ b/net-misc/chrony/chrony-4.1_pre1.ebuild @@ -0,0 +1,231 @@ +# 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=/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 )" + + if [[ ${PV} != *_pre* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" + fi +fi + +S="${WORKDIR}/${P/_/-}" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+caps +cmdmon debug html ipv6 libedit libtomcrypt +nettle nss +ntp +nts +phc pps +refclock +rtc samba +seccomp +sechash selinux" +# nettle > nss > libtomcrypt in configure +REQUIRED_USE=" + sechash? ( || ( nettle nss libtomcrypt ) ) + nettle? ( !nss ) + nss? ( !nettle ) + libtomcrypt? ( !nettle !nss ) + !sechash? ( !nss ) + !sechash? ( !nts? ( !nettle ) ) +" + +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 )" +fi + +DEPEND=" + caps? ( + acct-group/ntp + acct-user/ntp + sys-libs/libcap + ) + libedit? ( dev-libs/libedit ) + !libedit? ( sys-libs/readline:= ) + nettle? ( dev-libs/nettle:= ) + nss? ( dev-libs/nss:= ) + nts? ( net-libs/gnutls:= ) + pps? ( net-misc/pps-tools ) + seccomp? ( sys-libs/libseccomp ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-chronyd ) +" +BDEPEND=" + html? ( dev-ruby/asciidoctor ) + nts? ( virtual/pkgconfig ) + sechash? ( + nettle? ( virtual/pkgconfig ) + nss? ( virtual/pkgconfig ) + ) +" + +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 libtomcrypt '' '--without-tomcrypt') + $(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') + + --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 + # bug #711058 + 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 + + # See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5 + # in "Ebuild Phases" for an explanation of why we need to save the variable beforehand + 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 + # bug #719876 + 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 + + # TODO: Will try to re-enable before final release ideally? + # bug #783915 + 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/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild index 7e6fadddffaa..eb58830becb9 100644 --- a/net-misc/chrony/chrony-9999.ebuild +++ b/net-misc/chrony/chrony-9999.ebuild @@ -8,19 +8,26 @@ 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 - inherit git-r3 +if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git" + inherit git-r3 else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mlichvar.asc + inherit verify-sig + SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" + SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )" + + if [[ ${PV} != *_pre* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" + fi 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" +IUSE="+caps +cmdmon debug html ipv6 libedit libtomcrypt +nettle nss +ntp +nts +phc pps +refclock +rtc samba +seccomp +sechash selinux" # nettle > nss > libtomcrypt in configure REQUIRED_USE=" sechash? ( || ( nettle nss libtomcrypt ) ) @@ -29,16 +36,14 @@ REQUIRED_USE=" libtomcrypt? ( !nettle !nss ) !sechash? ( !nss ) !sechash? ( !nts? ( !nettle ) ) - nts? ( nettle ) " -RESTRICT="test" - -BDEPEND="nettle? ( virtual/pkgconfig )" -if [[ ${PV} == "9999" ]]; then +if [[ ${PV} == "9999" ]] ; then # Needed for doc generation in 9999 - BDEPEND+=" virtual/w3m" REQUIRED_USE+=" html" + BDEPEND+=" virtual/w3m" +else + BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-mlichvar )" fi DEPEND=" @@ -47,18 +52,26 @@ DEPEND=" acct-user/ntp sys-libs/libcap ) - nts? ( net-libs/gnutls:= ) libedit? ( dev-libs/libedit ) + !libedit? ( sys-libs/readline:= ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss:= ) - seccomp? ( sys-libs/libseccomp ) - html? ( dev-ruby/asciidoctor ) + nts? ( net-libs/gnutls:= ) pps? ( net-misc/pps-tools ) + seccomp? ( sys-libs/libseccomp ) " RDEPEND=" ${DEPEND} selinux? ( sec-policy/selinux-chronyd ) " +BDEPEND=" + html? ( dev-ruby/asciidoctor ) + nts? ( virtual/pkgconfig ) + sechash? ( + nettle? ( virtual/pkgconfig ) + nss? ( virtual/pkgconfig ) + ) +" PATCHES=( "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch @@ -76,13 +89,13 @@ src_prepare() { } src_configure() { - if ! use caps; then + if ! use caps ; then sed -i \ -e 's/ -u ntp//' \ "${T}"/chronyd.conf examples/chronyd.service || die fi - if ! use seccomp; then + if ! use seccomp ; then sed -i \ -e 's/ -F 0//' \ "${T}"/chronyd.conf examples/chronyd.service || die @@ -94,26 +107,28 @@ src_configure() { # on a system that is time-synced. export SOURCE_DATE_EPOCH=1607976314 - # not an autotools generated script + # Not an autotools generated script local myconf=( $(use_enable seccomp scfilter) - $(usex caps '' --disable-linuxcaps) - $(usex cmdmon '' --disable-cmdmon) + + $(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 '' --disable-tomcrypt) + $(usex ipv6 '' '--disable-ipv6') + $(usex libedit '' '--without-editline') + $(usex libtomcrypt '' '--without-tomcrypt') + $(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') + --chronysockdir="${EPREFIX}/run/chrony" --docdir="${EPREFIX}/usr/share/doc/${PF}" --mandir="${EPREFIX}/usr/share/man" @@ -121,17 +136,18 @@ src_configure() { --sysconfdir="${EPREFIX}/etc/chrony" --with-hwclockfile="${EPREFIX}/etc/adjtime" --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" + ${EXTRA_ECONF} ) - # print the ./configure call + # Print the ./configure call echo sh ./configure "${myconf[@]}" >&2 sh ./configure "${myconf[@]}" || die } src_compile() { - if [[ ${PV} == "9999" ]]; then - # uses w3m + if [[ ${PV} == "9999" ]] ; then + # Uses w3m emake -C doc man txt fi @@ -152,16 +168,17 @@ src_install() { newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')" - if use html; then + if use html ; then docinto html dodoc doc/*.html fi keepdir /var/{lib,log}/chrony - if use caps; then + if use caps ; then # Prepare a directory for the chrony.drift file (a la ntpsec) # Ensures the environment is sane on new installs + # bug #711058 fowners ntp:ntp /var/{lib,log}/chrony fperms 770 /var/lib/chrony fi @@ -178,6 +195,8 @@ pkg_preinst() { HAD_CAPS=false HAD_SECCOMP=false + # See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5 + # in "Ebuild Phases" for an explanation of why we need to save the variable beforehand if has_version 'net-misc/chrony[caps]' ; then HAD_CAPS=true fi @@ -185,7 +204,6 @@ pkg_preinst() { if has_version 'net-misc/chrony[seccomp]' ; then HAD_SECCOMP=true fi - } pkg_postinst() { @@ -193,6 +211,7 @@ pkg_postinst() { if [[ -n "${REPLACING_VERSIONS}" ]] ; then if use caps && ! ${HAD_CAPS} ; then + # bug #719876 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" @@ -201,6 +220,8 @@ pkg_postinst() { fi fi + # TODO: Will try to re-enable before final release ideally? + # bug #783915 if [[ ! ${HAD_SECCOMP} ]] && use seccomp ; then elog "To enable seccomp in enforcing mode, please modify:" elog "- /etc/conf.d/chronyd for OpenRC" |