Checked with upstream .. SUPATH and PATH valid again for PAM (bug #101047).

Fix building on UCLIBC.

Package-Manager: portage-2.0.51.22-r2

7 files changed, 437 insertions, 58 deletions

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index 013df13b66f4..3bb6d846b320 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/shadow
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.116 2005/08/01 11:47:37 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.117 2005/08/03 18:56:46 azarah Exp $
+
+*shadow-4.0.11.1-r1 (03 Aug 2005)
+
+  03 Aug 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/shadow-4.0.11.1-SUPATH.patch,
+  +files/shadow-4.0.11.1-ngettext.patch,
+  +files/shadow-4.0.11.1-uclibc-missing-l64a.patch,
+  +shadow-4.0.11.1-r1.ebuild:
+  Checked with upstream .. SUPATH and PATH valid again for PAM (bug #101047).
+  Fix building on UCLIBC.
 
 *shadow-4.0.11.1 (01 Aug 2005)
 
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index a1ae8bcab93b..8f7191039887 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,79 +1,73 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ac3c5c29460f248d06d4ef83c96ca912 shadow-4.0.7-r1.ebuild 6602
 MD5 2581b4daddefcf73a30d69ac42fdfd1a shadow-4.0.5-r3.ebuild 5614
-MD5 0faad34d69a5e1bba61af947618ae795 shadow-4.0.7-r4.ebuild 7206
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 c2ab407aa2ff8ce76a2600f2d4c6a3b2 shadow-4.0.7-r3.ebuild 7074
+MD5 db870979ea0f600d0bd8137520e2251a shadow-4.0.4.1-r4.ebuild 5961
 MD5 a51d02eb155feb33913816239bb3cf57 shadow-4.0.7.ebuild 5602
-MD5 45dacbf514dc7fc556ac8088d18ceda2 shadow-4.0.11.1.ebuild 6787
-MD5 06049e2959c62c88aee32422a37bf07f shadow-4.0.6-r1.ebuild 5641
-MD5 fad39eceb7fd04f2805c6acc16c59d57 shadow-4.0.5-r2.ebuild 5440
+MD5 c2ab407aa2ff8ce76a2600f2d4c6a3b2 shadow-4.0.7-r3.ebuild 7074
+MD5 0faad34d69a5e1bba61af947618ae795 shadow-4.0.7-r4.ebuild 7206
 MD5 5c67a171ae58363c905c519129df38c4 ChangeLog 21557
-MD5 db870979ea0f600d0bd8137520e2251a shadow-4.0.4.1-r4.ebuild 5961
+MD5 fe05ae3df6e7ba8f80c93d14ed85ab2a shadow-4.0.11.1-r1.ebuild 6969
 MD5 ad25974e54da8203a96dddffef6a46ce shadow-4.0.10.ebuild 6753
-MD5 962e753a4789598d75532745e1f3e6cf files/digest-shadow-4.0.10 67
-MD5 e32464f2df5a85f4f6c67bc78e9a23d1 files/shadow-4.0.7-nscd-socket-path.patch 1081
+MD5 ac3c5c29460f248d06d4ef83c96ca912 shadow-4.0.7-r1.ebuild 6602
+MD5 fad39eceb7fd04f2805c6acc16c59d57 shadow-4.0.5-r2.ebuild 5440
+MD5 06049e2959c62c88aee32422a37bf07f shadow-4.0.6-r1.ebuild 5641
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 20fd2dc35b8671b91e120b90281b4cf3 files/shadow-4.0.5-hack-X-envvars.patch 521
+MD5 d06833980d79d4f001b6064a3f52f938 files/shadow-4.0.7-iswheel.patch 416
+MD5 70b7c7f1725841e335e5f2361fc9ebab files/shadow-4.0.7-nscd-EPIPE-failure.patch 947
+MD5 d14e133da535d64d1b397784e17c213a files/shadow-4.0.5-login.defs.patch 766
+MD5 b4d0fc0f54800978591791493d6b2ec3 files/shadow-4.0.6-dots-in-usernames.patch 1993
+MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7-r4 66
+MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7-r3 66
+MD5 e983d3bcaf48f607dc79c9c69b5238a5 files/shadow-4.0.11.1-SUPATH.patch 878
+MD5 6355d65b618395c4adf46f733269546c files/shadow-4.0.10-dots-in-usernames.patch 1894
+MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r2 66
+MD5 3a50ee0f5e03479ab7db7f3987cd8107 files/shadow-4.0.11.1-ngettext.patch 1064
+MD5 c5e9081ed43837797e2f1617b7ce1c24 files/shadow-4.0.5-fix-adding-of-pam_env-set-env-vars.patch 285
+MD5 c87c0968ace90b32753b91f93ad7bab1 files/shadow-4.0.11.1-uclibc-missing-l64a.patch 1269
+MD5 391991f50203bd8b7738474051befdee files/shadow-4.0.5-remove-else.patch 531
+MD5 ae5d078bc6b651b5f081dcfc64b5df69 files/shadow-4.0.11.1-perms.patch 1659
+MD5 e32464f2df5a85f4f6c67bc78e9a23d1 files/shadow-4.0.7-nscd-socket-path.patch 1081
+MD5 aaf16ddabef285df169e37254b13561c files/shadow-4.0.4.1-selinux.diff 4296
+MD5 fda41657b856ffaeec5a2734b312409b files/shadow-4.0.5-fix-mail-configure.patch 5452
+MD5 e9ac6a566b65499773437ce98911a046 files/digest-shadow-4.0.6-r1 66
+MD5 201f1321262da41ccd1a0283216ae9a7 files/shadow-4.0.4.1-su-pam_open_session.patch 4886
+MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7 66
+MD5 c31db5c71b0cdfca75346abc2887aa02 files/shadow-4.0.5-nls-manpages.patch 362
+MD5 aaedecd7edcccff66f962fd82928eec9 files/shadow-4.0.10-long-groupnames.patch 1205
+MD5 a99f871c88548d503bad935d2aa6f412 files/shadow-4.0.4.1-nls-manpages.patch 355
+MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r3 66
 MD5 8bf11ce0e8ee683fe290462473871dab files/shadow-4.0.6-long-groupnames.patch 1625
-MD5 9375147f78a25196b654616c969af9a5 files/digest-shadow-4.0.11.1 69
+MD5 a744152ec905f4c06f3b92142b7fec8a files/securetty 253
 MD5 020e030c2d09b206e88cf9051ced6244 files/shadow-4.0.4.1-nonis.patch 1504
-MD5 aaf16ddabef285df169e37254b13561c files/shadow-4.0.4.1-selinux.diff 4296
-MD5 c5e9081ed43837797e2f1617b7ce1c24 files/shadow-4.0.5-fix-adding-of-pam_env-set-env-vars.patch 285
-MD5 7becc41b4f7264483ee3ff0ca8277084 files/shadow-4.0.4.1-passwd-typo.patch 438
+MD5 bb55107c3a9354ef2d1977547fdb5a83 files/shadow-4.0.4.1-useradd-manpage-update.patch 958
+MD5 9375147f78a25196b654616c969af9a5 files/digest-shadow-4.0.11.1 69
 MD5 f9846ea2aeefba54443ef5d6796f0bbc files/shadow-4.0.10-nls-manpages.patch 367
+MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7-r1 66
+MD5 058f760e522ab65e270293003805fe61 files/shadow-4.0.4.1-userdel-missing-brackets.patch 380
 MD5 b8efca60a25e256eebe54c3d0db0760f files/shadow-4.0.4.1-gcc34-xmalloc.patch 361
 MD5 90e2ab53494f677dc23b5137d6e39110 files/shadow-4.0.6-fix-configure.patch 3047
-MD5 13cddd2e24cbcaf5164e13f9105c222c files/shadow-4.0.7-perms.patch 1768
-MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7-r1 66
+MD5 636f233fa173a998195016c3808173d4 files/shadow-4.0.5-skey.patch 395
 MD5 fdb23bff28b70bd53f200379c33dd27c files/shadow-4.0.10-nonis.patch 1434
+MD5 13cddd2e24cbcaf5164e13f9105c222c files/shadow-4.0.7-perms.patch 1768
+MD5 962e753a4789598d75532745e1f3e6cf files/digest-shadow-4.0.10 67
 MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1-r4 67
-MD5 a99f871c88548d503bad935d2aa6f412 files/shadow-4.0.4.1-nls-manpages.patch 355
-MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7-r4 66
-MD5 d14e133da535d64d1b397784e17c213a files/shadow-4.0.5-login.defs.patch 766
-MD5 058f760e522ab65e270293003805fe61 files/shadow-4.0.4.1-userdel-missing-brackets.patch 380
-MD5 aaedecd7edcccff66f962fd82928eec9 files/shadow-4.0.10-long-groupnames.patch 1205
-MD5 a744152ec905f4c06f3b92142b7fec8a files/securetty 253
-MD5 b4d0fc0f54800978591791493d6b2ec3 files/shadow-4.0.6-dots-in-usernames.patch 1993
-MD5 bb55107c3a9354ef2d1977547fdb5a83 files/shadow-4.0.4.1-useradd-manpage-update.patch 958
-MD5 e9ac6a566b65499773437ce98911a046 files/digest-shadow-4.0.6-r1 66
-MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r2 66
-MD5 201f1321262da41ccd1a0283216ae9a7 files/shadow-4.0.4.1-su-pam_open_session.patch 4886
+MD5 95f7b8980169e81352229bd548909ea7 files/shadow-4.0.10-fix-configure.patch 579
 MD5 d15398f7d8c06b906abdf73ae3a55f54 files/shadow-4.0.6-manpages.patch 564
-MD5 636f233fa173a998195016c3808173d4 files/shadow-4.0.5-skey.patch 395
-MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r3 66
-MD5 391991f50203bd8b7738474051befdee files/shadow-4.0.5-remove-else.patch 531
-MD5 ae5d078bc6b651b5f081dcfc64b5df69 files/shadow-4.0.11.1-perms.patch 1659
-MD5 c31db5c71b0cdfca75346abc2887aa02 files/shadow-4.0.5-nls-manpages.patch 362
-MD5 6355d65b618395c4adf46f733269546c files/shadow-4.0.10-dots-in-usernames.patch 1894
-MD5 fda41657b856ffaeec5a2734b312409b files/shadow-4.0.5-fix-mail-configure.patch 5452
-MD5 70b7c7f1725841e335e5f2361fc9ebab files/shadow-4.0.7-nscd-EPIPE-failure.patch 947
-MD5 d06833980d79d4f001b6064a3f52f938 files/shadow-4.0.7-iswheel.patch 416
 MD5 a63ee37286c486567191c7c6b24432e2 files/shadow-4.0.7-lastlog.patch 455
-MD5 95f7b8980169e81352229bd548909ea7 files/shadow-4.0.10-fix-configure.patch 579
-MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7-r3 66
-MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7 66
-MD5 6e0bc0211949c624da0ea08d994a7038 files/default/useradd 96
-MD5 4b7d75b12f1bea9f349dff4c48c18b8b files/pam.d-include/login 245
-MD5 97b4f01b65fd3b8caa8983489e9b6848 files/pam.d-include/su 1059
+MD5 7becc41b4f7264483ee3ff0ca8277084 files/shadow-4.0.4.1-passwd-typo.patch 438
+MD5 9375147f78a25196b654616c969af9a5 files/digest-shadow-4.0.11.1-r1 69
 MD5 33d9efd092b6999143ea42c99a59bfb1 files/pam.d-include/system-auth-1.1 365
 MD5 e3a7d5b7abee1ba6e7f09ee607da87ba files/pam.d-include/su-openpam 249
-MD5 5df27e06de913de76e24790642eecfd2 files/pam.d-include/passwd 104
-MD5 5bff4f2134b72dabc4afa5bb296e874d files/pam.d-include/other 142
 MD5 caa5f36d54cb7a75ce5728f7f1badafb files/pam.d-include/system-auth 380
+MD5 4b7d75b12f1bea9f349dff4c48c18b8b files/pam.d-include/login 245
+MD5 97b4f01b65fd3b8caa8983489e9b6848 files/pam.d-include/su 1059
 MD5 50d7c96eab701fd6ddbf4b283e493b4c files/pam.d-include/shadow 152
+MD5 5df27e06de913de76e24790642eecfd2 files/pam.d-include/passwd 104
+MD5 5bff4f2134b72dabc4afa5bb296e874d files/pam.d-include/other 142
+MD5 6e0bc0211949c624da0ea08d994a7038 files/default/useradd 96
+MD5 33d9efd092b6999143ea42c99a59bfb1 files/pam.d/system-auth-1.1 365
+MD5 deed69f8fa52ca844f3669414bd5cf01 files/pam.d/system-auth 373
 MD5 987d0bd2e5dd1f96dc28ae2963054022 files/pam.d/login 333
 MD5 a1fc81dbd0d41face776fba4ca929d8f files/pam.d/su 1142
-MD5 33d9efd092b6999143ea42c99a59bfb1 files/pam.d/system-auth-1.1 365
+MD5 a5721c39446539b751dceae4b054542b files/pam.d/shadow 171
 MD5 8a59937d720a19824db6e4a8cd173a4b files/pam.d/passwd 172
 MD5 5bff4f2134b72dabc4afa5bb296e874d files/pam.d/other 142
-MD5 deed69f8fa52ca844f3669414bd5cf01 files/pam.d/system-auth 373
-MD5 a5721c39446539b751dceae4b054542b files/pam.d/shadow 171
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC8BzCgIKl8Uu19MoRAu/sAJ9X8LBRcORZ3mxBDoKvzsqq8ka/0QCeORBB
-Q6ZdoNqHzQqCgZ0VSqLCJi0=
-=Mbf6
------END PGP SIGNATURE-----
diff --git a/sys-apps/shadow/files/digest-shadow-4.0.11.1-r1 b/sys-apps/shadow/files/digest-shadow-4.0.11.1-r1
new file mode 100644
index 000000000000..797d6633880d
--- /dev/null
+++ b/sys-apps/shadow/files/digest-shadow-4.0.11.1-r1
@@ -0,0 +1 @@
+MD5 e60b7b16128b9e00576073389a0ff1e6 shadow-4.0.11.1.tar.bz2 1056103
diff --git a/sys-apps/shadow/files/shadow-4.0.11.1-SUPATH.patch b/sys-apps/shadow/files/shadow-4.0.11.1-SUPATH.patch
new file mode 100644
index 000000000000..7cbb8b73f8c2
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.0.11.1-SUPATH.patch
@@ -0,0 +1,45 @@
+diff -urp shadow-4.0.11.1/lib/getdef.c shadow-4.0.11.1.az/lib/getdef.c
+--- shadow-4.0.11.1/lib/getdef.c	2005-07-12 20:54:39.000000000 +0200
++++ shadow-4.0.11.1.az/lib/getdef.c	2005-08-03 20:35:10.000000000 +0200
+@@ -61,9 +61,7 @@ static struct itemdef def_table[] = {
+ 	{"CHSH_AUTH", NULL},
+ 	{"CRACKLIB_DICTPATH", NULL},
+ 	{"ENV_HZ", NULL},
+-	{"ENV_PATH", NULL},
+ 	{"ENV_ROOTPATH", NULL},	/* SuSE compatibility? */
+-	{"ENV_SUPATH", NULL},
+ 	{"ENV_TZ", NULL},
+ 	{"ENVIRON_FILE", NULL},
+ 	{"FAILLOG_ENAB", NULL},
+@@ -87,6 +85,8 @@ static struct itemdef def_table[] = {
+ 	{"QUOTAS_ENAB", NULL},
+ 	{"ULIMIT", NULL},
+ #endif
++	{"ENV_PATH", NULL},
++	{"ENV_SUPATH", NULL},
+ 	{"CONSOLE_GROUPS", NULL},
+ 	{"CONSOLE", NULL},
+ 	{"CREATE_HOME", NULL},
+diff -urp shadow-4.0.11.1/src/su.c shadow-4.0.11.1.az/src/su.c
+--- shadow-4.0.11.1/src/su.c	2005-07-18 12:14:39.000000000 +0200
++++ shadow-4.0.11.1.az/src/su.c	2005-08-03 20:34:02.000000000 +0200
+@@ -584,10 +584,8 @@ int main (int argc, char **argv)
+ #endif				/* !USE_PAM */
+ 
+ 	signal (SIGINT, SIG_DFL);
+-#ifndef USE_PAM
+-	cp = getdef_str ((pwent.pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH");
+ 
+-	/* XXX very similar code duplicated in libmisc/setupenv.c */
++	cp = getdef_str ((pwent.pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH");
+ 	if (!cp) {
+ 		addenv ("PATH=/bin:/usr/bin", NULL);
+ 	} else if (strchr (cp, '=')) {
+@@ -597,7 +595,6 @@ int main (int argc, char **argv)
+ 	}
+ 
+ 	environ = newenvp;	/* make new environment active */
+-#endif				/* !USE_PAM */
+ 
+ 	if (getenv ("IFS"))	/* don't export user IFS ... */
+ 		addenv ("IFS= \t\n", NULL);	/* ... instead, set a safe IFS */
diff --git a/sys-apps/shadow/files/shadow-4.0.11.1-ngettext.patch b/sys-apps/shadow/files/shadow-4.0.11.1-ngettext.patch
new file mode 100644
index 000000000000..9eba2c07220a
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.0.11.1-ngettext.patch
@@ -0,0 +1,28 @@
+New ngettext stuff borks on UCLIBC, as ngettext do not have a !ENABLE_NLS
+define.  Add a check for ngettext and add the ngettext define.  Both was
+inspired by coreutils.
+
+diff -urp shadow-4.0.11.1/configure.in shadow-4.0.11.1.az/configure.in
+--- shadow-4.0.11.1/configure.in	2005-08-03 00:59:56.000000000 +0200
++++ shadow-4.0.11.1.az/configure.in	2005-08-03 12:04:55.000000000 +0200
+@@ -280,6 +280,6 @@ if test "$with_libskey" = "yes"; then
+ fi
+ 
+ AM_GNU_GETTEXT_VERSION(0.12.1)
+-AM_GNU_GETTEXT([external])
++AM_GNU_GETTEXT([external], [need-ngettext])
+ 
+ AC_CONFIG_FILES([
+ 	Makefile
+diff -urp shadow-4.0.11.1/lib/defines.h shadow-4.0.11.1.az/lib/defines.h
+--- shadow-4.0.11.1/lib/defines.h	2005-06-14 22:27:48.000000000 +0200
++++ shadow-4.0.11.1.az/lib/defines.h	2005-08-03 12:06:42.000000000 +0200
+@@ -24,6 +24,8 @@
+ # undef textdomain
+ # define textdomain(Domain)	/* empty */
+ # define _(Text) Text
++# define ngettext(Msgid1, Msgid2, N) \
++    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+ #endif
+ 
+ #if STDC_HEADERS
diff --git a/sys-apps/shadow/files/shadow-4.0.11.1-uclibc-missing-l64a.patch b/sys-apps/shadow/files/shadow-4.0.11.1-uclibc-missing-l64a.patch
new file mode 100644
index 000000000000..8b6b87d8385f
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.0.11.1-uclibc-missing-l64a.patch
@@ -0,0 +1,64 @@
+UCLIBC have the prototypes in stdlib.h, but not the actual functions (yes, you
+guys sucks once again.  The better way might be rather to add lib/rad64.c back,
+but its higher maintainence our side at least.
+
+--- shadow-4.0.11.1/libmisc/salt.c	2005-08-03 12:50:45.000000000 +0200
++++ shadow-4.0.11.1.az/libmisc/salt.c	2005-08-03 13:07:03.000000000 +0200
+@@ -14,6 +14,57 @@
+ #include "prototypes.h"
+ #include "defines.h"
+ #include "getdef.h"
++
++#ifndef HAVE_A64L
++
++/*
++ * i64c - convert an integer to a radix 64 character
++ */
++
++int
++i64c(int i)
++{
++	if (i <= 0)
++		return ('.');
++
++	if (i == 1)
++		return ('/');
++
++	if (i >= 2 && i < 12)
++		return ('0' - 2 + i);
++
++	if (i >= 12 && i < 38)
++		return ('A' - 12 + i);
++
++	if (i >= 38 && i < 63)
++		return ('a' - 38 + i);
++
++	return ('z');
++}
++
++/*
++ * l64a - convert a long to a string of radix 64 characters
++ */
++
++char *
++l64a(long l)
++{
++	static	char	buf[8];
++	int	i = 0;
++
++	if (l < 0L)
++		return ((char *) 0);
++
++	do {
++		buf[i++] = i64c ((int) (l % 64));
++		buf[i] = '\0';
++	} while (l /= 64L, l > 0 && i < 6);
++
++	return (buf);
++}
++
++#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/shadow-4.0.11.1-r1.ebuild b/sys-apps/shadow/shadow-4.0.11.1-r1.ebuild
new file mode 100644
index 000000000000..18a9d86a6b84
--- /dev/null
+++ b/sys-apps/shadow/shadow-4.0.11.1-r1.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.11.1-r1.ebuild,v 1.1 2005/08/03 18:56:46 azarah Exp $
+
+inherit eutils libtool toolchain-funcs flag-o-matic
+
+# We should remove this login after pam-0.78 goes stable.
+FORCE_SYSTEMAUTH_UPDATE="no"
+
+DESCRIPTION="Utilities to deal with user accounts"
+HOMEPAGE="http://shadow.pld.org.pl/"
+SRC_URI="ftp://ftp.pld.org.pl/software/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls pam selinux skey nousuid"
+
+RDEPEND=">=sys-libs/cracklib-2.7-r3
+	pam? ( virtual/pam )
+	!pam? ( !sys-apps/pam-login )
+	skey? ( app-admin/skey )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.51-r2
+	nls? ( sys-devel/gettext )"
+# We moved /etc/pam.d/login to pam-login
+PDEPEND="pam? ( >=sys-apps/pam-login-4.0.11.1-r2 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# uclibc support, corrects NIS usage
+	epatch "${FILESDIR}"/${PN}-4.0.10-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
+
+	# don't install manpages if USE=-nls
+	epatch "${FILESDIR}"/${PN}-4.0.10-nls-manpages.patch
+
+	# tweak the default login.defs
+	epatch "${FILESDIR}"/${PN}-4.0.5-login.defs.patch
+
+	# The new configure changes do not detect utmp/logdir properly
+	epatch "${FILESDIR}"/${PN}-4.0.10-fix-configure.patch
+
+	# skeychallenge call needs updating #69741
+	epatch "${FILESDIR}"/shadow-4.0.5-skey.patch
+
+	# Make user/group names more flexible #3485 / #22920
+	epatch "${FILESDIR}"/${PN}-4.0.10-dots-in-usernames.patch
+	epatch "${FILESDIR}"/${PN}-4.0.10-long-groupnames.patch
+
+	# Checked with upstream .. SUPATH and PATH valid again for PAM (bug #101047)
+	epatch "${FILESDIR}"/${PN}-4.0.11.1-SUPATH.patch
+
+	# Some UCLIBC patches
+	epatch "${FILESDIR}"/${PN}-4.0.11.1-ngettext.patch
+	epatch "${FILESDIR}"/${PN}-4.0.11.1-uclibc-missing-l64a.patch
+
+	# lock down setuid perms #47208
+	epatch "${FILESDIR}"/${PN}-4.0.11.1-perms.patch
+
+	elibtoolize
+	epunt_cxx
+
+	# Needed by the UCLIBC patches
+	autoconf
+}
+
+src_compile() {
+	append-ldflags -Wl,-z,now
+	[[ ${CTARGET:-${CHOST}} != ${CHOST} ]] \
+		&& export ac_cv_func_setpgrp_void=yes
+	econf \
+		--disable-desrpc \
+		--with-libcrypt \
+		--with-libcrack \
+		--enable-shared=no \
+		--enable-static=yes \
+		$(use_with pam libpam) \
+		$(use_with skey libskey) \
+		$(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}
+
+	if use pam; then
+		# These is now shipped with pam-login, and login
+		# had/have a serious root exploit with pam support
+		# enabled.
+		for x in "${D}"/bin/login \
+		         "${D}"/usr/bin/faillog "${D}"/usr/bin/lastlog \
+		         "${D}"/usr/share/man/man1/login.1* \
+		         "${D}"/usr/share/man/man5/login.{access,defs}.5* \
+		         "${D}"/usr/share/man/man5/faillog.5* \
+		         "${D}"/usr/share/man/man8/lastlog.8* \
+		         "${D}"/usr/share/man/man8/faillog.8*; do
+				 [[ -f ${x} ]] && rm -f ${x}
+		done
+	fi
+
+	insinto /etc
+	# Using a securetty with devfs device names added
+	# (compat names kept for non-devfs compatibility)
+	insopts -m0600 ; doins "${FILESDIR}"/securetty
+	use pam || { insopts -m0600 ; doins etc/login.access ; }
+	use pam || { insopts -m0600 ; doins etc/limits ; }
+	# Output arch-specific cruft
+	case $(tc-arch) in
+		ppc64) echo "hvc0" >> "${D}"/etc/securetty
+		       echo "hvsi0" >> "${D}"/etc/securetty;;
+		hppa)  echo "ttyB0" >> "${D}"/etc/securetty;;
+		arm)   echo "ttyFB0" >> "${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
+
+	if use pam ; then
+		local INSTALL_SYSTEM_PAMD="yes"
+
+		# Do not install below pam.d files if we have pam-0.78 or later
+		portageq has_version / '>=sys-libs/pam-0.78' && \
+			INSTALL_SYSTEM_PAMD="no"
+
+		for x in "${FILESDIR}"/pam.d-include/*; do
+			case "${x##*/}" in
+				"login")
+					# We do no longer install this one, as its from
+					# pam-login now.
+					;;
+				"system-auth"|"system-auth-1.1"|"other")
+					# These we only install if we do not have pam-0.78
+					# or later.
+					[ "${INSTALL_SYSTEM_PAMD}" = "yes" ] && [ -f ${x} ] && \
+						dopamd ${x}
+					;;
+				"su")
+					# Disable support for pam_env and pam_wheel on openpam
+					has_version sys-libs/pam && dopamd ${x}
+					;;
+				"su-openpam")
+					has_version sys-libs/openpam && newpamd ${x} su
+					;;
+				*)
+					[ -f ${x} ] && dopamd ${x}
+					;;
+			esac
+		done
+		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
+
+		# Only add this one if needed.
+		if [ "${FORCE_SYSTEMAUTH_UPDATE}" = "yes" ]; then
+			newpamd "${FILESDIR}"/pam.d-include/system-auth-1.1 system-auth.new || \
+				die "Failed to install system-auth.new!"
+		fi
+
+		# 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 {} \;
+	else
+		insinto /etc
+		insopts -m0644
+		newins etc/login.defs.linux login.defs
+	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}"/doc
+	dodoc INSTALL README WISHLIST
+	docinto txt
+	dodoc HOWTO LSM README.* *.txt
+}
+
+pkg_preinst() {
+	rm -f "${ROOT}"/etc/pam.d/system-auth.new
+}
+
+pkg_postinst() {
+	use pam || return 0;
+
+	if [ "${FORCE_SYSTEMAUTH_UPDATE}" = "yes" ]; then
+		local CHECK1="$(md5sum ${ROOT}/etc/pam.d/system-auth | cut -d ' ' -f 1)"
+		local CHECK2="$(md5sum ${ROOT}/etc/pam.d/system-auth.new | cut -d ' ' -f 1)"
+
+		if [ "${CHECK1}" != "${CHECK2}" ]; then
+			ewarn "Due to a security issue, ${ROOT}etc/pam.d/system-auth "
+			ewarn "is being updated automatically. Your old "
+			ewarn "system-auth will be backed up as:"
+			ewarn
+			ewarn "  ${ROOT}etc/pam.d/system-auth.bak"
+			echo
+
+			cp -a ${ROOT}/etc/pam.d/system-auth \
+				${ROOT}/etc/pam.d/system-auth.bak;
+			mv -f ${ROOT}/etc/pam.d/system-auth.new \
+				${ROOT}/etc/pam.d/system-auth
+			rm -f ${ROOT}/etc/pam.d/._cfg????_system-auth
+		else
+			rm -f ${ROOT}/etc/pam.d/system-auth.new
+		fi
+	fi
+}