From 681aad60df032a891dbbfc38f3ea4b404d6a8579 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 6 Aug 2023 03:21:28 +0100 Subject: gentoo auto-resync : 06:08:2023 - 03:21:27 --- net-misc/Manifest.gz | Bin 54286 -> 54294 bytes net-misc/chrony/Manifest | 8 +- net-misc/chrony/chrony-4.3-r2.ebuild | 261 --------------------------------- net-misc/chrony/chrony-4.4_pre2.ebuild | 261 +++++++++++++++++++++++++++++++++ net-misc/chrony/chrony-9999.ebuild | 9 +- net-misc/chrony/metadata.xml | 1 + net-misc/openrdap/Manifest | 2 +- net-misc/openrdap/metadata.xml | 3 + 8 files changed, 275 insertions(+), 270 deletions(-) delete mode 100644 net-misc/chrony/chrony-4.3-r2.ebuild create mode 100644 net-misc/chrony/chrony-4.4_pre2.ebuild (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index c1ee6518a23d..e9e984900972 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest index 29ed7e6f9504..4f1ff67bae22 100644 --- a/net-misc/chrony/Manifest +++ b/net-misc/chrony/Manifest @@ -6,7 +6,9 @@ AUX chronyd.conf-r3 390 BLAKE2B aa193e6bcf62cc305620139b7c198d39358feea710635608 AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da DIST chrony-4.3.tar.gz 593560 BLAKE2B 51ba6d19312fd52cd6d6d8ab9437c886a3779877170674db6dc37d657e849101e2669fd6c8723d24e43c895cd1924c3d8d2ff442baeef9abe8a6c313929edf5f SHA512 1394bac3ed684352fe89b7fef7da50e61f9f522abee807627ae1fc4c2dde891017bc8e5b13759fced028f3a1e875d5e4e5a4f85de65c63b5f83d0ca03bb4c5df DIST chrony-4.3.tar.gz.asc 833 BLAKE2B 12399205da4ee5c442207bfdf936ac88552a49b21b0db8c15b09118b579e2076f7cfec6ad916b08b41edc4f9f8e03b13d7758ed08e116bee54d0f0f9cd68a505 SHA512 300b06f253ac3727edb86a1b7c337f9529ee752bbb471b266217b6a8ac5183e827264177a3210d436425d746673bf11fbdc41da145673213e28165197c6c76b7 -EBUILD chrony-4.3-r2.ebuild 6863 BLAKE2B e178e5adb7433480d05f1ce9446cd27c2f93ed6c822a16ce0814ee2d0fee97e31e49eb29d052747fc88be31f09067f70c9ce7e20f35756f3efc304960eb2dc81 SHA512 d78c1c509404ecd9deb35e6912db2daa272e35b67b46dfd231fdd288ab9432daaa6a17485fb1d3eca6ec9cfd652fecb25189527cca8a7ff9d632395c23d1b128 +DIST chrony-4.4-pre2.tar.gz 610157 BLAKE2B 67bc9bb438f0dc6086c109def2b9e4fab862c66b79d4211937cccd1ec8454b3229e818b378dca5e0ecd634940c0dc02766b0b119822762d9d90bc76ffdbc4fb1 SHA512 4919cdbafa18f9cfc5d1ef0253373445c78f66480d3bfda2b58441d7abd2f330a2cd00ef7c498d733b74a0e3f02cb4c39b6ef2d054aed1648625e206f71888ad +DIST chrony-4.4-pre2.tar.gz.asc 833 BLAKE2B 303def8f0fb83f0329205f8d69a66413591b14a8fa36aaed33099e815d995d925565d6482c4122885af66aac58b82d3ab62bf6c602e7a8cfb4ff3a32de1465ba SHA512 fe74013a75c143a651f9e3844ab231df8166bac24b919a0850d822430fbca81b17f2d9b0d2c17fe0edf3a7dc33a93718e5bbb892c3551d8d52bcc75c38cecc57 EBUILD chrony-4.3-r5.ebuild 7012 BLAKE2B 1d2fd2f5f854d0a4189dfa140f6c0c71dca4dd4ed260c78b4ab58a503af484251aeef451d6d0b2bf8906f175b04ab79648b3c0f38d65353bf6ea12342de2d6cd SHA512 dd718ab86d6d8671b7892d080f01d0eac330393f1a7bcc82b02b02792a53af626b5cc97c0ef5ef2d1da728bf4ee2a6f1bd1200cd780da98f24465c81f67a3ed8 -EBUILD chrony-9999.ebuild 6928 BLAKE2B 1e8eb9cbd8d5a883484b529fbd97485510c1f4c3bfda468c7c947f4ef10d0245b1e74a9f3c19fe383eb5f956cecb23c8c474f3242a99bb702f9b297b1b25f257 SHA512 938a90029a676f9628daacfbb61d66f7549776784baf7c4abe39c86fa31dc5415113e83eae6f213fc4f968adcdb4729f3dc217f572caa5bed4de7cc0deac4ff6 -MISC metadata.xml 2300 BLAKE2B 8d0e8822361fef70945eab4eb365fee2f0c278fb36ad0641520310bf895d04202fce88d485149d021ebf577ee848b408cf46f4141f8606ff020d2483370c3b16 SHA512 57c813c655fa7a5083f26f908d7476dd165284feef014c750e845c60830af7baffe91e9444915d3994b053498714b4e717bfe7a2af34e90de50d823542c913d0 +EBUILD chrony-4.4_pre2.ebuild 6820 BLAKE2B 3ea59ddf6a576241fc2db789cd6c329f3106cf04c2d148253c521700f22b66578e4b23c56daa61141baff3c3b6170e804481e6247de6293e9033c08ff9662be7 SHA512 256add14214353f692642647e8282b0ac3160d105f4090e57d6f2cb6347efac23c6d97a36dbd38696811636b3999e7b25d97f1f6cc2cbb3dde574ea7b512eb56 +EBUILD chrony-9999.ebuild 6820 BLAKE2B 3ea59ddf6a576241fc2db789cd6c329f3106cf04c2d148253c521700f22b66578e4b23c56daa61141baff3c3b6170e804481e6247de6293e9033c08ff9662be7 SHA512 256add14214353f692642647e8282b0ac3160d105f4090e57d6f2cb6347efac23c6d97a36dbd38696811636b3999e7b25d97f1f6cc2cbb3dde574ea7b512eb56 +MISC metadata.xml 2353 BLAKE2B c5a7458f2aabf443f01e670cf1e1a578c6d1095b607df07a6a979610f8446ad8fbbbc2b86ca79f8f06b49cfeba1a31cd05b2748c46e2d283863fd43d0b8e7a3a SHA512 1ec4023f55368e03158535d45239572e6bd160d94c85126d3c7d1ddd02fd5743d65ee9ea2bf2e6fbde5b010483928432b5d5848bed03bcc78e9f6924ee189b42 diff --git a/net-misc/chrony/chrony-4.3-r2.ebuild b/net-misc/chrony/chrony-4.3-r2.ebuild deleted file mode 100644 index 858662d459ce..000000000000 --- a/net-misc/chrony/chrony-4.3-r2.ebuild +++ /dev/null @@ -1,261 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo 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="${BROOT}"/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 ~m68k ~mips ppc ppc64 ~riscv sparc x86" - fi -fi - -S="${WORKDIR}/${P/_/-}" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+caps +cmdmon debug html ipv6 libtomcrypt +nettle nss +ntp +nts +phc pps +readline +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 ) ) -" - -DEPEND=" - caps? ( - acct-group/ntp - acct-user/ntp - sys-libs/libcap - ) - nettle? ( dev-libs/nettle:= ) - nss? ( dev-libs/nss:= ) - nts? ( net-libs/gnutls:= ) - pps? ( net-misc/pps-tools ) - readline? ( dev-libs/libedit ) - seccomp? ( sys-libs/libseccomp ) -" -RDEPEND=" - ${DEPEND} - selinux? ( sec-policy/selinux-chronyd ) -" -# bison dep only for 4.3-r1 for ${P}-strict-prototypes-clang16.patch -BDEPEND=" - sys-devel/bison - html? ( dev-ruby/asciidoctor ) - nts? ( virtual/pkgconfig ) - sechash? ( - nettle? ( virtual/pkgconfig ) - nss? ( virtual/pkgconfig ) - ) -" - -if [[ ${PV} == 9999 ]] ; then - # Needed for doc generation in 9999 - REQUIRED_USE+=" html" - BDEPEND+=" - sys-devel/bison - virtual/w3m - " -else - BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )" -fi - -PATCHES=( - "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch - "${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch - "${FILESDIR}"/${P}-strict-prototypes-clang16.patch -) - -src_prepare() { - default - - sed -i \ - -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ - doc/* examples/* || die - - cp "${FILESDIR}"/chronyd.conf-r3 "${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 2//' \ - "${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) - - $(usev !caps '--disable-linuxcaps') - $(usev !cmdmon '--disable-cmdmon') - $(usev debug '--enable-debug') - $(usev !ipv6 '--disable-ipv6') - - # USE=readline here means "readline-like functionality" - # chrony only supports libedit in terms of the library providing - # it. - $(usev !readline '--without-editline --disable-readline') - - $(usev !libtomcrypt '--without-tomcrypt') - $(usev !nettle '--without-nettle') - $(usev !nss '--without-nss') - $(usev !ntp '--disable-ntp') - $(usev !nts '--disable-nts') - $(usev !nts '--without-gnutls') - $(usev !phc '--disable-phc') - $(usev !pps '--disable-pps') - $(usev !refclock '--disable-refclock') - $(usev !rtc '--disable-rtc') - $(usev samba '--enable-ntp-signd') - $(usev !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 - edo ./configure "${myconf[@]}" || die -} - -src_compile() { - if [[ ${PV} == 9999 ]] ; then - # Uses w3m - emake -C doc man txt - fi - - emake all docs $(usev !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 -R ntp:ntp /var/{lib,log}/chrony - fperms -R 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=0 - HAD_SECCOMP=0 - HAD_PRE_NEW_SECCOMP_LEVEL=0 - - # 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=1 - fi - - if has_version 'net-misc/chrony[seccomp]' ; then - HAD_SECCOMP=1 - fi - - if has_version '>=net-misc/chrony-4.1[seccomp]' ; then - # This version introduced a new filter level: -F 2 - # It's a limited set of seccomp filters designed to be 'bare minimum' - HAD_PRE_NEW_SECCOMP_LEVEL=1 - fi -} - -pkg_postinst() { - tmpfiles_process chronyd.conf - - if [[ -n "${REPLACING_VERSIONS}" ]] ; then - if use caps && ! [[ ${HAD_CAPS} -eq 1 ]] ; 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} -eq 0 ]] ; then - ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root" - fi - fi - - # See bug #783915 for general discussion on enabling seccomp filtering - # by default. - local show_seccomp_enable_msg=0 - - # Was seccomp disabled before and now enabled? - if [[ ${HAD_SECCOMP} -eq 0 ]] && use seccomp ; then - show_seccomp_enable_msg=1 - fi - - # Are we coming from an old version without the new 'minimal' filter? - # (-F 2) - if [[ ${HAD_PRE_NEW_SECCOMP_LEVEL} -eq 0 ]] ; then - show_seccomp_enable_msg=1 - fi - - if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then - elog "To enable seccomp in a stricter mode, please modify:" - elog "- ${EROOT}/etc/conf.d/chronyd for OpenRC" - elog "- systemctl edit chronyd for systemd" - elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)" - elog "By default, we now use -F 2 which is a baseline/minimal filter." - fi -} diff --git a/net-misc/chrony/chrony-4.4_pre2.ebuild b/net-misc/chrony/chrony-4.4_pre2.ebuild new file mode 100644 index 000000000000..772f32af1f61 --- /dev/null +++ b/net-misc/chrony/chrony-4.4_pre2.ebuild @@ -0,0 +1,261 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo systemd tmpfiles toolchain-funcs + +DESCRIPTION="NTP client and server programs" +HOMEPAGE="https://chrony-project.org/" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://gitlab.com/chrony/chrony.git" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/mlichvar.asc + inherit verify-sig + + SRC_URI="https://chrony-project.org/releases/${P/_/-}.tar.gz" + SRC_URI+=" verify-sig? ( https://chrony-project.org/releases/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )" + + if [[ ${PV} != *_pre* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + fi +fi + +S="${WORKDIR}/${P/_/-}" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+caps +cmdmon debug html libtomcrypt +nettle nss +ntp +nts +phc pps +readline +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 ) ) +" + +DEPEND=" + caps? ( + acct-group/ntp + acct-user/ntp + sys-libs/libcap + ) + libtomcrypt? ( dev-libs/libtomcrypt:= ) + nettle? ( dev-libs/nettle:= ) + nss? ( dev-libs/nss:= ) + nts? ( net-libs/gnutls:= ) + pps? ( net-misc/pps-tools ) + readline? ( dev-libs/libedit ) + 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 ) + ) +" + +if [[ ${PV} == 9999 ]] ; then + # Needed for doc generation in 9999 + REQUIRED_USE+=" html" + BDEPEND+=" + sys-devel/bison + virtual/w3m + " +else + BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )" +fi + +PATCHES=( + "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch + "${FILESDIR}"/${PN}-4.2-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-r3 "${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 2//' \ + "${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) + + $(usev !caps '--disable-linuxcaps') + $(usev !cmdmon '--disable-cmdmon') + $(usev debug '--enable-debug') + + # USE=readline here means "readline-like functionality" + # chrony only supports libedit in terms of the library providing + # it. + $(usev !readline '--without-editline --disable-readline') + + $(usev !libtomcrypt '--without-tomcrypt') + $(usev !nettle '--without-nettle') + $(usev !nss '--without-nss') + $(usev !ntp '--disable-ntp') + $(usev !nts '--disable-nts') + $(usev !nts '--without-gnutls') + $(usev !phc '--disable-phc') + $(usev !pps '--disable-pps') + $(usev !refclock '--disable-refclock') + $(usev !rtc '--disable-rtc') + $(usev samba '--enable-ntp-signd') + $(usev !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 + edo ./configure "${myconf[@]}" || die +} + +src_compile() { + if [[ ${PV} == 9999 ]] ; then + # Uses w3m + emake -C doc man txt + fi + + emake all docs $(usev !html 'ADOC=true') +} + +src_install() { + default + + # Compatibility with other distributions who install to /etc/chrony.conf (bug #835461) + dosym -r /etc/chrony/chrony.conf /etc/chrony.conf + + 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 -R ntp:ntp /var/{lib,log}/chrony + fperms -R 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=0 + HAD_SECCOMP=0 + HAD_PRE_NEW_SECCOMP_LEVEL=0 + + # 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=1 + fi + + if has_version 'net-misc/chrony[seccomp]' ; then + HAD_SECCOMP=1 + fi + + if has_version '>=net-misc/chrony-4.1[seccomp]' ; then + # This version introduced a new filter level: -F 2 + # It's a limited set of seccomp filters designed to be 'bare minimum' + HAD_PRE_NEW_SECCOMP_LEVEL=1 + fi +} + +pkg_postinst() { + tmpfiles_process chronyd.conf + + if [[ -n "${REPLACING_VERSIONS}" ]] ; then + if use caps && ! [[ ${HAD_CAPS} -eq 1 ]] ; 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} -eq 0 ]] ; then + ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root" + fi + fi + + # See bug #783915 for general discussion on enabling seccomp filtering + # by default. + local show_seccomp_enable_msg=0 + + # Was seccomp disabled before and now enabled? + if [[ ${HAD_SECCOMP} -eq 0 ]] && use seccomp ; then + show_seccomp_enable_msg=1 + fi + + # Are we coming from an old version without the new 'minimal' filter? + # (-F 2) + if [[ ${HAD_PRE_NEW_SECCOMP_LEVEL} -eq 0 ]] ; then + show_seccomp_enable_msg=1 + fi + + if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then + elog "To enable seccomp in a stricter mode, please modify:" + elog "- ${EROOT}/etc/conf.d/chronyd for OpenRC" + elog "- systemctl edit chronyd for systemd" + elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)" + elog "By default, we now use -F 2 which is a baseline/minimal filter." + fi +} diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild index f4810f848040..772f32af1f61 100644 --- a/net-misc/chrony/chrony-9999.ebuild +++ b/net-misc/chrony/chrony-9999.ebuild @@ -6,17 +6,17 @@ EAPI=8 inherit edo systemd tmpfiles toolchain-funcs DESCRIPTION="NTP client and server programs" -HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git" +HOMEPAGE="https://chrony-project.org/" if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git" + EGIT_REPO_URI="https://gitlab.com/chrony/chrony.git" inherit git-r3 else VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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 )" + SRC_URI="https://chrony-project.org/releases/${P/_/-}.tar.gz" + SRC_URI+=" verify-sig? ( https://chrony-project.org/releases/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )" if [[ ${PV} != *_pre* ]] ; then KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" @@ -79,7 +79,6 @@ fi PATCHES=( "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch "${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch - "${FILESDIR}"/${P}-strict-prototypes-clang16.patch ) src_prepare() { diff --git a/net-misc/chrony/metadata.xml b/net-misc/chrony/metadata.xml index dc25a0f1c6a2..33ac8a4febda 100644 --- a/net-misc/chrony/metadata.xml +++ b/net-misc/chrony/metadata.xml @@ -39,5 +39,6 @@ cpe:/a:chrony_project:chrony + chrony/chrony diff --git a/net-misc/openrdap/Manifest b/net-misc/openrdap/Manifest index f1da1aefda98..29e3602f5497 100644 --- a/net-misc/openrdap/Manifest +++ b/net-misc/openrdap/Manifest @@ -1,4 +1,4 @@ DIST openrdap-0.9.0_p20191017-deps.tar.gz 21223841 BLAKE2B 8bc7f6d7926835a0fd1f723cf9a63a57b15c11d6bdaeeeead5da307a6053c931eba55e3a27a6c9e7c069f3421005be97e6070da657328a63e60f083566333af3 SHA512 c536daa1c3b2f3ac904d3f2e33b38351bbf50e0abc5e071958efdf364d9d59910b1108cb355e5e3c9e8a1517b5b222c8ab39a899f9dd6d7e80dda617b5ed0290 DIST openrdap-0.9.0_p20191017.tar.gz 78085 BLAKE2B c3366aff7f12bdc8df4646c426e803834b382d02c0295eda0c97fef1ecc6ed54b6435e49bd1f67fe9884e4b8de466bb52db1494a4a531957c5c7c607eca4e5bc SHA512 494ceab714a4dc7c37c1a11a16a4d475627be59f9c56058a99ca203dece8a4963b06b0fca4091c1d3e194208427095335f9bb12043b02f27efb9b884ed43f7ef EBUILD openrdap-0.9.0_p20191017-r1.ebuild 660 BLAKE2B a9449ab97784bbd158e7870a5e02093228981c9cbf3161448ee3a0b100bec1f0a2d11462ffbbb87f0bbd1be7e47dc6dbe00f9c884548a4cf7cd7407f69ed6d4c SHA512 938365beac585cea6fe0f1f8b356d1a7fca356ae0f2e5d25b4de5c82953575169d819f314b85ed84f6a48d385219232f3119972e38d30230a7247be7b6bbf4e5 -MISC metadata.xml 502 BLAKE2B 8190935c5504521111ad0a3cd92de04eb407c0b5306ed48787b6950f2507eafb2715fa9bd62d5352f74af95a78f2fcd9d8521ed02c1f4da815e66671f48c4711 SHA512 cf4dd914fb175eee0ce8fcb545d2b933c4a028790ab7df98b37b8b681e7354239a0542ce5187a185deaef6a4b621cafab410ba3e72843e8cf01c05c564a7faae +MISC metadata.xml 580 BLAKE2B 830a3a45a2936218d8f652621f4b88fcb210a94f32b92bb377e4c2eed0a2fc35ee1610fe351efc571fdeced23505fde350f8f47f10c3edf575b3d71ba723e2c7 SHA512 f82c3a6eda15d4371a42e12f4658ae059f8b3708657c35696a8cc126ab6b5bb781662405714c15269bb96a099393cf94eabcafc1ab965c69a96d2cc090e277e6 diff --git a/net-misc/openrdap/metadata.xml b/net-misc/openrdap/metadata.xml index 363217878440..cebadf7d92a7 100644 --- a/net-misc/openrdap/metadata.xml +++ b/net-misc/openrdap/metadata.xml @@ -10,4 +10,7 @@ RDAP is a replacement for WHOIS, which provides domain name and IP address registration information in JSON format over HTTP(S). + + openrdap/rdap + -- cgit v1.2.3