Fix generation of booleans in man pages
This commit is contained in:
parent
1a1b575f7a
commit
f81e3d0371
@ -7010,7 +7010,7 @@ diff -up policycoreutils-2.1.14/sepolicy/sepolicy/generate.py.f20 policycoreutil
|
|||||||
for app in self.admin_domains:
|
for app in self.admin_domains:
|
||||||
diff -up policycoreutils-2.1.14/sepolicy/sepolicy/__init__.py.f20 policycoreutils-2.1.14/sepolicy/sepolicy/__init__.py
|
diff -up policycoreutils-2.1.14/sepolicy/sepolicy/__init__.py.f20 policycoreutils-2.1.14/sepolicy/sepolicy/__init__.py
|
||||||
--- policycoreutils-2.1.14/sepolicy/sepolicy/__init__.py.f20 2013-06-21 07:49:23.556732881 -0400
|
--- policycoreutils-2.1.14/sepolicy/sepolicy/__init__.py.f20 2013-06-21 07:49:23.556732881 -0400
|
||||||
+++ policycoreutils-2.1.14/sepolicy/sepolicy/__init__.py 2013-06-21 07:49:23.577732994 -0400
|
+++ policycoreutils-2.1.14/sepolicy/sepolicy/__init__.py 2013-06-21 17:08:46.257133137 -0400
|
||||||
@@ -61,6 +61,62 @@ def search(types, info = {} ):
|
@@ -61,6 +61,62 @@ def search(types, info = {} ):
|
||||||
dict_list = filter(lambda x: _dict_has_perms(x, perms), dict_list)
|
dict_list = filter(lambda x: _dict_has_perms(x, perms), dict_list)
|
||||||
return dict_list
|
return dict_list
|
||||||
@ -7152,7 +7152,7 @@ diff -up policycoreutils-2.1.14/sepolicy/sepolicy/__init__.py.f20 policycoreutil
|
|||||||
return mpaths
|
return mpaths
|
||||||
|
|
||||||
def get_installed_policy(root = "/"):
|
def get_installed_policy(root = "/"):
|
||||||
@@ -316,6 +403,36 @@ def _dict_has_perms(dict, perms):
|
@@ -316,6 +403,39 @@ def _dict_has_perms(dict, perms):
|
||||||
return False
|
return False
|
||||||
return True
|
return True
|
||||||
|
|
||||||
@ -7179,7 +7179,10 @@ diff -up policycoreutils-2.1.14/sepolicy/sepolicy/__init__.py.f20 policycoreutil
|
|||||||
+ if not isinstance(b,tuple):
|
+ if not isinstance(b,tuple):
|
||||||
+ continue
|
+ continue
|
||||||
+ if b[0].startswith(short_name) or b[0].startswith(domainname):
|
+ if b[0].startswith(short_name) or b[0].startswith(domainname):
|
||||||
+ if b not in domainbools and (b[0], not b[1]) not in domainbools:
|
+ if b in domainbools:
|
||||||
|
+ continue
|
||||||
|
+ if (b[0], not b[1]) in domainbools:
|
||||||
|
+ continue
|
||||||
+ domainbools.append(b)
|
+ domainbools.append(b)
|
||||||
+ else:
|
+ else:
|
||||||
+ if b not in bools and (b[0], not b[1]) not in bools:
|
+ if b not in bools and (b[0], not b[1]) not in bools:
|
||||||
@ -7191,7 +7194,7 @@ diff -up policycoreutils-2.1.14/sepolicy/sepolicy/__init__.py.f20 policycoreutil
|
|||||||
global booleans
|
global booleans
|
||||||
diff -up policycoreutils-2.1.14/sepolicy/sepolicy/manpage.py.f20 policycoreutils-2.1.14/sepolicy/sepolicy/manpage.py
|
diff -up policycoreutils-2.1.14/sepolicy/sepolicy/manpage.py.f20 policycoreutils-2.1.14/sepolicy/sepolicy/manpage.py
|
||||||
--- policycoreutils-2.1.14/sepolicy/sepolicy/manpage.py.f20 2013-06-21 07:49:57.346915569 -0400
|
--- policycoreutils-2.1.14/sepolicy/sepolicy/manpage.py.f20 2013-06-21 07:49:57.346915569 -0400
|
||||||
+++ policycoreutils-2.1.14/sepolicy/sepolicy/manpage.py 2013-06-21 07:50:07.855972384 -0400
|
+++ policycoreutils-2.1.14/sepolicy/sepolicy/manpage.py 2013-06-21 17:08:27.155986171 -0400
|
||||||
@@ -114,39 +114,6 @@ def gen_domains():
|
@@ -114,39 +114,6 @@ def gen_domains():
|
||||||
domains.sort()
|
domains.sort()
|
||||||
return domains
|
return domains
|
||||||
@ -7276,7 +7279,7 @@ diff -up policycoreutils-2.1.14/sepolicy/sepolicy/manpage.py.f20 policycoreutils
|
|||||||
- self.bools.append(b)
|
- self.bools.append(b)
|
||||||
+ domainbools, bools = get_bools(t)
|
+ domainbools, bools = get_bools(t)
|
||||||
+ self.bools += bools
|
+ self.bools += bools
|
||||||
+ self.domainbools += bools
|
+ self.domainbools += domainbools
|
||||||
|
|
||||||
self.bools.sort()
|
self.bools.sort()
|
||||||
self.domainbools.sort()
|
self.domainbools.sort()
|
||||||
@ -7387,7 +7390,7 @@ diff -up policycoreutils-2.1.14/sepolicy/sepolicy/network.py.f20 policycoreutils
|
|||||||
return d
|
return d
|
||||||
diff -up policycoreutils-2.1.14/sepolicy/sepolicy.py.f20 policycoreutils-2.1.14/sepolicy/sepolicy.py
|
diff -up policycoreutils-2.1.14/sepolicy/sepolicy.py.f20 policycoreutils-2.1.14/sepolicy/sepolicy.py
|
||||||
--- policycoreutils-2.1.14/sepolicy/sepolicy.py.f20 2013-06-21 07:49:23.555732875 -0400
|
--- policycoreutils-2.1.14/sepolicy/sepolicy.py.f20 2013-06-21 07:49:23.555732875 -0400
|
||||||
+++ policycoreutils-2.1.14/sepolicy/sepolicy.py 2013-06-21 07:49:23.577732994 -0400
|
+++ policycoreutils-2.1.14/sepolicy/sepolicy.py 2013-06-21 17:08:10.999861863 -0400
|
||||||
@@ -40,7 +40,7 @@ except IOError:
|
@@ -40,7 +40,7 @@ except IOError:
|
||||||
__builtin__.__dict__['_'] = unicode
|
__builtin__.__dict__['_'] = unicode
|
||||||
|
|
||||||
@ -7457,13 +7460,17 @@ diff -up policycoreutils-2.1.14/sepolicy/sepolicy.py.f20 policycoreutils-2.1.14/
|
|||||||
mypolicy.set_admin_domains(args.admin_domain)
|
mypolicy.set_admin_domains(args.admin_domain)
|
||||||
mypolicy.set_existing_domains(args.domain)
|
mypolicy.set_existing_domains(args.domain)
|
||||||
|
|
||||||
@@ -484,6 +513,9 @@ def gen_generate_args(parser):
|
@@ -484,9 +513,12 @@ def gen_generate_args(parser):
|
||||||
pol.add_argument("-u", "--user", dest="user", default=[],
|
pol.add_argument("-u", "--user", dest="user", default=[],
|
||||||
action=CheckUser,
|
action=CheckUser,
|
||||||
help=_("Enter SELinux user(s) which will transition to this domain"))
|
help=_("Enter SELinux user(s) which will transition to this domain"))
|
||||||
+ pol.add_argument("-r", "--role", dest="role", default=[],
|
+ pol.add_argument("-r", "--role", dest="role", default=[],
|
||||||
+ action=CheckRole,
|
+ action=CheckRole,
|
||||||
+ help=_("Enter SELinux role(s) to which this domain will transition"))
|
+ help=_("Enter SELinux role(s) to which the administror domain will transition"))
|
||||||
pol.add_argument("-a", "--admin", dest="admin_domain",default=[],
|
pol.add_argument("-a", "--admin", dest="admin_domain",default=[],
|
||||||
action=CheckAdmin,
|
action=CheckAdmin,
|
||||||
help=_("Enter domain(s) that this confined admin will administrate"))
|
- help=_("Enter domain(s) that this confined admin will administrate"))
|
||||||
|
+ help=_("Enter domain(s) which this confined admin will administrate"))
|
||||||
|
pol.add_argument("-n", "--name", dest="name",
|
||||||
|
default=None,
|
||||||
|
help=_("name of policy to generate"))
|
||||||
|
@ -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: 46.3%{?dist}
|
Release: 46.4%{?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
|
||||||
@ -311,7 +311,10 @@ The policycoreutils-restorecond package contains the restorecond service.
|
|||||||
%systemd_postun_with_restart restorecond.service
|
%systemd_postun_with_restart restorecond.service
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Jun 21 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-46.2
|
* Fri Jun 21 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-46.4
|
||||||
|
- Fix generation of booleans in man pages
|
||||||
|
|
||||||
|
* Fri Jun 21 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-46.3
|
||||||
- Update Translations
|
- Update Translations
|
||||||
- Remove requires for systemd-sysv
|
- Remove requires for systemd-sysv
|
||||||
- Move systemd-units require to restorecond section
|
- Move systemd-units require to restorecond section
|
||||||
|
Loading…
Reference in New Issue
Block a user