Fixing apache2.pam as pointed out in #155050 (thanks to candrews at integralblue.com).

Package-Manager: portage-2.1.2.9

3 files changed, 29 insertions, 15 deletions

diff --git a/net-www/mod_auth_pam/ChangeLog b/net-www/mod_auth_pam/ChangeLog
index f6cde82aba32..4dc81c386561 100644
--- a/net-www/mod_auth_pam/ChangeLog
+++ b/net-www/mod_auth_pam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/mod_auth_pam
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pam/ChangeLog,v 1.20 2007/05/12 10:57:59 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pam/ChangeLog,v 1.21 2007/06/14 19:42:03 phreak Exp $
+
+  14 Jun 2007; Christian Heim <phreak@gentoo.org> files/apache2.pam:
+  Fixing apache2.pam as pointed out in #155050 (thanks to candrews at
+  integralblue.com).
 
   12 May 2007; Luca Longinotti <chtekk@gentoo.org>
   -files/10_mod_auth_pam_ap1.conf,
diff --git a/net-www/mod_auth_pam/Manifest b/net-www/mod_auth_pam/Manifest
index 7d34116f0b8e..99ca686f9c5e 100644
--- a/net-www/mod_auth_pam/Manifest
+++ b/net-www/mod_auth_pam/Manifest
@@ -1,11 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 10_mod_auth_pam.conf 761 RMD160 78eed072d6ba5582a7aa64e199c1d5f88597fd10 SHA1 5dc34b3b9fb14486e09b4af4288f55e42047462d SHA256 922b2e0a34d4c34c7358ee8cda40682536b926715991619f0900f68baeddf51b
 MD5 6d39291f46444e6f9b7dbb3627ca5e78 files/10_mod_auth_pam.conf 761
 RMD160 78eed072d6ba5582a7aa64e199c1d5f88597fd10 files/10_mod_auth_pam.conf 761
 SHA256 922b2e0a34d4c34c7358ee8cda40682536b926715991619f0900f68baeddf51b files/10_mod_auth_pam.conf 761
-AUX apache2.pam 327 RMD160 47cbb63921f115e927f938dae82e7155a7aa5cfd SHA1 ff9381e34b7988673708ba40ee46c8581fee420c SHA256 bf813064125e86e4416973667fe5147f6415ef2543e538c90aea92bc8b13c8f1
-MD5 6b1cd54dfe7b7385155a4a1c1f58caa4 files/apache2.pam 327
-RMD160 47cbb63921f115e927f938dae82e7155a7aa5cfd files/apache2.pam 327
-SHA256 bf813064125e86e4416973667fe5147f6415ef2543e538c90aea92bc8b13c8f1 files/apache2.pam 327
+AUX apache2.pam 199 RMD160 de749492c26c3d8d89168fa355b56e7e50503c33 SHA1 8fba890c43eab4c7cbd2e80fed7077e537931b47 SHA256 9eabd671d89f5f49eacb1304d4eafd28f1b2116e3ab60426b47166a06749cbe2
+MD5 5876b4a619537c01211d3253b0184d90 files/apache2.pam 199
+RMD160 de749492c26c3d8d89168fa355b56e7e50503c33 files/apache2.pam 199
+SHA256 9eabd671d89f5f49eacb1304d4eafd28f1b2116e3ab60426b47166a06749cbe2 files/apache2.pam 199
 AUX mod_auth_pam-1.1.1-service_name.patch 1644 RMD160 3a85398814be77c2f111b5a6ad447ac5f9442fd2 SHA1 e7bbd920d2da8fda63288488f7a0d367cdd1e05b SHA256 a3b5ebfa4533815dc6c9eb86d28eb8e6a4cd4959cd6d77d90774dc0c63efc023
 MD5 231d4fb9a632f6b129bf065fcf03c4b2 files/mod_auth_pam-1.1.1-service_name.patch 1644
 RMD160 3a85398814be77c2f111b5a6ad447ac5f9442fd2 files/mod_auth_pam-1.1.1-service_name.patch 1644
