[Pkg-shadow-commits] r982 - trunk/debian/patches

[Christian Perrier]

Author: bubulle
Date: 2006-05-07 20:36:57 +0000 (Sun, 07 May 2006)
New Revision: 982

Added:
   trunk/debian/patches/382_libmisc_copydir_check_return_values
Removed:
   trunk/debian/patches/482_libmisc_copydir_check_return_values
Modified:
   trunk/debian/patches/series
Log:
Patch 482 has been applied


Copied: trunk/debian/patches/382_libmisc_copydir_check_return_values (from rev 980, trunk/debian/patches/482_libmisc_copydir_check_return_values)
===================================================================
--- trunk/debian/patches/482_libmisc_copydir_check_return_values	2006-05-07 17:16:14 UTC (rev 980)
+++ trunk/debian/patches/382_libmisc_copydir_check_return_values	2006-05-07 20:36:57 UTC (rev 982)
@@ -0,0 +1,28 @@
+Goal: Verify return values
+
+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:33:45.042014333 +0100
++++ shadow-4.0.15/libmisc/copydir.c	2006-03-08 19:34:05.358898710 +0100
+@@ -225,13 +225,12 @@
+ #ifdef WITH_SELINUX
+ 			selinux_file_context (dst_name);
+ #endif
+-			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)) {
++			if (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)
++			    || copy_tree (src_name, dst_name, uid, gid)) {
+ 				err++;
+ 				break;
+ 			}

Deleted: trunk/debian/patches/482_libmisc_copydir_check_return_values
===================================================================
--- trunk/debian/patches/482_libmisc_copydir_check_return_values	2006-05-07 20:20:20 UTC (rev 981)
+++ trunk/debian/patches/482_libmisc_copydir_check_return_values	2006-05-07 20:36:57 UTC (rev 982)
@@ -1,28 +0,0 @@
-Goal: Verify return values
-
-Status wrt upstream: not reported yet
-
-Index: shadow-4.0.15/libmisc/copydir.c
-===================================================================
---- shadow-4.0.15.orig/libmisc/copydir.c	2006-03-08 19:33:45.042014333 +0100
-+++ shadow-4.0.15/libmisc/copydir.c	2006-03-08 19:34:05.358898710 +0100
-@@ -225,13 +225,12 @@
- #ifdef WITH_SELINUX
- 			selinux_file_context (dst_name);
- #endif
--			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)) {
-+			if (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)
-+			    || copy_tree (src_name, dst_name, uid, gid)) {
- 				err++;
- 				break;
- 			}

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2006-05-07 20:20:20 UTC (rev 981)
+++ trunk/debian/patches/series	2006-05-07 20:36:57 UTC (rev 982)
@@ -35,7 +35,7 @@
 523_su_arguments_are_no_more_concatenated_by_default
 479_chowntty_debug
 480_getopt_args_reorder
-482_libmisc_copydir_check_return_values
+382_libmisc_copydir_check_return_values
 483_su_fakelogin_wrong_arg0
 491_configure.in_friendly_selinux_detection
 592_manpages_typos