old

Package-Manager: portage-2.2.0_alpha20/cvs/Linux x86_64

24 files changed, 10 insertions, 1601 deletions

diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index bd53c989cd9e..57ffe1d9d3a8 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,8 +1,8 @@
-AUX 4.1.2.2/shadow-svn-2298.patch 1702 RMD160 0c9acfa0a9664e58012dfc86aea2b328aedcfc24 SHA1 aae2e1aa5b40269258f7bef890e93685bd7ff6b4 SHA256 a19dfd9a3f884930f7a1458e9e9767853d09949a9c04274762097ceddfd8129b
-AUX 4.1.2.2/shadow-svn-2364.patch 1944 RMD160 b70c637777ce46115fff0ce1796feff0b5d32e24 SHA1 861172fb52ccafe0e7c35cb740dbfae472a5b59d SHA256 32f1da89c135aaa03062e973b3f2281f560c1cc35663af739ae2b4c2dafc6277
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX default/useradd 96 RMD160 55c38953c800c6aae1ebe4312028560f77e7414f SHA1 348916abd4f794ee99310e1c006fbf00296ea2d7 SHA256 31aa2cbe4a34a9f7d4d134c1fecd007c9bbf4d40e19d0dcddbcd396f1853b490
 AUX login.defs 6254 RMD160 1daa093f13d56126833e6e97d6dd60498a68304a SHA1 0cb67ea901d9544f1bb6f8f147aa25bb2f50628e SHA256 b7bfd7b1c34ce3d35865b572abc69d278dea4eef4f349c26b238735547c4ac22
-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
@@ -15,34 +15,19 @@ AUX pam.d-include/su-openpam 249 RMD160 f89c58a177c15c8c6b515280c1c3e4a843eba191
 AUX pam.d-include/system-auth 380 RMD160 21b5e82097a1d0bef37b40a56f47c6bdbcc6c7b2 SHA1 f8416f974e41156e7990bcbdfde1c6554088f106 SHA256 704c07b9bab8201d55d80970e5a086ea35d93d62969aeb27ee9ebef85a029ed9
 AUX pam.d-include/system-auth-1.1 365 RMD160 28d216f6542554bf175a43a8763827831009224d SHA1 91af0856563242ca34c6f49ee57d90c8a9e6a0f8 SHA256 e073f573c88515cf38fb22faa26ccf87d55d34e6d460d28ad25682958de4c13e
 AUX securetty 262 RMD160 47898e8cef18c582cce9a5ea04bfcdeb8de786bc SHA1 51014069c1884948ad6684d79931a0a89f445471 SHA256 9bc3c187d5535ebe83cf22129b7189a9d8e4c05520af187bff6cff4d8f083c67
-AUX shadow-4.0.11.1-perms.patch 1659 RMD160 ee52a5ceee5edba881bfd16618e3c8f91fff86e3 SHA1 4338d459cda46b030769f40cb1a87c550aee6065 SHA256 71fec5c9214f6bbd2c2bb27426887d4a77e0d29a3dad024e1be56473c0cce4fa
-AUX shadow-4.0.12-gcc2.patch 962 RMD160 957d464b6ed164496a99b8243a07103ddc5dd28a SHA1 2c7367740319e1b2a3f43f8de73e6700cf916973 SHA256 5a0099878940dbe4fe976e076841c869481c6ee473fdcf46f11f8270e7c98606
-AUX shadow-4.0.13-dots-in-usernames.patch 917 RMD160 999f1f6a6468527db1fbc21b7b2a1113fa2aef86 SHA1 bf8fd187ea3b80f98b3dbd5a7af6b17385673b42 SHA256 ddd255ec0e5abd2aeb708ddb3f03a8dd2ecf318cfa5cdbd179f599322d1092f3
-AUX shadow-4.0.13-long-groupnames.patch 398 RMD160 a1fdef5d2c87579838332558624f86d591b85c4b SHA1 ea8eb52bd13b4cd24c564db02ee73fff65fa0372 SHA256 e0f7969be35f190d09d355aa3b76a09f2b1b5ea9a461a27ac1b9ead982211a16
-AUX shadow-4.0.13-nonis.patch 1795 RMD160 ed7ece3f676283f24daa4d7506a0ed73a5bb4e77 SHA1 c2f1472da3865370201d1c43e26db86da7fdd6c5 SHA256 4a4bbed01da45aa7217e12a070e0a86c70a4c9049bddaa881d404a362e5df145
-AUX shadow-4.0.15-uclibc-missing-l64a.patch 1354 RMD160 6d35c4ddad876edacdd41be056fa8abd567ae802 SHA1 27012d25d41a19dcafab1fb45921bbf7aa12885d SHA256 37ac2cdea64f849e0cf9e92ccefeab05b0466541268fb4844f18a94c377c8514
-AUX shadow-4.0.16-fix-useradd-usergroups.patch 3319 RMD160 22c4f916fe1f9da00b0d587b9976491426142f98 SHA1 b08cb5129717c040479f287e0c7851da27b77483 SHA256 b9428435b51341f23be148fa6921408b595dd965a02d1ba731d1ff5b9caba786
-AUX shadow-4.0.17-login.defs.patch 372 RMD160 055add143d873be6a57dbd1f8620b7e45268b5b3 SHA1 2db43522c24931ef6eacc00fca1c982ee9148bb9 SHA256 c23c744f959f3ea8f8aab23652f439803a5167b3a50fa3ef3ca5d4c1f12a9101
-AUX shadow-4.0.18.1-useradd-usermod.patch 1081 RMD160 65bb85eba9f2e08f4febeea97d522d515f7d9fb7 SHA1 c13cf8b5c566e129d4fc62ad3ac08b6c856c992e SHA256 ca34bc36424585c9f1d64c6b4201ce62c964773c7c6c16faecdd2610ad655cfb
-AUX shadow-4.0.18.2-useradd.patch 489 RMD160 8b4b6f9e83a1da6152ae588355709d0df3deb0b6 SHA1 8a829fa144597a0806a136bc275e484c6029dd61 SHA256 9069a1a025e1dd96d3a3b4e5e759f55b297a34a2943f27e160864c090390a8c4
-AUX shadow-4.1.0-fix-useradd-usergroups.patch 2569 RMD160 d8c719470c7df384f9d5ebcdd98603d2d30f1718 SHA1 982b8e53962be4583beeb09efff472d2b34ea2e3 SHA256 c7f7de07b82295289e9bce0e93353527dd70451149978c70129348ff9ad80957
-AUX shadow-4.1.1-audit.patch 454 RMD160 4acba81f49136c3c948ee6a4ac4c43460c07bce1 SHA1 78e3bf843d480ddae04389bdfe5245b42074eae2 SHA256 b2bedbb88bd5d85ea398438802daa516af6105c8fdd356bfa4978c1335ba3ea5
-AUX shadow-4.1.2.1+openpam.patch 3588 RMD160 3c03cc2cc0810c509284c25b94230d24acafa5f8 SHA1 852d648189ebdbc90e1a3b6da62db2a13bc63572 SHA256 0a86d07dd96f54980d2424311f6e5706bf5e3f1f177b72f46bb5e4143495562a
-AUX shadow-4.1.2.2-id-types.patch 2322 RMD160 2f5e682b0f92caec379ab0aee1d810f8bc699d84 SHA1 5dd17e458002878e0b36b887b2b7fc1a8b416ac7 SHA256 97f85a9b3ead6820ec494953671dfd7ebce4e15d62b4d57cb7df3dc7c826f496
-AUX shadow-4.1.2.2-l64a.patch 308 RMD160 d7d0ab42c8fd3d9a53dd1ce262dfc7b17fa4f311 SHA1 eab29cee05c1ec35a4597219f0d8905bca79a426 SHA256 ea66d85fba3948e31084a616b190000fcf9fcf677596cd0f40aa1e173553d00d
-AUX shadow-4.1.2.2-optional-nscd.patch 3244 RMD160 f844c6958f4f3830e9d98daa7622c12991918f61 SHA1 91590b754b562c0918b3232cd4f9e4282cf54891 SHA256 18d97094520b9eda248da1449cda5b448d4102dd234cce4af5cabd6190afb652
-AUX shadow-4.1.2.2-optional-utimes.patch 1397 RMD160 ffeceac79a9474fcd4c9064ebac6edddc45b6eeb SHA1 b56a1174a5fa591b04d7b93b44ec2c5f9285dd28 SHA256 28de85f16e6f4c52ea8f67beecd483d9a58adcd3c2234e88da049fccb9aabd93
 AUX shadow-4.1.3-dots-in-usernames.patch 302 RMD160 dcd0fdb1646a16cae1f3da0858257a22addefd17 SHA1 997e007090618713f9f0295ab540a6f2c9489885 SHA256 2299ffaec204d20e00d791bf5b982571c9261a74c7a7b865a9f7cad1cdcb43ba
 AUX shadow-4.1.4.2-env-reset-keep-locale.patch 436 RMD160 0acad89469885cc88937e23f20a84231af3840fa SHA1 8410b1b291f9c72efa03003f6afdd3e1fdeebe88 SHA256 5dd113c5cc0ea77dc8d8903b8c327b3b5e2cc9a529306ca85651631f06652e8f
 AUX shadow-4.1.4.2-fix-etc-gshadow-reading.patch 570 RMD160 80cbb45693ce4a1b19ced06819aa0488b72c3433 SHA1 1ce93a152cd17db37bd442da21e06d538cdea544 SHA256 091effa9c0336ffdc269d60a26af707b21ce849bdec7128baa21ce2bb5cba6b2
 AUX shadow-4.1.4.2-groupmod-pam-check.patch 689 RMD160 daa22dfce4b35d02951958fafdbac3816794bd63 SHA1 5823f38c0085b27e7e4327ab17ecc13563a43650 SHA256 ad60c0c26b70007750da034223eca38f1a98512fc80ce2fe40440e31a7585c52
 AUX shadow-4.1.4.2-su_no_sanitize_env.patch 315 RMD160 114abfb9ccc429342a83b8e919929c3818019718 SHA1 28ca6c0624c0fe5e4582ccca54e957ede125e96d SHA256 675098bb3dca4d8ac78e6c1c4ae7f513cb4017583b34b6b4d67611578bff8723
