Version bump.

(Portage version: 2.0.53_rc4)

6 files changed, 164 insertions, 0 deletions

diff --git a/sys-apps/shadow/files/digest-shadow-4.0.13 b/sys-apps/shadow/files/digest-shadow-4.0.13
new file mode 100644
index 000000000000..6f8f6aa3d631
--- /dev/null
+++ b/sys-apps/shadow/files/digest-shadow-4.0.13
@@ -0,0 +1 @@
+MD5 5c6a105d89afb0900922260e9c5650cc shadow-4.0.13.tar.bz2 1087998
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
new file mode 100644
index 000000000000..54e1d72e61b3
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.0.13-dots-in-usernames.patch
@@ -0,0 +1,28 @@
+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-login.defs.patch b/sys-apps/shadow/files/shadow-4.0.13-login.defs.patch
new file mode 100644
index 000000000000..4ac4b4ec5513
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.0.13-login.defs.patch
@@ -0,0 +1,25 @@
+Index: etc/login.defs
+===================================================================
+RCS file: /cvsroot/shadow/etc/login.defs,v
+retrieving revision 1.8
+diff -u -p -U0 -r1.8 login.defs
+--- etc/login.defs	1 Sep 2005 19:57:45 -0000	1.8
++++ etc/login.defs	10 Oct 2005 22:17:39 -0000
+@@ -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/lib/cracklib_dict
+@@ -227 +227 @@
+-LOGIN_RETRIES		5
++LOGIN_RETRIES		3
+@@ -279 +279 @@
+-#MD5_CRYPT_ENAB	no
++MD5_CRYPT_ENAB	yes
+@@ -330 +330 @@
+-#GETPASS_ASTERISKS 1
++GETPASS_ASTERISKS 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
new file mode 100644
index 000000000000..df322cf28b2c
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.0.13-long-groupnames.patch
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 000000000000..0c89e90e2123
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.0.13-nonis.patch
@@ -0,0 +1,53 @@
+--- 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.13-su-fix-environment.patch b/sys-apps/shadow/files/shadow-4.0.13-su-fix-environment.patch
new file mode 100644
index 000000000000..5db08fd5fd73
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.0.13-su-fix-environment.patch
@@ -0,0 +1,39 @@
+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,11 +594,6 @@
+ 		addenv ("PATH", cp);
+ 	}
+
+-#ifndef USE_PAM
+-	/* setup the environment for PAM later on, else we run into auth problems */
+-	environ = newenvp;	/* make new environment active */
+-#endif
+-
+ 	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
+ 
+ 	/*