diff options
| -rw-r--r-- | sys-apps/shadow/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-apps/shadow/files/shadow-4.0.6-dots-in-usernames.patch | 28 | ||||
| -rw-r--r-- | sys-apps/shadow/files/shadow-4.0.6-long-groupnames.patch | 23 | ||||
| -rw-r--r-- | sys-apps/shadow/shadow-4.0.6.ebuild | 8 |
4 files changed, 64 insertions, 3 deletions
diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog index 31ea49c9c1be..40e478ec8fb1 100644 --- 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/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 index 000000000000..c02fd8a656f3 --- /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 index 000000000000..4ca93018a37d --- /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 64edc1705596..6a851a6784eb 100644 --- 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 \ |