-DIST shadow-4.1.2.2.tar.bz2 1697615 RMD160 19b8d3bc37d26d708ecad6a86e6a1f2dcc3c51d3 SHA1 6cbd29104c219ff6776eececb8068f7326d57a45 SHA256 378fbfb0e8bb8c87be239fccd692818871f763206bb7d881744f4fa72dc6b491
 DIST shadow-4.1.4.2.tar.bz2 1790400 RMD160 8483dc5aefc52708199e09a7b2d6831f0a8e357b SHA1 43e29471057c671de51360b10e3ee2b419c78ffa SHA256 97987f6a7967a85e6aa0dba2a1d52db8bd69af5a717391de5693db768fb78990
-DIST shadow_4.0.18.2.orig.tar.gz 2501791 RMD160 f13d5c06bc88eea8d851a8c396110b2e96d1bb39 SHA1 c3426cddc8605ddb7ff55fdc231dc191ecc46989 SHA256 0b3cbfb32200cacd8544734d227d0a576642baf573f972f046bbbae457145cae
-EBUILD shadow-4.0.18.2.ebuild 5172 RMD160 52a11801829a25b8c856d0841e0f398dc103ec08 SHA1 2f0a7f884c7f37ecc2679bbfcd3e642974edd79a SHA256 aba083a533bab41c29dd818772b5890f8b8eb9b634bb870b75b9bf0046c3b8a6
-EBUILD shadow-4.1.2.2.ebuild 4754 RMD160 8c5c5bbb82ef37b66dc9da78b4a735dba6660fb4 SHA1 935f5d49f4d6cb928275c9fe32e0cd86ea87b62c SHA256 78898eb623d2a5da8697408528b57b45304a8981b17865eb1f4bc99ec74831c6
-EBUILD shadow-4.1.4.2-r5.ebuild 5373 RMD160 523514ebf3ca72435930bf5ae093acbd6845626e SHA1 c1c7d3d45aadc5a7afd5360c51defcebca3337c6 SHA256 ab434273ac12b0d0fc301a98cfc32109ac6cfb8e7a408b4c2c5f3b8de9c6c41c
 EBUILD shadow-4.1.4.2-r6.ebuild 5375 RMD160 151b7dd298a1eca7b1a83f11347c659d22280597 SHA1 e20090a69c966ce4a208f5615403e1f2ce4ec11b SHA256 3517782694b7e273c8b5547ba126a99d788eb1fb450c23c4ce22b068948a0f31
 MISC ChangeLog 43206 RMD160 abd5db0f303dd3c3e432b30c9e12f8aea7e2a7b4 SHA1 42c15f3d0bcd84a713c98f32573c335df0b759b0 SHA256 e9b0b215140b538cf6363e080170a8a9e541058626aeae5d3c5162b71245cdc9
 MISC metadata.xml 455 RMD160 362e8de9b1b405329950e77bb76397e8e6d80aae SHA1 f23fddf7e062594cc7ba32ee232dcb1c9b9bba34 SHA256 19a998c1a6a2bdc5baffc01ec9d3233f8032f0a9bab4666f56944e481e9dc5cc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk1Q3wYACgkQaC/OocHi7JbNeAD/VNRKMgIj70wx259B8Nv/f5SZ
