rpms/coreutils/devel coreutils-selinux.patch, 1.20, 1.21 coreutils.spec, 1.110, 1.111

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12801

Modified Files:
	coreutils-selinux.patch coreutils.spec 
Log Message:
* Wed Apr 26 2006 Tim Waugh <twaugh at redhat.com> 5.94-4
- Fix 'cp -Z' when the destination exists (bug #189967).


coreutils-selinux.patch:
 README             |    4 
 config.hin         |   27 +--
 configure.ac       |    7 
 man/Makefile.am    |    4 
 man/Makefile.in    |   56 +++----
 man/chcon.1        |   64 ++++++++
 man/chcon.x        |    4 
 man/cp.1           |    5 
 man/dir.1          |   14 +
 man/id.1           |    3 
 man/install.1      |    5 
 man/ls.1           |   14 +
 man/mkdir.1        |    2 
 man/mkfifo.1       |    3 
 man/mknod.1        |    3 
 man/runcon.1       |   43 +++++
 man/runcon.x       |   14 +
 man/stat.1         |    6 
 man/vdir.1         |   14 +
 src/Makefile.am    |   23 +-
 src/chcon.c        |  421 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/copy.c         |   68 ++++++++
 src/copy.h         |    3 
 src/cp.c           |   64 +++++++-
 src/id.c           |   68 ++++++++
 src/install.c      |   99 ++++++++++++
 src/ls.c           |  296 ++++++++++++++++++++++++++++++++-----
 src/mkdir.c        |   30 +++
 src/mkfifo.c       |   29 +++
 src/mknod.c        |   30 +++
 src/mv.c           |   12 +
 src/runcon.c       |  253 +++++++++++++++++++++++++++++++
 src/stat.c         |  142 ++++++++++++++---
 tests/help-version |    4 
 34 files changed, 1710 insertions(+), 124 deletions(-)

Index: coreutils-selinux.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-selinux.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- coreutils-selinux.patch	20 Apr 2006 11:39:12 -0000	1.20
+++ coreutils-selinux.patch	26 Apr 2006 11:02:22 -0000	1.21
@@ -2245,8 +2245,8 @@
 +  }
 +#endif
  }
---- coreutils-5.94/src/copy.c.selinux	2006-03-24 13:23:39.000000000 +0000
-+++ coreutils-5.94/src/copy.c	2006-03-24 13:23:45.000000000 +0000
+--- coreutils-5.94/src/copy.c	2006-03-24 13:23:45.000000000 +0000
++++ coreutils-5.94/src/copy.c	2006-04-26 14:06:02.000000000 +1000
 @@ -51,6 +51,11 @@
  #include "xreadlink.h"
  #include "yesno.h"
@@ -2259,7 +2259,33 @@
  #ifndef HAVE_FCHMOD
  # define HAVE_FCHMOD false
  #endif
-@@ -1416,6 +1421,32 @@
+@@ -238,6 +243,25 @@
+     {
+       dest_desc = open (dst_name, O_WRONLY | O_TRUNC | O_BINARY, dst_mode);
+ 
++#ifdef WITH_SELINUX
++      if (dest_desc >= 0)
++	{
++	  security_context_t con;
++	  if(getfscreatecon(&con) == -1)
++	    {
++	      return_val = false;
++	      goto close_src_desc;
++	    }
++	  if(fsetfilecon(dest_desc, con) == -1)
++	    {
++	      return_val = false;
++	      freecon(con);
++	      goto close_src_desc;
++	    }
++	  freecon(con);
++	}
++#endif
++
+       if (dest_desc < 0 && x->unlink_dest_after_failed_open)
+ 	{
+ 	  if (unlink (dst_name) != 0)
+@@ -1416,6 +1440,32 @@
       In such cases, set this variable to zero.  */
    preserve_metadata = true;
  
@@ -2292,7 +2318,7 @@
    if (S_ISDIR (src_mode))
      {
        struct dir_list *dir;
-@@ -1486,7 +1517,13 @@
+@@ -1486,7 +1536,13 @@
  
        /* Are we crossing a file system boundary?  */
        if (x->one_file_system && device != 0 && device != src_sb.st_dev)
@@ -2307,7 +2333,7 @@
  
        /* Copy the contents of the directory.  */
  
-@@ -1622,6 +1659,11 @@
+@@ -1622,6 +1678,11 @@
  	    }
  	}
  
@@ -2319,7 +2345,7 @@
        /* There's no need to preserve timestamps or permissions.  */
        preserve_metadata = false;
  
-@@ -1760,6 +1802,11 @@
+@@ -1760,6 +1821,11 @@
  
  un_backup:
  


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- coreutils.spec	20 Apr 2006 11:39:12 -0000	1.110
+++ coreutils.spec	26 Apr 2006 11:02:25 -0000	1.111
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 5.94
-Release: 3
+Release: 4
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -261,6 +261,9 @@
 /sbin/runuser
 
 %changelog
+* Wed Apr 26 2006 Tim Waugh <twaugh at redhat.com> 5.94-4
+- Fix 'cp -Z' when the destination exists (bug #189967).
+
 * Thu Apr 20 2006 Tim Waugh <twaugh at redhat.com> 5.94-3
 - Make 'ls -Z' output more consistent with other output formats.