120 lines
5.3 KiB
Diff
120 lines
5.3 KiB
Diff
diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.62/Makefile
|
|
--- nsapolicycoreutils/Makefile 2008-08-28 09:34:24.000000000 -0400
|
|
+++ policycoreutils-2.0.62/Makefile 2009-02-18 16:52:27.000000000 -0500
|
|
@@ -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.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.62/restorecond/restorecond.conf
|
|
--- nsapolicycoreutils/restorecond/restorecond.conf 2009-02-18 16:44:47.000000000 -0500
|
|
+++ policycoreutils-2.0.62/restorecond/restorecond.conf 2009-02-23 11:32:21.000000000 -0500
|
|
@@ -5,3 +5,7 @@
|
|
/var/run/utmp
|
|
/var/log/wtmp
|
|
~/*
|
|
+/root/.ssh
|
|
+/root/.ssh/*
|
|
+
|
|
+
|
|
diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.62/scripts/fixfiles
|
|
--- nsapolicycoreutils/scripts/fixfiles 2009-02-18 16:44:47.000000000 -0500
|
|
+++ policycoreutils-2.0.62/scripts/fixfiles 2009-02-19 10:07:49.000000000 -0500
|
|
@@ -122,7 +122,7 @@
|
|
fi
|
|
if [ ! -z "$RPMFILES" ]; then
|
|
for i in `echo "$RPMFILES" | sed 's/,/ /g'`; do
|
|
- rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -i -f - 2>&1 >> $LOGFILE
|
|
+ rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -R -i -f - 2>&1 >> $LOGFILE
|
|
done
|
|
exit $?
|
|
fi
|
|
diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.62/semanage/semanage
|
|
--- nsapolicycoreutils/semanage/semanage 2009-02-18 16:44:47.000000000 -0500
|
|
+++ policycoreutils-2.0.62/semanage/semanage 2009-03-12 09:22:45.000000000 -0400
|
|
@@ -464,10 +464,10 @@
|
|
else:
|
|
fd = open(input, 'r')
|
|
trans = seobject.semanageRecords(store)
|
|
- trans.begin()
|
|
+ trans.start()
|
|
for l in fd.readlines():
|
|
process_args(mkargv(l))
|
|
- trans.commit()
|
|
+ trans.finish()
|
|
else:
|
|
process_args(sys.argv[1:])
|
|
|
|
diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.62/semanage/seobject.py
|
|
--- nsapolicycoreutils/semanage/seobject.py 2008-11-14 17:10:15.000000000 -0500
|
|
+++ policycoreutils-2.0.62/semanage/seobject.py 2009-03-31 08:54:25.000000000 -0400
|
|
@@ -281,15 +281,20 @@
|
|
global handle
|
|
|
|
if handle != None:
|
|
- self.transaction = True
|
|
self.sh = handle
|
|
else:
|
|
self.sh=get_handle(store)
|
|
- self.transaction = False
|
|
+ self.transaction = False
|
|
|
|
def deleteall(self):
|
|
raise ValueError(_("Not yet implemented"))
|
|
|
|
+ def start(self):
|
|
+ if self.transaction:
|
|
+ raise ValueError(_("Semanage transaction already in progress"))
|
|
+ self.begin()
|
|
+ self.transaction = True
|
|
+
|
|
def begin(self):
|
|
if self.transaction:
|
|
return
|
|
@@ -303,6 +308,12 @@
|
|
if rc < 0:
|
|
raise ValueError(_("Could not commit semanage transaction"))
|
|
|
|
+ def finish(self):
|
|
+ if not self.transaction:
|
|
+ raise ValueError(_("Semanage transaction not in progress"))
|
|
+ self.transaction = False
|
|
+ self.commit()
|
|
+
|
|
class permissiveRecords(semanageRecords):
|
|
def __init__(self, store):
|
|
semanageRecords.__init__(self, store)
|
|
@@ -328,6 +339,7 @@
|
|
|
|
|
|
def add(self, type):
|
|
+ import glob
|
|
name = "permissive_%s" % type
|
|
dirname = "/var/lib/selinux"
|
|
os.chdir(dirname)
|
|
@@ -351,16 +363,19 @@
|
|
fd.close()
|
|
|
|
rc = semanage_module_install(self.sh, data, len(data));
|
|
- if rc < 0:
|
|
- raise ValueError(_("Could not set permissive domain %s (module installation failed)") % name)
|
|
-
|
|
- self.commit()
|
|
+ if rc >= 0:
|
|
+ self.commit()
|
|
|
|
for root, dirs, files in os.walk("tmp", topdown=False):
|
|
for name in files:
|
|
os.remove(os.path.join(root, name))
|
|
for name in dirs:
|
|
os.rmdir(os.path.join(root, name))
|
|
+ os.removedirs("tmp")
|
|
+ for i in glob.glob("permissive_%s.*" % type):
|
|
+ os.remove(i)
|
|
+ if rc < 0:
|
|
+ raise ValueError(_("Could not set permissive domain %s (module installation failed)") % name)
|
|
|
|
def delete(self, name):
|
|
for n in name.split():
|