+TC/JSBoi52WWFfkIbvMA/jG/zE4qF1Kkw1IrqdXGquDoyrFxIwoJTPVSxoUZy5eo
+=TOCu
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/shadow/files/4.1.2.2/shadow-svn-2298.patch b/sys-apps/shadow/files/4.1.2.2/shadow-svn-2298.patch
deleted file mode 100644
index 5489001cc1fa..000000000000
--- a/sys-apps/shadow/files/4.1.2.2/shadow-svn-2298.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-http://bugs.gentoo.org/256784
-
-From 6f74a20a3002280f23033dea64d7186896d0dfc0 Mon Sep 17 00:00:00 2001
-From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
-Date: Sat, 30 Aug 2008 18:31:21 +0000
-Subject: [PATCH] 	* configure.in: Check if the stat structure has a st_atim or
- 	st_atimensec field.
- 	* libmisc/copydir.c: Conditionally use the stat's st_atim and
- 	st_atimensec fields.
-
-git-svn-id: svn://svn.debian.org/pkg-shadow/upstream/trunk@2298 5a98b0ae-9ef6-0310-add3-de5d479b70d7
----
- ChangeLog         |    4 ++++
- libmisc/copydir.c |    9 +++++++--
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
-+	* configure.in: Check if the stat structure has a st_atim or
-+	st_atimensec field.
-+	* libmisc/copydir.c: Conditionally use the stat's st_atim and
-+	st_atimensec fields.
-
-diff --git a/libmisc/copydir.c b/libmisc/copydir.c
-index b887303..cdd2037 100644
---- a/libmisc/copydir.c
-+++ b/libmisc/copydir.c
-@@ -288,16 +288,21 @@ static int copy_entry (const char *src, const char *dst,
- 	if (LSTAT (src, &sb) == -1) {
- 		/* If we cannot stat the file, do not care. */
- 	} else {
--#if  defined(_BSD_SOURCE) || defined(_SVID_SOURCE)
-+#ifdef	HAVE_STRUCT_STAT_ST_ATIM
- 		mt[0].tv_sec  = sb.st_atim.tv_sec;
- 		mt[0].tv_usec = sb.st_atim.tv_nsec / 1000;
- 		mt[1].tv_sec  = sb.st_mtim.tv_sec;
- 		mt[1].tv_usec = sb.st_mtim.tv_nsec / 1000;
- #else
- 		mt[0].tv_sec  = sb.st_atime;
--		mt[0].tv_usec = sb.st_atimensec / 1000;
- 		mt[1].tv_sec  = sb.st_mtime;
-+#ifdef HAVE_STRUCT_STAT_ST_ATIMENSEC
-+		mt[0].tv_usec = sb.st_atimensec / 1000;
- 		mt[1].tv_usec = sb.st_mtimensec / 1000;
-+#else
-+		mt[0].tv_usec = 0;
-+		mt[1].tv_usec = 0;
-+#endif
- #endif
- 
- 		if (S_ISDIR (sb.st_mode)) {
--- 
-1.6.1.2
-
diff --git a/sys-apps/shadow/files/4.1.2.2/shadow-svn-2364.patch b/sys-apps/shadow/files/4.1.2.2/shadow-svn-2364.patch
deleted file mode 100644
index 59333feb0be7..000000000000
--- a/sys-apps/shadow/files/4.1.2.2/shadow-svn-2364.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-http://bugs.gentoo.org/256784
-
-From 060292366348d55eb90b5c3f4f15768ffc7639d2 Mon Sep 17 00:00:00 2001
-From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
-Date: Sun, 7 Sep 2008 00:05:38 +0000
-Subject: [PATCH] 	* libmisc/copydir.c, configure.in: Check for the presence of
- 	st_mtim and st_mtimensec, as for st_atim and st_atimensec.
-
-git-svn-id: svn://svn.debian.org/pkg-shadow/upstream/trunk@2364 5a98b0ae-9ef6-0310-add3-de5d479b70d7
----
- ChangeLog         |    5 +++++
- configure.in      |    2 ++
- libmisc/copydir.c |   17 ++++++++++++-----
- 3 files changed, 19 insertions(+), 5 deletions(-)
-
-+2008-09-07  Nicolas François  <nicolas.francois@centraliens.net>
-+
-+	* libmisc/copydir.c, configure.in: Check for the presence of
-+	st_mtim and st_mtimensec, as for st_atim and st_atimensec.
-
-/* configure.in changes are in the 4.1.2.2 configure.in ... */
- 
-diff --git a/libmisc/copydir.c b/libmisc/copydir.c
-index cdd2037..a9aec98 100644
---- a/libmisc/copydir.c
-+++ b/libmisc/copydir.c
-@@ -288,19 +288,26 @@ static int copy_entry (const char *src, const char *dst,
- 	if (LSTAT (src, &sb) == -1) {
- 		/* If we cannot stat the file, do not care. */
- 	} else {
--#ifdef	HAVE_STRUCT_STAT_ST_ATIM
-+#ifdef HAVE_STRUCT_STAT_ST_ATIM
- 		mt[0].tv_sec  = sb.st_atim.tv_sec;
- 		mt[0].tv_usec = sb.st_atim.tv_nsec / 1000;
--		mt[1].tv_sec  = sb.st_mtim.tv_sec;
--		mt[1].tv_usec = sb.st_mtim.tv_nsec / 1000;
- #else
- 		mt[0].tv_sec  = sb.st_atime;
--		mt[1].tv_sec  = sb.st_mtime;
- #ifdef HAVE_STRUCT_STAT_ST_ATIMENSEC
- 		mt[0].tv_usec = sb.st_atimensec / 1000;
--		mt[1].tv_usec = sb.st_mtimensec / 1000;
- #else
- 		mt[0].tv_usec = 0;
-+#endif
-+#endif
-+
-+#ifdef HAVE_STRUCT_STAT_ST_MTIM
-+		mt[1].tv_sec  = sb.st_mtim.tv_sec;
-+		mt[1].tv_usec = sb.st_mtim.tv_nsec / 1000;
-+#else
-+		mt[1].tv_sec  = sb.st_mtime;
-+#ifdef HAVE_STRUCT_STAT_ST_MTIMENSEC
-+		mt[1].tv_usec = sb.st_mtimensec / 1000;
-+#else
- 		mt[1].tv_usec = 0;
- #endif
- #endif
--- 
-1.6.1.2
-
diff --git a/sys-apps/shadow/files/login.pamd.2 b/sys-apps/shadow/files/login.pamd.2
deleted file mode 100644
index fdbdf1cda9b0..000000000000
--- a/sys-apps/shadow/files/login.pamd.2
+++ /dev/null
@@ -1,27 +0,0 @@
-#%PAM-1.0
-
-auth       required	pam_securetty.so
-auth       required	pam_tally.so file=/var/log/faillog onerr=succeed
-auth       required	pam_shells.so
-auth       required	pam_nologin.so
-auth       include	system-auth
-
-account    required	pam_access.so
-account    include	system-auth
-account    required	pam_tally.so file=/var/log/faillog onerr=succeed
-
-password   include	system-auth
-
-#%EPAM-Use-Flag:selinux%## pam_selinux.so close should be the first session rule
-#%EPAM-Use-Flag:selinux%#session    required	pam_selinux.so close
-#%EPAM-Use-Flag:selinux%#
-session    required	pam_env.so
-session    optional	pam_lastlog.so
-session    optional	pam_motd.so motd=/etc/motd
-session    optional	pam_mail.so
-
-session    include	system-auth
-
-#%EPAM-Use-Flag:selinux%## pam_selinux.so open should be the last session rule
-#%EPAM-Use-Flag:selinux%#session    required	pam_selinux.so multiple open
-#%EPAM-Use-Flag:selinux%#
diff --git a/sys-apps/shadow/files/shadow-4.0.11.1-perms.patch b/sys-apps/shadow/files/shadow-4.0.11.1-perms.patch
deleted file mode 100644
index 3446fd7f66de..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.11.1-perms.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/Makefile.am	2005-08-01 12:29:59.000000000 +0200
-+++ src.az/Makefile.am	2005-08-01 12:30:44.000000000 +0200
-@@ -45,6 +45,8 @@ noinst_PROGRAMS = id sulogin
- 
- suidbins       = su
- suidubins      = chage chfn chsh expiry gpasswd newgrp passwd
-+suidbinperms   = 4711
-+suidubinperms  = 4711
- 
- LDADD 	       = $(top_builddir)/libmisc/libmisc.a \
- 		 $(top_builddir)/lib/libshadow.la
-@@ -79,8 +81,8 @@ install-am: all-am
- 	ln -sf newgrp	$(DESTDIR)$(ubindir)/sg
- 	ln -sf vipw	$(DESTDIR)$(usbindir)/vigr
- 	for i in $(suidbins); do \
--		chmod -f 4755 $(DESTDIR)$(bindir)/$$i; \
-+		chmod -f $(suidbinperms) $(DESTDIR)$(bindir)/$$i; \
- 	done
- 	for i in $(suidubins); do \
--		chmod -f 4755 $(DESTDIR)$(ubindir)/$$i; \
-+		chmod -f $(suidubinperms) $(DESTDIR)$(ubindir)/$$i; \
- 	done
---- src/Makefile.in	2005-08-01 12:31:07.000000000 +0200
-+++ src.az/Makefile.in	2005-08-01 12:33:54.000000000 +0200
-@@ -346,6 +346,8 @@ INCLUDES = \
- 
- suidbins = su
- suidubins = chage chfn chsh expiry gpasswd newgrp passwd
-+suidbinperms = 4711
-+suidubinperms = 4711
- LDADD = $(top_builddir)/libmisc/libmisc.a \
- 		 $(top_builddir)/lib/libshadow.la
- 
-@@ -839,10 +841,10 @@ install-am: all-am
- 	ln -sf newgrp	$(DESTDIR)$(ubindir)/sg
- 	ln -sf vipw	$(DESTDIR)$(usbindir)/vigr
- 	for i in $(suidbins); do \
--		chmod -f 4755 $(DESTDIR)$(bindir)/$$i; \
-+		chmod -f $(suidbinperms) $(DESTDIR)$(bindir)/$$i; \
- 	done
- 	for i in $(suidubins); do \
--		chmod -f 4755 $(DESTDIR)$(ubindir)/$$i; \
-+		chmod -f $(suidubinperms) $(DESTDIR)$(ubindir)/$$i; \
- 	done
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/sys-apps/shadow/files/shadow-4.0.12-gcc2.patch b/sys-apps/shadow/files/shadow-4.0.12-gcc2.patch
deleted file mode 100644
index b70dbceffc56..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.12-gcc2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Fix compiling with gcc-2.95.x:
-
------
-newgrp.c: In function `main':
-newgrp.c:459: parse error before `child'
-newgrp.c:467: `child' undeclared (first use in this function)
-newgrp.c:467: (Each undeclared identifier is reported only once
-newgrp.c:467: for each function it appears in.)
-newgrp.c:476: `pid' undeclared (first use in this function)
-make[2]: *** [newgrp.o] Error 1
------
-
---- shadow-4.0.12/src/newgrp.c	2005-08-24 13:30:51.000000000 +0200
-+++ shadow-4.0.12.az/src/newgrp.c	2005-08-24 13:31:01.000000000 +0200
-@@ -424,6 +424,7 @@
- 	if (getdef_bool ("SYSLOG_SG_ENAB")) {
- 		char *loginname = getlogin ();
- 		char *tty = ttyname (0);
-+		pid_t child, pid;
- 
- 		if (loginname != NULL)
- 			loginname = xstrdup (loginname);
-@@ -456,7 +457,6 @@
- 		 * avoid any possibility of the parent being stopped when it
- 		 * receives SIGCHLD from the terminating subshell.  -- JWP
- 		 */
--		pid_t child, pid;
- 
- 		signal (SIGINT, SIG_IGN);
- 		signal (SIGQUIT, SIG_IGN);
diff --git a/sys-apps/shadow/files/shadow-4.0.13-dots-in-usernames.patch b/sys-apps/shadow/files/shadow-4.0.13-dots-in-usernames.patch
deleted file mode 100644
index 54e1d72e61b3..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.13-dots-in-usernames.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Allow people to add users with dots in their names.
-
-http://bugs.gentoo.org/22920
-
-Index: libmisc/chkname.c
-===================================================================
-RCS file: /cvsroot/shadow/libmisc/chkname.c,v
-retrieving revision 1.11
-diff -u -p -r1.11 chkname.c
---- libmisc/chkname.c	31 Aug 2005 17:24:57 -0000	1.11
-+++ libmisc/chkname.c	10 Oct 2005 22:20:16 -0000
-@@ -18,7 +18,7 @@
- static int good_name (const char *name)
- {
- 	/*
--	 * User/group names must match [a-z_][a-z0-9_-]*[$]
-+	 * User/group names must match [a-z_][a-z0-9_-.]*[$]
- 	 */
- 	if (!*name || !((*name >= 'a' && *name <= 'z') || *name == '_'))
- 		return 0;
-@@ -27,6 +27,7 @@ static int good_name (const char *name)
- 		if (!((*name >= 'a' && *name <= 'z') ||
- 		      (*name >= '0' && *name <= '9') ||
- 		      *name == '_' || *name == '-' ||
-+		      *name == '.' ||
- 		      (*name == '$' && *(name + 1) == '\0')))
- 			return 0;
- 	}
diff --git a/sys-apps/shadow/files/shadow-4.0.13-long-groupnames.patch b/sys-apps/shadow/files/shadow-4.0.13-long-groupnames.patch
deleted file mode 100644
index df322cf28b2c..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.13-long-groupnames.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Remove arbitrary requirement on the length of groups.  Perhaps we 
-should turn this into a configure option and send upstream ?
-
-http://bugs.gentoo.org/3485
-
---- libmisc/chkname.c
-+++ libmisc/chkname.c
-@@ -59,8 +60,10 @@
- 	 * Arbitrary limit for group names - max 16
- 	 * characters (same as on HP-UX 10).
- 	 */
-+#if 0
- 	if (strlen (name) > 16)
- 		return 0;
-+#endif
- 
- 	return good_name (name);
- }
diff --git a/sys-apps/shadow/files/shadow-4.0.13-nonis.patch b/sys-apps/shadow/files/shadow-4.0.13-nonis.patch
deleted file mode 100644
index 0c89e90e2123..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.13-nonis.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- src/login_nopam.c
-+++ src/login_nopam.c
-@@ -50,7 +50,9 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>		/* for inet_ntoa() */
- extern struct group *getgrnam ();
-+#ifdef USE_NIS
- extern int innetgr ();
-+#endif
- 
- #if !defined(MAXHOSTNAMELEN) || (MAXHOSTNAMELEN < 64)
- #undef MAXHOSTNAMELEN
-@@ -178,6 +180,7 @@ static char *myhostname (void)
- 	return (name);
- }
- 
-+#ifdef USE_NIS
- /* netgroup_match - match group against machine or user */
- static int
- netgroup_match (const char *group, const char *machine, const char *user)
-@@ -193,6 +196,7 @@ netgroup_match (const char *group, const
- 
- 	return innetgr (group, machine, user, mydomain);
- }
-+#endif
- 
- /* user_match - match a username against one token */
- static int user_match (const char *tok, const char *string)
-@@ -214,8 +218,10 @@ static int user_match (const char *tok, 
- 		*at = 0;
- 		return (user_match (tok, string)
- 			&& from_match (at + 1, myhostname ()));
-+#ifdef USE_NIS
- 	} else if (tok[0] == '@') {	/* netgroup */
- 		return (netgroup_match (tok + 1, (char *) 0, string));
-+#endif
- 	} else if (string_match (tok, string)) {	/* ALL or exact match */
- 		return (YES);
- 	} else if ((group = getgrnam (tok))) {	/* try group membership */
-@@ -271,9 +277,12 @@ static int from_match (const char *tok, 
- 	 * contain a "." character. If the token is a network number, return YES
- 	 * if it matches the head of the string.
- 	 */
-+#ifdef USE_NIS
- 	if (tok[0] == '@') {	/* netgroup */
- 		return (netgroup_match (tok + 1, string, (char *) 0));
--	} else if (string_match (tok, string)) {	/* ALL or exact match */
-+	} else
-+#endif
-+	if (string_match (tok, string)) {	/* ALL or exact match */
- 		return (YES);
- 	} else if (tok[0] == '.') {	/* domain: match last fields */
- 		if ((str_len = strlen (string)) > (tok_len = strlen (tok))
diff --git a/sys-apps/shadow/files/shadow-4.0.15-uclibc-missing-l64a.patch b/sys-apps/shadow/files/shadow-4.0.15-uclibc-missing-l64a.patch
deleted file mode 100644
index ac9aa8c9dfd4..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.15-uclibc-missing-l64a.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-uClibc svn has l64a() support in it, but not uClibc 0.9.28 release
-
---- shadow-4.0.15/libmisc/salt.c
-+++ shadow-4.0.15/libmisc/salt.c
-@@ -14,6 +14,52 @@
- #include "prototypes.h"
- #include "defines.h"
- #include "getdef.h"
-+
-+#ifndef HAVE_A64L
-+
-+/*
-+ * l64a - convert a long to a string of radix 64 characters
-+ */
-+
-+static const char conv_table[64] =
-+{
-+  '.', '/', '0', '1', '2', '3', '4', '5',
-+  '6', '7', '8', '9', 'A', 'B', 'C', 'D',
-+  'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L',
-+  'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
-+  'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b',
-+  'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
-+  'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r',
-+  's', 't', 'u', 'v', 'w', 'x', 'y', 'z'
-+};
-+
-+char *
-+l64a (n)
-+     long int n;
-+{
-+  unsigned long int m = (unsigned long int) n;
-+  static char result[7];
-+  int cnt;
-+
-+  /* The standard says that only 32 bits are used.  */
-+  m &= 0xffffffff;
-+
-+  if (m == 0ul)
-+    /* The value for N == 0 is defined to be the empty string. */
-+    return (char *) "";
-+
-+  for (cnt = 0; m > 0ul; ++cnt)
-+    {
-+      result[cnt] = conv_table[m & 0x3f];
-+      m >>= 6;
-+    }
-+  result[cnt] = '\0';
-+
-+  return result;
-+}
-+
-+#endif /* !HAVE_A64L */
-+
- /*
-  * Generate 8 base64 ASCII characters of random salt.  If MD5_CRYPT_ENAB
-  * in /etc/login.defs is "yes", the salt string will be prefixed by "$1$"
diff --git a/sys-apps/shadow/files/shadow-4.0.16-fix-useradd-usergroups.patch b/sys-apps/shadow/files/shadow-4.0.16-fix-useradd-usergroups.patch
deleted file mode 100644
index 3170869f0277..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.16-fix-useradd-usergroups.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-http://bugs.gentoo.org/128715
-
-exact implementation details are still in discussion upstream, but this fixes 
-the behavior to not suck like current code
-
-Index: src/useradd.c
-===================================================================
-RCS file: /cvsroot/shadow/src/useradd.c,v
-retrieving revision 1.96
-diff -u -p -r1.96 useradd.c
---- src/useradd.c	30 May 2006 18:28:45 -0000	1.96
-+++ src/useradd.c	10 Jun 2006 22:13:32 -0000
-@@ -114,7 +114,7 @@ static int do_grp_update = 0;	/* group f
- static char *Prog;
- 
- static int
-- bflg = 0,			/* new default root of home directory */
-+    bflg = 0,			/* new default root of home directory */
-     cflg = 0,			/* comment (GECOS) field for new account */
-     dflg = 0,			/* home directory for new account */
-     Dflg = 0,			/* set/show new user default values */
-@@ -253,6 +253,12 @@ static void get_defaults (void)
- 	const struct group *grp;
- 
- 	/*
-+	 * Pull relevant settings from login.defs first.
-+	 */
-+	if (getdef_bool ("USERGROUPS_ENAB"))
-+		nflg = -1;
-+
-+	/*
- 	 * Open the defaults file for reading.
- 	 */
- 
-@@ -628,6 +634,8 @@ static void usage (void)
- 			   "  -K, --key KEY=VALUE		overrides /etc/login.defs defaults\n"
- 			   "  -m, --create-home		create home directory for the new user\n"
- 			   "				account\n"
-+			   "  -n, --user-group		create a new group with the same name as the\n"
-+			   "				new user\n"
- 			   "  -o, --non-unique		allow create user with duplicate\n"
- 			   "				(non-unique) UID\n"
- 			   "  -p, --password PASSWORD	use encrypted password for the new user\n"
-@@ -1009,6 +1017,7 @@ static void process_flags (int argc, cha
- 			{"skel", required_argument, NULL, 'k'},
- 			{"key", required_argument, NULL, 'K'},
- 			{"create-home", no_argument, NULL, 'm'},
-+			{"user-group", no_argument, NULL, 'n'},
- 			{"non-unique", no_argument, NULL, 'o'},
- 			{"password", required_argument, NULL, 'p'},
- 			{"shell", required_argument, NULL, 's'},
-@@ -1016,7 +1025,7 @@ static void process_flags (int argc, cha
- 			{NULL, 0, NULL, '\0'}
- 		};
- 		while ((c =
--			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMop:s:u:",
-+			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMnop:s:u:",
- 				     long_options, NULL)) != -1) {
- 			switch (c) {
- 			case 'b':
-@@ -1156,6 +1165,9 @@ static void process_flags (int argc, cha
- 			case 'm':
- 				mflg++;
- 				break;
-+			case 'n':
-+				nflg = 1;
-+				break;
- 			case 'o':
- 				oflg++;
- 				break;
-@@ -1203,6 +1215,16 @@ static void process_flags (int argc, cha
- 		usage ();
- 
- 	/*
-+	 * Using --gid and --user-group doesn't make sense.
-+	 */
-+	if (nflg == -1 && gflg)
-+		nflg = 0;
-+	if (nflg && gflg) {
-+		fprintf (stderr, _("%s: options -g and -n conflict\n"), Prog);
-+		exit (E_BAD_ARG);
-+	}
-+
-+	/*
- 	 * Either -D or username is required. Defaults can be set with -D
- 	 * for the -b, -e, -f, -g, -s options only.
- 	 */
-@@ -1725,7 +1747,7 @@ int main (int argc, char **argv)
- 	 * to that group, use useradd -g username username.
- 	 * --bero
- 	 */
--	if (!gflg) {
-+	if (nflg) {
- 		if (getgrnam (user_name)) {
- 			fprintf (stderr,
- 				 _
-@@ -1759,7 +1781,7 @@ int main (int argc, char **argv)
- 
- 	/* do we have to add a group for that user? This is why we need to
- 	 * open the group files in the open_files() function  --gafton */
--	if (!(nflg || gflg)) {
-+	if (nflg) {
- 		find_new_gid ();
- 		grp_add ();
- 	}
diff --git a/sys-apps/shadow/files/shadow-4.0.17-login.defs.patch b/sys-apps/shadow/files/shadow-4.0.17-login.defs.patch
deleted file mode 100644
index 03eb731fa968..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.17-login.defs.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- etc/login.defs
-+++ etc/login.defs
-@@ -38 +38 @@
--MAIL_CHECK_ENAB		yes
-+MAIL_CHECK_ENAB		no
-@@ -205 +205 @@
--SU_WHEEL_ONLY	no
-+SU_WHEEL_ONLY	yes
-@@ -210 +210 @@
--CRACKLIB_DICTPATH	/var/cache/cracklib/cracklib_dict
-+CRACKLIB_DICTPATH	/usr/@LIBDIR@/cracklib_dict
-@@ -227 +227 @@
--LOGIN_RETRIES		5
-+LOGIN_RETRIES		3
-@@ -279 +279 @@
--#MD5_CRYPT_ENAB	no
-+MD5_CRYPT_ENAB	yes
diff --git a/sys-apps/shadow/files/shadow-4.0.18.1-useradd-usermod.patch b/sys-apps/shadow/files/shadow-4.0.18.1-useradd-usermod.patch
deleted file mode 100644
index 8fe14329f1c1..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.18.1-useradd-usermod.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- shadow-4.0.18.1.orig/src/useradd.c	2006-07-28 19:42:48.000000000 +0200
-+++ shadow-4.0.18.1/src/useradd.c	2006-08-04 09:24:34.000000000 +0200
-@@ -203,13 +203,17 @@
- 	long gid;
- 	char *errptr;
- 
-+	struct group* grp = getgrnam (grname);
-+	if (grp)
-+		return grp;
-+
- 	gid = strtol (grname, &errptr, 10);
- 	if (*errptr || errno == ERANGE || gid < 0) {
- 		fprintf (stderr,
- 			 _("%s: invalid numeric argument '%s'\n"), Prog, grname);
- 		exit (E_BAD_ARG);
- 	}
--	return getgrnam (grname);
-+	return getgrgid (gid);
- }
- 
- static long get_number (const char *numstr)
---- shadow-4.0.18.1.orig/src/usermod.c	2006-07-28 19:42:48.000000000 +0200
-+++ shadow-4.0.18.1/src/usermod.c	2006-08-04 09:24:21.000000000 +0200
-@@ -165,13 +165,17 @@
- 	long val;
- 	char *errptr;
- 
-+	struct group* grp = getgrnam (grname);
-+	if (grp)
-+		return grp;
-+
- 	val = strtol (grname, &errptr, 10);
- 	if (*errptr || errno == ERANGE || val < 0) {
- 		fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog,
- 			 grname);
- 		exit (E_BAD_ARG);
- 	}
--	return getgrnam (grname);
-+	return getgrgid (val);
- }
- 
- /*
diff --git a/sys-apps/shadow/files/shadow-4.0.18.2-useradd.patch b/sys-apps/shadow/files/shadow-4.0.18.2-useradd.patch
deleted file mode 100644
index 1135500758b8..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.18.2-useradd.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- shadow-4.0.18.2/src/useradd.c
-+++ shadow-4.0.18.2/src/useradd.c
-@@ -203,14 +203,18 @@
- 	long gid;
- 	char *errptr;
- 
-+	struct group* grp = getgrnam (grname);
-+	if (grp)
-+		return grp;
-+
- 	gid = strtol (grname, &errptr, 10);
- 	if (*errptr || errno == ERANGE || gid < 0) {
- 		fprintf (stderr,
- 			 _("%s: invalid numeric argument '%s'\n"), Prog,
- 			 grname);
- 		exit (E_BAD_ARG);
- 	}
--	return getgrnam (grname);
-+	return getgrgid (gid);
- }
- 
- static long get_number (const char *numstr)
diff --git a/sys-apps/shadow/files/shadow-4.1.0-fix-useradd-usergroups.patch b/sys-apps/shadow/files/shadow-4.1.0-fix-useradd-usergroups.patch
deleted file mode 100644
index 8595ec39a91f..000000000000
--- a/sys-apps/shadow/files/shadow-4.1.0-fix-useradd-usergroups.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-http://bugs.gentoo.org/128715
-
-exact implementation details are still in discussion upstream, but this fixes 
-the behavior to not suck like current code
-
---- src/useradd.c
-+++ src/useradd.c
-@@ -254,6 +254,12 @@
- 	char *cp, *ep;
- 
- 	/*
-+	 * Pull relevant settings from login.defs first.
-+	 */
-+	if (getdef_bool ("USERGROUPS_ENAB"))
-+		nflg = -1;
-+
-+	/*
- 	 * Open the defaults file for reading.
- 	 */
- 
-@@ -632,6 +638,8 @@
- 			   "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
- 			   "  -m, --create-home             create home directory for the new user\n"
- 			   "                                account\n"
-+			   "  -n, --user-group              create a new group with the same name as the\n"
-+			   "                                new user\n"
- 			   "  -o, --non-unique              allow create user with duplicate\n"
- 			   "                                (non-unique) UID\n"
- 			   "  -p, --password PASSWORD       use encrypted password for the new user\n"
-@@ -1001,6 +1009,7 @@
- 			{"skel", required_argument, NULL, 'k'},
- 			{"key", required_argument, NULL, 'K'},
- 			{"create-home", no_argument, NULL, 'm'},
-+			{"user-group", no_argument, NULL, 'n'},
- 			{"non-unique", no_argument, NULL, 'o'},
- 			{"password", required_argument, NULL, 'p'},
- 			{"shell", required_argument, NULL, 's'},
-@@ -1008,7 +1017,7 @@
- 			{NULL, 0, NULL, '\0'}
- 		};
- 		while ((c =
--			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMop:s:u:",
-+			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMnop:s:u:",
- 				     long_options, NULL)) != -1) {
- 			switch (c) {
- 			case 'b':
-@@ -1145,6 +1154,9 @@
- 			case 'm':
- 				mflg++;
- 				break;
-+			case 'n':
-+				nflg = 1;
-+				break;
- 			case 'o':
- 				oflg++;
- 				break;
-@@ -1192,6 +1204,16 @@
- 		usage ();
- 
- 	/*
-+	 * Using --gid and --user-group doesn't make sense.
-+	 */
-+	if (nflg == -1 && gflg)
-+		nflg = 0;
-+	if (nflg && gflg) {
-+		fprintf (stderr, _("%s: options -g and -n conflict\n"), Prog);
-+		exit (E_BAD_ARG);
-+	}
-+
-+	/*
- 	 * Either -D or username is required. Defaults can be set with -D
- 	 * for the -b, -e, -f, -g, -s options only.
- 	 */
-@@ -1728,7 +1750,7 @@
- 	 * to that group, use useradd -g username username.
- 	 * --bero
- 	 */
--	if (!gflg) {
-+	if (nflg) {
- 		if (getgrnam (user_name)) { /* local, no need for xgetgrnam */
- 			fprintf (stderr,
- 				 _
-@@ -1762,7 +1784,7 @@
- 
- 	/* do we have to add a group for that user? This is why we need to
- 	 * open the group files in the open_files() function  --gafton */
--	if (!(nflg || gflg)) {
-+	if (nflg) {
- 		find_new_gid ();
- 		grp_add ();
- 	}
diff --git a/sys-apps/shadow/files/shadow-4.1.1-audit.patch b/sys-apps/shadow/files/shadow-4.1.1-audit.patch
deleted file mode 100644
index 5968279f872f..000000000000
--- a/sys-apps/shadow/files/shadow-4.1.1-audit.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/trunk/src/newgrp.c	2008/04/16 22:03:43	1975
-+++ b/trunk/src/newgrp.c	2008/04/16 22:04:46	1976
-@@ -53,6 +53,10 @@
- static char *Prog;
- static int is_newgrp;
- 
-+#ifdef WITH_AUDIT
-+char audit_buf[80];
-+#endif
-+
- /* local function prototypes */
- static void usage (void);
- static void check_perms (const struct group *grp,
-@@ -349,8 +353,6 @@
- #endif
- 
- #ifdef WITH_AUDIT
--	char audit_buf[80];
--
- 	audit_help_open ();
- #endif
- 	setlocale (LC_ALL, "");
diff --git a/sys-apps/shadow/files/shadow-4.1.2.1+openpam.patch b/sys-apps/shadow/files/shadow-4.1.2.1+openpam.patch
deleted file mode 100644
index f10e02d03682..000000000000
--- a/sys-apps/shadow/files/shadow-4.1.2.1+openpam.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Index: shadow-4.1.2.1/configure.in
-===================================================================
---- shadow-4.1.2.1.orig/configure.in
-+++ shadow-4.1.2.1/configure.in
-@@ -339,13 +339,29 @@ if test "$with_libpam" != "no"; then
- 		AC_MSG_ERROR(libpam not found)
- 	fi
- 
--	AC_CHECK_LIB(pam_misc, main,
--	             [pam_misc_lib="yes"], [pam_misc_lib="no"])
--	if test "$pam_misc_lib$with_libpam" = "noyes" ; then
--		AC_MSG_ERROR(libpam_misc not found)
-+	LIBPAM="-lpam"
-+	pam_conv_function="no"
-+
-+	AC_CHECK_LIB(pam, openpam_ttyconv,
-+		[pam_conv_function="openpam_ttyconv"],
-+		AC_CHECK_LIB(pam_misc, misc_conv,
-+			[pam_conv_function="misc_conv"; LIBPAM="$LIBPAM -lpam_misc"])
-+		)
-+
-+	if test "$pam_conv_function$with_libpam" = "noyes" ; then
-+		AC_MSG_ERROR(PAM conversation function not found)
- 	fi
- 
--	if test "$pam_lib$pam_misc_lib" = "yesyes" ; then
-+	pam_headers_found=no
-+	AC_CHECK_HEADERS( [security/openpam.h security/pam_misc.h],
-+			 [ pam_headers_found=yes ; break ], [],
-+			 [ #include <security/pam_appl.h> ] )
-+        if test "$pam_headers_found$with_libpam" = "noyes" ; then
-+	                AC_MSG_ERROR(PAM headers not found)
-+        fi
-+
-+
-+	if test "$pam_lib$pam_headers_found" = "yesyes" -a "$pam_conv_function" != "no" ; then
- 		with_libpam="yes"
- 	else
- 		with_libpam="no"
-@@ -353,9 +369,22 @@ if test "$with_libpam" != "no"; then
- fi
- dnl Now with_libpam is either yes or no
- if test "$with_libpam" = "yes"; then
-+	AC_CHECK_DECLS([PAM_ESTABLISH_CRED,
-+		PAM_DELETE_CRED,
-+		PAM_NEW_AUTHTOK_REQD,
-+		PAM_DATA_SILENT],
-+		[], [], [#include <security/pam_appl.h>])
-+
-+
-+	save_libs=$LIBS
-+        LIBS="$LIBS $LIBPAM"
-+	AC_CHECK_FUNCS([pam_fail_delay])
-+	LIBS=$save_libs
-+
- 	AC_DEFINE(USE_PAM, 1, [Define to support Pluggable Authentication Modules])
-+	AC_DEFINE_UNQUOTED(SHADOW_PAM_CONVERSATION, [$pam_conv_function],[PAM converstation to use])
- 	AM_CONDITIONAL(USE_PAM, [true])
--	LIBPAM="-lpam -lpam_misc"
-+
- 	AC_MSG_CHECKING(use login and su access checking if PAM not used)
- 	AC_MSG_RESULT(no)
- else
-Index: shadow-4.1.2.1/lib/pam_defs.h
-===================================================================
---- shadow-4.1.2.1.orig/lib/pam_defs.h
-+++ shadow-4.1.2.1/lib/pam_defs.h
-@@ -28,24 +28,31 @@
-  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
-+#include <config.h>
- #include <security/pam_appl.h>
--#include <security/pam_misc.h>
-+#ifdef HAVE_SECURITY_PAM_MISC_H
-+# include <security/pam_misc.h>
-+#endif
-+#ifdef HAVE_SECURITY_OPENPAM_H
-+# include <security/openpam.h>
-+#endif
-+
- 
- static struct pam_conv conv = {
--	misc_conv,
-+	SHADOW_PAM_CONVERSATION,
- 	NULL
- };
- 
- /* compatibility with different versions of Linux-PAM */
--#ifndef PAM_ESTABLISH_CRED
-+#if !HAVE_DECL_PAM_ESTABLISH_CRED
- #define PAM_ESTABLISH_CRED PAM_CRED_ESTABLISH
- #endif
--#ifndef PAM_DELETE_CRED
-+#if !HAVE_DECL_PAM_DELETE_CRED
- #define PAM_DELETE_CRED PAM_CRED_DELETE
- #endif
--#ifndef PAM_NEW_AUTHTOK_REQD
-+#if !HAVE_DECL_PAM_NEW_AUTHTOK_REQD
- #define PAM_NEW_AUTHTOK_REQD PAM_AUTHTOKEN_REQD
- #endif
--#ifndef PAM_DATA_SILENT
-+#if !HAVE_DECL_PAM_DATA_SILENT
- #define PAM_DATA_SILENT 0
- #endif
-Index: shadow-4.1.2.1/src/login.c
-===================================================================
---- shadow-4.1.2.1.orig/src/login.c
-+++ shadow-4.1.2.1/src/login.c
-@@ -644,9 +644,10 @@ int main (int argc, char **argv)
- 			  failed = 0;
- 
- 			  failcount++;
-+#ifdef HAVE_PAM_FAIL_DELAY
- 			  if (delay > 0)
- 			    retcode = pam_fail_delay(pamh, 1000000*delay);
--
-+#endif
- 			  retcode = pam_authenticate (pamh, 0);
- 
- 			  pam_get_item (pamh, PAM_USER,
diff --git a/sys-apps/shadow/files/shadow-4.1.2.2-id-types.patch b/sys-apps/shadow/files/shadow-4.1.2.2-id-types.patch
deleted file mode 100644
index 689884fecbcb..000000000000
--- a/sys-apps/shadow/files/shadow-4.1.2.2-id-types.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 670cce502aadf86b5b5d78059e5474e6171919f3 Mon Sep 17 00:00:00 2001
-From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
-Date: Sat, 30 Aug 2008 18:30:58 +0000
-Subject: [PATCH] * lib/groupio.h, lib/prototypes.h, lib/pwio.h, lib/sgetgrent.c:
- 	Include <sys/types.h> before <pwd.h> and <grp.h>. It is necessary
- 	for the definition of uid_t and gid_t.
- 	* lib/pwmem.c: do not include <pwd.h>, "pwio.h" is sufficient
- 	here.
-
-git-svn-id: svn://svn.debian.org/pkg-shadow/upstream/trunk@2297 5a98b0ae-9ef6-0310-add3-de5d479b70d7
----
- lib/groupio.h    |    1 +
- lib/prototypes.h |    1 +
- lib/pwio.h       |    2 ++
- lib/pwmem.c      |    3 +--
- lib/sgetgrent.c  |    1 +
- 6 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/lib/groupio.h b/lib/groupio.h
-index 9f2984c..d229845 100644
---- a/lib/groupio.h
-+++ b/lib/groupio.h
-@@ -35,6 +35,7 @@
- #ifndef _GROUPIO_H
- #define _GROUPIO_H
- 
-+#include <sys/types.h>
- #include <grp.h>
- 
- extern int gr_close (void);
-diff --git a/lib/prototypes.h b/lib/prototypes.h
-index f1ffc50..feeedc4 100644
---- a/lib/prototypes.h
-+++ b/lib/prototypes.h
-@@ -48,6 +48,7 @@
- #else
- #include <utmp.h>
- #endif
-+#include <sys/types.h>
- #include <pwd.h>
- #include <grp.h>
- #include <shadow.h>
-diff --git a/lib/pwio.h b/lib/pwio.h
-index 28f8bbd..52c7bf3 100644
---- a/lib/pwio.h
-+++ b/lib/pwio.h
-@@ -35,7 +35,9 @@
- #ifndef _PWIO_H
- #define _PWIO_H
- 
-+#include <sys/types.h>
- #include <pwd.h>
-+
- extern int pw_close (void);
- extern const struct passwd *pw_locate (const char *name);
- extern const struct passwd *pw_locate_uid (uid_t uid);
-diff --git a/lib/pwmem.c b/lib/pwmem.c
-index 95a6137..84dee3d 100644
---- a/lib/pwmem.c
-+++ b/lib/pwmem.c
-@@ -35,10 +35,9 @@
- 
- #ident "$Id: shadow-4.1.2.2-id-types.patch,v 1.1 2009/03/15 04:56:23 vapier Exp $"
- 
-+#include <stdio.h>
- #include "prototypes.h"
- #include "defines.h"
--#include <pwd.h>
--#include <stdio.h>
- #include "pwio.h"
- 
- struct passwd *__pw_dup (const struct passwd *pwent)
-diff --git a/lib/sgetgrent.c b/lib/sgetgrent.c
-index 6f090aa..186ee40 100644
---- a/lib/sgetgrent.c
-+++ b/lib/sgetgrent.c
-@@ -35,6 +35,7 @@
- #ident "$Id: shadow-4.1.2.2-id-types.patch,v 1.1 2009/03/15 04:56:23 vapier Exp $"
- 
- #include <stdio.h>
-+#include <sys/types.h>
- #include <grp.h>
- #include "defines.h"
- #include "prototypes.h"
--- 
-1.6.2
-
diff --git a/sys-apps/shadow/files/shadow-4.1.2.2-l64a.patch b/sys-apps/shadow/files/shadow-4.1.2.2-l64a.patch
deleted file mode 100644
index e06598cf3cc0..000000000000
--- a/sys-apps/shadow/files/shadow-4.1.2.2-l64a.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/260001
---- a/libmisc/salt.c
-+++ b/libmisc/salt.c
-@@ -20,9 +20,6 @@
- #include "getdef.h"
- 
- /* local function prototypes */
--#ifndef HAVE_L64A
--char *l64a(long value);
--#endif /* !HAVE_L64A */
- static void seedRNG (void);
- static char *gensalt (size_t salt_size);
- #ifdef USE_SHA_CRYPT
diff --git a/sys-apps/shadow/files/shadow-4.1.2.2-optional-nscd.patch b/sys-apps/shadow/files/shadow-4.1.2.2-optional-nscd.patch
deleted file mode 100644
index 419a604c3b7f..000000000000
--- a/sys-apps/shadow/files/shadow-4.1.2.2-optional-nscd.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 803bce24e3c902efcfba82dad08f25edf1dd3d6f Mon Sep 17 00:00:00 2001
-From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
-Date: Sat, 30 Aug 2008 18:30:36 +0000
-Subject: [PATCH] * configure.in, lib/nscd.h, lib/nscd.c: Added --with-nscd flag to
- 	support systems without nscd.
-
-git-svn-id: svn://svn.debian.org/pkg-shadow/upstream/trunk@2296 5a98b0ae-9ef6-0310-add3-de5d479b70d7
----
- configure.in |   13 +++++++++++--
- lib/nscd.c   |    4 ++++
- lib/nscd.h   |    4 ++++
- 4 files changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 044617c..8384a15 100644
---- a/configure.in
-+++ b/configure.in
-@@ -38,9 +38,9 @@ AC_CHECK_HEADERS(errno.h fcntl.h limits.h unistd.h sys/time.h utmp.h \
- dnl shadow now uses the libc's shadow implementation
- AC_CHECK_HEADER([shadow.h],,[AC_MSG_ERROR([You need a libc with shadow.h])])
- 
--AC_CHECK_FUNCS(l64a fchmod fchown fsync getgroups gethostname getspnam \
-+AC_CHECK_FUNCS(l64a fchmod fchown fsync futimes getgroups gethostname getspnam \
- 	gettimeofday getusershell getutent initgroups lchown lckpwdf lstat \
--	memcpy memset setgroups sigaction strchr updwtmp updwtmpx innetgr \
-+	lutimes memcpy memset setgroups sigaction strchr updwtmp updwtmpx innetgr \
- 	getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r)
- AC_SYS_LARGEFILE
- 
-@@ -235,12 +235,20 @@ AC_ARG_WITH(libcrack,
- AC_ARG_WITH(sha-crypt,
- 	[AC_HELP_STRING([--with-sha-crypt], [allow the SHA256 and SHA512 password encryption algorithms @<:@default=yes@:>@])],
- 	[with_sha_crypt=$withval], [with_sha_crypt=yes])
-+AC_ARG_WITH(nscd,
-+	[AC_HELP_STRING([--with-nscd], [enable support for nscd @<:@default=yes@:>@])],
-+	[with_nscd=$withval], [with_nscd=yes])
- 
- AM_CONDITIONAL(USE_SHA_CRYPT, test "x$with_sha_crypt" = "xyes")
- if test "$with_sha_crypt" = "yes"; then
- 		AC_DEFINE(USE_SHA_CRYPT, 1, [Define to allow the SHA256 and SHA512 password encryption algorithms])
- fi
- 
-+AM_CONDITIONAL(USE_NSCD, test "x$with_nscd" = "xyes")
-+if test "$with_nscd" = "yes"; then
-+	AC_DEFINE(USE_NSCD, 1, [Define to support flushing of nscd caches])
-+fi
-+
- dnl Check for some functions in libc first, only if not found check for
- dnl other libraries.  This should prevent linking libnsl if not really
- dnl needed (Linux glibc, Irix), but still link it if needed (Solaris).
-@@ -457,4 +465,5 @@ echo "	SELinux support:		$with_selinux"
- echo "	shadow group support:		$enable_shadowgrp"
- echo "	S/Key support:			$with_skey"
- echo "	SHA passwords encryption:	$with_sha_crypt"
-+echo "	nscd support:			$with_nscd"
- echo
-diff --git a/lib/nscd.c b/lib/nscd.c
-index 59b7172..5f54b72 100644
---- a/lib/nscd.c
-+++ b/lib/nscd.c
-@@ -1,5 +1,8 @@
- /* Author: Peter Vrabec <pvrabec@redhat.com> */
- 
-+#include <config.h>
-+#ifdef USE_NSCD
-+
- /* because of TEMP_FAILURE_RETRY */
- #define _GNU_SOURCE
- 
-@@ -54,4 +57,5 @@ int nscd_flush_cache (const char *service)
- 
- 	return 0;
- }
-+#endif
- 
-diff --git a/lib/nscd.h b/lib/nscd.h
-index 8bb10a8..a430b00 100644
---- a/lib/nscd.h
-+++ b/lib/nscd.h
-@@ -4,6 +4,10 @@
- /*
-  * nscd_flush_cache - flush specified service buffer in nscd cache
-  */
-+#ifdef	USE_NSCD
- extern int nscd_flush_cache (const char *service);
-+#else
-+#define nscd_flush_cache(service) (0)
-+#endif
- 
- #endif
--- 
-1.6.2
-
diff --git a/sys-apps/shadow/files/shadow-4.1.2.2-optional-utimes.patch b/sys-apps/shadow/files/shadow-4.1.2.2-optional-utimes.patch
deleted file mode 100644
index eba90da113a9..000000000000
--- a/sys-apps/shadow/files/shadow-4.1.2.2-optional-utimes.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 1ed3c6672957f2033f217f90a76f85973f1c85c6 Mon Sep 17 00:00:00 2001
-From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
-Date: Sat, 30 Aug 2008 18:29:55 +0000
-Subject: [PATCH] * NEWS: Added support for uclibc.
- 	* configure.in, libmisc/copydir.c: futimes() and lutimes() are not
- 	standard. Check if they are implemented before using them. Do not
- 	set the time of links if lutimes() does not exist, and use
- 	utimes() as a replacement for futimes().
-
-git-svn-id: svn://svn.debian.org/pkg-shadow/upstream/trunk@2294 5a98b0ae-9ef6-0310-add3-de5d479b70d7
----
- libmisc/copydir.c |    8 ++++++++
- 3 files changed, 17 insertions(+), 0 deletions(-)
-
-diff --git a/libmisc/copydir.c b/libmisc/copydir.c
-index abcea4c..b887303 100644
---- a/libmisc/copydir.c
-+++ b/libmisc/copydir.c
-@@ -431,12 +431,14 @@ static int copy_symlink (const char *src, const char *dst,
- 		return -1;
- 	}
- 
-+#ifdef HAVE_LUTIMES
- 	/* 2007-10-18: We don't care about
- 	 *  exit status of lutimes because
- 	 *  it returns ENOSYS on many system
- 	 *  - not implemented
- 	 */
- 	lutimes (dst, mt);
-+#endif
- 
- 	return err;
- }
-@@ -548,9 +550,15 @@ static int copy_file (const char *src, const char *dst,
- 
- 	(void) close (ifd);
- 
-+#ifdef HAVE_FUTIMES
- 	if (futimes (ofd, mt) != 0) {
- 		return -1;
- 	}
-+#else
-+	if (utimes(dst, mt) != 0) {
-+		return -1;
-+	}
-+#endif
- 
- 	if (close (ofd) != 0) {
- 		return -1;
--- 
-1.6.2
-
diff --git a/sys-apps/shadow/shadow-4.0.18.2.ebuild b/sys-apps/shadow/shadow-4.0.18.2.ebuild
deleted file mode 100644
index 94a9a799cf8b..000000000000
--- a/sys-apps/shadow/shadow-4.0.18.2.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# 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.0.18.2.ebuild,v 1.12 2009/08/23 10:45:45 vapier Exp $
-
-inherit eutils libtool toolchain-funcs autotools pam multilib
-
-DESCRIPTION="Utilities to deal with user accounts"
-HOMEPAGE="http://shadow.pld.org.pl/ http://pkg-shadow.alioth.debian.org/"
-SRC_URI="mirror://debian/pool/main/s/shadow/shadow_${PV}.orig.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls pam selinux skey nousuid cracklib"
-
-RDEPEND="cracklib? ( >=sys-libs/cracklib-2.7-r3 )
-	pam? ( >=sys-libs/pam-0.99 )
-	!sys-apps/pam-login
-	!app-admin/nologin
-	skey? ( sys-auth/skey )
-	selinux? ( >=sys-libs/libselinux-1.28 )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# uclibc support, corrects NIS usage
-	epatch "${FILESDIR}"/${PN}-4.0.13-nonis.patch
-
-	# If su should not simulate a login shell, use '/bin/sh' as shell to enable
-	# running of commands as user with /bin/false as shell, closing bug #15015.
-	# *** This one could be a security hole; disable for now ***
-	#epatch "${FILESDIR}"/${P}-nologin-run-sh.patch
-
-	# tweak the default login.defs
-	epatch "${FILESDIR}"/${PN}-4.0.17-login.defs.patch
-	sed -i "s:@LIBDIR@:$(get_libdir):" etc/login.defs || die
-
-	# Make user/group names more flexible #3485 / #22920
-	epatch "${FILESDIR}"/${PN}-4.0.13-dots-in-usernames.patch
-	epatch "${FILESDIR}"/${PN}-4.0.13-long-groupnames.patch
-
-	# Fix compiling with gcc-2.95.x
-	epatch "${FILESDIR}"/${PN}-4.0.12-gcc2.patch
-
-	# lock down setuid perms #47208
-	epatch "${FILESDIR}"/${PN}-4.0.11.1-perms.patch
-
-	epatch "${FILESDIR}"/${PN}-4.0.15-uclibc-missing-l64a.patch
-	epatch "${FILESDIR}"/${PN}-4.0.16-fix-useradd-usergroups.patch #128715
-	epatch "${FILESDIR}"/${PN}-4.0.18.2-useradd.patch
-
-	# Needed by the UCLIBC patches
-	eautoconf || die
-
-	elibtoolize
-	epunt_cxx
-}
-
-src_compile() {
-	tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes
-	econf \
-		--disable-desrpc \
-		--with-libcrypt \
-		--enable-shared=no \
-		--enable-static=yes \
-		$(use_with cracklib libcrack) \
-		$(use_with pam libpam) \
-		$(use_with skey) \
-		$(use_with selinux) \
-		$(use_enable nls) \
-		|| die "bad configure"
-	emake || die "compile problem"
-}
-
-src_install() {
-	local perms=4711
-	use nousuid && perms=711
-	make DESTDIR="${D}" suiduperms=${perms} install || die "install problem"
-	dosym useradd /usr/sbin/adduser
-
-	# Remove libshadow and libmisc; see bug 37725 and the following
-	# comment from shadow's README.linux:
-	#   Currently, libshadow.a is for internal use only, so if you see
-	#   -lshadow in a Makefile of some other package, it is safe to
-	#   remove it.
-	rm -f "${D}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la}
-
-	insinto /etc
-	# Using a securetty with devfs device names added
-	# (compat names kept for non-devfs compatibility)
-	insopts -m0600 ; doins "${FILESDIR}"/securetty
-	if ! use pam ; then
-		insopts -m0600
-		doins etc/login.access etc/limits
-	fi
-	# Output arch-specific cruft
-	case $(tc-arch) in
-		ppc*)  echo "hvc0" >> "${D}"/etc/securetty
-			   echo "hvsi0" >> "${D}"/etc/securetty
-			   echo "ttyPSC0" >> "${D}"/etc/securetty;;
-		hppa)  echo "ttyB0" >> "${D}"/etc/securetty;;
-		arm)   echo "ttyFB0" >> "${D}"/etc/securetty;;
-		sh)    echo "ttySC0" >> "${D}"/etc/securetty
-			   echo "ttySC1" >> "${D}"/etc/securetty;;
-	esac
-
-	# needed for 'adduser -D'
-	insinto /etc/default
-	insopts -m0600
-	doins "${FILESDIR}"/default/useradd
-
-	# move passwd to / to help recover broke systems #64441
-	mv "${D}"/usr/bin/passwd "${D}"/bin/
-	dosym /bin/passwd /usr/bin/passwd
-
-	cd "${S}"
-	insinto /etc
-	insopts -m0644
-	newins etc/login.defs login.defs
-
-	if use pam ; then
-		dopamd "${FILESDIR}/pam.d-include/"{su,passwd,shadow}
-
-		newpamd "${FILESDIR}/login.pamd.2" login
-
-		for x in chage chsh chfn chpasswd newusers \
-				 user{add,del,mod} group{add,del,mod} ; do
-			newpamd "${FILESDIR}"/pam.d-include/shadow ${x}
-		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
-
-		# remove manpages that pam will install for us
-		# and/or don't apply when using pam
-		find "${D}"/usr/share/man \
-			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
-			-exec rm {} \;
-	fi
-
-	# Remove manpages that are handled by other packages
-	find "${D}"/usr/share/man \
-		'(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \
-		-exec rm {} \;
-
-	cd "${S}"
-	dodoc ChangeLog NEWS TODO
-	newdoc README README.download
-	cd doc
-	dodoc HOWTO README* WISHLIST *.txt
-}
-
-pkg_preinst() {
-	rm -f "${ROOT}"/etc/pam.d/system-auth.new \
-		"${ROOT}/etc/login.defs.new"
-
-	use pam && pam_epam_expand "${D}"/etc/pam.d/login
-}
-
-pkg_postinst() {
-	# Enable shadow groups (we need ROOT=/ here, as grpconv only
-	# operate on / ...).
-	if [[ ${ROOT} == / && ! -f /etc/gshadow ]] ; then
-		if grpck -r &>/dev/null; then
-			grpconv
-		else
-			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
-			ewarn "run 'grpconv' afterwards!"
-		fi
-	fi
-}
diff --git a/sys-apps/shadow/shadow-4.1.2.2.ebuild b/sys-apps/shadow/shadow-4.1.2.2.ebuild
deleted file mode 100644
index f2997c5ed2f0..000000000000
--- a/sys-apps/shadow/shadow-4.1.2.2.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2009 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.2.ebuild,v 1.16 2009/08/23 10:45:45 vapier Exp $
-
-inherit eutils libtool toolchain-funcs autotools pam multilib
-
-DESCRIPTION="Utilities to deal with user accounts"
-HOMEPAGE="http://shadow.pld.org.pl/ http://pkg-shadow.alioth.debian.org/"
-SRC_URI="ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-${PV}.tar.bz2"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="audit cracklib nls pam selinux skey"
-
-RDEPEND="audit? ( sys-process/audit )
-	cracklib? ( >=sys-libs/cracklib-2.7-r3 )
-	pam? ( virtual/pam )
-	!sys-apps/pam-login
-	!app-admin/nologin
-	skey? ( sys-auth/skey )
-	selinux? ( >=sys-libs/libselinux-1.28 )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-RDEPEND="${RDEPEND}
-	pam? ( >=sys-auth/pambase-20080219.1 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PV}/*.patch
-
-	# tweak the default login.defs
-	epatch "${FILESDIR}"/${PN}-4.0.17-login.defs.patch
-	sed -i "s:@LIBDIR@:$(get_libdir):" etc/login.defs || die
-
-	# Make user/group names more flexible #3485 / #22920
-	epatch "${FILESDIR}"/${PN}-4.0.13-dots-in-usernames.patch
-	epatch "${FILESDIR}"/${PN}-4.0.13-long-groupnames.patch
-
-	epatch "${FILESDIR}"/${PN}-4.1.2.1+openpam.patch #232586
-	epatch "${FILESDIR}"/${P}-l64a.patch #260001
-	epatch "${FILESDIR}"/${P}-id-types.patch
-	epatch "${FILESDIR}"/${P}-optional-nscd.patch
-	epatch "${FILESDIR}"/${P}-optional-utimes.patch
-
-	eautoconf
-	eautoheader
-
-	elibtoolize
-	epunt_cxx
-}
-
-src_compile() {
-	tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes
-	econf \
-		--enable-shared=no \
-		--enable-static=yes \
-		$(use_with audit) \
-		$(use_with cracklib libcrack) \
-		$(use_with pam libpam) \
-		$(use_with skey) \
-		$(use_with selinux) \
-		$(use_enable nls) \
-		$(use_with elibc_glibc nscd) \
-		|| die "bad configure"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" suidperms=4711 install || die "install problem"
-	dosym useradd /usr/sbin/adduser
-
-	# Remove libshadow and libmisc; see bug 37725 and the following
-	# comment from shadow's README.linux:
-	#   Currently, libshadow.a is for internal use only, so if you see
-	#   -lshadow in a Makefile of some other package, it is safe to
-	#   remove it.
-	rm -f "${D}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la}
-
-	insinto /etc
-	# Using a securetty with devfs device names added
-	# (compat names kept for non-devfs compatibility)
-	insopts -m0600 ; doins "${FILESDIR}"/securetty
-	if ! use pam ; then
-		insopts -m0600
-		doins etc/login.access etc/limits
-	fi
-	# Output arch-specific cruft
-	case $(tc-arch) in
-		ppc*)  echo "hvc0" >> "${D}"/etc/securetty
-			   echo "hvsi0" >> "${D}"/etc/securetty
-			   echo "ttyPSC0" >> "${D}"/etc/securetty;;
-		hppa)  echo "ttyB0" >> "${D}"/etc/securetty;;
-		arm)   echo "ttyFB0" >> "${D}"/etc/securetty;;
-		sh)    echo "ttySC0" >> "${D}"/etc/securetty
-			   echo "ttySC1" >> "${D}"/etc/securetty;;
-	esac
-
-	# needed for 'adduser -D'
-	insinto /etc/default
-	insopts -m0600
-	doins "${FILESDIR}"/default/useradd
-
-	# move passwd to / to help recover broke systems #64441
-	mv "${D}"/usr/bin/passwd "${D}"/bin/
-	dosym /bin/passwd /usr/bin/passwd
-
-	cd "${S}"
-	insinto /etc
-	insopts -m0644
-	newins etc/login.defs login.defs
-
-	if use pam ; then
-		dopamd "${FILESDIR}/pam.d-include/"{su,passwd,shadow}
-
-		newpamd "${FILESDIR}/login.pamd.2" login
-
-		for x in chage chsh chfn chpasswd newusers \
-				 user{add,del,mod} group{add,del,mod} ; do
-			newpamd "${FILESDIR}"/pam.d-include/shadow ${x}
-		done
-
-		# comment out login.defs options that pam hates
-		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
-		find "${D}"/usr/share/man \
-			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
-			-exec rm {} \;
-	fi
-
-	# Remove manpages that are handled by other packages
-	find "${D}"/usr/share/man \
-		'(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \
-		-exec rm {} \;
-
-	cd "${S}"
-	dodoc ChangeLog NEWS TODO
-	newdoc README README.download
-	cd doc
-	dodoc HOWTO README* WISHLIST *.txt
-}
-
-pkg_preinst() {
-	rm -f "${ROOT}"/etc/pam.d/system-auth.new \
-		"${ROOT}/etc/login.defs.new"
-
-	use pam && pam_epam_expand "${D}"/etc/pam.d/login
-}
-
-pkg_postinst() {
-	# Enable shadow groups (we need ROOT=/ here, as grpconv only
-	# operate on / ...).
-	if [[ ${ROOT} == / && ! -f /etc/gshadow ]] ; then
-		if grpck -r &>/dev/null; then
-			grpconv
-		else
-			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
-			ewarn "run 'grpconv' afterwards!"
-		fi
-	fi
-}
diff --git a/sys-apps/shadow/shadow-4.1.4.2-r5.ebuild b/sys-apps/shadow/shadow-4.1.4.2-r5.ebuild
deleted file mode 100644
index b3040f9d55fa..000000000000
--- a/sys-apps/shadow/shadow-4.1.4.2-r5.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.4.2-r5.ebuild,v 1.7 2010/10/10 17:12:45 armin76 Exp $
-
-inherit eutils libtool toolchain-funcs pam multilib
-
-DESCRIPTION="Utilities to deal with user accounts"
-HOMEPAGE="http://shadow.pld.org.pl/ http://pkg-shadow.alioth.debian.org/"
-SRC_URI="ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-${PV}.tar.bz2"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="audit cracklib nls pam selinux skey"
-
-RDEPEND="audit? ( sys-process/audit )
-	cracklib? ( >=sys-libs/cracklib-2.7-r3 )
-	pam? ( virtual/pam )
-	!sys-apps/pam-login
-	!app-admin/nologin
-	skey? ( sys-auth/skey )
-	selinux? ( >=sys-libs/libselinux-1.28 )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-RDEPEND="${RDEPEND}
-	pam? ( >=sys-auth/pambase-20080219.1 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-4.1.4.2-env-reset-keep-locale.patch #283725
-	epatch "${FILESDIR}"/${PN}-4.1.3-dots-in-usernames.patch #22920
-	epatch "${FILESDIR}"/${PN}-4.1.4.2-groupmod-pam-check.patch #300790
-	epatch "${FILESDIR}"/${PN}-4.1.4.2-su_no_sanitize_env.patch #301957
-	epatch "${FILESDIR}"/${PN}-4.1.4.2-fix-etc-gshadow-reading.patch #327605
-	elibtoolize
-	epunt_cxx
-}
-
-src_compile() {
-	tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes
-	econf \
-		--without-group-name-max-length \
-		--enable-shared=no \
-		--enable-static=yes \
-		$(use_with audit) \
-		$(use_with cracklib libcrack) \
-		$(use_with pam libpam) \
-		$(use_with skey) \
-		$(use_with selinux) \
-		$(use_enable nls) \
-		$(use_with elibc_glibc nscd)
-	emake || die "compile problem"
-}
-
-set_login_opt() {
-	local comment="" opt=$1 val=$2
-	[[ -z ${val} ]] && comment="#"
-	sed -i -r \
-		-e "/^#?${opt}/s:.*:${comment}${opt} ${val}:" \
-		"${D}"/etc/login.defs
-	local res=$(grep "^${comment}${opt}" "${D}"/etc/login.defs)
-	einfo ${res:-Unable to find ${opt} in /etc/login.defs}
-}
-
-src_install() {
-	emake DESTDIR="${D}" suidperms=4711 install || die "install problem"
-
-	# Remove libshadow and libmisc; see bug 37725 and the following
-	# comment from shadow's README.linux:
-	#   Currently, libshadow.a is for internal use only, so if you see
-	#   -lshadow in a Makefile of some other package, it is safe to
-	#   remove it.
-	rm -f "${D}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la}
-
-	insinto /etc
-	# Using a securetty with devfs device names added
-	# (compat names kept for non-devfs compatibility)
-	insopts -m0600 ; doins "${FILESDIR}"/securetty
-	if ! use pam ; then
-		insopts -m0600
-		doins etc/login.access etc/limits
-	fi
-	# Output arch-specific cruft
-	local devs
-	case $(tc-arch) in
-		ppc*)  devs="hvc0 hvsi0 ttyPSC0";;
-		hppa)  devs="ttyB0";;
-		arm)   devs="ttyFB0";;
-		sh)    devs="ttySC0 ttySC1";;
-	esac
-	[[ -n ${devs} ]] && printf '%s\n' ${devs} >> "${D}"/etc/securetty
-
-	# needed for 'useradd -D'
-	insinto /etc/default
-	insopts -m0600
-	doins "${FILESDIR}"/default/useradd
-
-	# move passwd to / to help recover broke systems #64441
-	mv "${D}"/usr/bin/passwd "${D}"/bin/
-	dosym /bin/passwd /usr/bin/passwd
-
-	cd "${S}"
-	insinto /etc
-	insopts -m0644
-	newins etc/login.defs login.defs
-
-	if ! use pam ; then
-		set_login_opt MAIL_CHECK_ENAB no
-		set_login_opt SU_WHEEL_ONLY yes
-		set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict
-		set_login_opt LOGIN_RETRIES 3
-		set_login_opt ENCRYPT_METHOD SHA512
-	else
-		dopamd "${FILESDIR}/pam.d-include/"{su,shadow}
-
-		newpamd "${FILESDIR}/login.pamd.2" login
-
-		for x in passwd chpasswd chgpasswd; do
-			newpamd "${FILESDIR}"/pam.d-include/passwd ${x} || die
-		done
-
-		for x in chage chsh chfn newusers \
-				 user{add,del,mod} group{add,del,mod} ; do
-			newpamd "${FILESDIR}"/pam.d-include/shadow ${x} || die
-		done
-
-		# comment out login.defs options that pam hates
-		local opt
-		for opt in \
-			CHFN_AUTH \
-			CRACKLIB_DICTPATH \
-			ENV_HZ \
-			ENVIRON_FILE \
-			FAILLOG_ENAB \
-			FTMP_FILE \
-			LASTLOG_ENAB \
-			MAIL_CHECK_ENAB \
-			MOTD_FILE \
-			NOLOGINS_FILE \
-			OBSCURE_CHECKS_ENAB \
-			PASS_ALWAYS_WARN \
-			PASS_CHANGE_TRIES \
-			PASS_MIN_LEN \
-			PORTTIME_CHECKS_ENAB \
-			QUOTAS_ENAB \
-			SU_WHEEL_ONLY
-		do
-			set_login_opt ${opt}
-		done
-
-		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
-		find "${D}"/usr/share/man \
-			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
-			-exec rm {} +
-	fi
-
-	# Remove manpages that are handled by other packages
-	find "${D}"/usr/share/man \
-		'(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \
-		-exec rm {} +
-
-	cd "${S}"
-	dodoc ChangeLog NEWS TODO
-	newdoc README README.download
-	cd doc
-	dodoc HOWTO README* WISHLIST *.txt
-}
-
-pkg_preinst() {
-	rm -f "${ROOT}"/etc/pam.d/system-auth.new \
-		"${ROOT}/etc/login.defs.new"
-
-	use pam && pam_epam_expand "${D}"/etc/pam.d/login
-}
-
-pkg_postinst() {
-	# Enable shadow groups (we need ROOT=/ here, as grpconv only
-	# operate on / ...).
-	if [[ ${ROOT} == / && ! -f /etc/gshadow ]] ; then
-		if grpck -r 2>/dev/null ; then
-			grpconv
-		else
-			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
-			ewarn "run 'grpconv' afterwards!"
-		fi
-	fi
-
-	einfo "The 'adduser' symlink to 'useradd' has been dropped."
-}