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 8E7971382C5 for ; Sun, 21 Mar 2021 15:06:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CDE31E07D8; Sun, 21 Mar 2021 15:06:24 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 B2F2AE07D8 for ; Sun, 21 Mar 2021 15:06:24 +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 D1593335CEE for ; Sun, 21 Mar 2021 15:06:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 379C25B9 for ; Sun, 21 Mar 2021 15:06:22 +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: <1616339166.45fd59bda6eaec275f44ecba6cd5b8a29cfb535f.floppym@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.6_p1-r1.ebuild app-admin/sudo/sudo-1.9.6_p1.ebuild app-admin/sudo/sudo-9999.ebuild X-VCS-Directories: app-admin/sudo/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 45fd59bda6eaec275f44ecba6cd5b8a29cfb535f X-VCS-Branch: master Date: Sun, 21 Mar 2021 15:06:22 +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: 8b0c6d2b-f086-4559-bde6-e8eead023c32 X-Archives-Hash: 0c01b470ab5f68978ae0b6843a38ddf7 commit: 45fd59bda6eaec275f44ecba6cd5b8a29cfb535f Author: Mike Gilbert gentoo org> AuthorDate: Sun Mar 21 15:02:51 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Mar 21 15:06:06 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45fd59bd app-admin/sudo: re-order default secure_path Match the order from baselayout. Closes: https://bugs.gentoo.org/777267 Signed-off-by: Mike Gilbert gentoo.org> app-admin/sudo/{sudo-1.9.6_p1.ebuild => sudo-1.9.6_p1-r1.ebuild} | 3 ++- app-admin/sudo/sudo-9999.ebuild | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app-admin/sudo/sudo-1.9.6_p1.ebuild b/app-admin/sudo/sudo-1.9.6_p1-r1.ebuild similarity index 98% rename from app-admin/sudo/sudo-1.9.6_p1.ebuild rename to app-admin/sudo/sudo-1.9.6_p1-r1.ebuild index f222aa9f58b..6f0b7c8646a 100644 --- a/app-admin/sudo/sudo-1.9.6_p1.ebuild +++ b/app-admin/sudo/sudo-1.9.6_p1-r1.ebuild @@ -110,7 +110,7 @@ set_secure_path() { done SECURE_PATH=${newpath#:} } - cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}} + cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}} # finally, strip gcc paths #136027 rmpath() { @@ -198,6 +198,7 @@ src_install() { insinto /etc/openldap/schema newins doc/schema.OpenLDAP sudo.schema fi + if use pam; then pamd_mimic system-auth sudo auth account session pamd_mimic system-auth sudo-i auth account session diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild index ffa8c7c9bf9..6f0b7c8646a 100644 --- a/app-admin/sudo/sudo-9999.ebuild +++ b/app-admin/sudo/sudo-9999.ebuild @@ -110,7 +110,7 @@ set_secure_path() { done SECURE_PATH=${newpath#:} } - cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}} + cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}} # finally, strip gcc paths #136027 rmpath() {