- Fix fcontext translation handling in system-config-selinux

This commit is contained in:
Dan Walsh 2010-08-23 11:28:37 -04:00
parent 0bb879d732
commit 1ae6edaa3f
2 changed files with 27 additions and 1 deletions

View File

@ -0,0 +1,21 @@
diff -up policycoreutils-2.0.83/gui/fcontextPage.py.old policycoreutils-2.0.83/gui/fcontextPage.py
--- policycoreutils-2.0.83/gui/fcontextPage.py.old 2010-08-23 11:23:31.000000000 -0400
+++ policycoreutils-2.0.83/gui/fcontextPage.py 2010-08-23 11:23:48.000000000 -0400
@@ -185,14 +185,14 @@ class fcontextPage(semanagePage):
self.error(e.args[0])
def add(self):
+ ftype=["", "--", "-d", "-c", "-b", "-s", "-l", "-p" ]
fspec=self.fcontextEntry.get_text().strip()
type=self.fcontextTypeEntry.get_text().strip()
mls=self.fcontextMLSEntry.get_text().strip()
list_model=self.fcontextFileTypeCombo.get_model()
- iter = self.fcontextFileTypeCombo.get_active_iter()
- ftype=list_model.get_value(iter,0)
+ active = self.fcontextFileTypeCombo.get_active()
self.wait()
- (rc, out) = commands.getstatusoutput("semanage fcontext -a -t %s -r %s -f '%s' '%s'" % (type, mls, ftype, fspec))
+ (rc, out) = commands.getstatusoutput("semanage fcontext -a -t %s -r %s -f '%s' '%s'" % (type, mls, ftype[active], fspec))
self.ready()
if rc != 0:
self.error(out)

View File

@ -7,7 +7,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.0.82
Release: 5%{?dist}
Release: 6%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@ -24,6 +24,7 @@ Patch: policycoreutils-rhat.patch
Patch1: policycoreutils-po.patch
Patch3: policycoreutils-gui.patch
Patch4: policycoreutils-sepolgen.patch
Patch5: policycoreutils-fcontext.patch
Obsoletes: policycoreutils < 2.0.61-2
%global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
@ -62,6 +63,7 @@ context.
%patch1 -p1 -b .rhatpo
%patch3 -p1 -b .gui
%patch4 -p1 -b .sepolgen
%patch5 -p1 -b .fcontext
%build
make LSPP_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fPIE" LDFLAGS="-pie -Wl,-z,relro" all
@ -305,6 +307,9 @@ fi
exit 0
%changelog
* Fri Aug 13 2010 Dan Walsh <dwalsh@redhat.com> 2.0.82-6
- Fix fcontext translation handling in system-config-selinux
* Thu Jul 22 2010 Dan Walsh <dwalsh@redhat.com> 2.0.82-5
- Fix sandbox command on HOMEDIR