Make all pam.d files use just the modules' filenames instead of full path to fix multilib setups.

Package-Manager: portage-2.0.51.22-r1

10 files changed, 96 insertions, 79 deletions

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index 55ea578959c2..0df0888249d4 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/shadow
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.103 2005/06/10 15:18:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.104 2005/06/16 09:50:55 flameeyes Exp $
+
+  16 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  files/pam.d/system-auth-1.1, files/pam.d-include/system-auth-1.1,
+  files/pam.d/login, files/pam.d/other, files/pam.d/passwd,
+  files/pam.d/shadow, files/pam.d/su, files/pam.d/system-auth:
+  Make all pam.d files use just the modules' filenames instead of full path to
+  fix multilib setups.
 
   10 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> files/securetty:
   Added vc/0 tty0 for uml.  Blame rocket.
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 7eb139145601..37fc37d0a1aa 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,54 +1,64 @@
-MD5 c2b8acac8658a986b511b7764bf78e9f ChangeLog 19308
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 702cfc2e266100c3928680b3b0a05f62 ChangeLog 19656
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 db870979ea0f600d0bd8137520e2251a shadow-4.0.4.1-r4.ebuild 5961
-MD5 a51d02eb155feb33913816239bb3cf57 shadow-4.0.7.ebuild 5602
-MD5 06049e2959c62c88aee32422a37bf07f shadow-4.0.6-r1.ebuild 5641
 MD5 fad39eceb7fd04f2805c6acc16c59d57 shadow-4.0.5-r2.ebuild 5440
 MD5 a5ff413fb8140bced49067f81ef73cbb shadow-4.0.5-r3.ebuild 5515
+MD5 06049e2959c62c88aee32422a37bf07f shadow-4.0.6-r1.ebuild 5641
 MD5 ac3c5c29460f248d06d4ef83c96ca912 shadow-4.0.7-r1.ebuild 6602
+MD5 a51d02eb155feb33913816239bb3cf57 shadow-4.0.7.ebuild 5602
 MD5 969267a499da1158e3d9c021d8ca41c0 shadow-4.0.7-r2.ebuild 6820
-MD5 e9ac6a566b65499773437ce98911a046 files/digest-shadow-4.0.6-r1 66
 MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1-r4 67
+MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r2 66
+MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r3 66
+MD5 e9ac6a566b65499773437ce98911a046 files/digest-shadow-4.0.6-r1 66
+MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7 66
+MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7-r1 66
 MD5 e279025434e6328ff7f251d6bb179d77 files/securetty 258
 MD5 b8efca60a25e256eebe54c3d0db0760f files/shadow-4.0.4.1-gcc34-xmalloc.patch 361
 MD5 a99f871c88548d503bad935d2aa6f412 files/shadow-4.0.4.1-nls-manpages.patch 355
 MD5 020e030c2d09b206e88cf9051ced6244 files/shadow-4.0.4.1-nonis.patch 1504
+MD5 7becc41b4f7264483ee3ff0ca8277084 files/shadow-4.0.4.1-passwd-typo.patch 438
 MD5 aaf16ddabef285df169e37254b13561c files/shadow-4.0.4.1-selinux.diff 4296
 MD5 201f1321262da41ccd1a0283216ae9a7 files/shadow-4.0.4.1-su-pam_open_session.patch 4886
 MD5 bb55107c3a9354ef2d1977547fdb5a83 files/shadow-4.0.4.1-useradd-manpage-update.patch 958
 MD5 058f760e522ab65e270293003805fe61 files/shadow-4.0.4.1-userdel-missing-brackets.patch 380
-MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7 66
-MD5 7becc41b4f7264483ee3ff0ca8277084 files/shadow-4.0.4.1-passwd-typo.patch 438
+MD5 c5e9081ed43837797e2f1617b7ce1c24 files/shadow-4.0.5-fix-adding-of-pam_env-set-env-vars.patch 285
+MD5 fda41657b856ffaeec5a2734b312409b files/shadow-4.0.5-fix-mail-configure.patch 5452
+MD5 20fd2dc35b8671b91e120b90281b4cf3 files/shadow-4.0.5-hack-X-envvars.patch 521
 MD5 d14e133da535d64d1b397784e17c213a files/shadow-4.0.5-login.defs.patch 766
 MD5 c31db5c71b0cdfca75346abc2887aa02 files/shadow-4.0.5-nls-manpages.patch 362
-MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r2 66
-MD5 20fd2dc35b8671b91e120b90281b4cf3 files/shadow-4.0.5-hack-X-envvars.patch 521
 MD5 391991f50203bd8b7738474051befdee files/shadow-4.0.5-remove-else.patch 531
 MD5 636f233fa173a998195016c3808173d4 files/shadow-4.0.5-skey.patch 395
-MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r3 66
-MD5 c5e9081ed43837797e2f1617b7ce1c24 files/shadow-4.0.5-fix-adding-of-pam_env-set-env-vars.patch 285
-MD5 fda41657b856ffaeec5a2734b312409b files/shadow-4.0.5-fix-mail-configure.patch 5452
-MD5 90e2ab53494f677dc23b5137d6e39110 files/shadow-4.0.6-fix-configure.patch 3047
 MD5 b4d0fc0f54800978591791493d6b2ec3 files/shadow-4.0.6-dots-in-usernames.patch 1993
+MD5 90e2ab53494f677dc23b5137d6e39110 files/shadow-4.0.6-fix-configure.patch 3047
 MD5 8bf11ce0e8ee683fe290462473871dab files/shadow-4.0.6-long-groupnames.patch 1625
 MD5 d15398f7d8c06b906abdf73ae3a55f54 files/shadow-4.0.6-manpages.patch 564
 MD5 d06833980d79d4f001b6064a3f52f938 files/shadow-4.0.7-iswheel.patch 416
-MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7-r1 66
 MD5 a63ee37286c486567191c7c6b24432e2 files/shadow-4.0.7-lastlog.patch 455
 MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7-r2 66
 MD5 6e0bc0211949c624da0ea08d994a7038 files/default/useradd 96
-MD5 51b0337bd261f6ed5e53af5dc196431a files/pam.d/system-auth 499
-MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/pam.d/login 431
-MD5 344d17a865edc40adebe07797853c839 files/pam.d/other 198
-MD5 a1c7fb84c2dc309db86ba7b8d3dfae76 files/pam.d/passwd 214
-MD5 60d44a6f43aafcb9ca35858ab2534a49 files/pam.d/shadow 227
-MD5 942190363cb06bd4cf1b3acdcca6c513 files/pam.d/su 1296
-MD5 1baa646400c4a596290e9d4b9e1c09b2 files/pam.d/system-auth-1.1 491
-MD5 e3a7d5b7abee1ba6e7f09ee607da87ba files/pam.d-include/su-openpam 249
+MD5 987d0bd2e5dd1f96dc28ae2963054022 files/pam.d/login 333
+MD5 5bff4f2134b72dabc4afa5bb296e874d files/pam.d/other 142
+MD5 8a59937d720a19824db6e4a8cd173a4b files/pam.d/passwd 172
+MD5 a5721c39446539b751dceae4b054542b files/pam.d/shadow 171
+MD5 a1fc81dbd0d41face776fba4ca929d8f files/pam.d/su 1142
+MD5 deed69f8fa52ca844f3669414bd5cf01 files/pam.d/system-auth 373
+MD5 33d9efd092b6999143ea42c99a59bfb1 files/pam.d/system-auth-1.1 365
 MD5 4b7d75b12f1bea9f349dff4c48c18b8b files/pam.d-include/login 245
 MD5 5bff4f2134b72dabc4afa5bb296e874d files/pam.d-include/other 142
 MD5 5df27e06de913de76e24790642eecfd2 files/pam.d-include/passwd 104
 MD5 50d7c96eab701fd6ddbf4b283e493b4c files/pam.d-include/shadow 152
 MD5 97b4f01b65fd3b8caa8983489e9b6848 files/pam.d-include/su 1059
 MD5 caa5f36d54cb7a75ce5728f7f1badafb files/pam.d-include/system-auth 380
-MD5 1baa646400c4a596290e9d4b9e1c09b2 files/pam.d-include/system-auth-1.1 491
+MD5 33d9efd092b6999143ea42c99a59bfb1 files/pam.d-include/system-auth-1.1 365
+MD5 e3a7d5b7abee1ba6e7f09ee607da87ba files/pam.d-include/su-openpam 249
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCsUucj5H05b2HAEkRAjrcAJ9WpM70hwkTwpaMkpO0WOAVtgBuiACZAR+Q
+VejITUINxkbVG1YzYbtdBGE=
+=cZlp
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/shadow/files/pam.d-include/system-auth-1.1 b/sys-apps/shadow/files/pam.d-include/system-auth-1.1
index 795f0fe723f0..fe80483120ae 100644
--- a/sys-apps/shadow/files/pam.d-include/system-auth-1.1
+++ b/sys-apps/shadow/files/pam.d-include/system-auth-1.1
@@ -1,14 +1,14 @@
 #%PAM-1.0
 
