rpms/patch
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Fixed operation when SELinux is disabled (bug #498102). Patch from Jan

Browse Source 
Kratochvil.
This commit is contained in:
Tim Waugh 2009-04-29 16:39:13 +00:00
parent 1d18fb7541
commit 9389e191f1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patch-selinux.patch
View File

@ -81,8 +81,8 @@ diff -up patch-2.5.4/patch.c.selinux patch-2.5.4/patch.c
quotearg (outname)); quotearg (outname));
+ if (! inerrno && incontext) { + if (! inerrno && incontext) {
+ security_context_t outcontext; + security_context_t outcontext;
+ getfilecon (outname, &outcontext); + if (! getfilecon (outname, &outcontext) && outcontext &&
+ if (strcmp(outcontext, incontext) && + strcmp(outcontext, incontext) &&
+ setfilecon (outname, incontext) != 0) { + setfilecon (outname, incontext) != 0) {
+ if (errno != ENOTSUP && errno != EPERM) + if (errno != ENOTSUP && errno != EPERM)
+ pfatal ("Can't set security context on file %s", + pfatal ("Can't set security context on file %s",

6
patch.spec
View File

@ -1,7 +1,7 @@
Summary: Utility for modifying/upgrading files Summary: Utility for modifying/upgrading files
Name: patch Name: patch
Version: 2.5.4 Version: 2.5.4
Release: 38%{?dist} Release: 39%{?dist}
License: GPLv2+ License: GPLv2+
URL: http://www.gnu.org/software/patch/patch.html URL: http://www.gnu.org/software/patch/patch.html
Group: Development/Tools Group: Development/Tools
@ -68,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/*/* %{_mandir}/*/*
%changelog %changelog
* Wed Apr 29 2009 Tim Waugh <twaugh@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@lists.fedoraproject.org> - 2.5.4-38 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.4-38
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild