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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AC25D15800F for ; Tue, 14 Feb 2023 14:16:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE04DE07AE; Tue, 14 Feb 2023 14:16:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8B96EE07AE for ; Tue, 14 Feb 2023 14:16:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4D2D0335D8A for ; Tue, 14 Feb 2023 14:16:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7763089F for ; Tue, 14 Feb 2023 14:16:19 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1676384173.20ee025a8c833ae54a167026e4930c6c2a2ef75c.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/ntp/ntp-4.2.8_p15-r6.ebuild X-VCS-Directories: net-misc/ntp/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 20ee025a8c833ae54a167026e4930c6c2a2ef75c X-VCS-Branch: master Date: Tue, 14 Feb 2023 14:16:19 +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: f8e64355-a01c-4d2d-8469-d4d6910c16fc X-Archives-Hash: d0440720cd32479667aa75fbb721903e commit: 20ee025a8c833ae54a167026e4930c6c2a2ef75c Author: Mike Gilbert gentoo org> AuthorDate: Tue Feb 14 14:13:26 2023 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Tue Feb 14 14:16:13 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20ee025a net-misc/ntp: fix install with USE=openntpd Closes: https://bugs.gentoo.org/894368 Signed-off-by: Mike Gilbert gentoo.org> net-misc/ntp/ntp-4.2.8_p15-r6.ebuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net-misc/ntp/ntp-4.2.8_p15-r6.ebuild b/net-misc/ntp/ntp-4.2.8_p15-r6.ebuild index 64ff48c345f8..47cdd643d619 100644 --- a/net-misc/ntp/ntp-4.2.8_p15-r6.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p15-r6.ebuild @@ -112,15 +112,13 @@ src_install() { fi sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die - newtmpfiles "${FILESDIR}"/ntp.tmpfiles ntp.conf - if use openntpd ; then cd "${ED}" || die rm usr/sbin/ntpd || die - rm -r var/lib || die rm etc/{conf,init}.d/ntpd || die rm usr/share/man/*/ntpd.8 || die else + newtmpfiles "${FILESDIR}"/ntp.tmpfiles ntp.conf systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service if use caps ; then sed -i '/ExecStart/ s|$| -u ntp:ntp|' \ @@ -137,7 +135,9 @@ src_install() { } pkg_postinst() { - tmpfiles_process ntp.conf + if ! use openntpd; then + tmpfiles_process ntp.conf + fi if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then eerror "The notrust option was found in your /etc/ntp.conf!" ewarn "If your ntpd starts sending out weird responses,"