-auth       required	/lib/security/pam_env.so
-auth       sufficient	/lib/security/pam_unix.so likeauth nullok
-auth       required	/lib/security/pam_deny.so
+auth       required	pam_env.so
+auth       sufficient	pam_unix.so likeauth nullok
+auth       required	pam_deny.so
 
-account    required	/lib/security/pam_unix.so
+account    required	pam_unix.so
 
-password   required	/lib/security/pam_cracklib.so retry=3
-password   sufficient	/lib/security/pam_unix.so nullok md5 shadow use_authtok
-password   required	/lib/security/pam_deny.so
+password   required	pam_cracklib.so retry=3
+password   sufficient	pam_unix.so nullok md5 shadow use_authtok
+password   required	pam_deny.so
 
-session    required	/lib/security/pam_limits.so
-session    required	/lib/security/pam_unix.so
+session    required	pam_limits.so
+session    required	pam_unix.so
diff --git a/sys-apps/shadow/files/pam.d/login b/sys-apps/shadow/files/pam.d/login
index 7c9ad5938634..31a664b302ae 100644
--- a/sys-apps/shadow/files/pam.d/login
+++ b/sys-apps/shadow/files/pam.d/login
@@ -1,12 +1,12 @@
 #%PAM-1.0
 
-auth       required	/lib/security/pam_securetty.so
-auth       required	/lib/security/pam_stack.so service=system-auth
-auth       required	/lib/security/pam_nologin.so
+auth       required	pam_securetty.so
+auth       required	pam_stack.so service=system-auth
+auth       required	pam_nologin.so
 
-account    required	/lib/security/pam_stack.so service=system-auth
+account    required	pam_stack.so service=system-auth
 
-password   required	/lib/security/pam_stack.so service=system-auth
+password   required	pam_stack.so service=system-auth
 
-session    required	/lib/security/pam_stack.so service=system-auth
-session    optional	/lib/security/pam_console.so
+session    required	pam_stack.so service=system-auth
+session    optional	pam_console.so
diff --git a/sys-apps/shadow/files/pam.d/other b/sys-apps/shadow/files/pam.d/other
index a6a5605332dd..bb0b9647c076 100644
--- a/sys-apps/shadow/files/pam.d/other
+++ b/sys-apps/shadow/files/pam.d/other
@@ -1,9 +1,9 @@
 #%PAM-1.0
 
-auth       required	/lib/security/pam_deny.so
+auth       required	pam_deny.so
 
-account    required	/lib/security/pam_deny.so
+account    required	pam_deny.so
 
-password   required	/lib/security/pam_deny.so
+password   required	pam_deny.so
 
-session    required	/lib/security/pam_deny.so
+session    required	pam_deny.so
diff --git a/sys-apps/shadow/files/pam.d/passwd b/sys-apps/shadow/files/pam.d/passwd
index 38250aeb5a70..c09409bb3a16 100644
--- a/sys-apps/shadow/files/pam.d/passwd
+++ b/sys-apps/shadow/files/pam.d/passwd
@@ -1,7 +1,7 @@
 #%PAM-1.0
 
-auth       required	/lib/security/pam_stack.so service=system-auth
+auth       required	pam_stack.so service=system-auth
 
-account    required	/lib/security/pam_stack.so service=system-auth
+account    required	pam_stack.so service=system-auth
 
-password   required	/lib/security/pam_stack.so service=system-auth
+password   required	pam_stack.so service=system-auth
diff --git a/sys-apps/shadow/files/pam.d/shadow b/sys-apps/shadow/files/pam.d/shadow
index 12cabadafb10..28db08c25c6f 100644
--- a/sys-apps/shadow/files/pam.d/shadow
+++ b/sys-apps/shadow/files/pam.d/shadow
@@ -1,8 +1,8 @@
 #%PAM-1.0 
 
-auth       sufficient	/lib/security/pam_rootok.so
-auth       required	/lib/security/pam_permit.so
+auth       sufficient	pam_rootok.so
+auth       required	pam_permit.so
 
-account    required	/lib/security/pam_stack.so service=system-auth
+account    required	pam_stack.so service=system-auth
 
-password   required	/lib/security/pam_permit.so
+password   required	pam_permit.so
diff --git a/sys-apps/shadow/files/pam.d/su b/sys-apps/shadow/files/pam.d/su
index c9458bf8695d..e5b1d834f3f1 100644
--- a/sys-apps/shadow/files/pam.d/su
+++ b/sys-apps/shadow/files/pam.d/su
@@ -1,32 +1,32 @@
 #%PAM-1.0
 
