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

Allow semanage fcontext -a -t "<<none>>" ... to work

Browse Source
This commit is contained in:
Dan Walsh 2013-03-27 11:20:46 -04:00
parent 98c418def3
commit 8e3bfe0949
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
policycoreutils-rhat.patch
View File

@ -2059,7 +2059,7 @@ index 6e33c85..89b8b24 100644
return return
diff --git a/policycoreutils/semanage/seobject.py b/policycoreutils/semanage/seobject.py diff --git a/policycoreutils/semanage/seobject.py b/policycoreutils/semanage/seobject.py
index 85bc37f..f703aed 100644 index 85bc37f..0f9bc6e 100644
--- a/policycoreutils/semanage/seobject.py --- a/policycoreutils/semanage/seobject.py
+++ b/policycoreutils/semanage/seobject.py +++ b/policycoreutils/semanage/seobject.py
@@ -32,11 +32,10 @@ from IPy import IP @@ -32,11 +32,10 @@ from IPy import IP
@ -2119,7 +2119,22 @@ index 85bc37f..f703aed 100644
(rc, iface) = semanage_iface_create(self.sh) (rc, iface) = semanage_iface_create(self.sh)
if rc < 0: if rc < 0:
@@ -1777,7 +1781,8 @@ class fcontextRecords(semanageRecords): @@ -1640,11 +1644,12 @@ class interfaceRecords(semanageRecords):
print "%-30s %s:%s:%s " % (k,ddict[k][0], ddict[k][1],ddict[k][2])
class fcontextRecords(semanageRecords):
+ valid_types = ["<<none>>"]
try:
- valid_types = sepolicy.info(sepolicy.ATTRIBUTE,"file_type")[0]["types"]
+ valid_types += sepolicy.info(sepolicy.ATTRIBUTE,"file_type")[0]["types"]
valid_types += sepolicy.info(sepolicy.ATTRIBUTE,"device_node")[0]["types"]
except RuntimeError:
- valid_types = []
+ pass
def __init__(self, store = ""):
semanageRecords.__init__(self, store)
@@ -1777,7 +1782,8 @@ class fcontextRecords(semanageRecords):
raise ValueError(_("Could not check if file context for %s is defined") % target) raise ValueError(_("Could not check if file context for %s is defined") % target)
if exists: if exists:
@ -2129,7 +2144,7 @@ index 85bc37f..f703aed 100644
(rc, fcontext) = semanage_fcontext_create(self.sh) (rc, fcontext) = semanage_fcontext_create(self.sh)
if rc < 0: if rc < 0:
@@ -2026,6 +2031,9 @@ class booleanRecords(semanageRecords): @@ -2026,6 +2032,9 @@ class booleanRecords(semanageRecords):
self.modify_local = False self.modify_local = False
def __mod(self, name, value): def __mod(self, name, value):

9
policycoreutils.spec
View File

@ -7,7 +7,7 @@
Summary: SELinux policy core utilities Summary: SELinux policy core utilities
Name: policycoreutils Name: policycoreutils
Version: 2.1.14 Version: 2.1.14
Release: 26%{?dist} Release: 27%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Base Group: System Environment/Base
# Based on git repository with tag 20101221 # Based on git repository with tag 20101221
@ -309,11 +309,14 @@ The policycoreutils-restorecond package contains the restorecond service.
%{_bindir}/systemctl try-restart restorecond.service >/dev/null 2>&1 || : %{_bindir}/systemctl try-restart restorecond.service >/dev/null 2>&1 || :
%changelog %changelog
* Mon Mar 25 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-25 * Wed Mar 27 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-27
- Allow semanage fcontext -a -t "<<none>>" ... to work
* Mon Mar 25 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-26
- Can not unshare IPC in sandbox, since it blows up Xephyr - Can not unshare IPC in sandbox, since it blows up Xephyr
- Remove bogus error message sandbox about reseting setfsuid - Remove bogus error message sandbox about reseting setfsuid
* Thu Mar 21 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-24 * Thu Mar 21 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-25
- Fix sepolicy generate --customize to generate policy with -w commands - Fix sepolicy generate --customize to generate policy with -w commands
* Thu Mar 21 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-24 * Thu Mar 21 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-24