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 DA5D81382C5 for ; Mon, 8 Feb 2021 14:54:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9532DE091C; Mon, 8 Feb 2021 14:54:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 7350AE091C for ; Mon, 8 Feb 2021 14:54:18 +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 C10B6340D4D for ; Mon, 8 Feb 2021 14:54:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CAF944C6 for ; Mon, 8 Feb 2021 14:54:13 +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: <1612796041.266a34008a4c3c400238340e3d97280ef5d7b5f8.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/chrony/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/chrony/chrony-4.0-r1.ebuild X-VCS-Directories: net-misc/chrony/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 266a34008a4c3c400238340e3d97280ef5d7b5f8 X-VCS-Branch: master Date: Mon, 8 Feb 2021 14:54:13 +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: bfcf9e61-d913-489a-8b05-ae20c9da0449 X-Archives-Hash: d66791ebfb8cc07abc7fdc0658db5309 commit: 266a34008a4c3c400238340e3d97280ef5d7b5f8 Author: Peter Alfredsen icloud com> AuthorDate: Tue Dec 15 11:53:21 2020 +0000 Commit: Sam James gentoo org> CommitDate: Mon Feb 8 14:54:01 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=266a3400 net-misc/chrony: add 4.0-r1 ebuild Copied from -9999 with new changes. Signed-off-by: Peter Alfredsen icloud.com> Closes: https://github.com/gentoo/gentoo/pull/18658 Signed-off-by: Sam James gentoo.org> net-misc/chrony/chrony-4.0-r1.ebuild | 190 +++++++++++++++++++++++++++++++++++ 1 file changed, 190 insertions(+) diff --git a/net-misc/chrony/chrony-4.0-r1.ebuild b/net-misc/chrony/chrony-4.0-r1.ebuild new file mode 100644 index 00000000000..21e864d92e0 --- /dev/null +++ b/net-misc/chrony/chrony-4.0-r1.ebuild @@ -0,0 +1,190 @@ +# 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 + 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 debug html ipv6 libedit +nettle nss +ntp +phc +nts pps +refclock +rtc samba +seccomp +sechash selinux" +REQUIRED_USE=" + sechash? ( || ( nettle nss ) ) + nettle? ( !nss ) + !sechash? ( !nss ) + !sechash? ( !nts? ( !nettle ) ) + nts? ( 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 + ) + nts? ( net-libs/gnutls:= ) + libedit? ( dev-libs/libedit ) + nettle? ( dev-libs/nettle:= ) + nss? ( dev-libs/nss:= ) + 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 + + 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 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) + ${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-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 +}