From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1244191-garchives=archives.gentoo.org@lists.gentoo.org> 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 857C41382C5 for <garchives@archives.gentoo.org>; Fri, 22 Jan 2021 21:19:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89821E0BD9; Fri, 22 Jan 2021 21:19:57 +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 6DF8EE0BD9 for <gentoo-commits@lists.gentoo.org>; Fri, 22 Jan 2021 21:19:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 3D9D0341165 for <gentoo-commits@lists.gentoo.org>; Fri, 22 Jan 2021 21:19:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BC728CC for <gentoo-commits@lists.gentoo.org>; Fri, 22 Jan 2021 21:19:54 +0000 (UTC) From: "Sam James" <sam@gentoo.org> 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" <sam@gentoo.org> Message-ID: <1611350388.21a41a187a3eb57511fde8278f0153d91047cdb8.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/fcron/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-process/fcron/fcron-3.2.1-r1.ebuild sys-process/fcron/fcron-3.2.1-r3.ebuild sys-process/fcron/fcron-3.3.0_beta-r1.ebuild X-VCS-Directories: sys-process/fcron/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 21a41a187a3eb57511fde8278f0153d91047cdb8 X-VCS-Branch: master Date: Fri, 22 Jan 2021 21:19:54 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a168b84a-e11c-4318-85a3-764975c477f0 X-Archives-Hash: 18f5401c6c7b96a41cf78d7d77b4367c commit: 21a41a187a3eb57511fde8278f0153d91047cdb8 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Jan 22 21:19:48 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jan 22 21:19:48 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21a41a18 sys-process/fcron: install pam files conditionally Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-process/fcron/fcron-3.2.1-r1.ebuild | 6 +++--- sys-process/fcron/fcron-3.2.1-r3.ebuild | 6 +++--- sys-process/fcron/fcron-3.3.0_beta-r1.ebuild | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys-process/fcron/fcron-3.2.1-r1.ebuild b/sys-process/fcron/fcron-3.2.1-r1.ebuild index 7e07ebb433d..e1c90a0def3 100644 --- a/sys-process/fcron/fcron-3.2.1-r1.ebuild +++ b/sys-process/fcron/fcron-3.2.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -147,7 +147,7 @@ src_install() { fperms 0750 /etc/fcron fperms 0640 /etc/fcron/fcron.{allow,deny,conf} - pamd_mimic system-services fcron auth account session + use pam && pamd_mimic system-services fcron auth account session cat > "${T}"/fcrontab.pam <<- EOF # Don't ask for the user's password; fcrontab will only allow to # change user if running as root. @@ -159,7 +159,7 @@ src_install() { account include system-auth session include system-auth EOF - newpamd "${T}"/fcrontab.pam fcrontab + use pam && newpamd "${T}"/fcrontab.pam fcrontab newinitd "${FILESDIR}"/fcron.init.4 fcron systemd_newunit "${S}/script/fcron.init.systemd" fcron.service diff --git a/sys-process/fcron/fcron-3.2.1-r3.ebuild b/sys-process/fcron/fcron-3.2.1-r3.ebuild index e4ae261689b..a564610b6fc 100644 --- a/sys-process/fcron/fcron-3.2.1-r3.ebuild +++ b/sys-process/fcron/fcron-3.2.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -148,7 +148,7 @@ src_install() { fperms 0750 /etc/fcron fperms 0640 /etc/fcron/fcron.{allow,deny,conf} - pamd_mimic system-services fcron auth account session + use pam && pamd_mimic system-services fcron auth account session cat > "${T}"/fcrontab.pam <<- EOF # Don't ask for the user's password; fcrontab will only allow to # change user if running as root. @@ -160,7 +160,7 @@ src_install() { account include system-auth session include system-auth EOF - newpamd "${T}"/fcrontab.pam fcrontab + use pam && newpamd "${T}"/fcrontab.pam fcrontab newinitd "${FILESDIR}"/fcron.init-r5 fcron systemd_newunit "${S}/script/fcron.init.systemd" fcron.service diff --git a/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild b/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild index ca2a152f403..0e7915a8d60 100644 --- a/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild +++ b/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -153,7 +153,7 @@ src_install() { fperms 0750 /etc/fcron fperms 0640 /etc/fcron/fcron.{allow,deny,conf} - pamd_mimic system-services fcron auth account session + use pam && pamd_mimic system-services fcron auth account session cat > "${T}"/fcrontab.pam <<- EOF # Don't ask for the user's password; fcrontab will only allow to # change user if running as root. @@ -165,7 +165,7 @@ src_install() { account include system-auth session include system-auth EOF - newpamd "${T}"/fcrontab.pam fcrontab + use pam && newpamd "${T}"/fcrontab.pam fcrontab newinitd "${FILESDIR}"/fcron.init-r5 fcron systemd_newunit "${S}/script/fcron.init.systemd" fcron.service