Tue Apr 14 10:19:46 UTC 2009

Author: pvrabec

Update of /cvs/extras/rpms/shadow-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10106

Modified Files:
	.cvsignore shadow-utils.spec sources 
Added Files:
	shadow-4.1.3-goodname.patch shadow-4.1.3-redhat.patch 
Removed Files:
	shadow-4.0.17-login.defs 
	shadow-4.1.1-selinuxUserMappings.patch 
	shadow-4.1.2-audit.patch shadow-4.1.2-checkName.patch 
	shadow-4.1.2-gmNoGroup.patch shadow-4.1.2-gmSEGV.patch 
	shadow-4.1.2-goodname.patch shadow-4.1.2-redhat.patch 
	shadow-4.1.2-selinux.patch 
	shadow-4.1.2-sysAccountDownhill.patch shadow-4.1.2-uid.patch 
Log Message:
upgrade


shadow-4.1.3-goodname.patch:

--- NEW FILE shadow-4.1.3-goodname.patch ---
diff -up shadow-4.1.3/libmisc/chkname.c.goodname shadow-4.1.3/libmisc/chkname.c
--- shadow-4.1.3/libmisc/chkname.c.goodname	2008-12-23 23:42:21.000000000 +0100
+++ shadow-4.1.3/libmisc/chkname.c	2009-04-14 11:46:21.000000000 +0200
@@ -54,20 +54,28 @@
 static bool is_valid_name (const char *name)
 {
 	/*
-	 * User/group names must match [a-z_][a-z0-9_-]*[$]
-	 */
-	if (('\0' == *name) ||
-	    !((('a' <= *name) && ('z' >= *name)) || ('_' == *name))) {
+         * User/group names must match gnu e-regex:
+         *    [a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,30}[a-zA-Z0-9_.$-]?
+         *
+         * as a non-POSIX, extension, allow "$" as the last char for
+         * sake of Samba 3.x "add machine script"
+         */
+	if ( ('\0' == *name) ||
+             !((*name >= 'a' && *name <= 'z') ||
+               (*name >= 'A' && *name <= 'Z') ||
+               (*name >= '0' && *name <= '9') ||
+               (*name == '_') || (*name == '.') 
+	      )) {
 		return false;
 	}
 
 	while ('\0' != *++name) {
-		if (!(( ('a' <= *name) && ('z' >= *name) ) ||
-		      ( ('0' <= *name) && ('9' >= *name) ) ||
-		      ('_' == *name) ||
-		      ('-' == *name) ||
-		      ( ('$' == *name) && ('\0' == *(name + 1)) )
-		     )) {
+                if (!(  (*name >= 'a' && *name <= 'z') ||
+                        (*name >= 'A' && *name <= 'Z') ||
+                        (*name >= '0' && *name <= '9') ||
+                        (*name == '_') || (*name == '.') || (*name == '-') ||
+                        (*name == '$' && *(name + 1) == '\0') 
+                     )) {
 			return false;
 		}
 	}
diff -up shadow-4.1.3/man/groupadd.8.goodname shadow-4.1.3/man/groupadd.8
--- shadow-4.1.3/man/groupadd.8.goodname	2009-04-12 04:46:15.000000000 +0200
+++ shadow-4.1.3/man/groupadd.8	2009-04-14 11:45:13.000000000 +0200
@@ -139,9 +139,7 @@ Shadow password suite configuration\&.
 .RE
 .SH "CAVEATS"
 .PP
-Groupnames must begin with a lower case letter or an underscore, and only lower case letters, underscores, dashes, and dollar signs may follow\&. In regular expression terms: [a\-z_][a\-z0\-9_\-]*[$]?
-.PP
-Groupnames may only be up to 16 characters long\&.
+Groupnames may only be up to 32 characters long\&.
 .PP
 You may not add a NIS or LDAP group\&. This must be performed on the corresponding server\&.
 .PP
diff -up shadow-4.1.3/man/useradd.8.goodname shadow-4.1.3/man/useradd.8
--- shadow-4.1.3/man/useradd.8.goodname	2009-04-12 04:46:35.000000000 +0200
+++ shadow-4.1.3/man/useradd.8	2009-04-14 11:45:13.000000000 +0200
@@ -385,8 +385,6 @@ Similarly, if the username already exist
 \fBuseradd\fR
 will deny the user account creation request\&.
 .PP
-Usernames must begin with a lower case letter or an underscore, and only lower case letters, underscores, dashes, and dollar signs may follow\&. In regular expression terms: [a\-z_][a\-z0\-9_\-]*[$]?
-.PP
 Usernames may only be up to 32 characters long\&.
 .SH "CONFIGURATION"
 .PP

shadow-4.1.3-redhat.patch:

--- NEW FILE shadow-4.1.3-redhat.patch ---
diff -up shadow-4.1.3-rc1/libmisc/find_new_gid.c.redhat shadow-4.1.3-rc1/libmisc/find_new_gid.c
--- shadow-4.1.3-rc1/libmisc/find_new_gid.c.redhat	2009-04-06 15:46:43.000000000 +0200
+++ shadow-4.1.3-rc1/libmisc/find_new_gid.c	2009-04-06 15:48:29.000000000 +0200
@@ -56,11 +56,11 @@ int find_new_gid (bool sys_group, gid_t 
 	assert (gid != NULL);
 
 	if (!sys_group) {
-		gid_min = getdef_ulong ("GID_MIN", 1000L);
+		gid_min = getdef_ulong ("GID_MIN", 500L);
 		gid_max = getdef_ulong ("GID_MAX", 60000L);
 	} else {
 		gid_min = getdef_ulong ("SYS_GID_MIN", 1L);
-		gid_max = getdef_ulong ("GID_MIN", 1000L) - 1;
+		gid_max = getdef_ulong ("GID_MIN", 500L) - 1;
 		gid_max = getdef_ulong ("SYS_GID_MAX", (unsigned long) gid_max);
 	}
 	used_gids = alloca (sizeof (char) * gid_max +1);
diff -up shadow-4.1.3-rc1/libmisc/find_new_uid.c.redhat shadow-4.1.3-rc1/libmisc/find_new_uid.c
--- shadow-4.1.3-rc1/libmisc/find_new_uid.c.redhat	2009-04-06 15:46:49.000000000 +0200
+++ shadow-4.1.3-rc1/libmisc/find_new_uid.c	2009-04-06 15:48:46.000000000 +0200
@@ -56,11 +56,11 @@ int find_new_uid (bool sys_user, uid_t *
 	assert (uid != NULL);
 
 	if (!sys_user) {
-		uid_min = getdef_ulong ("UID_MIN", 1000L);
+		uid_min = getdef_ulong ("UID_MIN", 500L);
 		uid_max = getdef_ulong ("UID_MAX", 60000L);
 	} else {
 		uid_min = getdef_ulong ("SYS_UID_MIN", 1L);
-		uid_max = getdef_ulong ("UID_MIN", 1000L) - 1;
+		uid_max = getdef_ulong ("UID_MIN", 500L) - 1;
 		uid_max = getdef_ulong ("SYS_UID_MAX", (unsigned long) uid_max);
 	}
 	used_uids = alloca (sizeof (char) * uid_max +1);
diff -up shadow-4.1.3-rc1/src/useradd.c.redhat shadow-4.1.3-rc1/src/useradd.c
--- shadow-4.1.3-rc1/src/useradd.c.redhat	2009-04-06 15:49:02.000000000 +0200
+++ shadow-4.1.3-rc1/src/useradd.c	2009-04-06 15:55:22.000000000 +0200
@@ -89,7 +89,7 @@ char *Prog;
 static gid_t def_group = 100;
 static const char *def_gname = "other";
 static const char *def_home = "/home";
-static const char *def_shell = "";
+static const char *def_shell = "/sbin/nologin";
 static const char *def_template = SKEL_DIR;
 static const char *def_create_mail_spool = "no";
 
@@ -101,7 +101,7 @@ static char def_file[] = USER_DEFAULTS_F
 #define	VALID(s)	(strcspn (s, ":\n") == strlen (s))
 
 static const char *user_name = "";
-static const char *user_pass = "!";
+static const char *user_pass = "!!";
 static uid_t user_id;
 static gid_t user_gid;
 static const char *user_comment = "";


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	26 May 2008 13:17:35 -0000	1.19
+++ .cvsignore	14 Apr 2009 10:19:12 -0000	1.20
@@ -1,4 +1,3 @@
 shadow-4.0.17-login.defs
 shadow-4.0.18.1-useradd
-shadow-4.1.1.tar.bz2
-shadow-4.1.2.tar.bz2
+shadow-4.1.3.tar.bz2


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- shadow-utils.spec	24 Mar 2009 16:09:09 -0000	1.128
+++ shadow-utils.spec	14 Apr 2009 10:19:14 -0000	1.129
@@ -1,36 +1,22 @@
-%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
-%define WITH_SELINUX 1
-%endif
-
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
-Version: 4.1.2
-Release: 13%{?dist}
+Version: 4.1.3
+Release: 1%{?dist}
 Epoch: 2
 URL: http://pkg-shadow.alioth.debian.org/
 Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.bz2
 Source1: shadow-4.0.17-login.defs
 Source2: shadow-4.0.18.1-useradd
-
-Patch0: shadow-4.1.2-redhat.patch
-Patch1: shadow-4.1.2-goodname.patch
-Patch2: shadow-4.1.2-selinux.patch
-Patch3: shadow-4.1.2-sysAccountDownhill.patch
-Patch4: shadow-4.1.2-gmSEGV.patch
-Patch5: shadow-4.1.2-audit.patch
-Patch6: shadow-4.1.1-selinuxUserMappings.patch
-Patch7: shadow-4.1.2-checkName.patch
-Patch8: shadow-4.1.2-gmNoGroup.patch
-Patch9: shadow-4.1.2-uid.patch
-
+Patch0: shadow-4.1.3-redhat.patch
+Patch1: shadow-4.1.3-goodname.patch
 License: BSD and GPLv2+
 Group: System Environment/Base
-BuildRequires: autoconf, automake, libtool, gettext-devel
 BuildRequires: libselinux-devel >= 1.25.2-1
 BuildRequires: audit-libs-devel >= 1.6.5
+#BuildRequires: autoconf, automake, libtool, gettext-devel
 Requires: libselinux >= 1.25.2-1
 Requires: audit-libs >= 1.6.5
-Requires: setup policycoreutils
+Requires: setup
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -49,34 +35,23 @@
 %setup -q -n shadow-%{version}
 %patch0 -p1 -b .redhat
 %patch1 -p1 -b .goodname
-%patch2 -p1 -b .selinux
-%patch3 -p1 -b .sysAccountDownhill
-%patch4 -p1 -b .gmSEGV
-%patch5 -p1 -b .audit
-%patch6 -p1 -b .selinuxUserMappings
-%patch7 -p1 -b .checkName
-%patch8 -p1 -b .gmNoGroup
-%patch9 -p1 -b .uid
 
 iconv -f ISO88591 -t utf-8  doc/HOWTO > doc/HOWTO.utf8
 cp -f doc/HOWTO.utf8 doc/HOWTO
 
-rm po/*.gmo
-rm po/stamp-po
-
-aclocal
-libtoolize --force
-automake -a
-autoconf
+#rm po/*.gmo
+#rm po/stamp-po
+#aclocal
+#libtoolize --force
+#automake -a
+#autoconf
 
 %build
 %configure \
         --enable-shadowgrp \
         --with-audit \
         --with-sha-crypt \
-%if %{WITH_SELINUX}
         --with-selinux \
-%endif
         --without-libcrack \
         --without-libpam \
         --disable-shared
@@ -199,11 +174,11 @@
 %{_mandir}/man8/vigr.8*
 
 %changelog
-* Tue Mar 24 2009 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-13
-- do not allow UID/GID = 4294967295 (#484040,#133664)
+* Tue Apr 14 2009 Peter Vrabec <pvrabec at redhat.com> 2:4.1.3-1
+- upgrade
 
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:4.1.2-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue Mar 24 2009 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-12
+- don not allow UID/GID = 4294967295 (#484040)
 
 * Mon Jan 19 2009 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-11
 - fix license tag (#226416)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	26 May 2008 13:17:35 -0000	1.20
+++ sources	14 Apr 2009 10:19:14 -0000	1.21
@@ -1,4 +1,3 @@
 e91727c55dbafc9915250e31535f13bb  shadow-4.0.17-login.defs
 ebdf46b79f9b414353c9ae8aba4d55cc  shadow-4.0.18.1-useradd
-b1aa30abb3cce16a37b53e45e1ec70a4  shadow-4.1.1.tar.bz2
-ce90cbe9cba7f6673cb10cad49083c1c  shadow-4.1.2.tar.bz2
+d222bd50f64d52a32882c82ab1e85f28  shadow-4.1.3.tar.bz2


--- shadow-4.0.17-login.defs DELETED ---


--- shadow-4.1.1-selinuxUserMappings.patch DELETED ---


--- shadow-4.1.2-audit.patch DELETED ---


--- shadow-4.1.2-checkName.patch DELETED ---


--- shadow-4.1.2-gmNoGroup.patch DELETED ---


--- shadow-4.1.2-gmSEGV.patch DELETED ---


--- shadow-4.1.2-goodname.patch DELETED ---


--- shadow-4.1.2-redhat.patch DELETED ---


--- shadow-4.1.2-selinux.patch DELETED ---


--- shadow-4.1.2-sysAccountDownhill.patch DELETED ---


--- shadow-4.1.2-uid.patch DELETED ---


