From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A3ACC13835B for ; Sun, 20 Dec 2020 06:29:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 96539E0996; Sun, 20 Dec 2020 06:29:46 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 69178E0996 for ; Sun, 20 Dec 2020 06:29:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BF5B9341274 for ; Sun, 20 Dec 2020 06:29:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 088443BD for ; Sun, 20 Dec 2020 06:29:42 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1608445651.b4b89d0fd4d27f5e7798a79a38bee223f549dbfc.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/chrony/files/, net-misc/chrony/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/chrony/Manifest net-misc/chrony/chrony-3.5.1-r1.ebuild net-misc/chrony/files/chronyd.init X-VCS-Directories: net-misc/chrony/files/ net-misc/chrony/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b4b89d0fd4d27f5e7798a79a38bee223f549dbfc X-VCS-Branch: master Date: Sun, 20 Dec 2020 06:29:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 15f526b3-f739-4f15-a3ec-ae4090439409 X-Archives-Hash: c671d128db7e202a134b8fef30170910 commit: b4b89d0fd4d27f5e7798a79a38bee223f549dbfc Author: Sam James gentoo org> AuthorDate: Sun Dec 20 06:27:31 2020 +0000 Commit: Sam James gentoo org> CommitDate: Sun Dec 20 06:27:31 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4b89d0f net-misc/chrony: cleanup old Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> net-misc/chrony/Manifest | 1 - net-misc/chrony/chrony-3.5.1-r1.ebuild | 196 --------------------------------- net-misc/chrony/files/chronyd.init | 65 ----------- 3 files changed, 262 deletions(-) diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest index f52b2b3f5f6..d338cb37157 100644 --- a/net-misc/chrony/Manifest +++ b/net-misc/chrony/Manifest @@ -1,2 +1 @@ -DIST chrony-3.5.1.tar.gz 459902 BLAKE2B 503402c0dd68a340eb5ecd8b57dcb83d90124f31e8deb6e20bd1e9ed19b5dc952fa7f40a697d0d0cb77c349c9f3297dcd32265d77670a71836ba8709dcc83053 SHA512 489cf614bfb2c1e024343af1316c339b287ed5c7b6cec15b44ef3d90512036fb1da3fd627d291a193c59d9c5c095afa66c529eeb6fd0c1bbc8256ed8873b7984 DIST chrony-4.0.tar.gz 546939 BLAKE2B 1d4035977be3603b34024c5c1c2aa5f2b4aca03fe7dc1eb41be2e9aeefa06e20a5f74776c50bdadaffba10ae25e7980bcbd9cf2b999bd73087728afe7a80253e SHA512 a1c11a386c43f495910f7f2e9b5fbb1652c3631471d182b9b8203dfef98611d11535ad547a879856551263aed0ae2e30e4135b8ed89553684706166bc1c725c9 diff --git a/net-misc/chrony/chrony-3.5.1-r1.ebuild b/net-misc/chrony/chrony-3.5.1-r1.ebuild deleted file mode 100644 index ca404b746fd..00000000000 --- a/net-misc/chrony/chrony-3.5.1-r1.ebuild +++ /dev/null @@ -1,196 +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/" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git" - - inherit git-r3 -else - SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE=" - +caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock - +rtc samba +seccomp +sechash selinux -" -REQUIRED_USE=" - ?? ( libedit readline ) - sechash? ( nettle ) -" -RESTRICT=test -CDEPEND=" - caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) - libedit? ( dev-libs/libedit ) - nettle? ( dev-libs/nettle:= ) - 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 ) -" -BDEPEND=" - nettle? ( virtual/pkgconfig ) -" -PATCHES=( - "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch - "${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch -) -S="${WORKDIR}/${P/_/-}" - -if [[ ${PV} == "9999" ]]; then - BDEPEND+=" virtual/w3m" -fi - -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 - - 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 - - # 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 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) - ${CHRONY_EDITLINE} - ${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/files/chronyd.init b/net-misc/chrony/files/chronyd.init deleted file mode 100644 index 3a71fe748fd..00000000000 --- a/net-misc/chrony/files/chronyd.init +++ /dev/null @@ -1,65 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - use dns -} - -checkconfig() { - # Note that /etc/chrony/chrony.keys is *NOT* checked. This - # is because the user may have specified another key - # file, and we don't want to force the user to use that - # exact name for the key file. - if [ ! -f "${CFGFILE}" ] ; then - eerror "Please create ${CFGFILE} and the" - eerror "chrony key file (usually /etc/chrony/chrony.keys)" - eerror "by using the" - eerror "" - eerror " chrony.conf.example" - eerror " chrony.keys.example" - eerror "" - eerror "files (from the documentation directory)" - eerror "as templates." - return 1 - else - # Actually, I tried it, and chrony seems to ignore the pidfile - # option. I'm going to leave it here anyway, since you never - # know if it might be handy - PIDFILE=`awk '/^ *pidfile/{print $2}' "${CFGFILE}"` - fi - return 0 -} - -setxtrarg() { - if [ -c /dev/rtc ]; then - grep -q '^rtcfile' "${CFGFILE}" && ARGS="${ARGS} -s" - fi - grep -q '^dumponexit$' "${CFGFILE}" && ARGS="${ARGS} -r" - return 0 -} - -start() { - checkconfig || return $? - setxtrarg - - [ -n "${PIDFILE}" ] || PIDFILE=/run/chronyd.pid - - ebegin "Starting chronyd" - start-stop-daemon --start --background --quiet \ - --exec /usr/sbin/chronyd \ - --pidfile "${PIDFILE}" \ - -- -f "${CFGFILE}" ${ARGS} - eend $? "Failed to start chronyd" -} - -stop() { - checkconfig || return $? - - [ -n "${PIDFILE}" ] || PIDFILE=/run/chronyd.pid - - ebegin "Stopping chronyd" - start-stop-daemon --stop --quiet \ - --pidfile "${PIDFILE}" - eend $? "Failed to stop chronyd" -}