[Pkg-shadow-commits] r567 - branches/4.0.13/debian/patches
Alexander Gattin
xrgtn-guest at costa.debian.org
Thu Oct 6 16:41:05 UTC 2005
Author: xrgtn-guest
Date: 2005-10-06 16:41:05 +0000 (Thu, 06 Oct 2005)
New Revision: 567
Modified:
branches/4.0.13/debian/patches/404_undef_USE_PAM.dpatch
branches/4.0.13/debian/patches/427_chage_expiry_0
branches/4.0.13/debian/patches/442_useradd-O_option
Log:
Updated patches for the latest CVS code.
Also, I placed "#undef USE_PAM" _immediately_ after "#include <config.h>", i.e.
one line upper than it used to be placed before, because this allows the patch
to succeeed with fuzz 2 after "$Id:" in affected files changes.
Modified: branches/4.0.13/debian/patches/404_undef_USE_PAM.dpatch
===================================================================
--- branches/4.0.13/debian/patches/404_undef_USE_PAM.dpatch 2005-10-05 14:57:19 UTC (rev 566)
+++ branches/4.0.13/debian/patches/404_undef_USE_PAM.dpatch 2005-10-06 16:41:05 UTC (rev 567)
@@ -6,120 +6,111 @@
* If it is kept for 4.0.13, libmisc/salt.c will also require an
#undef USE_PAM
-Index: shadow-4.0.13/src/chage.c
+Index: shadow-cvs/src/chage.c
===================================================================
---- shadow-4.0.13.orig/src/chage.c 2005-10-04 08:06:31.341170465 +0200
-+++ shadow-4.0.13/src/chage.c 2005-10-04 08:07:30.509114566 +0200
-@@ -29,6 +29,8 @@
+--- shadow-cvs.orig/src/chage.c 2005-10-05 17:04:22.000000000 +0300
++++ shadow-cvs/src/chage.c 2005-10-06 02:44:56.000000000 +0300
+@@ -28,6 +28,7 @@
+ */
#include <config.h>
-
+#undef USE_PAM
-+
- #ident "$Id: chage.c,v 1.64 2005/09/07 15:00:45 kloczek Exp $"
- #include <ctype.h>
-Index: shadow-4.0.13/src/chpasswd.c
+ #ident "$Id: chage.c,v 1.66 2005/10/04 20:26:41 kloczek Exp $"
+
+Index: shadow-cvs/src/chpasswd.c
===================================================================
---- shadow-4.0.13.orig/src/chpasswd.c 2005-10-04 08:06:31.342170261 +0200
-+++ shadow-4.0.13/src/chpasswd.c 2005-10-04 08:07:30.510114363 +0200
-@@ -29,6 +29,8 @@
+--- shadow-cvs.orig/src/chpasswd.c 2005-10-05 17:04:22.000000000 +0300
++++ shadow-cvs/src/chpasswd.c 2005-10-06 02:44:56.000000000 +0300
+@@ -28,6 +28,7 @@
+ */
#include <config.h>
-
+#undef USE_PAM
-+
- #ident "$Id: chpasswd.c,v 1.32 2005/09/07 15:00:45 kloczek Exp $"
- #include <fcntl.h>
-Index: shadow-4.0.13/src/groupadd.c
+ #ident "$Id: chpasswd.c,v 1.33 2005/10/04 21:05:12 kloczek Exp $"
+
+Index: shadow-cvs/src/groupadd.c
===================================================================
---- shadow-4.0.13.orig/src/groupadd.c 2005-10-04 08:06:31.342170261 +0200
-+++ shadow-4.0.13/src/groupadd.c 2005-10-04 08:07:30.511114159 +0200
-@@ -29,6 +29,8 @@
+--- shadow-cvs.orig/src/groupadd.c 2005-10-05 17:04:22.000000000 +0300
++++ shadow-cvs/src/groupadd.c 2005-10-06 02:44:56.000000000 +0300
+@@ -28,6 +28,7 @@
+ */
#include <config.h>
-
+#undef USE_PAM
-+
- #ident "$Id: groupadd.c,v 1.47 2005/09/07 15:00:45 kloczek Exp $"
- #include <ctype.h>
-Index: shadow-4.0.13/src/groupdel.c
+ #ident "$Id: groupadd.c,v 1.48 2005/10/04 21:05:12 kloczek Exp $"
+
+Index: shadow-cvs/src/groupdel.c
===================================================================
---- shadow-4.0.13.orig/src/groupdel.c 2005-10-04 08:06:31.343170057 +0200
-+++ shadow-4.0.13/src/groupdel.c 2005-10-04 08:07:30.512113955 +0200
-@@ -29,6 +29,8 @@
+--- shadow-cvs.orig/src/groupdel.c 2005-10-05 17:04:22.000000000 +0300
++++ shadow-cvs/src/groupdel.c 2005-10-06 02:44:56.000000000 +0300
+@@ -28,6 +28,7 @@
+ */
#include <config.h>
-
+#undef USE_PAM
-+
- #ident "$Id: groupdel.c,v 1.28 2005/09/07 15:00:45 kloczek Exp $"
- #include <ctype.h>
-Index: shadow-4.0.13/src/groupmod.c
+ #ident "$Id: groupdel.c,v 1.29 2005/10/04 21:05:12 kloczek Exp $"
+
+Index: shadow-cvs/src/groupmod.c
===================================================================
---- shadow-4.0.13.orig/src/groupmod.c 2005-10-04 08:06:31.343170057 +0200
-+++ shadow-4.0.13/src/groupmod.c 2005-10-04 08:07:30.519112529 +0200
-@@ -29,6 +29,8 @@
+--- shadow-cvs.orig/src/groupmod.c 2005-10-05 17:04:22.000000000 +0300
++++ shadow-cvs/src/groupmod.c 2005-10-06 02:44:56.000000000 +0300
+@@ -28,6 +28,7 @@
+ */
#include <config.h>
-
+#undef USE_PAM
-+
- #ident "$Id: groupmod.c,v 1.35 2005/09/07 15:00:45 kloczek Exp $"
- #include <ctype.h>
-Index: shadow-4.0.13/src/newusers.c
+ #ident "$Id: groupmod.c,v 1.36 2005/10/04 21:05:12 kloczek Exp $"
+
+Index: shadow-cvs/src/newusers.c
===================================================================
---- shadow-4.0.13.orig/src/newusers.c 2005-10-04 08:06:31.344169854 +0200
-+++ shadow-4.0.13/src/newusers.c 2005-10-04 08:07:30.520112326 +0200
-@@ -35,6 +35,8 @@
+--- shadow-cvs.orig/src/newusers.c 2005-10-05 17:04:22.000000000 +0300
++++ shadow-cvs/src/newusers.c 2005-10-06 02:44:56.000000000 +0300
+@@ -34,6 +34,7 @@
+ */
#include <config.h>
-
+#undef USE_PAM
-+
- #ident "$Id: newusers.c,v 1.29 2005/09/07 15:00:45 kloczek Exp $"
- #include <sys/types.h>
-Index: shadow-4.0.13/src/useradd.c
+ #ident "$Id: newusers.c,v 1.30 2005/10/04 21:05:12 kloczek Exp $"
+
+Index: shadow-cvs/src/useradd.c
===================================================================
---- shadow-4.0.13.orig/src/useradd.c 2005-10-04 08:06:31.345169650 +0200
-+++ shadow-4.0.13/src/useradd.c 2005-10-04 08:07:30.523111714 +0200
-@@ -29,6 +29,8 @@
+--- shadow-cvs.orig/src/useradd.c 2005-10-05 17:04:22.000000000 +0300
++++ shadow-cvs/src/useradd.c 2005-10-06 02:44:56.000000000 +0300
+@@ -28,6 +28,7 @@
+ */
#include <config.h>
-
+#undef USE_PAM
-+
- #ident "$Id: useradd.c,v 1.83 2005/09/07 15:00:45 kloczek Exp $"
- #include <ctype.h>
-Index: shadow-4.0.13/src/userdel.c
+ #ident "$Id: useradd.c,v 1.84 2005/10/04 21:05:12 kloczek Exp $"
+
+Index: shadow-cvs/src/userdel.c
===================================================================
---- shadow-4.0.13.orig/src/userdel.c 2005-10-04 08:06:31.345169650 +0200
-+++ shadow-4.0.13/src/userdel.c 2005-10-04 08:07:30.524111511 +0200
-@@ -29,6 +29,8 @@
+--- shadow-cvs.orig/src/userdel.c 2005-10-05 17:04:22.000000000 +0300
++++ shadow-cvs/src/userdel.c 2005-10-06 02:44:56.000000000 +0300
+@@ -28,6 +28,7 @@
+ */
#include <config.h>
-
+#undef USE_PAM
-+
- #ident "$Id: userdel.c,v 1.51 2005/10/02 15:29:31 kloczek Exp $"
- #include <errno.h>
-Index: shadow-4.0.13/src/usermod.c
+ #ident "$Id: userdel.c,v 1.52 2005/10/04 21:05:12 kloczek Exp $"
+
+Index: shadow-cvs/src/usermod.c
===================================================================
---- shadow-4.0.13.orig/src/usermod.c 2005-10-04 08:06:31.346169446 +0200
-+++ shadow-4.0.13/src/usermod.c 2005-10-04 08:07:30.526111103 +0200
-@@ -29,6 +29,8 @@
+--- shadow-cvs.orig/src/usermod.c 2005-10-05 17:04:23.000000000 +0300
++++ shadow-cvs/src/usermod.c 2005-10-06 02:44:56.000000000 +0300
+@@ -28,6 +28,7 @@
+ */
#include <config.h>
-
+#undef USE_PAM
-+
- #ident "$Id: usermod.c,v 1.57 2005/09/07 15:00:45 kloczek Exp $"
- #include <ctype.h>
+ #ident "$Id: usermod.c,v 1.58 2005/10/04 21:05:12 kloczek Exp $"
+
Modified: branches/4.0.13/debian/patches/427_chage_expiry_0
===================================================================
--- branches/4.0.13/debian/patches/427_chage_expiry_0 2005-10-05 14:57:19 UTC (rev 566)
+++ branches/4.0.13/debian/patches/427_chage_expiry_0 2005-10-06 16:41:05 UTC (rev 567)
@@ -3,11 +3,11 @@
Status wrt upstream: It should be forwarded to upstream.
-Index: shadow-4.0.13/src/chage.c
+Index: shadow-cvs/src/chage.c
===================================================================
---- shadow-4.0.13.orig/src/chage.c 2005-10-04 08:07:30.509114566 +0200
-+++ shadow-4.0.13/src/chage.c 2005-10-04 08:07:36.598873750 +0200
-@@ -235,8 +235,10 @@
+--- shadow-cvs.orig/src/chage.c 2005-10-06 02:48:24.000000000 +0300
++++ shadow-cvs/src/chage.c 2005-10-06 02:48:44.000000000 +0300
+@@ -234,8 +234,10 @@
* was last modified. The date is the number of days since 1/1/1970.
*/
printf (_("Last password change\t\t\t\t\t: "));
Modified: branches/4.0.13/debian/patches/442_useradd-O_option
===================================================================
--- branches/4.0.13/debian/patches/442_useradd-O_option 2005-10-05 14:57:19 UTC (rev 566)
+++ branches/4.0.13/debian/patches/442_useradd-O_option 2005-10-06 16:41:05 UTC (rev 567)
@@ -2,10 +2,10 @@
Note: useradd.8 needs to be regenerated.
-Index: shadow-4.0.13/man/useradd.8.xml
+Index: shadow-cvs/man/useradd.8.xml
===================================================================
---- shadow-4.0.13.orig/man/useradd.8.xml 2005-10-04 08:07:12.327819105 +0200
-+++ shadow-4.0.13/man/useradd.8.xml 2005-10-04 08:07:37.300730743 +0200
+--- shadow-cvs.orig/man/useradd.8.xml 2005-10-06 02:48:22.000000000 +0300
++++ shadow-cvs/man/useradd.8.xml 2005-10-06 02:48:57.000000000 +0300
@@ -201,6 +201,11 @@
<replaceable>UID_MIN</replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>
doesn't work yet.
@@ -18,11 +18,11 @@
</listitem>
</varlistentry>
<varlistentry>
-Index: shadow-4.0.13/src/useradd.c
+Index: shadow-cvs/src/useradd.c
===================================================================
---- shadow-4.0.13.orig/src/useradd.c 2005-10-04 08:07:30.523111714 +0200
-+++ shadow-4.0.13/src/useradd.c 2005-10-04 08:07:37.302730336 +0200
-@@ -950,7 +950,7 @@
+--- shadow-cvs.orig/src/useradd.c 2005-10-06 02:48:22.000000000 +0300
++++ shadow-cvs/src/useradd.c 2005-10-06 02:48:57.000000000 +0300
+@@ -949,7 +949,7 @@
{NULL, 0, NULL, '\0'}
};
while ((c =
@@ -31,7 +31,7 @@
long_options, NULL)) != -1) {
switch (c) {
case 'b':
-@@ -1069,6 +1069,7 @@
+@@ -1068,6 +1068,7 @@
kflg++;
break;
case 'K':
More information about the Pkg-shadow-commits
mailing list