- Add genhomedircon patch from Joshua Brindle

This commit is contained in:
Daniel J Walsh 2005-11-14 22:09:06 +00:00
parent a7114403d6
commit ab22837824
2 changed files with 38 additions and 1 deletions

View File

@ -0,0 +1,32 @@
Index: libsemanage/src/semanage_store.c
===================================================================
RCS file: /cvsroot/selinux/nsa/selinux-usr/libsemanage/src/semanage_store.c,v
retrieving revision 1.21
diff -u -r1.21 semanage_store.c
--- libsemanage/src/semanage_store.c 9 Nov 2005 14:52:55 -0000 1.21
+++ libsemanage/src/semanage_store.c 14 Nov 2005 21:43:09 -0000
@@ -950,11 +950,6 @@
goto cleanup;
}
- if ((r = semanage_exec_prog(sh, sh->conf->genhomedircon, sh->conf->store_path, "")) != 0) {
- ERR(sh, "genhomedircon returned error code %d.", r);
- goto cleanup;
- }
-
retval = 0;
cleanup:
free(storepath);
@@ -1070,6 +1065,12 @@
goto cleanup;
}
+ if ((retval = semanage_exec_prog(sh, sh->conf->genhomedircon, sh->conf->store_path, "")) != 0) {
+ ERR(sh, "genhomedircon returned error code %d.", retval);
+ goto cleanup;
+ }
+
+
cleanup:
return retval;

View File

@ -2,11 +2,12 @@
Summary: SELinux binary policy manipulation library
Name: libsemanage
Version: 1.3.53
Release: 2
Release: 3
License: GPL
Group: System Environment/Libraries
Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
Patch: libsemanage-swigify.patch
Patch1: libsemanage-genhomedircon.patch
BuildRoot: %{_tmppath}/%{name}-buildroot
BuildRequires: libselinux-devel >= %{libselinuxver}
@ -39,6 +40,7 @@ needed for developing applications that manipulate binary policies.
%prep
%setup -q
%patch -p1 -b .swigify
%patch1 -p1 -b .genhomedircon
%build
make CFLAGS="%{optflags}"
@ -73,6 +75,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_includedir}/semanage/*.h
%changelog
* Mon Nov 14 2005 Dan Walsh <dwalsh@redhat.com> 1.3.53-3
- Add genhomedircon patch from Joshua Brindle
* Fri Nov 11 2005 Dan Walsh <dwalsh@redhat.com> 1.3.53-2
- Add swigify patch from Joshua Brindle