Add patches to enable long group names #3485 and usernames with a . in them #22920.

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index 31ea49c9c1bef37691cb75bc6130a27aa592dd70..40e478ec8fb1e21bd38f041cd2bf520db201b113 100644 (file)
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/shadow
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.93 2005/01/07 04:53:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.94 2005/01/10 06:35:04 vapier Exp $
+
+  10 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/shadow-4.0.6-dots-in-usernames.patch,
+  +files/shadow-4.0.6-long-groupnames.patch, shadow-4.0.6.ebuild:
+  Add patches to enable long group names #3485 and usernames with a . in them
+  #22920.
 
   06 Jan 2005; Mike Frysinger <vapier@gentoo.org>
   +files/shadow-4.0.6-manpages.patch, shadow-4.0.6.ebuild:

diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 137737761e231e5bad943a163a44f0a01052c682..9caf05956b803cb55a96923ed1d5fe83f1219f56 100644 (file)
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7b37daac44e02daf71f88d38186cdea8 ChangeLog 16972
+MD5 65df2cc398ee19db3ce71f63b6166f4d ChangeLog 17224
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 64c8c8131c7bbba90c84132b722baa38 shadow-4.0.4.1-r4.ebuild 5947
-MD5 498b29f3eb732e07497949bd2b4f29d4 shadow-4.0.6.ebuild 5271
+MD5 080d68b76a4c9e4199caca00b8d008a2 shadow-4.0.6.ebuild 5436
 MD5 4442569a619d928b23429170034aee02 shadow-4.0.5-r2.ebuild 5424
 MD5 3d9d665aebdcc9922e3a7c3a852c2d06 shadow-4.0.5-r3.ebuild 5509
 MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1-r4 67
@@ -29,6 +29,8 @@ MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r3 66
 MD5 c5e9081ed43837797e2f1617b7ce1c24 files/shadow-4.0.5-fix-adding-of-pam_env-set-env-vars.patch 285
 MD5 fda41657b856ffaeec5a2734b312409b files/shadow-4.0.5-fix-mail-configure.patch 5452
 MD5 d15398f7d8c06b906abdf73ae3a55f54 files/shadow-4.0.6-manpages.patch 564
+MD5 722c164266b87cc374eae4ce1de7632b files/shadow-4.0.6-dots-in-usernames.patch 882
+MD5 fcbc820ddc961b2b153ccc5a7a62935b files/shadow-4.0.6-long-groupnames.patch 659
 MD5 6e0bc0211949c624da0ea08d994a7038 files/default/useradd 96
 MD5 51b0337bd261f6ed5e53af5dc196431a files/pam.d/system-auth 499
 MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/pam.d/login 431
@@ -38,9 +40,9 @@ MD5 60d44a6f43aafcb9ca35858ab2534a49 files/pam.d/shadow 227
 MD5 942190363cb06bd4cf1b3acdcca6c513 files/pam.d/su 1296
 MD5 624bacd4dd8e9855404cd262dd6f8f62 files/pam.d/system-auth-1.1 671
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.9.14 (GNU/Linux)
 
-iD8DBQFB3hXZroRuSHgZdywRAtt3AJkBVjuAG0zO/uHB0B/fNdUlmtrxxwCffbUc
-Bkz086P94XBdD9n/+6OsGaM=
-=MNdJ
+iD8DBQFB4iI3roRuSHgZdywRAkMKAJ9D4VG7wuORt92xJ+IO8mQL21TVkwCeKWNO
+aZpz+QS/fPxdTbw5QZS1I+k=
+=EFcc
 -----END PGP SIGNATURE-----

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
new file mode 100644 (file)
index 0000000..c02fd8a
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.0.6-dots-in-usernames.patch
@@ -0,0 +1,28 @@
+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;
+       }

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
new file mode 100644 (file)
index 0000000..4ca9301
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.0.6-long-groupnames.patch
@@ -0,0 +1,23 @@
+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);
+ }

diff --git a/sys-apps/shadow/shadow-4.0.6.ebuild b/sys-apps/shadow/shadow-4.0.6.ebuild
index 64edc17055966a588697bfca628be43ea28fd631..6a851a6784ebf0f7a0a4143291781cca8f1f64da 100644 (file)
--- a/sys-apps/shadow/shadow-4.0.6.ebuild
+++ b/sys-apps/shadow/shadow-4.0.6.ebuild
@@ -1,6 +1,6 @@
 # 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.6.ebuild,v 1.7 2005/01/07 04:53:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.6.ebuild,v 1.8 2005/01/10 06:35:04 vapier Exp $
 
 inherit eutils libtool gnuconfig flag-o-matic
 
@@ -56,6 +56,10 @@ src_unpack() {
        # Tweak manpages #70880
        epatch ${FILESDIR}/shadow-${PV}-manpages.patch
 
+       # Make user/group names more flexible #3485 / #22920
+       epatch "${FILESDIR}"/${P}-dots-in-usernames.patch
+       epatch "${FILESDIR}"/${P}-long-groupnames.patch
+
        # Allows shadow configure detect newer systems properly
        gnuconfig_update
        elibtoolize
@@ -63,7 +67,7 @@ src_unpack() {
 
 src_compile() {
        append-ldflags -Wl,-z,now
-       [[ ${CTARGET} != ${CHOST} ]] \
+       [[ ${CTARGET:-${CHOST}} != ${CHOST} ]] \
                && export ac_cv_func_setpgrp_void=yes
        econf \
                --disable-desrpc \