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

- Change netfilter stuff to be non-fatal so update can proceed.

Browse Source
This commit is contained in:
Daniel J Walsh 2006-08-09 19:08:44 +00:00
parent 1b2c2ff0fd
commit 6ba7395041
2 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libsemanage-rhat.patch
View File

@ -1,25 +1,17 @@
diff --exclude-from=exclude -N -u -r nsalibsemanage/src/conf-parse.y libsemanage-1.6.8/src/conf-parse.y diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-1.6.13/src/semanage_store.c
--- nsalibsemanage/src/conf-parse.y 2006-06-05 13:20:27.000000000 -0400 --- nsalibsemanage/src/semanage_store.c 2006-08-03 11:22:25.000000000 -0400
+++ libsemanage-1.6.8/src/conf-parse.y 2006-06-16 13:27:59.000000000 -0400 +++ libsemanage-1.6.13/src/semanage_store.c 2006-08-09 15:03:06.000000000 -0400
@@ -25,6 +25,7 @@ @@ -1072,8 +1072,11 @@
#include <selinux/selinux.h>
#include <semanage/handle.h>
+#include <unistd.h> snprintf(store_nc, PATH_MAX, "%s%s", storepath, running_nc);
#include <stdio.h> if (semanage_copy_file(active_nc, store_nc, sh->conf->file_mode) == -1) {
#include <stdlib.h> - ERR(sh, "Could not copy %s to %s.", active_nc, store_nc);
#include <string.h> - goto cleanup;
@@ -187,7 +188,12 @@ + INFO(sh, "Could not copy %s to %s.", active_nc, store_nc);
if ((conf->setfiles = calloc(1, sizeof(*(current_conf->setfiles)))) == NULL) { + /*
return -1; + ERR(sh, "Could not copy %s to %s.", active_nc, store_nc);
} + goto cleanup;
- if ((conf->setfiles->path = strdup("/sbin/setfiles")) == NULL || + */
+ if (access("/sbin/setfiles",X_OK) == 0) {
+ conf->setfiles->path = strdup("/sbin/setfiles");
+ } else {
+ conf->setfiles->path = strdup("/usr/sbin/setfiles");
+ }
+ if ((conf->setfiles->path == NULL) ||
(conf->setfiles->args = strdup("-q -c $@ $<")) == NULL) {
return -1;
} }
if (!sh->do_reload)

7
libsemanage.spec
View File

@ -3,10 +3,11 @@
Summary: SELinux binary policy manipulation library Summary: SELinux binary policy manipulation library
Name: libsemanage Name: libsemanage
Version: 1.6.13 Version: 1.6.13
Release: 1 Release: 2
License: GPL License: GPL
Group: System Environment/Libraries Group: System Environment/Libraries
Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
Patch: libsemanage-rhat.patch
BuildRoot: %{_tmppath}/%{name}-buildroot BuildRoot: %{_tmppath}/%{name}-buildroot
BuildRequires: libselinux-devel >= %{libselinuxver} BuildRequires: libselinux-devel >= %{libselinuxver}
@ -40,6 +41,7 @@ needed for developing applications that manipulate binary policies.
%prep %prep
%setup -q %setup -q
%patch -p1 -b .rhat
%build %build
make clean make clean
@ -75,6 +77,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_mandir}/man3/* %{_mandir}/man3/*
%changelog %changelog
* Wed Aug 9 2006 Dan Walsh <dwalsh@redhat.com> - 1.6.13-2
- Change netfilter stuff to be non-fatal so update can proceed.
* Thu Aug 3 2006 Dan Walsh <dwalsh@redhat.com> - 1.6.13-1 * Thu Aug 3 2006 Dan Walsh <dwalsh@redhat.com> - 1.6.13-1
- Upgrade to latest from NSA - Upgrade to latest from NSA
* Merged netfilter contexts support from Chris PeBenito. * Merged netfilter contexts support from Chris PeBenito.