commit:     45fd59bda6eaec275f44ecba6cd5b8a29cfb535f
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 21 15:02:51 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> 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 <floppym <AT> 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() {

Reply via email to