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 CC1A01382C5 for ; Mon, 8 Feb 2021 14:54:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10BF6E0919; Mon, 8 Feb 2021 14:54:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 EAB4EE0919 for ; Mon, 8 Feb 2021 14:54:17 +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 D447E340D54 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 3915F4CB for ; Mon, 8 Feb 2021 14:54:14 +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: <1612796042.010d17c7b421a0fa06ecd2430913f04ea5f47562.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 net-misc/chrony/chrony-9999.ebuild X-VCS-Directories: net-misc/chrony/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 010d17c7b421a0fa06ecd2430913f04ea5f47562 X-VCS-Branch: master Date: Mon, 8 Feb 2021 14:54:14 +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: bb4f92fd-e077-47e6-bc6d-6bf7fe0c4837 X-Archives-Hash: abf07a239d3a677668f24fd834854b63 commit: 010d17c7b421a0fa06ecd2430913f04ea5f47562 Author: Sam James gentoo org> AuthorDate: Mon Feb 8 14:14:24 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Feb 8 14:54:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=010d17c7 net-misc/chrony: add notice when switching USE=caps -> USE=-caps Closes: https://bugs.gentoo.org/740550 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> net-misc/chrony/chrony-4.0-r1.ebuild | 12 ++++++++---- net-misc/chrony/chrony-9999.ebuild | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/net-misc/chrony/chrony-4.0-r1.ebuild b/net-misc/chrony/chrony-4.0-r1.ebuild index d663e9cb680..4a9997a20a5 100644 --- a/net-misc/chrony/chrony-4.0-r1.ebuild +++ b/net-misc/chrony/chrony-4.0-r1.ebuild @@ -188,10 +188,14 @@ pkg_preinst() { 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" + if [[ -n "${REPLACING_VERSIONS}" ]] ; then + if 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" + elif ! use caps && ! ${HAD_CAPS} ; then + ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root" + fi fi if [[ ! ${HAD_SECCOMP} ]] && use seccomp ; then diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild index d663e9cb680..4a9997a20a5 100644 --- a/net-misc/chrony/chrony-9999.ebuild +++ b/net-misc/chrony/chrony-9999.ebuild @@ -188,10 +188,14 @@ pkg_preinst() { 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" + if [[ -n "${REPLACING_VERSIONS}" ]] ; then + if 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" + elif ! use caps && ! ${HAD_CAPS} ; then + ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root" + fi fi if [[ ! ${HAD_SECCOMP} ]] && use seccomp ; then