Fix bug #223631: upstream removed the note that the options don't apply to PAM, so now list the unusable entries explicitly.

Package-Manager: portage-2.1.5.2

4 files changed, 42 insertions, 11 deletions

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index 45d1d7684ebc..54b672a2f484 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/shadow
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.203 2008/05/25 20:21:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.204 2008/05/27 00:19:58 flameeyes Exp $
+
+*shadow-4.1.2-r1 (27 May 2008)
+
+  27 May 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/login_defs_pam.sed, -shadow-4.1.2.ebuild, +shadow-4.1.2-r1.ebuild:
+  Fix bug #223631: upstream removed the note that the options don't apply to
+  PAM, so now list the unusable entries explicitly.
 
 *shadow-4.1.2 (25 May 2008)
 
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 37d1d71a94f2..aa63f7d6027b 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -8,6 +8,7 @@ AUX login.pamd.1 1020 RMD160 9f0ec8ff53bf96b89dc8a03d73839e5d8ea83552 SHA1 544ae
 AUX login.pamd.2 915 RMD160 753976e3e134d8ce45560cf268683703d7d612fc SHA1 bf0b761a9ab5f35b0b035380b8bf986e08326f1e SHA256 6bc326f38a8948313e5b6032c45cd2a4973d2f518000325e744545e82d517573
 AUX login.pamd.3 190 RMD160 83f99401afac6a4b540ace456c532035c0c5a5d6 SHA1 858a04878e979b440fffb29e9ffd668b7ab71344 SHA256 1009e196b630dae5d1f40b1cc6ee42a38ecdb7c2cd4bfa40fb7114ee74e0bfd0
 AUX login_defs.awk 738 RMD160 4c05e7ab04b1b630bba093fdb2c2501c11a2d5be SHA1 74a28544ec0de8dbc530846c54af763f8ebc9f18 SHA256 6ceb9e03c2f7df817f3162de48886c9c66a596cb2af98fbf523c93e26840113b
+AUX login_defs_pam.sed 479 RMD160 cd2ae67da537b03eacd00b21505ea126ab54fa91 SHA1 5e19690cfe2053dc054011c97056e0b965ce9e2e SHA256 587239d5b1425c5766f10cea5352b325699fb35829d9375bda68bbfd74f1d839
 AUX pam.d-include/login 245 RMD160 100e5514b65603d1fa0001cc0dce5dd2caaf232f SHA1 12c3524fe5565c722adffef58804b18bdaa1f411 SHA256 39bbe2ed696a22c7549a39a7cfd47c16e347e5af4fd71b8c01ec87fce59ba0a0
 AUX pam.d-include/other 142 RMD160 ccd73af37364c1c7edbe9150255fd0bcf8b12b09 SHA1 e038542a11ff3da16756518f236b6d273da1d08d SHA256 5e05df2743ec0021364b05f4bbe2e5a3a670abb5af845c3fa760731e5b7272ca
 AUX pam.d-include/passwd 104 RMD160 15f20c39c10b3ebd53d9ef41da3e35e84b37a8ca SHA1 11cfabf1c2620c8485a2dcd6b10fef0739adc3f0 SHA256 7ec450d9ca70382a524aacd42c979969aca21ef4d26433026d35bda398d3361c
@@ -39,13 +40,13 @@ EBUILD shadow-4.0.18.2.ebuild 5176 RMD160 a5c96abaee6d2cc8eeb20dbe70be9f2243bf9b
 EBUILD shadow-4.1.0-r1.ebuild 4790 RMD160 72df08d8e11f491f0029fa2f4e11afdfb1c3c8d5 SHA1 c35bb6806f13d60c9280287064218ee6d685eaac SHA256 fbfbd5f1d7947e41e3752404c51f5c71cb877e706dac324a98a710ad93a310d4
 EBUILD shadow-4.1.0.ebuild 4714 RMD160 d815b6327373a047eba8f9d00274c071f4443f70 SHA1 2c3ffa6165eab6f29b7ae0e05ad726693bacac7b SHA256 ef6c16a0676b128e57e56a234c0c001bf3af7db8224fe583a40765763549790d
 EBUILD shadow-4.1.1.ebuild 4569 RMD160 6148a7a986d1ff26414cc4b32cbed95ad06727d2 SHA1 650609e70f8a9b1025e37cc87361d996acd4d5c7 SHA256 1ab2f49316c43eaf632c2ff4cae54647b5c49383cc80cf2f219b7366195e4bdd