@@ -19,10 +22,10 @@ EBUILD mod_auth_pam-1.1.1-r2.ebuild 1542 RMD160 e15226b2d33a67c830ff66b362872549
 MD5 3cebcc40d3f7445c07e6b8e78ce12623 mod_auth_pam-1.1.1-r2.ebuild 1542
 RMD160 e15226b2d33a67c830ff66b3628725491d2a396f mod_auth_pam-1.1.1-r2.ebuild 1542
 SHA256 734ea5894452a019ce05eaaf011d4486618372ef350adf4d9dab241adf8d919a mod_auth_pam-1.1.1-r2.ebuild 1542
-MISC ChangeLog 3300 RMD160 007ab8c64604ec56a6e437ca5e99a26e7627e7f3 SHA1 58b56dc537e8ef7c03e6fc67332bea9d5703ed1f SHA256 e4fe475bb66352aee037a0cc4a2635fb647e1cd255bb51827ed69241c1baa996
-MD5 7eb8b07f8192a262219b31f667e1ad80 ChangeLog 3300
-RMD160 007ab8c64604ec56a6e437ca5e99a26e7627e7f3 ChangeLog 3300
-SHA256 e4fe475bb66352aee037a0cc4a2635fb647e1cd255bb51827ed69241c1baa996 ChangeLog 3300
+MISC ChangeLog 3461 RMD160 e1a98f9206167cd886e324eb65c37f4449744a13 SHA1 aaf716a4f89073fb5c18daecf258fc0318928b98 SHA256 2302f962128ad5bf185f422abaaa3c4523aaff3b79bd5626b7238f36e92dda3e
+MD5 87546a648f3359e95be982a0eb86c9af ChangeLog 3461
+RMD160 e1a98f9206167cd886e324eb65c37f4449744a13 ChangeLog 3461
+SHA256 2302f962128ad5bf185f422abaaa3c4523aaff3b79bd5626b7238f36e92dda3e ChangeLog 3461
 MISC metadata.xml 226 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e SHA1 fe9f7ce6f2281683065abb3255c8b731665c82ac SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8
 MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226
 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e metadata.xml 226
@@ -33,3 +36,10 @@ SHA256 bba5e29ae8b31f6dfcc058ff10ef6e528d57056ef718748920ac96288f17ec0d files/di
 MD5 49900d6fb41df415b014223fd0810f57 files/digest-mod_auth_pam-1.1.1-r2 265
 RMD160 c8e2a0326e86b920e5a1eb120dd923ca3a618cc5 files/digest-mod_auth_pam-1.1.1-r2 265
 SHA256 bba5e29ae8b31f6dfcc058ff10ef6e528d57056ef718748920ac96288f17ec0d files/digest-mod_auth_pam-1.1.1-r2 265
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGcZobyuNVb5qfaOYRAiRwAJ9SmUp9vgU64GgQlO7plo7URW5regCfXrqs
+nJc1EXk+PwmVeCsxIvLuCOE=
+=JdGh
+-----END PGP SIGNATURE-----
diff --git a/net-www/mod_auth_pam/files/apache2.pam b/net-www/mod_auth_pam/files/apache2.pam
index a0539df577f3..e80e5548cb51 100644
--- a/net-www/mod_auth_pam/files/apache2.pam
+++ b/net-www/mod_auth_pam/files/apache2.pam
@@ -1,6 +1,6 @@
-#%PAM-1.0
-auth       required	/lib/security/pam_stack.so service=system-auth
-auth       required	/lib/security/pam_nologin.so
-account    required	/lib/security/pam_stack.so service=system-auth
-password   required	/lib/security/pam_stack.so service=system-auth
-session    required	/lib/security/pam_stack.so service=system-auth
+#%PAM-1.0

+auth       include      system-auth

+auth       required     pam_nologin.so

+account    include      system-auth

+password   include      system-auth

+session    include      system-auth