summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2021-03-21 11:02:51 -0400
committerMike Gilbert <floppym@gentoo.org>2021-03-21 11:06:06 -0400
commit45fd59bda6eaec275f44ecba6cd5b8a29cfb535f (patch)
tree190536c9e6c5ed207e3e8311ee24e78f8cabe913 /app-admin
parentdev-libs/libpeas: Version bump to 1.30.0 (diff)
downloadgentoo-45fd59bda6eaec275f44ecba6cd5b8a29cfb535f.tar.gz
gentoo-45fd59bda6eaec275f44ecba6cd5b8a29cfb535f.tar.bz2
gentoo-45fd59bda6eaec275f44ecba6cd5b8a29cfb535f.zip
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@gentoo.org>
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/sudo/sudo-1.9.6_p1-r1.ebuild (renamed from app-admin/sudo/sudo-1.9.6_p1.ebuild)3
-rw-r--r--app-admin/sudo/sudo-9999.ebuild2
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
index f222aa9f58ba..6f0b7c8646a3 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 ffa8c7c9bf97..6f0b7c8646a3 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() {