-auth       sufficient	/lib/security/pam_rootok.so
+auth       sufficient	pam_rootok.so
 
 # If you want to restrict users begin allowed to su even more,
 # create /etc/security/suauth.allow (or to that matter) that is only
 # writable by root, and add users that are allowed to su to that
 # file, one per line.
-#auth       required     /lib/security/pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.allow
+#auth       required     pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.allow
 
 # Uncomment this to allow users in the wheel group to su without
 # entering a passwd.
-#auth       sufficient   /lib/security/pam_wheel.so use_uid trust
+#auth       sufficient   pam_wheel.so use_uid trust
 
 # Alternatively to above, you can implement a list of users that do
 # not need to supply a passwd with a list.
-#auth       sufficient   /lib/security/pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.nopass
+#auth       sufficient   pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.nopass
 
 # Comment this to allow any user, even those not in the 'wheel'
 # group to su
-auth       required     /lib/security/pam_wheel.so use_uid
+auth       required     pam_wheel.so use_uid
 
-auth       required	/lib/security/pam_stack.so service=system-auth
+auth       required	pam_stack.so service=system-auth
 
-account    required	/lib/security/pam_stack.so service=system-auth
+account    required	pam_stack.so service=system-auth
 
-password   required	/lib/security/pam_stack.so service=system-auth
+password   required	pam_stack.so service=system-auth
 
-session    required	/lib/security/pam_stack.so service=system-auth
-session    required     /lib/security/pam_env.so
-session    optional	/lib/security/pam_xauth.so
+session    required	pam_stack.so service=system-auth
+session    required     pam_env.so
+session    optional	pam_xauth.so
 
diff --git a/sys-apps/shadow/files/pam.d/system-auth b/sys-apps/shadow/files/pam.d/system-auth
index 805919924415..d6d008f69bde 100644
--- a/sys-apps/shadow/files/pam.d/system-auth
+++ b/sys-apps/shadow/files/pam.d/system-auth
@@ -1,14 +1,14 @@
 #%PAM-1.0
 
-auth       required	/lib/security/pam_env.so
-auth       sufficient	/lib/security/pam_unix.so likeauth nullok nodelay
-auth       required	/lib/security/pam_deny.so
+auth       required	pam_env.so
+auth       sufficient	pam_unix.so likeauth nullok nodelay
+auth       required	pam_deny.so
 
-account    required	/lib/security/pam_unix.so
+account    required	pam_unix.so
 
-password   required	/lib/security/pam_cracklib.so retry=3
-password   sufficient	/lib/security/pam_unix.so nullok md5 shadow use_authtok
-password   required	/lib/security/pam_deny.so
+password   required	pam_cracklib.so retry=3
+password   sufficient	pam_unix.so nullok md5 shadow use_authtok
+password   required	pam_deny.so
 
-session    required	/lib/security/pam_limits.so
-session    required	/lib/security/pam_unix.so
+session    required	pam_limits.so
+session    required	pam_unix.so
diff --git a/sys-apps/shadow/files/pam.d/system-auth-1.1 b/sys-apps/shadow/files/pam.d/system-auth-1.1
index 795f0fe723f0..fe80483120ae 100644
--- a/sys-apps/shadow/files/pam.d/system-auth-1.1
+++ b/sys-apps/shadow/files/pam.d/system-auth-1.1
@@ -1,14 +1,14 @@
 #%PAM-1.0
 
-auth       required	/lib/security/pam_env.so
-auth       sufficient	/lib/security/pam_unix.so likeauth nullok
-auth       required	/lib/security/pam_deny.so
+auth       required	pam_env.so
+auth       sufficient	pam_unix.so likeauth nullok
+auth       required	pam_deny.so
 
-account    required	/lib/security/pam_unix.so
+account    required	pam_unix.so
 
-password   required	/lib/security/pam_cracklib.so retry=3
-password   sufficient	/lib/security/pam_unix.so nullok md5 shadow use_authtok
-password   required	/lib/security/pam_deny.so
+password   required	pam_cracklib.so retry=3
+password   sufficient	pam_unix.so nullok md5 shadow use_authtok
+password   required	pam_deny.so
 
-session    required	/lib/security/pam_limits.so
-session    required	/lib/security/pam_unix.so
+session    required	pam_limits.so
+session    required	pam_unix.so