[Pkg-shadow-commits] r1061 - trunk/debian/patches
Nicolas FRANCOIS
nekral-guest at costa.debian.org
Tue Aug 1 20:53:26 UTC 2006
Author: nekral-guest
Date: 2006-08-01 20:53:26 +0000 (Tue, 01 Aug 2006)
New Revision: 1061
Modified:
trunk/debian/patches/504_undef_USE_PAM.dpatch
trunk/debian/patches/504_undef_USE_PAM.nolibpam
Log:
Revert revision r1060, and compile groupmems with PAM.
Note: groupmems is not distributed in Debian curently.
Modified: trunk/debian/patches/504_undef_USE_PAM.dpatch
===================================================================
--- trunk/debian/patches/504_undef_USE_PAM.dpatch 2006-08-01 18:44:09 UTC (rev 1060)
+++ trunk/debian/patches/504_undef_USE_PAM.dpatch 2006-08-01 20:53:26 UTC (rev 1061)
@@ -2,22 +2,22 @@
newusers, useradd, userdel, usermod, chgpasswd (keep them low-level)
Fixes: #283961, #162181, #162199, #162228, #369806.
-Index: shadow-4.0.18/src/chage.c
+Index: shadow-4.0.17/src/chage.c
===================================================================
---- shadow-4.0.18.orig/src/chage.c 2006-08-01 19:32:47.826554095 +0200
-+++ shadow-4.0.18/src/chage.c 2006-08-01 20:43:11.678509605 +0200
+--- shadow-4.0.17.orig/src/chage.c 2006-06-25 16:12:38.000000000 +0200
++++ shadow-4.0.17/src/chage.c 2006-07-11 22:25:06.000000000 +0200
@@ -28,6 +28,7 @@
*/
#include <config.h>
+#undef USE_PAM
- #ident "$Id: chage.c,v 1.73 2006/07/11 13:15:41 kloczek Exp $"
+ #ident "$Id: chage.c,v 1.72 2006/06/20 20:00:04 kloczek Exp $"
-Index: shadow-4.0.18/src/chpasswd.c
+Index: shadow-4.0.17/src/chpasswd.c
===================================================================
---- shadow-4.0.18.orig/src/chpasswd.c 2006-08-01 19:32:47.834554168 +0200
-+++ shadow-4.0.18/src/chpasswd.c 2006-08-01 20:43:11.678509605 +0200
+--- shadow-4.0.17.orig/src/chpasswd.c 2006-06-24 12:18:55.000000000 +0200
++++ shadow-4.0.17/src/chpasswd.c 2006-07-11 22:25:06.000000000 +0200
@@ -28,6 +28,7 @@
*/
@@ -26,22 +26,22 @@
#ident "$Id: chpasswd.c,v 1.37 2006/06/24 10:18:55 kloczek Exp $"
-Index: shadow-4.0.18/src/groupadd.c
+Index: shadow-4.0.17/src/groupadd.c
===================================================================
---- shadow-4.0.18.orig/src/groupadd.c 2006-08-01 19:32:47.846554278 +0200
-+++ shadow-4.0.18/src/groupadd.c 2006-08-01 20:43:11.678509605 +0200
+--- shadow-4.0.17.orig/src/groupadd.c 2006-06-24 07:52:00.000000000 +0200
++++ shadow-4.0.17/src/groupadd.c 2006-07-11 22:25:06.000000000 +0200
@@ -28,6 +28,7 @@
*/
#include <config.h>
+#undef USE_PAM
- #ident "$Id: groupadd.c,v 1.55 2006/07/28 17:38:52 kloczek Exp $"
+ #ident "$Id: groupadd.c,v 1.53 2006/06/24 05:52:00 kloczek Exp $"
-Index: shadow-4.0.18/src/groupdel.c
+Index: shadow-4.0.17/src/groupdel.c
===================================================================
---- shadow-4.0.18.orig/src/groupdel.c 2006-08-01 19:32:47.854554351 +0200
-+++ shadow-4.0.18/src/groupdel.c 2006-08-01 20:43:11.678509605 +0200
+--- shadow-4.0.17.orig/src/groupdel.c 2006-01-18 20:55:15.000000000 +0100
++++ shadow-4.0.17/src/groupdel.c 2006-07-11 22:25:06.000000000 +0200
@@ -28,6 +28,7 @@
*/
@@ -50,22 +50,22 @@
#ident "$Id: groupdel.c,v 1.31 2006/01/18 19:55:15 kloczek Exp $"
-Index: shadow-4.0.18/src/groupmod.c
+Index: shadow-4.0.17/src/groupmod.c
===================================================================
---- shadow-4.0.18.orig/src/groupmod.c 2006-08-01 19:32:47.866554461 +0200
-+++ shadow-4.0.18/src/groupmod.c 2006-08-01 20:43:11.678509605 +0200
+--- shadow-4.0.17.orig/src/groupmod.c 2006-06-25 16:12:38.000000000 +0200
++++ shadow-4.0.17/src/groupmod.c 2006-07-11 22:25:06.000000000 +0200
@@ -28,6 +28,7 @@
*/
#include <config.h>
+#undef USE_PAM
- #ident "$Id: groupmod.c,v 1.41 2006/07/28 17:38:52 kloczek Exp $"
+ #ident "$Id: groupmod.c,v 1.37 2005/10/19 15:21:07 kloczek Exp $"
-Index: shadow-4.0.18/src/newusers.c
+Index: shadow-4.0.17/src/newusers.c
===================================================================
---- shadow-4.0.18.orig/src/newusers.c 2006-08-01 19:32:47.878554571 +0200
-+++ shadow-4.0.18/src/newusers.c 2006-08-01 20:43:11.682509639 +0200
+--- shadow-4.0.17.orig/src/newusers.c 2006-03-07 16:50:33.000000000 +0100
++++ shadow-4.0.17/src/newusers.c 2006-07-11 22:25:06.000000000 +0200
@@ -34,6 +34,7 @@
*/
@@ -74,22 +74,22 @@
#ident "$Id: newusers.c,v 1.33 2006/03/07 15:47:32 kloczek Exp $"
-Index: shadow-4.0.18/src/useradd.c
+Index: shadow-4.0.17/src/useradd.c
===================================================================
---- shadow-4.0.18.orig/src/useradd.c 2006-08-01 19:32:47.886554644 +0200
-+++ shadow-4.0.18/src/useradd.c 2006-08-01 20:43:11.682509639 +0200
+--- shadow-4.0.17.orig/src/useradd.c 2006-06-22 13:30:32.000000000 +0200
++++ shadow-4.0.17/src/useradd.c 2006-07-11 22:48:17.000000000 +0200
@@ -28,6 +28,7 @@
*/
#include <config.h>
+#undef USE_PAM
- #ident "$Id: useradd.c,v 1.100 2006/07/28 17:42:48 kloczek Exp $"
+ #ident "$Id: useradd.c,v 1.99 2006/06/22 11:30:32 kloczek Exp $"
-Index: shadow-4.0.18/src/userdel.c
+Index: shadow-4.0.17/src/userdel.c
===================================================================
---- shadow-4.0.18.orig/src/userdel.c 2006-08-01 19:32:47.894554718 +0200
-+++ shadow-4.0.18/src/userdel.c 2006-08-01 20:43:11.682509639 +0200
+--- shadow-4.0.17.orig/src/userdel.c 2006-07-10 06:11:32.000000000 +0200
++++ shadow-4.0.17/src/userdel.c 2006-07-11 22:48:17.000000000 +0200
@@ -28,6 +28,7 @@
*/
@@ -98,22 +98,22 @@
#ident "$Id: userdel.c,v 1.66 2006/07/10 04:11:32 kloczek Exp $"
-Index: shadow-4.0.18/src/usermod.c
+Index: shadow-4.0.17/src/usermod.c
===================================================================
---- shadow-4.0.18.orig/src/usermod.c 2006-08-01 19:32:47.906554827 +0200
-+++ shadow-4.0.18/src/usermod.c 2006-08-01 20:43:11.686509673 +0200
+--- shadow-4.0.17.orig/src/usermod.c 2006-06-25 15:10:29.000000000 +0200
++++ shadow-4.0.17/src/usermod.c 2006-07-11 22:48:15.000000000 +0200
@@ -28,6 +28,7 @@
*/
#include <config.h>
+#undef USE_PAM
- #ident "$Id: usermod.c,v 1.71 2006/07/28 17:42:48 kloczek Exp $"
+ #ident "$Id: usermod.c,v 1.69 2006/06/25 13:10:29 kloczek Exp $"
-Index: shadow-4.0.18/src/chgpasswd.c
+Index: shadow-4.0.17/src/chgpasswd.c
===================================================================
---- shadow-4.0.18.orig/src/chgpasswd.c 2006-08-01 19:32:47.918554937 +0200
-+++ shadow-4.0.18/src/chgpasswd.c 2006-08-01 20:43:11.686509673 +0200
+--- shadow-4.0.17.orig/src/chgpasswd.c 2006-06-20 22:00:04.000000000 +0200
++++ shadow-4.0.17/src/chgpasswd.c 2006-07-11 22:25:06.000000000 +0200
@@ -28,6 +28,7 @@
*/
@@ -122,10 +122,10 @@
#ident "$Id: chgpasswd.c,v 1.5 2006/06/20 20:00:04 kloczek Exp $"
-Index: shadow-4.0.18/lib/getdef.c
+Index: shadow-4.0.17/lib/getdef.c
===================================================================
---- shadow-4.0.18.orig/lib/getdef.c 2006-08-01 20:43:11.594508892 +0200
-+++ shadow-4.0.18/lib/getdef.c 2006-08-01 20:43:11.686509673 +0200
+--- shadow-4.0.17.orig/lib/getdef.c 2006-07-11 22:49:19.000000000 +0200
++++ shadow-4.0.17/lib/getdef.c 2006-07-11 22:52:15.000000000 +0200
@@ -82,6 +82,9 @@
{"UMASK", NULL},
{"USERDEL_CMD", NULL},
@@ -144,10 +144,10 @@
{"MOTD_FILE", NULL},
{"NOLOGINS_FILE", NULL},
{"OBSCURE_CHECKS_ENAB", NULL},
-Index: shadow-4.0.18/lib/prototypes.h
+Index: shadow-4.0.17/lib/prototypes.h
===================================================================
---- shadow-4.0.18.orig/lib/prototypes.h 2006-08-01 19:32:47.938555121 +0200
-+++ shadow-4.0.18/lib/prototypes.h 2006-08-01 20:43:11.686509673 +0200
+--- shadow-4.0.17.orig/lib/prototypes.h 2006-07-11 22:55:07.000000000 +0200
++++ shadow-4.0.17/lib/prototypes.h 2006-07-11 22:59:42.000000000 +0200
@@ -130,8 +130,12 @@
/* rlogin.c */
extern int do_rlogin (const char *, char *, int, char *, int);
@@ -161,10 +161,10 @@
/* setugid.c */
extern int setup_groups (const struct passwd *);
-Index: shadow-4.0.18/libmisc/salt.c
+Index: shadow-4.0.17/libmisc/salt.c
===================================================================
---- shadow-4.0.18.orig/libmisc/salt.c 2006-08-01 19:32:47.950555230 +0200
-+++ shadow-4.0.18/libmisc/salt.c 2006-08-01 20:43:11.690509707 +0200
+--- shadow-4.0.17.orig/libmisc/salt.c 2006-07-11 22:54:04.000000000 +0200
++++ shadow-4.0.17/libmisc/salt.c 2006-07-11 22:54:23.000000000 +0200
@@ -6,6 +6,7 @@
*/
@@ -173,15 +173,3 @@
#ident "$Id: salt.c,v 1.10 2005/08/31 17:24:58 kloczek Exp $"
-Index: shadow-4.0.18/src/groupmems.c
-===================================================================
---- shadow-4.0.18.orig/src/groupmems.c 2006-08-01 20:43:20.806587069 +0200
-+++ shadow-4.0.18/src/groupmems.c 2006-08-01 20:43:39.402745025 +0200
-@@ -29,6 +29,7 @@
- */
-
- #include <config.h>
-+#undef USE_PAM
-
- #include <fcntl.h>
- #include <getopt.h>
Modified: trunk/debian/patches/504_undef_USE_PAM.nolibpam
===================================================================
--- trunk/debian/patches/504_undef_USE_PAM.nolibpam 2006-08-01 18:44:09 UTC (rev 1060)
+++ trunk/debian/patches/504_undef_USE_PAM.nolibpam 2006-08-01 20:53:26 UTC (rev 1061)
@@ -18,11 +18,10 @@
gpasswd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
-groupadd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
-groupdel_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
--groupmems_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
--groupmod_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
+groupadd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
+groupdel_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
-+groupmems_LDADD = $(LDADD) $(LIBSELINUX)
+ groupmems_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
+-groupmod_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
+groupmod_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
grpck_LDADD = $(LDADD) $(LIBSELINUX)
grpconv_LDADD = $(LDADD) $(LIBSELINUX)
More information about the Pkg-shadow-commits
mailing list