[Pkg-shadow-commits] r994 - in trunk/debian: . patches

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2006-05-18 16:34:23 +0000 (Thu, 18 May 2006)
New Revision: 994

Added:
   trunk/debian/patches/361_keep_sticky_bit_for_dirs
Removed:
   trunk/debian/patches/461_keep_sticky_bit_for_dirs
Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
Log:
Rename 461_keep_sticky_bit_for_dirs to 361_xxx.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-05-18 16:31:43 UTC (rev 993)
+++ trunk/debian/changelog	2006-05-18 16:34:23 UTC (rev 994)
@@ -9,6 +9,7 @@
       + rename 407_32char_grnames.dpatch to 507_xxx for the same reason.
       + rename 432_login_cancel_timout_after_authentication to 332_xxx,
         because it is already applied upstream.
+      + rename 461_keep_sticky_bit_for_dirs to 361_xxx for the same reason.
 
  -- Christian Perrier <bubulle at debian.org>  Thu, 18 May 2006 01:44:56 -0500
 

Copied: trunk/debian/patches/361_keep_sticky_bit_for_dirs (from rev 993, trunk/debian/patches/461_keep_sticky_bit_for_dirs)

Deleted: trunk/debian/patches/461_keep_sticky_bit_for_dirs
===================================================================
--- trunk/debian/patches/461_keep_sticky_bit_for_dirs	2006-05-18 16:31:43 UTC (rev 993)
+++ trunk/debian/patches/461_keep_sticky_bit_for_dirs	2006-05-18 16:34:23 UTC (rev 994)
@@ -1,24 +0,0 @@
-Goal: Keep sticky bit on dirs when copied with copy_tree. This should allo
-      to keep them when copying the skeleton directory in useradd
-
-Fixes: #296729
-
-Status wrt upstream: Applied in 4.0.16
-
-Index: shadow-4.0.15/libmisc/copydir.c
-===================================================================
---- shadow-4.0.15.orig/libmisc/copydir.c	2006-03-08 19:32:10.102246428 +0100
-+++ shadow-4.0.15/libmisc/copydir.c	2006-03-08 19:33:45.042014333 +0100
-@@ -225,10 +225,11 @@
- #ifdef WITH_SELINUX
- 			selinux_file_context (dst_name);
- #endif
--			mkdir (dst_name, sb.st_mode & 0777);
-+			mkdir (dst_name, sb.st_mode);
- 			chown (dst_name,
- 			       uid == (uid_t) - 1 ? sb.st_uid : uid,
- 			       gid == (gid_t) - 1 ? sb.st_gid : gid);
-+			chmod (dst_name, sb.st_mode);
- 
- 			if (copy_tree (src_name, dst_name, uid, gid)) {
- 				err++;

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2006-05-18 16:31:43 UTC (rev 993)
+++ trunk/debian/patches/series	2006-05-18 16:34:23 UTC (rev 994)
@@ -22,7 +22,7 @@
 352_doc_password_check_order
 454_userdel_no_MAIL_FILE
 501_commonio_group_shadow
-461_keep_sticky_bit_for_dirs
+361_keep_sticky_bit_for_dirs
 462_warn_to_edit_shadow
 463_login_delay_obeys_to_PAM
 467_useradd_-r_LSB