86 lines
4.0 KiB
Diff
86 lines
4.0 KiB
Diff
diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.47/Makefile
|
|
--- nsapolicycoreutils/Makefile 2007-12-19 06:02:52.000000000 -0500
|
|
+++ policycoreutils-2.0.47/Makefile 2008-05-08 16:25:33.277950000 -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.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.47/restorecond/restorecond.c
|
|
--- nsapolicycoreutils/restorecond/restorecond.c 2007-07-16 14:20:41.000000000 -0400
|
|
+++ policycoreutils-2.0.47/restorecond/restorecond.c 2008-05-08 16:25:33.306921000 -0400
|
|
@@ -210,9 +210,10 @@
|
|
}
|
|
|
|
if (fsetfilecon(fd, scontext) < 0) {
|
|
- syslog(LOG_ERR,
|
|
- "set context %s->%s failed:'%s'\n",
|
|
- filename, scontext, strerror(errno));
|
|
+ if (errno != EOPNOTSUPP)
|
|
+ syslog(LOG_ERR,
|
|
+ "set context %s->%s failed:'%s'\n",
|
|
+ filename, scontext, strerror(errno));
|
|
if (retcontext >= 0)
|
|
free(prev_context);
|
|
free(scontext);
|
|
@@ -225,8 +226,9 @@
|
|
if (retcontext >= 0)
|
|
free(prev_context);
|
|
} else {
|
|
- syslog(LOG_ERR, "get context on %s failed: '%s'\n",
|
|
- filename, strerror(errno));
|
|
+ if (errno != EOPNOTSUPP)
|
|
+ syslog(LOG_ERR, "get context on %s failed: '%s'\n",
|
|
+ filename, strerror(errno));
|
|
}
|
|
free(scontext);
|
|
close(fd);
|
|
diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.47/restorecond/restorecond.init
|
|
--- nsapolicycoreutils/restorecond/restorecond.init 2007-07-16 14:20:41.000000000 -0400
|
|
+++ policycoreutils-2.0.47/restorecond/restorecond.init 2008-05-08 16:25:33.311916000 -0400
|
|
@@ -2,7 +2,7 @@
|
|
#
|
|
# restorecond: Daemon used to maintain path file context
|
|
#
|
|
-# chkconfig: 2345 12 87
|
|
+# chkconfig: - 12 87
|
|
# description: restorecond uses inotify to look for creation of new files \
|
|
# listed in the /etc/selinux/restorecond.conf file, and restores the \
|
|
# correct security context.
|
|
diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.47/scripts/fixfiles
|
|
--- nsapolicycoreutils/scripts/fixfiles 2008-02-13 11:16:14.000000000 -0500
|
|
+++ policycoreutils-2.0.47/scripts/fixfiles 2008-05-08 16:25:33.316911000 -0400
|
|
@@ -151,6 +151,7 @@
|
|
relabel() {
|
|
if [ ! -z "$RPMFILES" ]; then
|
|
restore
|
|
+ rm -rf /tmp/gconfd-* /tmp/pulse-* /tmp/orbit-*
|
|
fi
|
|
|
|
if [ $fullFlag == 1 ]; then
|
|
diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.47/semanage/semanage
|
|
--- nsapolicycoreutils/semanage/semanage 2008-04-08 09:37:20.000000000 -0400
|
|
+++ policycoreutils-2.0.47/semanage/semanage 2008-05-08 16:25:51.445630000 -0400
|
|
@@ -129,7 +129,7 @@
|
|
setrans = ""
|
|
roles = ""
|
|
seuser = ""
|
|
- prefix = ""
|
|
+ prefix = "user"
|
|
heading=1
|
|
value=0
|
|
add = 0
|
|
diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.47/semanage/seobject.py
|
|
--- nsapolicycoreutils/semanage/seobject.py 2008-04-22 16:18:44.000000000 -0400
|
|
+++ policycoreutils-2.0.47/semanage/seobject.py 2008-05-08 16:25:33.333894000 -0400
|
|
@@ -464,7 +464,7 @@
|
|
def __init__(self, store = ""):
|
|
semanageRecords.__init__(self, store)
|
|
|
|
- def add(self, name, roles, selevel, serange, prefix):
|
|
+ def add(self, name, roles, selevel, serange, prefix = "user"):
|
|
if is_mls_enabled == 1:
|
|
if serange == "":
|
|
serange = "s0"
|