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 677CB1382C5 for ; Fri, 22 Jan 2021 17:32:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 743C2E0AE7; Fri, 22 Jan 2021 17:32:00 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 4C80AE0AE7 for ; Fri, 22 Jan 2021 17:32:00 +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 9A98E340EAD for ; Fri, 22 Jan 2021 17:31:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ECBFF53 for ; Fri, 22 Jan 2021 17:31:56 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1611336693.611e9dcbfc489de3a498931cf29cc1932c80b6c6.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/sudo/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/sudo/sudo-1.9.3_p1-r1.ebuild app-admin/sudo/sudo-1.9.3_p1.ebuild app-admin/sudo/sudo-1.9.4_p2-r1.ebuild app-admin/sudo/sudo-1.9.4_p2.ebuild app-admin/sudo/sudo-1.9.5_p1-r1.ebuild app-admin/sudo/sudo-1.9.5_p1.ebuild app-admin/sudo/sudo-9999.ebuild X-VCS-Directories: app-admin/sudo/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 611e9dcbfc489de3a498931cf29cc1932c80b6c6 X-VCS-Branch: master Date: Fri, 22 Jan 2021 17:31:56 +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: bf0ae133-cf0d-4876-8c1d-9df0c9371c84 X-Archives-Hash: f4373ebee8b68e6ca263d3268310ade3 commit: 611e9dcbfc489de3a498931cf29cc1932c80b6c6 Author: Mikle Kolyada gentoo org> AuthorDate: Fri Jan 22 17:31:33 2021 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Fri Jan 22 17:31:33 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=611e9dcb app-admin/sudo: install pam files conditionally Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Mikle Kolyada gentoo.org> app-admin/sudo/{sudo-1.9.3_p1.ebuild => sudo-1.9.3_p1-r1.ebuild} | 8 +++++--- app-admin/sudo/{sudo-1.9.4_p2.ebuild => sudo-1.9.4_p2-r1.ebuild} | 8 +++++--- app-admin/sudo/{sudo-1.9.5_p1.ebuild => sudo-1.9.5_p1-r1.ebuild} | 7 ++++--- app-admin/sudo/sudo-9999.ebuild | 8 +++++--- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/app-admin/sudo/sudo-1.9.3_p1.ebuild b/app-admin/sudo/sudo-1.9.3_p1-r1.ebuild similarity index 97% rename from app-admin/sudo/sudo-1.9.3_p1.ebuild rename to app-admin/sudo/sudo-1.9.3_p1-r1.ebuild index 32639cb05df..b85357b30b3 100644 --- a/app-admin/sudo/sudo-1.9.3_p1.ebuild +++ b/app-admin/sudo/sudo-1.9.3_p1-r1.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=7 @@ -198,8 +198,10 @@ src_install() { newins doc/schema.OpenLDAP sudo.schema fi - pamd_mimic system-auth sudo auth account session - pamd_mimic system-auth sudo-i auth account session + if use pam; then + pamd_mimic system-auth sudo auth account session + pamd_mimic system-auth sudo-i auth account session + fi keepdir /var/db/sudo/lectured fperms 0700 /var/db/sudo/lectured diff --git a/app-admin/sudo/sudo-1.9.4_p2.ebuild b/app-admin/sudo/sudo-1.9.4_p2-r1.ebuild similarity index 97% rename from app-admin/sudo/sudo-1.9.4_p2.ebuild rename to app-admin/sudo/sudo-1.9.4_p2-r1.ebuild index 84770ae1b43..97dbed1a020 100644 --- a/app-admin/sudo/sudo-1.9.4_p2.ebuild +++ b/app-admin/sudo/sudo-1.9.4_p2-r1.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=7 @@ -198,8 +198,10 @@ src_install() { newins doc/schema.OpenLDAP sudo.schema fi - pamd_mimic system-auth sudo auth account session - pamd_mimic system-auth sudo-i auth account session + if use pam; then + pamd_mimic system-auth sudo auth account session + pamd_mimic system-auth sudo-i auth account session + fi keepdir /var/db/sudo/lectured fperms 0700 /var/db/sudo/lectured diff --git a/app-admin/sudo/sudo-1.9.5_p1.ebuild b/app-admin/sudo/sudo-1.9.5_p1-r1.ebuild similarity index 98% rename from app-admin/sudo/sudo-1.9.5_p1.ebuild rename to app-admin/sudo/sudo-1.9.5_p1-r1.ebuild index 53eee6aee83..ae5daa1d0fd 100644 --- a/app-admin/sudo/sudo-1.9.5_p1.ebuild +++ b/app-admin/sudo/sudo-1.9.5_p1-r1.ebuild @@ -197,9 +197,10 @@ src_install() { insinto /etc/openldap/schema newins doc/schema.OpenLDAP sudo.schema fi - - pamd_mimic system-auth sudo auth account session - pamd_mimic system-auth sudo-i auth account session + if use pam; then + pamd_mimic system-auth sudo auth account session + pamd_mimic system-auth sudo-i auth account session + fi keepdir /var/db/sudo/lectured fperms 0700 /var/db/sudo/lectured diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild index 84770ae1b43..97dbed1a020 100644 --- a/app-admin/sudo/sudo-9999.ebuild +++ b/app-admin/sudo/sudo-9999.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=7 @@ -198,8 +198,10 @@ src_install() { newins doc/schema.OpenLDAP sudo.schema fi - pamd_mimic system-auth sudo auth account session - pamd_mimic system-auth sudo-i auth account session + if use pam; then + pamd_mimic system-auth sudo auth account session + pamd_mimic system-auth sudo-i auth account session + fi keepdir /var/db/sudo/lectured fperms 0700 /var/db/sudo/lectured