rpms/patch/devel patch-selinux.patch,1.4,1.5 patch.spec,1.38,1.39

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/patch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11013

Modified Files:
	patch-selinux.patch patch.spec 
Log Message:
* Wed Apr 29 2009 Tim Waugh <twaugh at redhat.com> 2.5.4-39
- Fixed operation when SELinux is disabled (bug #498102).  Patch from
  Jan Kratochvil.


patch-selinux.patch:

Index: patch-selinux.patch
===================================================================
RCS file: /cvs/pkgs/rpms/patch/devel/patch-selinux.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- patch-selinux.patch	17 Feb 2009 15:36:59 -0000	1.4
+++ patch-selinux.patch	29 Apr 2009 16:39:13 -0000	1.5
@@ -81,8 +81,8 @@ diff -up patch-2.5.4/patch.c.selinux pat
  			    quotearg (outname));
 +		  if (! inerrno && incontext) {
 +			  security_context_t outcontext;
-+			  getfilecon (outname, &outcontext);
-+			  if (strcmp(outcontext, incontext) && 
++			  if (! getfilecon (outname, &outcontext) && outcontext &&
++			      strcmp(outcontext, incontext) && 
 +			      setfilecon (outname, incontext) != 0) {
 +				  if (errno != ENOTSUP && errno != EPERM)
 +					  pfatal ("Can't set security context on file %s",


Index: patch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/patch/devel/patch.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- patch.spec	26 Feb 2009 09:59:43 -0000	1.38
+++ patch.spec	29 Apr 2009 16:39:13 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: Utility for modifying/upgrading files
 Name: patch
 Version: 2.5.4
-Release: 38%{?dist}
+Release: 39%{?dist}
 License: GPLv2+
 URL: http://www.gnu.org/software/patch/patch.html
 Group: Development/Tools
@@ -68,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Wed Apr 29 2009 Tim Waugh <twaugh at redhat.com> 2.5.4-39
+- Fixed operation when SELinux is disabled (bug #498102).  Patch from
+  Jan Kratochvil.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.4-38
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild