old #140533

39 files changed, 0 insertions, 1178 deletions

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
deleted file mode 100644
index 6d0eb56c9d09..000000000000
--- a/sys-apps/shadow/files/digest-shadow-4.0.11.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e60b7b16128b9e00576073389a0ff1e6 shadow-4.0.11.1.tar.bz2 1056103
-RMD160 16453f7205c05a11a03cec79217ada57ae9c7f16 shadow-4.0.11.1.tar.bz2 1056103
-SHA256 f092452a1ee39cc15a205dc1bfdde596da78f96160c36e03c685723a634a3e3b shadow-4.0.11.1.tar.bz2 1056103
diff --git a/sys-apps/shadow/files/digest-shadow-4.0.11.1-r2 b/sys-apps/shadow/files/digest-shadow-4.0.11.1-r2
deleted file mode 100644
index 6d0eb56c9d09..000000000000
--- a/sys-apps/shadow/files/digest-shadow-4.0.11.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e60b7b16128b9e00576073389a0ff1e6 shadow-4.0.11.1.tar.bz2 1056103
-RMD160 16453f7205c05a11a03cec79217ada57ae9c7f16 shadow-4.0.11.1.tar.bz2 1056103
-SHA256 f092452a1ee39cc15a205dc1bfdde596da78f96160c36e03c685723a634a3e3b shadow-4.0.11.1.tar.bz2 1056103
diff --git a/sys-apps/shadow/files/digest-shadow-4.0.12 b/sys-apps/shadow/files/digest-shadow-4.0.12
deleted file mode 100644
index 68c2d7ec493e..000000000000
--- a/sys-apps/shadow/files/digest-shadow-4.0.12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 609a417a45827c36ba6e33f9dc785371 shadow-4.0.12.tar.bz2 1082217
-RMD160 f0a532ee3d71c368313cbe9ab49f22986cde102c shadow-4.0.12.tar.bz2 1082217
-SHA256 abeeefd2cb3bfea62f8bdab29451f4585e7c4bb3b252b57e7e3a72ba9b0573cf shadow-4.0.12.tar.bz2 1082217
diff --git a/sys-apps/shadow/files/digest-shadow-4.0.13 b/sys-apps/shadow/files/digest-shadow-4.0.13
deleted file mode 100644
index 4b8379dc4232..000000000000
--- a/sys-apps/shadow/files/digest-shadow-4.0.13
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5c6a105d89afb0900922260e9c5650cc shadow-4.0.13.tar.bz2 1087998
-RMD160 02124e789e13e877727eb9072ad43900d4e50f56 shadow-4.0.13.tar.bz2 1087998
-SHA256 ef31bc7511214cb84f0d8c1821f841269d75d40ca8d48b1913b3b529f954b962 shadow-4.0.13.tar.bz2 1087998
diff --git a/sys-apps/shadow/files/digest-shadow-4.0.14-r1 b/sys-apps/shadow/files/digest-shadow-4.0.14-r1
deleted file mode 100644
index ac9830b87acc..000000000000
--- a/sys-apps/shadow/files/digest-shadow-4.0.14-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 903f55cf05bbe082617d3337743792fb shadow-4.0.14.tar.bz2 1246902
-RMD160 555bb154ba73b9e322ddd17517a77470cdfb7902 shadow-4.0.14.tar.bz2 1246902
-SHA256 e9beb4edf8689f94c32e9a8f53d1c6c542ef1a5678e8037d4c452c53dfbeb0ae shadow-4.0.14.tar.bz2 1246902
diff --git a/sys-apps/shadow/files/digest-shadow-4.0.14-r2 b/sys-apps/shadow/files/digest-shadow-4.0.14-r2
deleted file mode 100644
index ac9830b87acc..000000000000
--- a/sys-apps/shadow/files/digest-shadow-4.0.14-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 903f55cf05bbe082617d3337743792fb shadow-4.0.14.tar.bz2 1246902
-RMD160 555bb154ba73b9e322ddd17517a77470cdfb7902 shadow-4.0.14.tar.bz2 1246902
-SHA256 e9beb4edf8689f94c32e9a8f53d1c6c542ef1a5678e8037d4c452c53dfbeb0ae shadow-4.0.14.tar.bz2 1246902
diff --git a/sys-apps/shadow/files/digest-shadow-4.0.14-r3 b/sys-apps/shadow/files/digest-shadow-4.0.14-r3
deleted file mode 100644
index ac9830b87acc..000000000000
--- a/sys-apps/shadow/files/digest-shadow-4.0.14-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 903f55cf05bbe082617d3337743792fb shadow-4.0.14.tar.bz2 1246902
-RMD160 555bb154ba73b9e322ddd17517a77470cdfb7902 shadow-4.0.14.tar.bz2 1246902
-SHA256 e9beb4edf8689f94c32e9a8f53d1c6c542ef1a5678e8037d4c452c53dfbeb0ae shadow-4.0.14.tar.bz2 1246902
diff --git a/sys-apps/shadow/files/digest-shadow-4.0.15 b/sys-apps/shadow/files/digest-shadow-4.0.15
deleted file mode 100644
index 13dd58252a59..000000000000
--- a/sys-apps/shadow/files/digest-shadow-4.0.15
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a0452fa989f8ba45023cc5a08136568e shadow-4.0.15.tar.bz2 1294860
-RMD160 b7b9ee9469561205037a1eacaa8791f069ba124c shadow-4.0.15.tar.bz2 1294860
-SHA256 e486bdb083df453c2d15ac58887ef45a3006182c0cdb1c6092058ea588be538d shadow-4.0.15.tar.bz2 1294860
diff --git a/sys-apps/shadow/files/digest-shadow-4.0.15-r1 b/sys-apps/shadow/files/digest-shadow-4.0.15-r1
deleted file mode 100644
index 13dd58252a59..000000000000
--- a/sys-apps/shadow/files/digest-shadow-4.0.15-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a0452fa989f8ba45023cc5a08136568e shadow-4.0.15.tar.bz2 1294860
-RMD160 b7b9ee9469561205037a1eacaa8791f069ba124c shadow-4.0.15.tar.bz2 1294860
-SHA256 e486bdb083df453c2d15ac58887ef45a3006182c0cdb1c6092058ea588be538d shadow-4.0.15.tar.bz2 1294860
diff --git a/sys-apps/shadow/files/digest-shadow-4.0.16 b/sys-apps/shadow/files/digest-shadow-4.0.16
deleted file mode 100644
index e6b69a954530..000000000000
--- a/sys-apps/shadow/files/digest-shadow-4.0.16
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1d91f7479143d1d705b94180c0d4874b shadow-4.0.16.tar.bz2 1438030
-RMD160 9ac436d89913441b448da90ece25b77e818f3bd4 shadow-4.0.16.tar.bz2 1438030
-SHA256 2cbd0af0b4682d91282d2d0ad3110e6dfcad4e365d25a3b6beaf7048dd477bdd shadow-4.0.16.tar.bz2 1438030
diff --git a/sys-apps/shadow/files/digest-shadow-4.0.16-r1 b/sys-apps/shadow/files/digest-shadow-4.0.16-r1
deleted file mode 100644
index e6b69a954530..000000000000
--- a/sys-apps/shadow/files/digest-shadow-4.0.16-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1d91f7479143d1d705b94180c0d4874b shadow-4.0.16.tar.bz2 1438030
-RMD160 9ac436d89913441b448da90ece25b77e818f3bd4 shadow-4.0.16.tar.bz2 1438030
-SHA256 2cbd0af0b4682d91282d2d0ad3110e6dfcad4e365d25a3b6beaf7048dd477bdd shadow-4.0.16.tar.bz2 1438030
diff --git a/sys-apps/shadow/files/digest-shadow-4.0.7-r4 b/sys-apps/shadow/files/digest-shadow-4.0.7-r4
deleted file mode 100644
index 0a7a961ce9a3..000000000000
--- a/sys-apps/shadow/files/digest-shadow-4.0.7-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 89ebec0d1c0d861a5bd5c4c63e5cb0cc shadow-4.0.7.tar.bz2 1019749
-RMD160 f8551c8267c8da60366f24db7370ec03273f38bc shadow-4.0.7.tar.bz2 1019749
-SHA256 4bf9a7289d1e72b03d53e94c9f5de13cdc9573809270dab27b203fa471518f1b shadow-4.0.7.tar.bz2 1019749
diff --git a/sys-apps/shadow/files/shadow-4.0.10-dots-in-usernames.patch b/sys-apps/shadow/files/shadow-4.0.10-dots-in-usernames.patch
deleted file mode 100644
index 638b9cf86844..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.10-dots-in-usernames.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Allow people to add users with dots in their names.
-
-http://bugs.gentoo.org/show_bug.cgi?id=22920
-
-Index: libmisc/chkname.c
-===================================================================
-RCS file: /cvsroot/shadow/libmisc/chkname.c,v
-retrieving revision 1.8
-diff -u -r1.8 chkname.c
---- libmisc/chkname.c	12 May 2003 05:29:14 -0000	1.8
-+++ libmisc/chkname.c	10 Jan 2005 06:25:47 -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 @@
- 		if (!((*name >= 'a' && *name <= 'z') ||
- 		      (*name >= '0' && *name <= '9') ||
- 		      *name == '_' || *name == '-' ||
-+		      *name == '.' ||
- 		      (*name == '$' && *(name + 1) == '\0')))
- 			return 0;
- 	}
-Index: man/useradd.8
-===================================================================
-RCS file: /cvsroot/shadow/man/useradd.8,v
-retrieving revision 1.23
-diff -u -r1.23 useradd.8
---- man/useradd.8	11 Dec 2004 20:05:01 -0000	1.23
-+++ man/useradd.8	10 Jan 2005 06:40:15 -0000
-@@ -128,6 +128,23 @@
- .PP
- If no options are specified, \fBuseradd\fR displays the current default values.\&.
- 
-+.SH RESTRICTS
-+Currently,  the  shadow  suite  enforces  the following restrictions on 
-+user names:
-+
-+.nf
-+\- must begin with a lower case letter or underscore
-+\- can only contain lower case letters, underscores, and dashes
-+\- may end with a dollar sign
-+\- regex for these requirements: [a\-z_][a\-z0-9_\-$]*
-+.fi
-+
-+The length of usernames is restricted by glibc (via the UT_NAMESIZE define 
-+in the utmp header file).  This may range from 8 characters on older 
-+systems to 32 characters on newer systems.
-+
-+Note Gentoo adds a patch which allows people to create usernames with a 
-+dot in them.
- .SH "NOTES"
- 
- .PP
diff --git a/sys-apps/shadow/files/shadow-4.0.10-fix-configure.patch b/sys-apps/shadow/files/shadow-4.0.10-fix-configure.patch
deleted file mode 100644
index eeee957510ae..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.10-fix-configure.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix wrong var name
-
---- configure.in
-+++ configure.in
-@@ -165,7 +165,7 @@ AC_DEFINE_UNQUOTED(_UTMP_FILE, "$shadow_
- 
- AC_CACHE_CHECK([location of faillog/lastlog/wtmp], shadow_cv_logdir,
- [for shadow_cv_logdir in /var/log /var/adm /usr/adm /etc; do
--	if test -d $logdir; then
-+	if test -d $shadow_cv_logdir; then
- 		break
- 	fi
- done])
---- configure
-+++ configure
-@@ -22349,7 +22348,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   for shadow_cv_logdir in /var/log /var/adm /usr/adm /etc; do
--	if test -d $logdir; then
-+	if test -d $shadow_cv_logdir; then
- 		break
- 	fi
- done
diff --git a/sys-apps/shadow/files/shadow-4.0.10-long-groupnames.patch b/sys-apps/shadow/files/shadow-4.0.10-long-groupnames.patch
deleted file mode 100644
index 1d99693f5a5c..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.10-long-groupnames.patch
+++ /dev/null
@@ -1,39 +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/show_bug.cgi?id=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);
- }
---- man/groupadd.8
-+++ man/groupadd.8
-@@ -46,6 +46,18 @@
- \fB\-g\fR \fIgid\fR
- The numerical value of the group's ID\&. This value must be unique, unless the \fB\-o\fR option is used\&. The value must be non\-negative\&. The default is to use the smallest ID value greater than 999 and greater than every other group\&. Values between 0 and 999 are typically reserved for system accounts\&.
- 
-+.SH RESTRICTIONS
-+Currently, the shadow suite enforces the following restrictions on group 
-+names:
-+
-+.nf
-+\- must begin with a lower case letter or underscore
-+\- can only contain lower case letters, underscores, and dashes
-+\- regex for these requirements: [a\-z_][a\-z0\-9_\-]*
-+.fi
-+
-+Normally shadow enforces a 16 character limit, but Gentoo adds patches to 
-+remove it.
- .SH "FILES"
- 
- .TP
diff --git a/sys-apps/shadow/files/shadow-4.0.10-nls-manpages.patch b/sys-apps/shadow/files/shadow-4.0.10-nls-manpages.patch
deleted file mode 100644
index cb92f1717428..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.10-nls-manpages.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Don't install localized manpages is USE=-nls
-
-e-mailed upstream already
-
---- man/Makefile.in
-+++ man/Makefile.in
-@@ -153,7 +153,11 @@
- target_alias = @target_alias@
- 
- # subdirectories for translated manual pages
-+ifeq ($(USE_NLS),no)
-+SUBDIRS =
-+else
- SUBDIRS = cs de es fr hu id it ja ko pl pt_BR ru zh_CN zh_TW
-+endif
- man_XMANS = \
- 	chage.1.xml \
- 	chfn.1.xml \
diff --git a/sys-apps/shadow/files/shadow-4.0.10-nonis.patch b/sys-apps/shadow/files/shadow-4.0.10-nonis.patch
deleted file mode 100644
index 095d2219616e..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.10-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
-@@ -187,6 +189,7 @@
- 	return (name);
- }
- 
-+#ifdef USE_NIS
- /* netgroup_match - match group against machine or user */
- 
- static int
-@@ -203,6 +206,7 @@
- 
- 	return innetgr (group, machine, user, mydomain);
- }
-+#endif
- 
- /* user_match - match a username against one token */
- 
-@@ -226,8 +230,10 @@
- 		*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 */
-@@ -285,9 +291,13 @@
- 	 * 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
-+	if (string_match (tok, string)) {	/* ALL or exact match */
-+#endif
- 		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.11.1-SUPATH.patch b/sys-apps/shadow/files/shadow-4.0.11.1-SUPATH.patch
deleted file mode 100644
index 7cbb8b73f8c2..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.11.1-SUPATH.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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
deleted file mode 100644
index 9eba2c07220a..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.11.1-ngettext.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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-su-fix-environment.patch b/sys-apps/shadow/files/shadow-4.0.11.1-su-fix-environment.patch
deleted file mode 100644
index cfb2aa692fec..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.11.1-su-fix-environment.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-The patch from upstream (shadow-4.0.11.1-SUPATH.patch) sets environ too
-early when using PAM, so move it to !USE_PAM.  Also set USER and SHELL.
-
---- shadow-4.0.11.1/src/su.c	2005-08-04 12:34:35.000000000 +0200
-+++ shadow-4.0.11.1.az/src/su.c	2005-08-04 12:38:57.000000000 +0200
-@@ -594,8 +594,6 @@
- 		addenv ("PATH", cp);
- 	}
- 
--	environ = newenvp;	/* make new environment active */
--
- 	if (getenv ("IFS"))	/* don't export user IFS ... */
- 		addenv ("IFS= \t\n", NULL);	/* ... instead, set a safe IFS */
- 
-@@ -666,6 +664,8 @@
- 		exit (1);
- 	}
- #else				/* !USE_PAM */
-+	environ = newenvp;	/* make new environment active */
-+	
- 	if (!amroot)		/* no limits if su from root */
- 		setup_limits (&pwent);
- 
-@@ -676,8 +676,11 @@
- 	if (fakelogin)
- 		setup_env (&pwent);
- #if 1				/* Suggested by Joey Hess. XXX - is this right?  */
--	else
-+	else {
- 		addenv ("HOME", pwent.pw_dir);
-+		addenv ("USER", pwent.pw_name);
-+		addenv ("SHELL", pwent.pw_shell);
-+	}
- #endif
- 
- 	/*
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
deleted file mode 100644
index 8b6b87d8385f..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.11.1-uclibc-missing-l64a.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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/files/shadow-4.0.12-dots-in-usernames.patch b/sys-apps/shadow/files/shadow-4.0.12-dots-in-usernames.patch
deleted file mode 100644
index e0a5febe1ce2..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.12-dots-in-usernames.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Allow people to add users with dots in their names.
-
-http://bugs.gentoo.org/22920
-
---- libmisc/chkname.c
-+++ libmisc/chkname.c
-@@ -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 @@
- 		if (!((*name >= 'a' && *name <= 'z') ||
- 		      (*name >= '0' && *name <= '9') ||
- 		      *name == '_' || *name == '-' ||
-+		      *name == '.' ||
- 		      (*name == '$' && *(name + 1) == '\0')))
- 			return 0;
- 	}
---- man/useradd.8
-+++ man/useradd.8
-@@ -128,6 +128,23 @@
- If no options are specified,
- \fBuseradd\fR
- displays the current default values.
-+.SH RESTRICTS
-+Currently,  the  shadow  suite  enforces  the following restrictions on 
-+user names:
-+
-+.nf
-+\- must begin with a lower case letter or underscore
-+\- can only contain lower case letters, underscores, and dashes
-+\- may end with a dollar sign
-+\- regex for these requirements: [a\-z_][a\-z0-9_\-$]*
-+.fi
-+
-+The length of usernames is restricted by glibc (via the UT_NAMESIZE define 
-+in the utmp header file).  This may range from 8 characters on older 
-+systems to 32 characters on newer systems.
-+
-+Note Gentoo adds a patch which allows people to create usernames with a 
-+dot in them.
- .SH "NOTES"
- .PP
- The system administrator is responsible for placing the default user files in the
diff --git a/sys-apps/shadow/files/shadow-4.0.12-long-groupnames.patch b/sys-apps/shadow/files/shadow-4.0.12-long-groupnames.patch
deleted file mode 100644
index 6d08bc7e8e8b..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.12-long-groupnames.patch
+++ /dev/null
@@ -1,39 +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);
- }
---- man/groupadd.8
-+++ man/groupadd.8
-@@ -46,6 +46,18 @@
- .TP
- \fB\-o\fR
- Allow add group wit non\-unique GID.
-+.SH RESTRICTIONS
-+Currently, the shadow suite enforces the following restrictions on group 
-+names:
-+
-+.nf
-+\- must begin with a lower case letter or underscore
-+\- can only contain lower case letters, underscores, and dashes
-+\- regex for these requirements: [a\-z_][a\-z0\-9_\-]*
-+.fi
-+
-+Normally shadow enforces a 16 character limit, but Gentoo adds patches to 
-+remove it.
- .SH "FILES"
- .TP
- \fI/etc/group\fR
diff --git a/sys-apps/shadow/files/shadow-4.0.14-nls-manpages.patch b/sys-apps/shadow/files/shadow-4.0.14-nls-manpages.patch
deleted file mode 100644
index 85fd5cd2d428..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.14-nls-manpages.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Don't install localized manpages is USE=-nls
-
-e-mailed upstream already
-
---- man/Makefile.in
-+++ man/Makefile.in
-@@ -193,7 +193,11 @@
- target_alias = @target_alias@
- 
- # subdirectories for translated manual pages
-+ifeq ($(USE_NLS),no)
-+SUBDIRS =
-+else
- SUBDIRS = cs de es fi fr hu id it ja ko pl pt_BR ru tr zh_CN zh_TW
-+endif
- man_XMANS = \
- 	chage.1.xml \
- 	chfn.1.xml \
diff --git a/sys-apps/shadow/files/shadow-4.0.14-su-cvs.patch b/sys-apps/shadow/files/shadow-4.0.14-su-cvs.patch
deleted file mode 100644
index 58c2a7d59a44..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.14-su-cvs.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-grab upstream fix for
-http://bugs.gentoo.org/118342
-
-===================================================================
-RCS file: /cvsroot/shadow/src/su.c,v
-retrieving revision 1.61
-retrieving revision 1.62
-diff -u -r1.61 -r1.62
---- shadow/src/su.c	2006/01/02 22:37:47	1.61
-+++ shadow/src/su.c	2006/01/07 19:38:15	1.62
-@@ -256,6 +256,7 @@
- 	fprintf (stderr, _("Usage: su [options] [login]\n"
- 			   "\n"
- 			   "Options:\n"
-+			   "  -c, --command COMMAND		pass COMMAND to the invoked shell\n"
- 			   "  -h, --help			display this help message and exit\n"
- 			   "  -, -l, --login		make the shell a login shell\n"
- 			   "  -m, -p,\n"
-@@ -286,7 +287,7 @@
- 	uid_t my_uid;
- 	struct passwd *pw = 0;
- 	char **envp = environ;
--	char *shellstr = 0;
-+	char *shellstr = 0, *command = 0;
- 
- #ifdef USE_PAM
- 	int ret;
-@@ -328,6 +329,7 @@
- 		int option_index = 0;
- 		int c;
- 		static struct option long_options[] = {
-+			{"command", required_argument, NULL, 'c'},
- 			{"help", no_argument, NULL, 'h'},
- 			{"login", no_argument, NULL, 'l'},
- 			{"preserve-environment", no_argument, NULL, 'p'},
-@@ -336,7 +338,7 @@
- 		};
- 
- 		while ((c =
--			getopt_long (argc, argv, "-hlmps:", long_options,
-+			getopt_long (argc, argv, "-c:hlmps:", long_options,
- 				     &option_index)) != -1) {
- 			switch (c) {
- 			case 1:
-@@ -349,6 +351,9 @@
- 				optind--;
- 				goto end_su_options;
- 				break;	/* NOT REACHED */
-+			case 'c':
-+				command = optarg;
-+				break;
- 			case 'h':
- 				usage ();
- 				break;
-@@ -423,6 +428,8 @@
- 		(void) strcpy (name, "root");
- 
- 	doshell = argc == optind;	/* any arguments remaining? */
-+	if (command)
-+		doshell = 0;
- 
- 	/*
- 	 * Get the user's real name. The current UID is used to determine
-@@ -832,6 +839,11 @@
- 	if (!doshell) {
- 		/* Position argv to the remaining arguments */
- 		argv += optind;
-+		if (command) {
-+			argv -= 2;
-+			argv[0] = "-c";
-+			argv[1] = command;
-+		}
- 		/*
- 		 * Use the shell and create an argv
- 		 * with the rest of the command line included.
diff --git a/sys-apps/shadow/files/shadow-4.0.14-userdel-group-remove.patch b/sys-apps/shadow/files/shadow-4.0.14-userdel-group-remove.patch
deleted file mode 100644
index 1e51eed4b526..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.14-userdel-group-remove.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-http://bugs.gentoo.org/126432
-
-----------------------------
-revision 1.61
-date: 2006/02/07 20:19:46;  author: kloczek;  state: Exp;  lines: +1 -70
-user's group is already removed by update_groups(). remove_group()
-is not needed (bug introduced in 4.0.14 on merge FC fixes). Fixed by Nicolas
-François <nicolas.francois@centraliens.net>
-=============================================================================
-
-Index: src/userdel.c
-===================================================================
-RCS file: /cvsroot/shadow/src/userdel.c,v
-retrieving revision 1.60
-retrieving revision 1.61
-diff -u -p -r1.60 -r1.61
---- src/userdel.c	7 Feb 2006 16:39:41 -0000	1.60
-+++ src/userdel.c	7 Feb 2006 20:19:46 -0000	1.61
-@@ -66,9 +66,7 @@
- #define E_HOMEDIR	12	/* can't remove home directory */
- static char *user_name;
- static uid_t user_id;
--static gid_t user_gid;
- static char *user_home;
--static char *user_group;
- 
- static char *Prog;
- static int fflg = 0, rflg = 0;
-@@ -265,65 +263,6 @@ static void update_groups (void)
- }
- 
- /*
-- * remove_group - remove the user's group unless it is not really a user-private group
-- */
--static void remove_group ()
--{
--	char *glist_name;
--	struct group *gr;
--	struct passwd *pwd;
--
--	if (user_group == NULL || user_name == NULL)
--		return;
--
--	if (strcmp (user_name, user_group)) {
--		return;
--	}
--
--	glist_name = NULL;
--	gr = getgrnam (user_group);
--	if (gr)
--		glist_name = *(gr->gr_mem);
--	while (glist_name) {
--		while (glist_name && *glist_name) {
--			if (strncmp (glist_name, user_name, 16)) {
--				return;
--			}
--			glist_name++;
--		}
--	}
--
--	setpwent ();
--	while ((pwd = getpwent ())) {
--		if (strcmp (pwd->pw_name, user_name) == 0)
--			continue;
--
--		if (pwd->pw_gid == user_gid) {
--			return;
--		}
--	}
--
--	/* now actually do the removal if we haven't already returned */
--
--	if (!gr_remove (user_group)) {
--		fprintf (stderr, _("%s: error removing group entry\n"), Prog);
--	}
--#ifdef SHADOWGRP
--
--	/*
--	 * Delete the shadow group entries as well.
--	 */
--
--	if (is_shadow_grp && !sgr_remove (user_group)) {
--		fprintf (stderr, _("%s: error removing shadow group entry\n"),
--			 Prog);
--	}
--#endif				/* SHADOWGRP */
--	SYSLOG ((LOG_INFO, "remove group `%s'\n", user_group));
--	return;
--}
--
--/*
-  * close_files - close all of the files that were opened
-  *
-  *	close_files() closes all of the files that were opened for this
-@@ -652,7 +591,6 @@ static void remove_mailbox (void)
- int main (int argc, char **argv)
- {
- 	struct passwd *pwd;
--	struct group *grp;
- 	int arg;
- 	int errors = 0;
- 
-@@ -760,10 +698,6 @@ int main (int argc, char **argv)
- #endif
- 	user_id = pwd->pw_uid;
- 	user_home = xstrdup (pwd->pw_dir);
--	user_gid = pwd->pw_gid;
--	grp = getgrgid (user_gid);
--	if (grp)
--		user_group = xstrdup (grp->gr_name);
- 	/*
- 	 * Check to make certain the user isn't logged in.
- 	 */
-@@ -817,9 +751,6 @@ int main (int argc, char **argv)
- 	}
- #endif
- 
--	/* Remove the user's group if appropriate. */
--	remove_group ();
--
- 	if (rflg) {
- 		if (remove_tree (user_home)
- 		    || rmdir (user_home)) {
diff --git a/sys-apps/shadow/files/shadow-4.0.4.1-nonis.patch b/sys-apps/shadow/files/shadow-4.0.4.1-nonis.patch
deleted file mode 100644
index 288c19fe6c44..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.4.1-nonis.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- ./libmisc/login_access.c.nonis	Mon May  5 23:44:15 2003
-+++ ./libmisc/login_access.c	Wed Jan 28 11:44:10 2004
-@@ -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
-@@ -187,6 +189,7 @@
- 	return (name);
- }
- 
-+#ifdef USE_NIS
- /* netgroup_match - match group against machine or user */
- 
- static int
-@@ -203,6 +206,7 @@
- 
- 	return innetgr (group, machine, user, mydomain);
- }
-+#endif
- 
- /* user_match - match a username against one token */
- 
-@@ -226,8 +230,10 @@
- 		*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 */
-@@ -285,9 +291,13 @@
- 	 * 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
-+	if (string_match (tok, string)) {	/* ALL or exact match */
-+#endif
- 		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.5-login.defs.patch b/sys-apps/shadow/files/shadow-4.0.5-login.defs.patch
deleted file mode 100644
index 02a8e55d27e3..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.5-login.defs.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: etc/login.defs.linux
-===================================================================
-RCS file: /cvsroot/shadow/etc/login.defs.linux,v
-retrieving revision 1.14
-diff -u -B -U0 -r1.14 login.defs.linux
---- etc/login.defs.linux	4 May 2003 20:09:43 -0000	1.14
-+++ etc/login.defs.linux	29 Oct 2004 02:02:48 -0000
-@@ -46 +46 @@
--MAIL_CHECK_ENAB		yes
-+MAIL_CHECK_ENAB		no
-@@ -93 +93 @@
--#ISSUE_FILE	/etc/issue
-+ISSUE_FILE	/etc/issue
-@@ -223 +223 @@
--SU_WHEEL_ONLY	no
-+SU_WHEEL_ONLY	yes
-@@ -228 +228 @@
--CRACKLIB_DICTPATH	/var/cache/cracklib/cracklib_dict
-+CRACKLIB_DICTPATH	/usr/lib/cracklib_dict
-@@ -245 +245 @@
--LOGIN_RETRIES		5
-+LOGIN_RETRIES		3
-@@ -297 +297 @@
--#MD5_CRYPT_ENAB	no
-+MD5_CRYPT_ENAB	yes
-@@ -348 +348 @@
--#GETPASS_ASTERISKS 1
-+GETPASS_ASTERISKS 0
diff --git a/sys-apps/shadow/files/shadow-4.0.5-nls-manpages.patch b/sys-apps/shadow/files/shadow-4.0.5-nls-manpages.patch
deleted file mode 100644
index 39228d0ecc01..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.5-nls-manpages.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- man/Makefile.in.orig	2004-10-16 16:44:32.554707920 -0400
-+++ man/Makefile.in	2004-10-16 16:44:52.870619432 -0400
-@@ -153,7 +153,11 @@
- target_alias = @target_alias@
- 
- # subdirectories for translated manual pages
-+ifeq ($(USE_NLS),no)
-+SUBDIRS =
-+else
- SUBDIRS = cs de es fr hu id it ja ko pl pt_BR ru zh_CN zh_TW
-+endif
- man_MANS = \
- 	chage.1 \
- 	chfn.1 \
diff --git a/sys-apps/shadow/files/shadow-4.0.5-skey.patch b/sys-apps/shadow/files/shadow-4.0.5-skey.patch
deleted file mode 100644
index 14626b0a2330..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.5-skey.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- shadow-4.0.5.orig/lib/pwauth.c	2004-11-01 12:14:40.254524181 -0800
-+++ shadow-4.0.5/lib/pwauth.c	2004-11-01 12:15:13.426532987 -0800
-@@ -152,7 +152,7 @@
- 	 * If there is no SKEY information we default to not using SKEY.
- 	 */
- 
--	if (skeychallenge (&skey, user, challenge_info) == 0)
-+	if (skeychallenge (&skey, user, challenge_info, sizeof(challenge_info)) == 0)
- 		use_skey = 1;
- #endif
- 
diff --git a/sys-apps/shadow/files/shadow-4.0.6-dots-in-usernames.patch b/sys-apps/shadow/files/shadow-4.0.6-dots-in-usernames.patch
deleted file mode 100644
index 2d8f0a7cc49f..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.6-dots-in-usernames.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Allow people to add users with dots in their names.
-
-http://bugs.gentoo.org/show_bug.cgi?id=22920
-
-Index: libmisc/chkname.c
-===================================================================
-RCS file: /cvsroot/shadow/libmisc/chkname.c,v
-retrieving revision 1.8
-diff -u -r1.8 chkname.c
---- libmisc/chkname.c	12 May 2003 05:29:14 -0000	1.8
-+++ libmisc/chkname.c	10 Jan 2005 06:25:47 -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 @@
- 		if (!((*name >= 'a' && *name <= 'z') ||
- 		      (*name >= '0' && *name <= '9') ||
- 		      *name == '_' || *name == '-' ||
-+		      *name == '.' ||
- 		      (*name == '$' && *(name + 1) == '\0')))
- 			return 0;
- 	}
-Index: man/useradd.8
-===================================================================
-RCS file: /cvsroot/shadow/man/useradd.8,v
-retrieving revision 1.23
-diff -u -r1.23 useradd.8
---- man/useradd.8	11 Dec 2004 20:05:01 -0000	1.23
-+++ man/useradd.8	10 Jan 2005 06:40:15 -0000
-@@ -128,6 +128,23 @@
- .PP
- If no options are specified, \fBuseradd\fR displays the current default
- values.
-+.SH RESTRICTS
-+Currently,  the  shadow  suite  enforces  the following restrictions on 
-+user names:
-+
-+.nf
-+\- must begin with a lower case letter or underscore
-+\- can only contain lower case letters, underscores, and dashes
-+\- may end with a dollar sign
-+\- regex for these requirements: [a\-z_][a\-z0-9_\-$]*
-+.fi
-+
-+The length of usernames is restricted by glibc (via the UT_NAMESIZE define 
-+in the utmp header file).  This may range from 8 characters on older 
-+systems to 32 characters on newer systems.
-+
-+Note Gentoo adds a patch which allows people to create usernames with a 
-+dot in them.
- .SH NOTES
- The system administrator is responsible for placing the default user files
- in the \fI/etc/skel/\fR directory.
diff --git a/sys-apps/shadow/files/shadow-4.0.6-fix-configure.patch b/sys-apps/shadow/files/shadow-4.0.6-fix-configure.patch
deleted file mode 100644
index c7ec27ee09b4..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.6-fix-configure.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- configure.in.orig	2004-11-11 18:56:27.471755550 -0500
-+++ configure.in	2004-11-11 18:57:19.607238324 -0500
-@@ -151,25 +151,28 @@
- fi
- 
- AC_CACHE_CHECK([location of utmp], shadow_cv_utmpdir,
--[for utmpdir in /var/run /var/adm /usr/adm /etc none; do
-+[for shadow_cv_utmpdir in /var/run /var/adm /usr/adm /etc none; do
- 	if test -f $shadow_cv_utmpdir/utmp; then
- 		break
- 	fi
- done])
- if test "$shadow_cv_utmpdir" = "none"; then
- 	AC_MSG_WARN(utmp file not found)
-+else
-+	AC_DEFINE_UNQUOTED(_UTMP_FILE, "$shadow_cv_utmpdir/utmp")
- fi
--AC_DEFINE_UNQUOTED(_UTMP_FILE, "$shadow_cv_utmpdir/utmp")
- 
- AC_CACHE_CHECK([location of faillog/lastlog/wtmp], shadow_cv_logdir,
- [for shadow_cv_logdir in /var/log /var/adm /usr/adm /etc; do
--	if test -d $logdir; then
-+	if test -d $shadow_cv_logdir; then
- 		break
- 	fi
- done])
--AC_DEFINE_UNQUOTED(_WTMP_FILE, "$shadow_cv_logdir/wtmp")
--AC_DEFINE_UNQUOTED(LASTLOG_FILE, "$shadow_cv_logdir/lastlog")
--AC_DEFINE_UNQUOTED(FAILLOG_FILE, "$shadow_cv_logdir/faillog")
-+if test "$shadow_cv_logdir" != "none"; then
-+	AC_DEFINE_UNQUOTED(_WTMP_FILE, "$shadow_cv_logdir/wtmp")
-+	AC_DEFINE_UNQUOTED(LASTLOG_FILE, "$shadow_cv_logdir/lastlog")
-+	AC_DEFINE_UNQUOTED(FAILLOG_FILE, "$shadow_cv_logdir/faillog")
-+fi
- 
- AC_CACHE_CHECK([location of the passwd program], shadow_cv_passwd_dir,
- [if test -f /usr/bin/passwd; then
---- configure.orig	2004-11-11 18:57:46.546320649 -0500
-+++ configure	2004-11-11 18:57:55.968600631 -0500
-@@ -22326,7 +22324,7 @@
- if test "${shadow_cv_utmpdir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  for utmpdir in /var/run /var/adm /usr/adm /etc none; do
-+  for shadow_cv_utmpdir in /var/run /var/adm /usr/adm /etc none; do
- 	if test -f $shadow_cv_utmpdir/utmp; then
- 		break
- 	fi
-@@ -22337,11 +22335,12 @@
- if test "$shadow_cv_utmpdir" = "none"; then
- 	{ echo "$as_me:$LINENO: WARNING: utmp file not found" >&5
- echo "$as_me: WARNING: utmp file not found" >&2;}
--fi
--cat >>confdefs.h <<_ACEOF
-+else
-+	cat >>confdefs.h <<_ACEOF
- #define _UTMP_FILE "$shadow_cv_utmpdir/utmp"
- _ACEOF
- 
-+fi
- 
- echo "$as_me:$LINENO: checking location of faillog/lastlog/wtmp" >&5
- echo $ECHO_N "checking location of faillog/lastlog/wtmp... $ECHO_C" >&6
-@@ -22349,25 +22348,27 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   for shadow_cv_logdir in /var/log /var/adm /usr/adm /etc; do
--	if test -d $logdir; then
-+	if test -d $shadow_cv_logdir; then
- 		break
- 	fi
- done
- fi
- echo "$as_me:$LINENO: result: $shadow_cv_logdir" >&5
- echo "${ECHO_T}$shadow_cv_logdir" >&6
--cat >>confdefs.h <<_ACEOF
-+if test "$shadow_cv_logdir" != "none"; then
-+	cat >>confdefs.h <<_ACEOF
- #define _WTMP_FILE "$shadow_cv_logdir/wtmp"
- _ACEOF
- 
--cat >>confdefs.h <<_ACEOF
-+	cat >>confdefs.h <<_ACEOF
- #define LASTLOG_FILE "$shadow_cv_logdir/lastlog"
- _ACEOF
- 
--cat >>confdefs.h <<_ACEOF
-+	cat >>confdefs.h <<_ACEOF
- #define FAILLOG_FILE "$shadow_cv_logdir/faillog"
- _ACEOF
- 
-+fi
- 
- echo "$as_me:$LINENO: checking location of the passwd program" >&5
- echo $ECHO_N "checking location of the passwd program... $ECHO_C" >&6
diff --git a/sys-apps/shadow/files/shadow-4.0.6-long-groupnames.patch b/sys-apps/shadow/files/shadow-4.0.6-long-groupnames.patch
deleted file mode 100644
index 411dc5d40b68..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.6-long-groupnames.patch
+++ /dev/null
@@ -1,49 +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/show_bug.cgi?id=3485
-
-Index: libmisc/chkname.c
-===================================================================
-RCS file: /cvsroot/shadow/libmisc/chkname.c,v
-retrieving revision 1.8
-diff -u -r1.8 chkname.c
---- libmisc/chkname.c	12 May 2003 05:29:14 -0000	1.8
-+++ libmisc/chkname.c	10 Jan 2005 06:25:47 -0000
-@@ -58,8 +59,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);
- }
-Index: man/groupadd.8
-===================================================================
-RCS file: /cvsroot/shadow/man/groupadd.8,v
-retrieving revision 1.21
-diff -u -r1.21 groupadd.8
---- man/groupadd.8	4 Nov 2004 03:06:31 -0000	1.21
-+++ man/groupadd.8	10 Jan 2005 06:36:51 -0000
-@@ -46,6 +46,18 @@
- \fB-o\fR option is used. The value must be non-negative. The default is to
- use the smallest ID value greater than 999 and greater than every other
- group. Values between 0 and 999 are typically reserved for system accounts.
-+.SH RESTRICTIONS
-+Currently, the shadow suite enforces the following restrictions on group 
-+names:
-+
-+.nf
-+\- must begin with a lower case letter or underscore
-+\- can only contain lower case letters, underscores, and dashes
-+\- regex for these requirements: [a\-z_][a\-z0\-9_\-]*
-+.fi
-+
-+Normally shadow enforces a 16 character limit, but Gentoo adds patches to 
-+remove it.
- .SH FILES
- \fI/etc/group\fR	\- group account information
- .br
diff --git a/sys-apps/shadow/files/shadow-4.0.6-manpages.patch b/sys-apps/shadow/files/shadow-4.0.6-manpages.patch
deleted file mode 100644
index adde98d03369..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.6-manpages.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- man/usermod.8.orig	2004-11-03 23:04:32.000000000 -0500
-+++ man/usermod.8	2004-12-11 14:49:59.162308224 -0500
-@@ -113,2 +113,3 @@
- .BR groupmod (8),
-+.BR gpasswd (1),
- .BR useradd (8),
---- man/groupadd.8.orig	2004-11-03 22:06:31.000000000 -0500
-+++ man/groupadd.8	2004-12-11 14:50:15.458830776 -0500
-@@ -71,2 +71,3 @@
- .BR groupmod (8),
-+.BR gpasswd (1),
- .BR useradd (8),
---- man/groupdel.8.orig	2004-11-03 23:04:32.000000000 -0500
-+++ man/groupdel.8	2004-12-11 14:50:06.814144968 -0500
-@@ -62,2 +62,3 @@
- .BR groupmod (8),
-+.BR gpasswd (1),
- .BR useradd (8),
diff --git a/sys-apps/shadow/files/shadow-4.0.7-iswheel.patch b/sys-apps/shadow/files/shadow-4.0.7-iswheel.patch
deleted file mode 100644
index 575a0cd4b8e5..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.7-iswheel.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=80345
-
-diff -uNr shadow-4.0.7.orig/src/su.c shadow-4.0.7/src/su.c
---- shadow-4.0.7.orig/src/su.c	2005-02-01 12:22:11.553956864 +0100
-+++ shadow-4.0.7/src/su.c	2005-02-01 12:22:33.077684760 +0100
-@@ -111,7 +111,7 @@
- {
- 	struct group *grp;
- 
--	grp = getgrgid (0);
-+	grp = getgrnam ("wheel");
- 	if (!grp || !grp->gr_mem)
- 		return 0;
- 	return is_on_list (grp->gr_mem, username);
diff --git a/sys-apps/shadow/files/shadow-4.0.7-lastlog.patch b/sys-apps/shadow/files/shadow-4.0.7-lastlog.patch
deleted file mode 100644
index 04dc491c027b..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.7-lastlog.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-===================================================================
-RCS file: /cvsroot/shadow/libmisc/log.c,v
-retrieving revision 1.7
-retrieving revision 1.8
-diff -u -r1.7 -r1.8
---- shadow/libmisc/log.c
-+++ shadow/libmisc/log.c
-@@ -89,6 +89,7 @@
- 
- 	ll_time = newlog.ll_time;
- 	time (&ll_time);
-+	newlog.ll_time = ll_time;
- 	strncpy (newlog.ll_line, line, sizeof newlog.ll_line);
- #if HAVE_LL_HOST
- 	strncpy (newlog.ll_host, host, sizeof newlog.ll_host);
diff --git a/sys-apps/shadow/files/shadow-4.0.7-nscd-EPIPE-failure.patch b/sys-apps/shadow/files/shadow-4.0.7-nscd-EPIPE-failure.patch
deleted file mode 100644
index 7a4238b4ca37..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.7-nscd-EPIPE-failure.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Fix EPIPE failure when writing to nscd, bug #80413
-
---- shadow-4.0.7/lib/nscd.c	2005-07-08 14:59:49.000000000 +0200
-+++ shadow-4.0.7.az/lib/nscd.c	2005-07-08 14:59:22.000000000 +0200
-@@ -71,6 +71,7 @@
- {
- 	int sock = nscd_open_socket ();
- 	request_header req;
-+	struct iovec iov[2];
- 	ssize_t nbytes;
- 
- 	if (sock == -1)
-@@ -78,15 +79,15 @@
- 
- 	req.version = NSCD_VERSION;
- 	req.type = INVALIDATE;
--	req.key_len = strlen (service) + 1;
--	nbytes = write (sock, &req, sizeof (request_header));
--	if (nbytes != sizeof (request_header)) {
--		close (sock);
--		return -1;
--	}
-+	req.key_len = strlen(service);
-+
-+	iov[0].iov_base = &req;
-+	iov[0].iov_len = sizeof (req);
-+	iov[1].iov_base = service;
-+	iov[1].iov_len = req.key_len;
- 
--	nbytes = write (sock, (void *) service, req.key_len);
-+	nbytes = writev(sock, iov, 2);
- 
- 	close (sock);
--	return (nbytes != req.key_len ? (-1) : 0);
-+	return (nbytes != iov[0].iov_len + iov[1].iov_len ? (-1) : 0);
- }
diff --git a/sys-apps/shadow/files/shadow-4.0.7-nscd-socket-path.patch b/sys-apps/shadow/files/shadow-4.0.7-nscd-socket-path.patch
deleted file mode 100644
index 42236157f500..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.7-nscd-socket-path.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Newer glibc's have a different nscd socket location #74395
-(From Fedora/Redhat)
-
---- shadow-4.0.7/lib/nscd.c	2003-05-12 02:12:06.000000000 -0400
-+++ shadow-4.0.7.jj/lib/nscd.c	2005-05-21 04:44:08.000000000 -0400
-@@ -13,7 +13,8 @@
- /* Version number of the daemon interface */
- #define NSCD_VERSION 2
- /* Path for the Unix domain socket.  */
--#define _PATH_NSCDSOCKET "/var/run/.nscd_socket"
-+#define _PATH_NSCDSOCKET "/var/run/nscd/socket"
-+#define _PATH_NSCDSOCKET_OLD "/var/run/.nscd_socket"
- 
- /* Available services.  */
- typedef enum {
-@@ -57,8 +58,13 @@ static int nscd_open_socket (void)
- 	assert (sizeof (addr.sun_path) >= sizeof (_PATH_NSCDSOCKET));
- 	strcpy (addr.sun_path, _PATH_NSCDSOCKET);
- 	if (connect (sock, (struct sockaddr *) &addr, sizeof (addr)) < 0) {
--		close (sock);
--		return -1;
-+		addr.sun_family = AF_UNIX;
-+		assert (sizeof (addr.sun_path) >= sizeof (_PATH_NSCDSOCKET_OLD));
-+		strcpy (addr.sun_path, _PATH_NSCDSOCKET_OLD);
-+		if (connect (sock, (struct sockaddr *) &addr, sizeof (addr)) < 0) {
-+			close (sock);
-+			return -1;
-+		}
- 	}
- 
- 	return sock;
diff --git a/sys-apps/shadow/files/shadow-4.0.7-perms.patch b/sys-apps/shadow/files/shadow-4.0.7-perms.patch
deleted file mode 100644
index f754ca3f3b14..000000000000
--- a/sys-apps/shadow/files/shadow-4.0.7-perms.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Nrup src/Makefile.am src/Makefile.am
---- src/Makefile.am	2005-07-24 12:33:11.000000000 -0400
-+++ src/Makefile.am	2005-07-24 14:45:52.000000000 -0400
-@@ -46,6 +46,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
-@@ -71,8 +73,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
-diff -Nrup src/Makefile.in src/Makefile.in
---- src/Makefile.in	2005-07-24 12:33:56.000000000 -0400
-+++ src/Makefile.in	2005-07-24 14:46:07.000000000 -0400
-@@ -352,6 +352,9 @@ INCLUDES = \
- # id and groups are from gnu, sulogin from sysvinit
- 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
- 
-@@ -835,10 +838,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.