14f807a094
- Update to upstream * Add support for boolean files and group support for seusers from Dan Walsh. * Ensure that setfiles -p output is newline terminated from Russell Coker.
83 lines
4.1 KiB
Diff
83 lines
4.1 KiB
Diff
diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.53/Makefile
|
|
--- nsapolicycoreutils/Makefile 2008-08-05 09:58:35.000000000 -0400
|
|
+++ policycoreutils-2.0.53/Makefile 2008-08-01 07:34:03.000000000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
|
|
+SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
|
|
|
|
INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
|
|
|
|
diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.53/restorecond/restorecond.conf
|
|
--- nsapolicycoreutils/restorecond/restorecond.conf 2008-08-05 09:58:27.000000000 -0400
|
|
+++ policycoreutils-2.0.53/restorecond/restorecond.conf 2008-08-01 10:54:17.000000000 -0400
|
|
@@ -1,3 +1,4 @@
|
|
+/etc/services
|
|
/etc/resolv.conf
|
|
/etc/samba/secrets.tdb
|
|
/etc/mtab
|
|
diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.53/semanage/semanage
|
|
--- nsapolicycoreutils/semanage/semanage 2008-08-05 09:58:26.000000000 -0400
|
|
+++ policycoreutils-2.0.53/semanage/semanage 2008-08-05 10:13:48.000000000 -0400
|
|
@@ -45,11 +45,11 @@
|
|
def usage(message = ""):
|
|
print _("""
|
|
semanage {boolean|login|user|port|interface|fcontext|translation} -{l|D} [-n]
|
|
-semanage login -{a|d|m} [-sr] login_name | %groupname
|
|
-semanage user -{a|d|m} [-LrRP] selinux_name
|
|
+semanage login -{a|d|m} [-srF] login_name | login_file
|
|
+semanage user -{a|d|m} [-LrRPF] selinux_name | user_file
|
|
semanage port -{a|d|m} [-tr] [ -p proto ] port | port_range
|
|
semanage interface -{a|d|m} [-tr] interface_spec
|
|
-semanage fcontext -{a|d|m} [-frst] file_spec
|
|
+semanage fcontext -{a|d|m} [-frstF] file_spec | fcontext_file
|
|
semanage translation -{a|d|m} [-T] level
|
|
semanage boolean -{d|m} [--on|--off|-1|-0] -F boolean | boolean_file
|
|
semanage permissive -{d|a} type
|
|
@@ -103,15 +103,15 @@
|
|
valid_option={}
|
|
valid_everyone=[ '-a', '--add', '-d', '--delete', '-m', '--modify', '-l', '--list', '-h', '--help', '-n', '--noheading', '-C', '--locallist', '-D', '--deleteall', '-S', '--store' ]
|
|
valid_option["login"] = []
|
|
- valid_option["login"] += valid_everyone + [ '-s', '--seuser', '-r', '--range']
|
|
+ valid_option["login"] += valid_everyone + [ '-s', '--seuser', '-r', '--range', "-F", "--file"]
|
|
valid_option["user"] = []
|
|
- valid_option["user"] += valid_everyone + [ '-L', '--level', '-r', '--range', '-R', '--roles', '-P', '--prefix' ]
|
|
+ valid_option["user"] += valid_everyone + [ '-L', '--level', '-r', '--range', '-R', '--roles', '-P', '--prefix', "-F", "--file"]
|
|
valid_option["port"] = []
|
|
valid_option["port"] += valid_everyone + [ '-t', '--type', '-r', '--range', '-p', '--proto' ]
|
|
valid_option["interface"] = []
|
|
valid_option["interface"] += valid_everyone + [ '-t', '--type', '-r', '--range']
|
|
valid_option["fcontext"] = []
|
|
- valid_option["fcontext"] += valid_everyone + [ '-f', '--ftype', '-s', '--seuser', '-t', '--type', '-r', '--range']
|
|
+ valid_option["fcontext"] += valid_everyone + [ '-f', '--ftype', '-s', '--seuser', '-t', '--type', '-r', '--range', "-F", "--file"]
|
|
valid_option["translation"] = []
|
|
valid_option["translation"] += valid_everyone + [ '-T', '--trans' ]
|
|
valid_option["boolean"] = []
|
|
@@ -136,15 +136,15 @@
|
|
roles = ""
|
|
seuser = ""
|
|
prefix = "user"
|
|
- heading = True
|
|
- value = None
|
|
+ heading=1
|
|
+ value = None
|
|
add = False
|
|
modify = False
|
|
delete = False
|
|
deleteall = False
|
|
list = False
|
|
locallist = False
|
|
- use_file = False
|
|
+ use_file = False
|
|
store = ""
|
|
if len(sys.argv) < 3:
|
|
usage(_("Requires 2 or more arguments"))
|
|
@@ -208,7 +208,7 @@
|
|
usage()
|
|
|
|
if o == "-n" or o == "--noheading":
|
|
- heading = False
|
|
+ heading=0
|
|
|
|
if o == "-C" or o == "--locallist":
|
|
locallist = True
|