[Pkg-shadow-commits] r1128 - in branches/etch/debian: . patches

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2006-10-21 16:30:04 +0000 (Sat, 21 Oct 2006)
New Revision: 1128

Modified:
   branches/etch/debian/changelog
   branches/etch/debian/patches/401_cppw_src.dpatch
Log:
Fix cppw, which copied to /etc/passwd even with the -s switch.


Modified: branches/etch/debian/changelog
===================================================================
--- branches/etch/debian/changelog	2006-10-18 06:19:48 UTC (rev 1127)
+++ branches/etch/debian/changelog	2006-10-21 16:30:04 UTC (rev 1128)
@@ -3,6 +3,9 @@
   * The "" release
   * Debconf translation updates.
     - Wolof.
+  * Debian packaging fixes:
+    - Fix cppw, which copied to /etc/passwd even with the -s switch.
+      Closes: #394182
 
  -- Christian Perrier <bubulle at kheops.perrier.eu.org>  Wed, 18 Oct 2006 08:18:33 +0200
 

Modified: branches/etch/debian/patches/401_cppw_src.dpatch
===================================================================
--- branches/etch/debian/patches/401_cppw_src.dpatch	2006-10-18 06:19:48 UTC (rev 1127)
+++ branches/etch/debian/patches/401_cppw_src.dpatch	2006-10-21 16:30:04 UTC (rev 1128)
@@ -8,8 +8,8 @@
 Index: shadow-4.0.18.1/src/cppw.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.18.1/src/cppw.c	2006-09-17 12:25:09.059464295 +0200
-@@ -0,0 +1,200 @@
++++ shadow-4.0.18.1/src/cppw.c	2006-10-21 13:45:56.000000000 +0200
+@@ -0,0 +1,198 @@
 +/*
 +  cppw, cpgr  copy with locking given file over the password or group file
 +  with -s will copy with locking given file over shadow or gshadow file
@@ -192,11 +192,9 @@
 +  in_file = argv[argc - 1];
 +
 +  if (do_cppw) {
-+#ifdef SHADOWPWD
 +    if (cpshadow)
 +      cppwcopy(SHADOW_FILE, in_file, spw_lock, spw_unlock);
 +    else
-+#endif
 +      cppwcopy(PASSWD_FILE, in_file, pw_lock, pw_unlock);
 +  }
 +  else {
@@ -212,8 +210,8 @@
 +}
 Index: shadow-4.0.18.1/src/Makefile.am
 ===================================================================
---- shadow-4.0.18.1.orig/src/Makefile.am	2006-07-18 18:52:23.000000000 +0200
-+++ shadow-4.0.18.1/src/Makefile.am	2006-09-17 12:25:09.059464295 +0200
+--- shadow-4.0.18.1.orig/src/Makefile.am	2006-10-21 13:45:26.000000000 +0200
++++ shadow-4.0.18.1/src/Makefile.am	2006-10-21 13:45:40.000000000 +0200
 @@ -24,6 +24,7 @@
  sbin_PROGRAMS  = nologin
  ubin_PROGRAMS  = faillog lastlog chage chfn chsh expiry gpasswd newgrp passwd
@@ -232,8 +230,8 @@
  groupdel_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
 Index: shadow-4.0.18.1/po/POTFILES.in
 ===================================================================
---- shadow-4.0.18.1.orig/po/POTFILES.in	2006-07-18 18:56:36.000000000 +0200
-+++ shadow-4.0.18.1/po/POTFILES.in	2006-09-17 12:25:09.063464327 +0200
+--- shadow-4.0.18.1.orig/po/POTFILES.in	2006-10-21 13:45:26.000000000 +0200
++++ shadow-4.0.18.1/po/POTFILES.in	2006-10-21 13:45:40.000000000 +0200
 @@ -61,6 +61,7 @@
  src/chgpasswd.c
  src/chpasswd.c