[Pkg-shadow-commits] sid/debian/patches 404_undef_USE_PAM.dpatch,NONE,1.1 008_src.dpatch,1.5,1.6 00list,1.2,1.3
Nicolas FRAN??OIS
pkg-shadow-devel@lists.alioth.debian.org
Sat, 16 Apr 2005 23:23:34 +0000
Update of /cvsroot/pkg-shadow/sid/debian/patches
In directory haydn:/tmp/cvs-serv10556
Modified Files:
008_src.dpatch 00list
Added Files:
404_undef_USE_PAM.dpatch
Log Message:
Move the "#undef USE_PAM" diff from 008_src to 404_undef_USE_PAM.
Index: 00list
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/patches/00list,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- 00list 15 Apr 2005 23:49:21 -0000 1.2
+++ 00list 16 Apr 2005 23:23:31 -0000 1.3
@@ -55,3 +55,4 @@
401_cppw_src
#402_missing_debian_man_pages
403_sg_symlink_162339_163652
+404_undef_USE_PAM
--- NEW FILE: 404_undef_USE_PAM.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 404_undef_USE_PAM.dpatch by Nicolas FRANCOIS <nicolas.francois@centraliens.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Do not use PAM for chage, chpasswd, groupadd, groupdel, groupmod
## DP: newusers, useradd, userdel, usermod
## DP:
## DP: I don't know if it must be kept.
## DP: see also #283961, #162181, #162199, #162228.
@DPATCH@
diff -urNad shadow-4.0.3/src/chage.c /tmp/dpep.a88PWo/shadow-4.0.3/src/chage.c
--- shadow-4.0.3/src/chage.c 2005-04-16 21:23:27.935795000 +0200
+++ /tmp/dpep.a88PWo/shadow-4.0.3/src/chage.c 2005-04-16 21:25:07.565795000 +0200
@@ -29,6 +29,8 @@
#include <config.h>
+#undef USE_PAM
+
#include "rcsid.h"
RCSID (PKG_VER "$Id: 404_undef_USE_PAM.dpatch,v 1.1 2005/04/16 23:23:31 nekral-guest Exp $")
#include <sys/types.h>
diff -urNad shadow-4.0.3/src/chpasswd.c /tmp/dpep.a88PWo/shadow-4.0.3/src/chpasswd.c
--- shadow-4.0.3/src/chpasswd.c 2005-04-16 21:23:27.935795000 +0200
+++ /tmp/dpep.a88PWo/shadow-4.0.3/src/chpasswd.c 2005-04-16 21:25:07.565795000 +0200
@@ -29,6 +29,8 @@
#include <config.h>
+#undef USE_PAM
+
#include "rcsid.h"
RCSID (PKG_VER "$Id: 404_undef_USE_PAM.dpatch,v 1.1 2005/04/16 23:23:31 nekral-guest Exp $")
#include <stdio.h>
diff -urNad shadow-4.0.3/src/groupadd.c /tmp/dpep.a88PWo/shadow-4.0.3/src/groupadd.c
--- shadow-4.0.3/src/groupadd.c 2005-04-16 21:23:27.935795000 +0200
+++ /tmp/dpep.a88PWo/shadow-4.0.3/src/groupadd.c 2005-04-16 21:25:07.565795000 +0200
@@ -29,6 +29,8 @@
#include <config.h>
+#undef USE_PAM
+
#include "rcsid.h"
RCSID (PKG_VER "$Id: 404_undef_USE_PAM.dpatch,v 1.1 2005/04/16 23:23:31 nekral-guest Exp $")
#include <sys/types.h>
diff -urNad shadow-4.0.3/src/groupdel.c /tmp/dpep.a88PWo/shadow-4.0.3/src/groupdel.c
--- shadow-4.0.3/src/groupdel.c 2005-04-16 21:23:27.935795000 +0200
+++ /tmp/dpep.a88PWo/shadow-4.0.3/src/groupdel.c 2005-04-16 21:25:07.565795000 +0200
@@ -29,6 +29,8 @@
#include <config.h>
+#undef USE_PAM
+
#include "rcsid.h"
RCSID(PKG_VER "$Id: 404_undef_USE_PAM.dpatch,v 1.1 2005/04/16 23:23:31 nekral-guest Exp $")
diff -urNad shadow-4.0.3/src/groupmod.c /tmp/dpep.a88PWo/shadow-4.0.3/src/groupmod.c
--- shadow-4.0.3/src/groupmod.c 2005-04-16 21:23:27.935795000 +0200
+++ /tmp/dpep.a88PWo/shadow-4.0.3/src/groupmod.c 2005-04-16 21:25:07.565795000 +0200
@@ -29,6 +29,8 @@
#include <config.h>
+#undef USE_PAM
+
#include "rcsid.h"
RCSID (PKG_VER "$Id: 404_undef_USE_PAM.dpatch,v 1.1 2005/04/16 23:23:31 nekral-guest Exp $")
#include <sys/types.h>
diff -urNad shadow-4.0.3/src/newusers.c /tmp/dpep.a88PWo/shadow-4.0.3/src/newusers.c
--- shadow-4.0.3/src/newusers.c 2005-04-16 21:23:27.945795000 +0200
+++ /tmp/dpep.a88PWo/shadow-4.0.3/src/newusers.c 2005-04-16 21:25:07.605795000 +0200
@@ -35,6 +35,8 @@
#include <config.h>
+#undef USE_PAM
+
#include "rcsid.h"
RCSID (PKG_VER "$Id: 404_undef_USE_PAM.dpatch,v 1.1 2005/04/16 23:23:31 nekral-guest Exp $")
#include <sys/types.h>
diff -urNad shadow-4.0.3/src/useradd.c /tmp/dpep.a88PWo/shadow-4.0.3/src/useradd.c
--- shadow-4.0.3/src/useradd.c 2005-04-16 21:23:27.955795000 +0200
+++ /tmp/dpep.a88PWo/shadow-4.0.3/src/useradd.c 2005-04-16 21:25:07.665795000 +0200
@@ -29,6 +29,8 @@
#include <config.h>
+#undef USE_PAM
+
#include "rcsid.h"
RCSID (PKG_VER "$Id: 404_undef_USE_PAM.dpatch,v 1.1 2005/04/16 23:23:31 nekral-guest Exp $")
#include "prototypes.h"
diff -urNad shadow-4.0.3/src/userdel.c /tmp/dpep.a88PWo/shadow-4.0.3/src/userdel.c
--- shadow-4.0.3/src/userdel.c 2005-04-16 21:23:27.955795000 +0200
+++ /tmp/dpep.a88PWo/shadow-4.0.3/src/userdel.c 2005-04-16 21:25:07.725795000 +0200
@@ -29,6 +29,8 @@
#include <config.h>
+#undef USE_PAM
+
#include "rcsid.h"
RCSID (PKG_VER "$Id: 404_undef_USE_PAM.dpatch,v 1.1 2005/04/16 23:23:31 nekral-guest Exp $")
#include <sys/stat.h>
diff -urNad shadow-4.0.3/src/usermod.c /tmp/dpep.a88PWo/shadow-4.0.3/src/usermod.c
--- shadow-4.0.3/src/usermod.c 2005-04-16 21:23:27.955795000 +0200
+++ /tmp/dpep.a88PWo/shadow-4.0.3/src/usermod.c 2005-04-16 21:25:07.775795000 +0200
@@ -29,6 +29,8 @@
#include <config.h>
+#undef USE_PAM
+
#include "rcsid.h"
RCSID (PKG_VER "$Id: 404_undef_USE_PAM.dpatch,v 1.1 2005/04/16 23:23:31 nekral-guest Exp $")
#include <sys/types.h>
Index: 008_src.dpatch
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/patches/008_src.dpatch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- 008_src.dpatch 15 Apr 2005 23:49:21 -0000 1.5
+++ 008_src.dpatch 16 Apr 2005 23:23:31 -0000 1.6
@@ -24,66 +24,6 @@
@DPATCH@
-diff -Nru shadow-4.0.3/src/chage.c shadow-4.0.3_30.4/src/chage.c
---- shadow-4.0.3/src/chage.c 2002-01-05 16:41:43.000000000 +0100
-+++ shadow-4.0.3_30.4/src/chage.c 2004-11-02 22:17:38.000000000 +0100
-@@ -29,6 +29,8 @@
-
- #include <config.h>
-
-+#undef USE_PAM
-+
- #include "rcsid.h"
- RCSID (PKG_VER "$Id$")
- #include <sys/types.h>
-diff -Nru shadow-4.0.3/src/chpasswd.c shadow-4.0.3_30.4/src/chpasswd.c
---- shadow-4.0.3/src/chpasswd.c 2002-01-05 16:41:43.000000000 +0100
-+++ shadow-4.0.3_30.4/src/chpasswd.c 2004-11-02 22:17:38.000000000 +0100
-@@ -29,6 +29,8 @@
-
- #include <config.h>
-
-+#undef USE_PAM
-+
- #include "rcsid.h"
- RCSID (PKG_VER "$Id$")
- #include <stdio.h>
-diff -Nru shadow-4.0.3/src/groupadd.c shadow-4.0.3_30.4/src/groupadd.c
---- shadow-4.0.3/src/groupadd.c 2002-01-06 15:09:07.000000000 +0100
-+++ shadow-4.0.3_30.4/src/groupadd.c 2004-11-02 22:17:38.000000000 +0100
-@@ -29,6 +29,8 @@
-
- #include <config.h>
-
-+#undef USE_PAM
-+
- #include "rcsid.h"
- RCSID (PKG_VER "$Id$")
- #include <sys/types.h>
-diff -Nru shadow-4.0.3/src/groupdel.c shadow-4.0.3_30.4/src/groupdel.c
---- shadow-4.0.3/src/groupdel.c 2000-10-09 21:02:20.000000000 +0200
-+++ shadow-4.0.3_30.4/src/groupdel.c 2004-11-02 22:17:38.000000000 +0100
-@@ -29,6 +29,8 @@
-
- #include <config.h>
-
-+#undef USE_PAM
-+
- #include "rcsid.h"
- RCSID(PKG_VER "$Id$")
-
-diff -Nru shadow-4.0.3/src/groupmod.c shadow-4.0.3_30.4/src/groupmod.c
---- shadow-4.0.3/src/groupmod.c 2002-01-05 16:41:43.000000000 +0100
-+++ shadow-4.0.3_30.4/src/groupmod.c 2004-11-02 22:17:38.000000000 +0100
-@@ -29,6 +29,8 @@
-
- #include <config.h>
-
-+#undef USE_PAM
-+
- #include "rcsid.h"
- RCSID (PKG_VER "$Id$")
- #include <sys/types.h>
diff -Nru shadow-4.0.3/src/grpck.c shadow-4.0.3_30.4/src/grpck.c
--- shadow-4.0.3/src/grpck.c 2002-01-05 16:41:43.000000000 +0100
+++ shadow-4.0.3_30.4/src/grpck.c 2004-11-02 22:17:38.000000000 +0100
@@ -1346,18 +1286,6 @@
if (loginname == NULL)
loginname = "???";
-diff -Nru shadow-4.0.3/src/newusers.c shadow-4.0.3_30.4/src/newusers.c
---- shadow-4.0.3/src/newusers.c 2002-01-05 16:41:43.000000000 +0100
-+++ shadow-4.0.3_30.4/src/newusers.c 2004-11-02 22:17:38.000000000 +0100
-@@ -35,6 +35,8 @@
-
- #include <config.h>
-
-+#undef USE_PAM
-+
- #include "rcsid.h"
- RCSID (PKG_VER "$Id$")
- #include <sys/types.h>
diff -Nru shadow-4.0.3/src/su.c shadow-4.0.3_30.4/src/su.c
--- shadow-4.0.3/src/su.c 2002-03-08 05:30:28.000000000 +0100
+++ shadow-4.0.3_30.4/src/su.c 2004-11-02 22:17:38.000000000 +0100
@@ -1852,31 +1780,10 @@
+ run_shell (shell, command, additional_args, fakelogin);
/*NOTREACHED*/ exit (1);
}
-diff -Nru shadow-4.0.3/src/useradd.c shadow-4.0.3_30.4/src/useradd.c
---- shadow-4.0.3/src/useradd.c 2002-01-10 14:01:28.000000000 +0100
-+++ shadow-4.0.3_30.4/src/useradd.c 2004-11-02 22:17:38.000000000 +0100
-@@ -29,6 +29,8 @@
-
- #include <config.h>
-
-+#undef USE_PAM
-+
- #include "rcsid.h"
- RCSID (PKG_VER "$Id$")
- #include "prototypes.h"
diff -Nru shadow-4.0.3/src/userdel.c shadow-4.0.3_30.4/src/userdel.c
--- shadow-4.0.3/src/userdel.c 2002-01-05 16:41:44.000000000 +0100
+++ shadow-4.0.3_30.4/src/userdel.c 2004-11-02 22:17:38.000000000 +0100
-@@ -29,6 +29,8 @@
-
- #include <config.h>
-
-+#undef USE_PAM
-+
- #include "rcsid.h"
- RCSID (PKG_VER "$Id$")
- #include <sys/stat.h>
-@@ -147,6 +149,7 @@
+@@ -147,6 +147,7 @@
struct group *ngrp;
#ifdef SHADOWGRP
@@ -1884,7 +1791,7 @@
const struct sgrp *sgrp;
struct sgrp *nsgrp;
#endif /* SHADOWGRP */
-@@ -209,6 +212,10 @@
+@@ -209,6 +210,10 @@
gr_remove (grp->gr_name);
@@ -1895,7 +1802,7 @@
/*
* Update the DBM group file with the new entry as well.
*/
-@@ -279,6 +286,10 @@
+@@ -279,6 +284,10 @@
SYSLOG ((LOG_INFO, "delete `%s' from shadow group `%s'\n",
user_name, nsgrp->sg_name));
}
@@ -1909,16 +1816,7 @@
diff -Nru shadow-4.0.3/src/usermod.c shadow-4.0.3_30.4/src/usermod.c
--- shadow-4.0.3/src/usermod.c 2002-01-05 16:41:44.000000000 +0100
+++ shadow-4.0.3_30.4/src/usermod.c 2004-11-02 22:17:38.000000000 +0100
-@@ -29,6 +29,8 @@
-
- #include <config.h>
-
-+#undef USE_PAM
-+
- #include "rcsid.h"
- RCSID (PKG_VER "$Id$")
- #include <sys/types.h>
-@@ -1544,9 +1546,14 @@
+@@ -1544,9 +1544,14 @@
if (copy_tree (user_home, user_newhome,
uflg ? user_newid : -1,
gflg ? user_newgid : -1) ==