rpms/patch/devel patch-selinux.patch,1.1,1.2 patch.spec,1.21,1.22

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/patch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19593

Modified Files:
	patch-selinux.patch patch.spec 
Log Message:
* Thu Sep  8 2005 Tim Waugh <twaugh at redhat.com> 2.5.4-28
- Don't warn when getfilecon fails (bug #167822).


patch-selinux.patch:
 Makefile.in |    4 ++--
 util.c      |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 2 deletions(-)

Index: patch-selinux.patch
===================================================================
RCS file: /cvs/dist/rpms/patch/devel/patch-selinux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- patch-selinux.patch	6 Sep 2005 15:28:55 -0000	1.1
+++ patch-selinux.patch	8 Sep 2005 20:55:46 -0000	1.2
@@ -1,6 +1,6 @@
 --- patch-2.5.4/util.c.selinux	2005-09-06 15:01:13.000000000 +0000
 +++ patch-2.5.4/util.c	2005-09-06 15:01:13.000000000 +0000
-@@ -59,6 +59,52 @@
+@@ -59,6 +59,51 @@
  # endif
  #endif
  
@@ -36,7 +36,6 @@
 +	}
 +      if (getfilecon (to_file, &to_context) < 0)
 +	{
-+	  perror ("getfilecon");
 +	  freecon (from_context);
 +	  return ;
 +	}
@@ -53,7 +52,7 @@
  static void makedirs PARAMS ((char *));
  
  /* Move a file FROM (where *FROM_NEEDS_REMOVAL is nonzero if FROM
-@@ -152,6 +198,7 @@
+@@ -152,6 +197,7 @@
  	say ("Renaming file %s to %s\n",
  	     quotearg_n (0, from), quotearg_n (1, to));
  


Index: patch.spec
===================================================================
RCS file: /cvs/dist/rpms/patch/devel/patch.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- patch.spec	7 Sep 2005 08:08:36 -0000	1.21
+++ patch.spec	8 Sep 2005 20:55:46 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: The GNU patch command, for modifying/upgrading files.
 Name: patch
 Version: 2.5.4
-Release: 27
+Release: 28
 License: GPL
 URL: http://www.gnu.org/software/patch/patch.html
 Group: Development/Tools
@@ -62,6 +62,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Thu Sep  8 2005 Tim Waugh <twaugh at redhat.com> 2.5.4-28
+- Don't warn when getfilecon fails (bug #167822).
+
 * Wed Sep  7 2005 Tim Waugh <twaugh at redhat.com> 2.5.4-27
 - Applied patch from Ulrich Drepper to fix string overread (bug #167675).