commit: f3f5035b6682ffc66d5c7b7cd3ca5642f8b0e7a3 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Nov 25 06:34:09 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Nov 25 06:34:09 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3f5035b
net-misc/chrony: drop 4.3-r5 Signed-off-by: Sam James <sam <AT> gentoo.org> net-misc/chrony/Manifest | 2 - net-misc/chrony/chrony-4.3-r5.ebuild | 264 --------------------- .../chrony-4.3-strict-prototypes-clang16.patch | 71 ------ 3 files changed, 337 deletions(-) diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest index da9d29c4ac09..74d76950aa23 100644 --- a/net-misc/chrony/Manifest +++ b/net-misc/chrony/Manifest @@ -1,4 +1,2 @@ -DIST chrony-4.3.tar.gz 593560 BLAKE2B 51ba6d19312fd52cd6d6d8ab9437c886a3779877170674db6dc37d657e849101e2669fd6c8723d24e43c895cd1924c3d8d2ff442baeef9abe8a6c313929edf5f SHA512 1394bac3ed684352fe89b7fef7da50e61f9f522abee807627ae1fc4c2dde891017bc8e5b13759fced028f3a1e875d5e4e5a4f85de65c63b5f83d0ca03bb4c5df -DIST chrony-4.3.tar.gz.asc 833 BLAKE2B 12399205da4ee5c442207bfdf936ac88552a49b21b0db8c15b09118b579e2076f7cfec6ad916b08b41edc4f9f8e03b13d7758ed08e116bee54d0f0f9cd68a505 SHA512 300b06f253ac3727edb86a1b7c337f9529ee752bbb471b266217b6a8ac5183e827264177a3210d436425d746673bf11fbdc41da145673213e28165197c6c76b7 DIST chrony-4.4.tar.gz 612094 BLAKE2B 470c3d4ab9aa5949df1c10d0ecbd556fba3ce9b05e9dc4a5475795c174fca48a624975df68552f78927a19b72cb6b4f136ed4e5fa04a833dbd8139d0be144e4f SHA512 45e060eb0c5892552f28dc436429e5823409cc93533127af27b64d08ff9c769fdc72694272232114f5ca1884c2bc8b5e842fae7956dc457358e937bcd3dda4d7 DIST chrony-4.4.tar.gz.asc 833 BLAKE2B 07f863381d37e30435c3796c7ff4ac628dd81b248e76fe1b9ce6dff07f9f2bd9423a013c7d0a09f2bfe251a8e176b04731e1cb60829f1dc83a7321274d3f6992 SHA512 bb795b428567434937cbf3a12c559b549b89abe65010d04eed0fbdcfde35e7266771ea01c2c5581f3e5fae993f1782fff5a62c5ae09259d2b65dab9473d756a3 diff --git a/net-misc/chrony/chrony-4.3-r5.ebuild b/net-misc/chrony/chrony-4.3-r5.ebuild deleted file mode 100644 index 4b78f2f22ba9..000000000000 --- a/net-misc/chrony/chrony-4.3-r5.ebuild +++ /dev/null @@ -1,264 +0,0 @@ -# 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.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 ~ia64 ~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 ) -" -# 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') - - # 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/files/chrony-4.3-strict-prototypes-clang16.patch b/net-misc/chrony/files/chrony-4.3-strict-prototypes-clang16.patch deleted file mode 100644 index fb89a1eb3fef..000000000000 --- a/net-misc/chrony/files/chrony-4.3-strict-prototypes-clang16.patch +++ /dev/null @@ -1,71 +0,0 @@ -https://git.tuxfamily.org/chrony/chrony.git/commit/?id=7b97668319f9449b4adb1a978bb1fe9b0fb22e4d -https://bugs.gentoo.org/880519 - -From 7b97668319f9449b4adb1a978bb1fe9b0fb22e4d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <[email protected]> -Date: Wed, 9 Nov 2022 09:17:14 +0100 -Subject: getdate: fix various warnings which will be errors with clang-16 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -These were found by Gentoo's QA while rebuilding the world with -clang-16: https://bugs.gentoo.org/880519 - -Signed-off-by: Holger Hoffstätte <[email protected]> - ---- a/getdate.y -+++ b/getdate.y -@@ -448,9 +448,9 @@ o_merid : /* NULL */ - the same signature as the function definition does. */ - #include "getdate.h" - --extern struct tm *gmtime (); --extern struct tm *localtime (); --extern time_t mktime (); -+extern struct tm *gmtime (const time_t *timep); -+extern struct tm *localtime (const time_t *timep); -+extern time_t mktime (struct tm *tm); - - /* Month and day table. */ - static TABLE const MonthDayTable[] = { -@@ -641,16 +641,13 @@ static TABLE const MilitaryTable[] = { - - /* ARGSUSED */ - static int --yyerror (s) -- char *s ATTRIBUTE_UNUSED; -+yyerror (char *s ATTRIBUTE_UNUSED) - { - return 0; - } - - static int --ToHour (Hours, Meridian) -- int Hours; -- MERIDIAN Meridian; -+ToHour (int Hours, MERIDIAN Meridian) - { - switch (Meridian) - { -@@ -677,8 +674,7 @@ ToHour (Hours, Meridian) - } - - static int --ToYear (Year) -- int Year; -+ToYear (int Year) - { - if (Year < 0) - Year = -Year; -@@ -694,8 +690,7 @@ ToYear (Year) - } - - static int --LookupWord (buff) -- char *buff; -+LookupWord (char *buff) - { - register char *p; - register char *q; -cgit v0.10.2