-EBUILD shadow-4.1.2.ebuild 4540 RMD160 49d38c9a96e7e5eac210c4c4717a16785ae4d3d0 SHA1 19662290b494e1d2cec00e74803052b386583423 SHA256 ae0a0ab842dd4f855905c4919cc8dc5055af1e78c311c7fc54eb239c7cd88741
-MISC ChangeLog 35519 RMD160 491068dadc256a4d657382382e925d0f217d14f7 SHA1 f0b580d4788e70b947d816c77a94d06f89a03127 SHA256 6d9e1cbec9321aa760a2364cdd5097a29bc7ca0d7781bff850becbac80e1caa1
+EBUILD shadow-4.1.2-r1.ebuild 4517 RMD160 3dd0a823fbc4fee713d2403589939d320b454c73 SHA1 1dceb66f78f6b8ab95460e13ec981050654bcb1a SHA256 1c875201c210f7fa7871c863abec2eee61df2762181e53fe21c8bed243232705
+MISC ChangeLog 35813 RMD160 41bf694173279d96cab7a282399942b5bdf6f16d SHA1 c95187202f936c4f7f5e32f0f9418a0c2a3b7961 SHA256 6a29b1a2e1f5fd75905713716374a5cb72034165ba1f0a9a9a8ee5dce5267b7f
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD4DBQFIOcptj9hvisErhMIRAlplAJdKAz8hgvlpxXT9gn5sgkUtp3xbAKChsAuG
-7ZpF0wZHHKH/TG4BSZRJ8A==
-=y82J
+iEYEARECAAYFAkg7U7QACgkQAiZjviIA2XilQwCePgox8ynPaMWYD4CVY9Bopt7l
+jCUAnR4mLjahVaBjF+UpCdLDcMZEjfYe
+=belr
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/shadow/files/login_defs_pam.sed b/sys-apps/shadow/files/login_defs_pam.sed
new file mode 100644
index 000000000000..ba308ba9abeb
--- /dev/null
+++ b/sys-apps/shadow/files/login_defs_pam.sed
@@ -0,0 +1,24 @@
+/^FAILLOG_ENAB/b comment
+/^LASTLOG_ENAB/b comment
+/^MAIL_CHECK_ENAB/b comment
+/^OBSCURE_CHECKS_ENAB/b comment
+/^PORTTIME_CHECKS_ENAB/b comment
+/^QUOTAS_ENAB/b comment
+/^MOTD_FILE/b comment
+/^FTMP_FILE/b comment
+/^NOLOGINS_FILE/b comment
+/^ENV_HZ/b comment
+/^PASS_MIN_LEN/b comment
+/^SU_WHEEL_ONLY/b comment
+/^CRACKLIB_DICTPATH/b comment
+/^PASS_CHANGE_TRIES/b comment
+/^PASS_ALWAYS_WARN/b comment
+/^CHFN_AUTH/b comment
+/^ENVIRON_FILE/b comment
+
+b exit
+
+: comment
+  s:^:#:
+
+: exit
diff --git a/sys-apps/shadow/shadow-4.1.2.ebuild b/sys-apps/shadow/shadow-4.1.2-r1.ebuild
index c9ef29c677df..3a429ea91e6c 100644
--- a/sys-apps/shadow/shadow-4.1.2.ebuild
+++ b/sys-apps/shadow/shadow-4.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.2.ebuild,v 1.1 2008/05/25 20:21:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.2-r1.ebuild,v 1.1 2008/05/27 00:19:58 flameeyes Exp $
 
 inherit eutils libtool toolchain-funcs autotools pam multilib
 
@@ -115,9 +115,8 @@ src_install() {
 		done
 
 		# comment out login.defs options that pam hates
-		gawk -f "${FILESDIR}"/login_defs.awk \
-			lib/getdef.c etc/login.defs \
-			> "${D}"/etc/login.defs
+		sed -i -f "${FILESDIR}"/login_defs_pam.sed \
+			"${D}"/etc/login.defs
 
 		# remove manpages that pam will install for us
 		# and/or don't apply when using pam