[Pkg-shadow-commits] r356 - branches/experimental/debian/patches
Nicolas FRANCOIS
pkg-shadow-devel@lists.alioth.debian.org
Thu, 07 Jul 2005 01:30:28 +0000
Author: nekral-guest
Date: 2005-07-07 01:30:27 +0000 (Thu, 07 Jul 2005)
New Revision: 356
Modified:
branches/experimental/debian/patches/401_cppw_src.dpatch
branches/experimental/debian/patches/402_usermod.8-system-users-range-286258
branches/experimental/debian/patches/403_sg_symlink_162339_163652.dpatch
branches/experimental/debian/patches/405_subsystem_remove_*_in_shell.dpatch
branches/experimental/debian/patches/407_32char_grnames.dpatch
Log:
More updates to 4.0.10
Modified: branches/experimental/debian/patches/401_cppw_src.dpatch
===================================================================
--- branches/experimental/debian/patches/401_cppw_src.dpatch 2005-07-07 00:52:42 UTC (rev 355)
+++ branches/experimental/debian/patches/401_cppw_src.dpatch 2005-07-07 01:30:27 UTC (rev 356)
@@ -5,10 +5,10 @@
## DP: Add cppw / cpgr
@DPATCH@
-Index: shadow-4.0.3/src/cppw.c
+Index: shadow-4.0.10/src/cppw.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.3/src/cppw.c 2005-06-11 17:17:36.838451645 +0200
++++ shadow-4.0.10/src/cppw.c 2005-07-07 03:06:03.000000000 +0200
@@ -0,0 +1,200 @@
+/*
+ cppw, cpgr copy with locking given file over the password or group file
@@ -210,28 +210,27 @@
+
+ return 0;
+}
-Index: shadow-4.0.3/src/Makefile.am
+Index: shadow-4.0.10/src/Makefile.am
===================================================================
---- shadow-4.0.3.orig/src/Makefile.am 2005-06-11 17:16:25.832060919 +0200
-+++ shadow-4.0.3/src/Makefile.am 2005-06-11 17:17:36.847450300 +0200
-@@ -25,7 +25,7 @@ bin_PROGRAMS = groups login su
+--- shadow-4.0.10.orig/src/Makefile.am 2005-06-16 20:42:51.000000000 +0200
++++ shadow-4.0.10/src/Makefile.am 2005-07-07 03:06:03.000000000 +0200
+@@ -23,6 +23,7 @@
+ bin_PROGRAMS = groups login su
ubin_PROGRAMS = faillog lastlog chage chfn chsh expiry gpasswd newgrp passwd
- usbin_PROGRAMS = chpasswd dpasswd groupadd groupdel groupmod \
- logoutd mkpasswd newusers useradd userdel usermod grpck \
-- pwck vipw grpconv grpunconv pwconv pwunconv
-+ pwck vipw grpconv grpunconv pwconv pwunconv cppw
-
- noinst_PROGRAMS = id sulogin
-
-Index: shadow-4.0.3/po/POTFILES.in
+ usbin_PROGRAMS = \
++ cppw \
+ chpasswd \
+ groupadd \
+ groupdel \
+Index: shadow-4.0.10/po/POTFILES.in
===================================================================
---- shadow-4.0.3.orig/po/POTFILES.in 2005-06-11 17:17:13.947871794 +0200
-+++ shadow-4.0.3/po/POTFILES.in 2005-06-11 17:18:12.704092854 +0200
-@@ -80,6 +80,7 @@ src/chage.c
+--- shadow-4.0.10.orig/po/POTFILES.in 2005-07-07 02:54:12.000000000 +0200
++++ shadow-4.0.10/po/POTFILES.in 2005-07-07 03:06:03.000000000 +0200
+@@ -68,6 +68,7 @@
src/chfn.c
src/chpasswd.c
src/chsh.c
+src/cppw.c
- src/dpasswd.c
src/expiry.c
src/faillog.c
+ src/gpasswd.c
Modified: branches/experimental/debian/patches/402_usermod.8-system-users-range-286258
===================================================================
--- branches/experimental/debian/patches/402_usermod.8-system-users-range-286258 2005-07-07 00:52:42 UTC (rev 355)
+++ branches/experimental/debian/patches/402_usermod.8-system-users-range-286258 2005-07-07 01:30:27 UTC (rev 356)
@@ -2,16 +2,29 @@
Status wrt upstream: Not applied because too Debian-specific
-Index: shadow-4.0.3/man/usermod.8
+Index: shadow-4.0.10/man/usermod.8
===================================================================
---- shadow-4.0.3.orig/man/usermod.8 2005-06-20 23:31:40.000000000 +0200
-+++ shadow-4.0.3/man/usermod.8 2005-06-20 23:31:56.000000000 +0200
-@@ -91,7 +91,7 @@
- The numerical value of the user's ID.
- This value must be unique, unless the \fI-o\fR option is used.
- The value must be non-negative.
--Values between 0 and 99 are typically reserved for system accounts.
-+Values between 0 and 999 are typically reserved for system accounts.
- Any files which the user owns and which are located in the directory
- tree rooted at the user's home directory will have the file user ID
- changed automatically.
+--- shadow-4.0.10.orig/man/usermod.8 2005-06-16 18:08:37.000000000 +0200
++++ shadow-4.0.10/man/usermod.8 2005-07-07 03:18:59.000000000 +0200
+@@ -84,7 +84,7 @@
+
+ .TP
+ \fB\-u\fR \fIuid\fR
+-The numerical value of the user's ID\&. This value must be unique, unless the \fB\-o\fR option is used\&. The value must be non\-negative\&. Values between 0 and 99 are typically reserved for system accounts\&. Any files which the user owns and which are located in the directory tree rooted at the user's home directory will have the file user ID changed automatically\&. Files outside of the user's home directory must be altered manually\&.
++The numerical value of the user's ID\&. This value must be unique, unless the \fB\-o\fR option is used\&. The value must be non\-negative\&. Values between 0 and 999 are typically reserved for system accounts\&. Any files which the user owns and which are located in the directory tree rooted at the user's home directory will have the file user ID changed automatically\&. Files outside of the user's home directory must be altered manually\&.
+
+ .TP
+ \fB\-U\fR
+Index: shadow-4.0.10/man/usermod.8.xml
+===================================================================
+--- shadow-4.0.10.orig/man/usermod.8.xml 2005-06-16 18:01:21.000000000 +0200
++++ shadow-4.0.10/man/usermod.8.xml 2005-07-07 03:19:07.000000000 +0200
+@@ -204,7 +204,7 @@
+ <listitem>
+ <para>The numerical value of the user's ID. This value must be
+ unique, unless the <option>-o</option> option is used. The value
+- must be non-negative. Values between 0 and 99 are typically
++ must be non-negative. Values between 0 and 999 are typically
+ reserved for system accounts. Any files which the user owns and
+ which are located in the directory tree rooted at the user's
+ home directory will have the file user ID changed automatically.
Modified: branches/experimental/debian/patches/403_sg_symlink_162339_163652.dpatch
===================================================================
--- branches/experimental/debian/patches/403_sg_symlink_162339_163652.dpatch 2005-07-07 00:52:42 UTC (rev 355)
+++ branches/experimental/debian/patches/403_sg_symlink_162339_163652.dpatch 2005-07-07 01:30:27 UTC (rev 356)
@@ -12,14 +12,15 @@
## DP: (We just have to test if sg is linked to newgrp)
@DPATCH@
-diff -urNad shadow-4.0.3/src/Makefile.am /tmp/dpep.Utv29a/shadow-4.0.3/src/Makefile.am
---- shadow-4.0.3/src/Makefile.am 2005-04-15 23:07:41.589005000 +0200
-+++ /tmp/dpep.Utv29a/shadow-4.0.3/src/Makefile.am 2005-04-15 23:10:11.699005000 +0200
-@@ -54,7 +54,6 @@
- usermod_LDADD = $(LDADD) $(LIBPAM)
+Index: shadow-4.0.10/src/Makefile.am
+===================================================================
+--- shadow-4.0.10.orig/src/Makefile.am 2005-07-07 03:06:03.000000000 +0200
++++ shadow-4.0.10/src/Makefile.am 2005-07-07 03:21:45.000000000 +0200
+@@ -75,7 +75,6 @@
- install-exec-hook:
-- ln -sf newgrp $(DESTDIR)$(bindir)/sg
- ln -sf vigr $(DESTDIR)$(bindir)/vipw
+ install-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+- ln -sf newgrp $(DESTDIR)$(ubindir)/sg
+ ln -sf vipw $(DESTDIR)$(usbindir)/vigr
for i in $(suidbins); do \
- chmod 4755 $(DESTDIR)$(bindir)/$$i; \
+ chmod -f 4755 $(DESTDIR)$(bindir)/$$i; \
Modified: branches/experimental/debian/patches/405_subsystem_remove_*_in_shell.dpatch
===================================================================
--- branches/experimental/debian/patches/405_subsystem_remove_*_in_shell.dpatch 2005-07-07 00:52:42 UTC (rev 355)
+++ branches/experimental/debian/patches/405_subsystem_remove_*_in_shell.dpatch 2005-07-07 01:30:27 UTC (rev 356)
@@ -13,23 +13,23 @@
--- shadow-4.0.3/lib/prototypes.h 2005-04-17 19:40:40.837048000 +0200
+++ /tmp/dpep.Ff9YlN/shadow-4.0.3/lib/prototypes.h 2005-04-17 19:44:06.817048000 +0200
@@ -203,7 +203,7 @@
- extern void sulog(const char *, int, const char *, const char *);
+ extern void sulog (const char *, int, const char *, const char *);
/* sub.c */
--extern void subsystem(const struct passwd *);
-+extern void subsystem(struct passwd *);
+-extern void subsystem (const struct passwd *);
++extern void subsystem (struct passwd *);
/* ttytype.c */
- extern void ttytype(const char *);
+ extern void ttytype (const char *);
diff -urNad shadow-4.0.3/libmisc/sub.c /tmp/dpep.Ff9YlN/shadow-4.0.3/libmisc/sub.c
--- shadow-4.0.3/libmisc/sub.c 2005-04-17 19:40:40.907048000 +0200
+++ /tmp/dpep.Ff9YlN/shadow-4.0.3/libmisc/sub.c 2005-04-17 19:44:06.817048000 +0200
@@ -51,7 +51,7 @@
+ * directory will be used as the root of a new filesystem which
+ * the user is actually logged into.
*/
-
- void
--subsystem(const struct passwd *pw)
-+subsystem(struct passwd *pw)
+-void subsystem (const struct passwd *pw)
++void subsystem (struct passwd *pw)
{
/*
* The new root directory must begin with a "/" character.
Modified: branches/experimental/debian/patches/407_32char_grnames.dpatch
===================================================================
--- branches/experimental/debian/patches/407_32char_grnames.dpatch 2005-07-07 00:52:42 UTC (rev 355)
+++ branches/experimental/debian/patches/407_32char_grnames.dpatch 2005-07-07 01:30:27 UTC (rev 356)
@@ -36,7 +36,7 @@
--- shadow-4.0.3.orig/libmisc/chkname.c 2005-05-12 14:06:09.310665804 +0200
+++ shadow-4.0.3/libmisc/chkname.c 2005-05-12 14:06:10.644466517 +0200
@@ -72,10 +72,10 @@ int
- check_group_name(const char *name)
+ check_group_name (const char *name)
{
/*
- * Arbitrary limit for group names - max 16
@@ -44,8 +44,8 @@
+ * Arbitrary limit for group names - max 32
+ * same as linux UT_NAMESIZE
*/
-- if (strlen(name) > 16)
-+ if (strlen(name) > 32)
+- if (strlen (name) > 16)
++ if (strlen (name) > 32)
return 0;
- return good_name(name);
+ return good_name (name);