diff --git a/policycoreutils-2.0.83-disable.patch b/policycoreutils-2.0.83-disable.patch deleted file mode 100644 index 78b4b1d..0000000 --- a/policycoreutils-2.0.83-disable.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up policycoreutils-2.0.83/load_policy/load_policy.c.init policycoreutils-2.0.83/load_policy/load_policy.c ---- policycoreutils-2.0.83/load_policy/load_policy.c.init 2010-11-08 13:46:37.000000000 -0500 -+++ policycoreutils-2.0.83/load_policy/load_policy.c 2010-11-22 13:43:58.000000000 -0500 -@@ -74,6 +74,7 @@ int main(int argc, char **argv) - "%s: Warning! Boolean file argument (%s) is no longer supported, installed booleans file is always used. Continuing...\n", - argv[0], argv[optind++]); - } -+ errno = 0; - if (init) { - if (is_selinux_enabled() == 1) { - /* SELinux is already enabled, we should not do an initial load again */ -@@ -98,7 +99,12 @@ int main(int argc, char **argv) - else { - ret = selinux_mkload_policy(1); - } -- if (ret < 0) { -+ -+ /* selinux_init_load_policy returns -1 if it did not load_policy -+ * On SELinux disabled system it will always return -1 -+ * So check errno to see if anything went wrong -+ */ -+ if (ret < 0 && errno != 0) { - char *path=policy_path(); - fprintf(stderr, _("%s: Can't load policy file %s: %s\n"), - argv[0], path, strerror(errno)); diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 4fe274f..6336ce2 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -1,6 +1,6 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.84/audit2allow/audit2allow --- nsapolicycoreutils/audit2allow/audit2allow 2010-05-19 14:45:51.000000000 -0400 -+++ policycoreutils-2.0.84/audit2allow/audit2allow 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/audit2allow/audit2allow 2010-11-30 11:57:21.000000000 -0500 @@ -1,4 +1,4 @@ -#! /usr/bin/python -E +#! /usr/bin/python -Es @@ -121,7 +121,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po app = AuditToPolicy() diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-2.0.84/audit2allow/audit2allow.1 --- nsapolicycoreutils/audit2allow/audit2allow.1 2010-05-19 14:45:51.000000000 -0400 -+++ policycoreutils-2.0.84/audit2allow/audit2allow.1 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/audit2allow/audit2allow.1 2010-11-30 11:57:21.000000000 -0500 @@ -1,5 +1,6 @@ .\" Hey, Emacs! This is an -*- nroff -*- source file. .\" Copyright (c) 2005 Manoj Srivastava @@ -225,7 +225,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po .SH AUTHOR diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/sepolgen-ifgen policycoreutils-2.0.84/audit2allow/sepolgen-ifgen --- nsapolicycoreutils/audit2allow/sepolgen-ifgen 2010-05-19 14:45:51.000000000 -0400 -+++ policycoreutils-2.0.84/audit2allow/sepolgen-ifgen 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/audit2allow/sepolgen-ifgen 2010-11-30 11:57:21.000000000 -0500 @@ -1,4 +1,4 @@ -#! /usr/bin/python -E +#! /usr/bin/python -Es @@ -321,8 +321,20 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/load_policy/load_policy.c policycoreutils-2.0.84/load_policy/load_policy.c --- nsapolicycoreutils/load_policy/load_policy.c 2010-05-19 14:45:51.000000000 -0400 -+++ policycoreutils-2.0.84/load_policy/load_policy.c 2010-11-29 10:13:07.000000000 -0500 -@@ -23,6 +23,14 @@ ++++ policycoreutils-2.0.84/load_policy/load_policy.c 2010-11-30 11:57:21.000000000 -0500 +@@ -1,3 +1,4 @@ ++#define _GNU_SOURCE + #include + #include + #include +@@ -17,12 +18,21 @@ + #define PACKAGE "policycoreutils" /* the name of this package lang translation */ + #endif + ++ + void usage(char *progname) + { + fprintf(stderr, _("usage: %s [-qi]\n"), progname); exit(1); } @@ -337,7 +349,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po int main(int argc, char **argv) { int ret, opt, quiet = 0, nargs, init=0, enforce=0; -@@ -64,6 +72,7 @@ +@@ -64,6 +74,7 @@ "%s: Warning! Boolean file argument (%s) is no longer supported, installed booleans file is always used. Continuing...\n", argv[0], argv[optind++]); } @@ -345,16 +357,8 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po if (init) { if (is_selinux_enabled() == 1) { /* SELinux is already enabled, we should not do an initial load again */ -@@ -73,12 +82,18 @@ - exit(2); - } - ret = selinux_init_load_policy(&enforce); -- if (ret != 0 ) { -+ /* selinux_init_load_policy returns -1 if it did not load_policy -+ * On SELinux disabled system it will always return -1 -+ * So check errno to see if anything went wrong -+ */ -+ if (ret < 0 && errno != 0) { +@@ -76,9 +87,11 @@ + if (ret != 0 ) { if (enforce > 0) { /* SELinux in enforcing mode but load_policy failed */ + char *path=policy_path(); @@ -367,119 +371,29 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po exit(3); } } -diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/load_policy/load_policy.c.disable policycoreutils-2.0.84/load_policy/load_policy.c.disable ---- nsapolicycoreutils/load_policy/load_policy.c.disable 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.84/load_policy/load_policy.c.disable 2010-11-29 10:07:47.000000000 -0500 -@@ -0,0 +1,106 @@ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#ifdef USE_NLS -+#include /* for setlocale() */ -+#include /* for gettext() */ -+#define _(msgid) gettext (msgid) -+#else -+#define _(msgid) (msgid) -+#endif -+#ifndef PACKAGE -+#define PACKAGE "policycoreutils" /* the name of this package lang translation */ -+#endif +@@ -86,9 +99,16 @@ + else { + ret = selinux_mkload_policy(1); + } +- if (ret < 0) { +- fprintf(stderr, _("%s: Can't load policy: %s\n"), +- argv[0], strerror(errno)); + -+ -+void usage(char *progname) -+{ -+ fprintf(stderr, _("usage: %s [-qi]\n"), progname); -+ exit(1); -+} -+ -+char *policy_path(void) { -+ char *path=NULL; -+ if (asprintf(&path, "%s.%d", selinux_binary_policy_path(), security_policyvers()) < 0) { -+ return NULL; -+ } -+ return path; -+} -+ -+int main(int argc, char **argv) -+{ -+ int ret, opt, quiet = 0, nargs, init=0, enforce=0; -+ -+#ifdef USE_NLS -+ setlocale(LC_ALL, ""); -+ bindtextdomain(PACKAGE, LOCALEDIR); -+ textdomain(PACKAGE); -+#endif -+ -+ while ((opt = getopt(argc, argv, "bqi")) > 0) { -+ switch (opt) { -+ case 'b': -+ fprintf(stderr, "%s: Warning! The -b option is no longer supported, booleans are always preserved across reloads. Continuing...\n", -+ argv[0]); -+ break; -+ case 'q': -+ quiet = 1; -+ sepol_debug(0); -+ break; -+ case 'i': -+ init = 1; -+ break; -+ default: -+ usage(argv[0]); -+ } -+ } -+ -+ nargs = argc - optind; -+ if (nargs > 2) -+ usage(argv[0]); -+ if (nargs >= 1 && !quiet) { -+ fprintf(stderr, -+ "%s: Warning! Policy file argument (%s) is no longer supported, installed policy is always loaded. Continuing...\n", -+ argv[0], argv[optind++]); -+ } -+ if (nargs == 2 && ! quiet) { -+ fprintf(stderr, -+ "%s: Warning! Boolean file argument (%s) is no longer supported, installed booleans file is always used. Continuing...\n", -+ argv[0], argv[optind++]); -+ } -+ if (init) { -+ if (is_selinux_enabled() == 1) { -+ /* SELinux is already enabled, we should not do an initial load again */ -+ fprintf(stderr, -+ _("%s: Policy is already loaded and initial load requested\n"), -+ argv[0]); -+ exit(2); -+ } -+ ret = selinux_init_load_policy(&enforce); -+ if (ret != 0 ) { -+ if (enforce > 0) { -+ /* SELinux in enforcing mode but load_policy failed */ -+ char *path=policy_path(); -+ fprintf(stderr, -+ _("%s: Can't load policy file %s and enforcing mode requested: %s\n"), -+ argv[0], path, strerror(errno)); -+ free(path); -+ exit(3); -+ } -+ } -+ } -+ else { -+ ret = selinux_mkload_policy(1); -+ } -+ if (ret < 0) { -+ fprintf(stderr, _("%s: Can't load policy: %s\n"), -+ argv[0], strerror(errno)); -+ exit(2); -+ } -+ exit(0); -+} ++ /* selinux_init_load_policy returns -1 if it did not load_policy ++ * On SELinux disabled system it will always return -1 ++ * So check errno to see if anything went wrong ++ */ ++ if (ret < 0 && errno != 0) { ++ char *path=policy_path(); ++ fprintf(stderr, _("%s: Can't load policy file %s: %s\n"), ++ argv[0], path, strerror(errno)); ++ free(path); + exit(2); + } + exit(0); diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.84/Makefile --- nsapolicycoreutils/Makefile 2010-06-16 08:03:38.000000000 -0400 -+++ policycoreutils-2.0.84/Makefile 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/Makefile 2010-11-30 11:57:21.000000000 -0500 @@ -1,4 +1,4 @@ -SUBDIRS = setfiles semanage load_policy newrole run_init sandbox secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +SUBDIRS = setfiles semanage semanage/default_encoding load_policy newrole run_init sandbox secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool po gui @@ -488,7 +402,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/newrole/Makefile policycoreutils-2.0.84/newrole/Makefile --- nsapolicycoreutils/newrole/Makefile 2010-05-19 14:45:51.000000000 -0400 -+++ policycoreutils-2.0.84/newrole/Makefile 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/newrole/Makefile 2010-11-30 11:57:21.000000000 -0500 @@ -50,7 +50,7 @@ endif ifeq (${IS_SUID},y) @@ -500,7 +414,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po endif diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-2.0.84/newrole/newrole.c --- nsapolicycoreutils/newrole/newrole.c 2010-05-19 14:45:51.000000000 -0400 -+++ policycoreutils-2.0.84/newrole/newrole.c 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/newrole/newrole.c 2010-11-30 11:57:21.000000000 -0500 @@ -77,7 +77,7 @@ #endif #if defined(AUDIT_LOG_PRIV) || (NAMESPACE_PRIV) @@ -690,7 +604,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po fprintf(stderr, _("Unable to restore the environment, " diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.84/restorecond/Makefile --- nsapolicycoreutils/restorecond/Makefile 2010-05-19 14:45:51.000000000 -0400 -+++ policycoreutils-2.0.84/restorecond/Makefile 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/restorecond/Makefile 2010-11-30 11:57:21.000000000 -0500 @@ -1,17 +1,28 @@ # Installation directories. PREFIX ?= ${DESTDIR}/usr @@ -739,14 +653,14 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po /sbin/restorecon $(SBINDIR)/restorecond diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.84/restorecond/org.selinux.Restorecond.service --- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.84/restorecond/org.selinux.Restorecond.service 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/restorecond/org.selinux.Restorecond.service 2010-11-30 11:57:21.000000000 -0500 @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.selinux.Restorecond +Exec=/usr/sbin/restorecond -u diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-2.0.84/restorecond/restorecond.8 --- nsapolicycoreutils/restorecond/restorecond.8 2010-05-19 14:45:51.000000000 -0400 -+++ policycoreutils-2.0.84/restorecond/restorecond.8 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/restorecond/restorecond.8 2010-11-30 11:57:21.000000000 -0500 @@ -3,7 +3,7 @@ restorecond \- daemon that watches for file creation and then sets the default SELinux file context @@ -783,7 +697,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po .BR restorecon (8), diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.84/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 2010-05-19 14:45:51.000000000 -0400 -+++ policycoreutils-2.0.84/restorecond/restorecond.c 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/restorecond/restorecond.c 2010-11-30 11:57:21.000000000 -0500 @@ -30,9 +30,11 @@ * and makes sure that there security context matches the systems defaults * @@ -1288,7 +1202,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.84/restorecond/restorecond.conf --- nsapolicycoreutils/restorecond/restorecond.conf 2010-05-19 14:45:51.000000000 -0400 -+++ policycoreutils-2.0.84/restorecond/restorecond.conf 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/restorecond/restorecond.conf 2010-11-30 11:57:21.000000000 -0500 @@ -4,8 +4,5 @@ /etc/mtab /var/run/utmp @@ -1301,7 +1215,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po - diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.84/restorecond/restorecond.desktop --- nsapolicycoreutils/restorecond/restorecond.desktop 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.84/restorecond/restorecond.desktop 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/restorecond/restorecond.desktop 2010-11-30 11:57:21.000000000 -0500 @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=File Context maintainer @@ -1312,7 +1226,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po +StartupNotify=false diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.84/restorecond/restorecond.h --- nsapolicycoreutils/restorecond/restorecond.h 2010-05-19 14:45:51.000000000 -0400 -+++ policycoreutils-2.0.84/restorecond/restorecond.h 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/restorecond/restorecond.h 2010-11-30 11:57:21.000000000 -0500 @@ -24,7 +24,22 @@ #ifndef RESTORED_CONFIG_H #define RESTORED_CONFIG_H @@ -1340,7 +1254,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po #endif diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.84/restorecond/restorecond.init --- nsapolicycoreutils/restorecond/restorecond.init 2010-05-19 14:45:51.000000000 -0400 -+++ policycoreutils-2.0.84/restorecond/restorecond.init 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/restorecond/restorecond.init 2010-11-30 11:57:21.000000000 -0500 @@ -26,7 +26,7 @@ # Source function library. . /etc/rc.d/init.d/functions @@ -1371,13 +1285,13 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po - diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.84/restorecond/restorecond_user.conf --- nsapolicycoreutils/restorecond/restorecond_user.conf 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.84/restorecond/restorecond_user.conf 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/restorecond/restorecond_user.conf 2010-11-30 11:57:21.000000000 -0500 @@ -0,0 +1,2 @@ +~/* +~/public_html/* diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.84/restorecond/user.c --- nsapolicycoreutils/restorecond/user.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.84/restorecond/user.c 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/restorecond/user.c 2010-11-30 11:57:21.000000000 -0500 @@ -0,0 +1,239 @@ +/* + * restorecond @@ -1620,7 +1534,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po + diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.c policycoreutils-2.0.84/restorecond/utmpwatcher.c --- nsapolicycoreutils/restorecond/utmpwatcher.c 2010-05-19 14:45:51.000000000 -0400 -+++ policycoreutils-2.0.84/restorecond/utmpwatcher.c 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/restorecond/utmpwatcher.c 2010-11-30 11:57:21.000000000 -0500 @@ -72,8 +72,8 @@ if (utmp_wd == -1) exitApp("Error watching utmp file."); @@ -1633,7 +1547,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po return changed; diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.84/restorecond/watch.c --- nsapolicycoreutils/restorecond/watch.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.84/restorecond/watch.c 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/restorecond/watch.c 2010-11-30 11:57:21.000000000 -0500 @@ -0,0 +1,260 @@ +#define _GNU_SOURCE +#include @@ -1897,7 +1811,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po +} diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/basicwrapper policycoreutils-2.0.84/sandbox/deliverables/basicwrapper --- nsapolicycoreutils/sandbox/deliverables/basicwrapper 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.84/sandbox/deliverables/basicwrapper 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/sandbox/deliverables/basicwrapper 2010-11-30 11:57:21.000000000 -0500 @@ -0,0 +1,4 @@ +import os, sys +SANDBOX_ARGS = ['-f%s' % os.environ['_CONDOR_SCRATCH_DIR']] @@ -1905,7 +1819,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po +os.execv('/usr/bin/sandbox',SANDBOX_ARGS) diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/README policycoreutils-2.0.84/sandbox/deliverables/README --- nsapolicycoreutils/sandbox/deliverables/README 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.84/sandbox/deliverables/README 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/sandbox/deliverables/README 2010-11-30 11:57:21.000000000 -0500 @@ -0,0 +1,32 @@ +Files: +run-in-sandbox.py: @@ -1941,7 +1855,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po +Chris Pardy diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/run-in-sandbox.py policycoreutils-2.0.84/sandbox/deliverables/run-in-sandbox.py --- nsapolicycoreutils/sandbox/deliverables/run-in-sandbox.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.84/sandbox/deliverables/run-in-sandbox.py 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/sandbox/deliverables/run-in-sandbox.py 2010-11-30 11:57:21.000000000 -0500 @@ -0,0 +1,49 @@ +import os +import os.path @@ -1994,7 +1908,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po + diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/Makefile policycoreutils-2.0.84/sandbox/Makefile --- nsapolicycoreutils/sandbox/Makefile 2010-06-16 08:03:38.000000000 -0400 -+++ policycoreutils-2.0.84/sandbox/Makefile 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/sandbox/Makefile 2010-11-30 11:57:21.000000000 -0500 @@ -7,8 +7,8 @@ MANDIR ?= $(PREFIX)/share/man LOCALEDIR ?= /usr/share/locale @@ -2027,7 +1941,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po @python test_sandbox.py -v diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.84/sandbox/sandbox --- nsapolicycoreutils/sandbox/sandbox 2010-06-16 08:03:38.000000000 -0400 -+++ policycoreutils-2.0.84/sandbox/sandbox 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/sandbox/sandbox 2010-11-30 12:08:16.000000000 -0500 @@ -1,5 +1,6 @@ -#! /usr/bin/python -E +#! /usr/bin/python -Es @@ -2155,7 +2069,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po kill -TERM $WM_PID 2> /dev/null """ % (command, wm, command)) fd.close() -@@ -226,14 +245,20 @@ +@@ -226,14 +245,25 @@ def usage(self, message = ""): error_exit("%s\n%s" % (self.__parser.usage, message)) @@ -2163,16 +2077,21 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po + def __parse_options(self): from optparse import OptionParser -+ types = "\t" + "\n\t".join(setools.seinfo(setools.ATTRIBUTE, "sandbox_type")[0]['types']) ++ types = "" ++ try: ++ types = _(""" ++Policy defines the following types for use with the -t: ++\t%s ++""") % "\n\t".join(setools.seinfo(setools.ATTRIBUTE, "sandbox_type")[0]['types']) ++ except RuntimeError: ++ pass ++ usage = _(""" -sandbox [-h] [-[X|M] [-l level ] [-H homedir] [-T tempdir]] [-I includefile ] [-W windowmanager ] [[-i file ] ...] [ -t type ] command +sandbox [-h] [-l level ] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile ] [-W windowmanager ] [ -w windowsize ] [[-i file ] ...] [ -t type ] command + +sandbox [-h] [-l level ] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile ] [-W windowmanager ] [ -w windowsize ] [[-i file ] ...] [ -t type ] -S -+ -+Policy defines the following types for use with the -t: +%s -+ +""") % types -sandbox [-h] [-[X|M] [-l level ] [-H homedir] [-T tempdir]] [-I includefile ] [-W windowmanager ] [[-i file ] ...] [ -t type ] -S @@ -2180,7 +2099,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po parser = OptionParser(version=self.VERSION, usage=usage) parser.disable_interspersed_args() -@@ -268,6 +293,10 @@ +@@ -268,6 +298,10 @@ action="callback", callback=self.__validdir, help=_("alternate /tmp directory to use for mounting")) @@ -2191,7 +2110,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po parser.add_option("-W", "--windowmanager", dest="wm", type="string", default="/usr/bin/matchbox-window-manager -use_titlebar no", -@@ -276,13 +305,17 @@ +@@ -276,13 +310,17 @@ parser.add_option("-l", "--level", dest="level", help=_("MCS/MLS level for the sandbox")) @@ -2210,7 +2129,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po if self.__options.setype: self.setype = self.__options.setype -@@ -299,6 +332,9 @@ +@@ -299,6 +337,9 @@ self.__options.X_ind = True self.__homedir = self.__options.homedir self.__tmpdir = self.__options.tmpdir @@ -2220,7 +2139,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po else: if len(cmds) == 0: self.usage(_("Command required")) -@@ -351,22 +387,24 @@ +@@ -351,22 +392,24 @@ def __execute(self): try: @@ -2262,7 +2181,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po rc = subprocess.Popen(self.__cmds).wait() diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.8 policycoreutils-2.0.84/sandbox/sandbox.8 --- nsapolicycoreutils/sandbox/sandbox.8 2010-06-16 08:03:38.000000000 -0400 -+++ policycoreutils-2.0.84/sandbox/sandbox.8 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/sandbox/sandbox.8 2010-11-30 11:57:21.000000000 -0500 @@ -1,10 +1,13 @@ -.TH SANDBOX "8" "May 2009" "chcat" "User Commands" +.TH SANDBOX "8" "May 2010" "sandbox" "User Commands" @@ -2314,7 +2233,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po +.I Thomas Liu diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.conf policycoreutils-2.0.84/sandbox/sandbox.conf --- nsapolicycoreutils/sandbox/sandbox.conf 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.84/sandbox/sandbox.conf 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/sandbox/sandbox.conf 2010-11-30 11:57:21.000000000 -0500 @@ -0,0 +1,7 @@ +# Space separate list of homedirs +HOMEDIRS="/home" @@ -2325,7 +2244,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po +CPUUSAGE=80% diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.conf.5 policycoreutils-2.0.84/sandbox/sandbox.conf.5 --- nsapolicycoreutils/sandbox/sandbox.conf.5 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.84/sandbox/sandbox.conf.5 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/sandbox/sandbox.conf.5 2010-11-30 11:57:21.000000000 -0500 @@ -0,0 +1,40 @@ +.TH sandbox.conf "5" "June 2010" "sandbox.conf" "Linux System Administration" +.SH NAME @@ -2367,15 +2286,9 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po +.SH AUTHOR +This manual page was written by +.I Thomas Liu -diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.config policycoreutils-2.0.84/sandbox/sandbox.config ---- nsapolicycoreutils/sandbox/sandbox.config 2010-06-16 08:03:38.000000000 -0400 -+++ policycoreutils-2.0.84/sandbox/sandbox.config 1969-12-31 19:00:00.000000000 -0500 -@@ -1,2 +0,0 @@ --# Space separate list of homedirs --HOMEDIRS="/home" diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.init policycoreutils-2.0.84/sandbox/sandbox.init --- nsapolicycoreutils/sandbox/sandbox.init 2010-06-16 08:03:38.000000000 -0400 -+++ policycoreutils-2.0.84/sandbox/sandbox.init 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/sandbox/sandbox.init 2010-11-30 11:57:21.000000000 -0500 @@ -10,17 +10,12 @@ # # chkconfig: 345 1 99 @@ -2402,7 +2315,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po # Source function library. diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandboxX.sh policycoreutils-2.0.84/sandbox/sandboxX.sh --- nsapolicycoreutils/sandbox/sandboxX.sh 2010-06-16 08:03:38.000000000 -0400 -+++ policycoreutils-2.0.84/sandbox/sandboxX.sh 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/sandbox/sandboxX.sh 2010-11-30 11:57:21.000000000 -0500 @@ -1,13 +1,26 @@ #!/bin/bash context=`id -Z | secon -t -l -P` @@ -2435,7 +2348,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po break diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/seunshare.8 policycoreutils-2.0.84/sandbox/seunshare.8 --- nsapolicycoreutils/sandbox/seunshare.8 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.84/sandbox/seunshare.8 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/sandbox/seunshare.8 2010-11-30 11:57:21.000000000 -0500 @@ -0,0 +1,37 @@ +.TH SEUNSHARE "8" "May 2010" "seunshare" "User Commands" +.SH NAME @@ -2476,7 +2389,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po +.I Thomas Liu diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/seunshare.c policycoreutils-2.0.84/sandbox/seunshare.c --- nsapolicycoreutils/sandbox/seunshare.c 2010-06-16 08:03:38.000000000 -0400 -+++ policycoreutils-2.0.84/sandbox/seunshare.c 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/sandbox/seunshare.c 2010-11-30 11:57:21.000000000 -0500 @@ -1,13 +1,21 @@ +/* + * Authors: Dan Walsh @@ -2923,7 +2836,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po } diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.84/scripts/chcat --- nsapolicycoreutils/scripts/chcat 2010-05-19 14:45:51.000000000 -0400 -+++ policycoreutils-2.0.84/scripts/chcat 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/scripts/chcat 2010-11-30 11:57:21.000000000 -0500 @@ -1,4 +1,4 @@ -#! /usr/bin/python -E +#! /usr/bin/python -Es @@ -2932,8 +2845,8 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po # diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.84/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2010-05-19 14:45:51.000000000 -0400 -+++ policycoreutils-2.0.84/scripts/fixfiles 2010-11-29 10:07:47.000000000 -0500 -@@ -21,6 +21,25 @@ ++++ policycoreutils-2.0.84/scripts/fixfiles 2010-11-30 11:57:21.000000000 -0500 +@@ -21,6 +21,17 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # @@ -2947,19 +2860,11 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po +done +} + -+exclude_dirs() { -+ exclude= -+ for i in /var/lib/BackupPC /home /tmp /dev; do -+ [ -e $i ] && exclude="$exclude -e $i"; -+ done -+ echo "$exclude" -+} -+ +# # Set global Variables # fullFlag=0 -@@ -35,9 +54,7 @@ +@@ -35,9 +46,7 @@ LOGGER=/usr/sbin/logger SETFILES=/sbin/setfiles RESTORECON=/sbin/restorecon @@ -2970,7 +2875,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po SELINUXTYPE="targeted" if [ -e /etc/selinux/config ]; then . /etc/selinux/config -@@ -87,23 +104,10 @@ +@@ -87,23 +96,10 @@ esac; \ fi; \ done | \ @@ -2979,7 +2884,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po - \( -wholename /home -o -wholename /root -o -wholename /tmp -wholename /dev \) -prune -o -print0"; \ - done 2> /dev/null | \ - ${RESTORECON} $* -0 -f - -+ ${RESTORECON} -f - -R -p `exclude_dirs`; \ ++ ${RESTORECON} -f - -R -p -e /var/lib/BackupPC -e /home -e /tmp -r /dev; \ rm -f ${TEMPFILE} ${PREFCTEMPFILE} fi } @@ -2995,7 +2900,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po rpmlist() { rpm -q --qf '[%{FILESTATES} %{FILENAMES}\n]' "$1" | grep '^0 ' | cut -f2- -d ' ' -@@ -121,23 +125,16 @@ +@@ -121,23 +117,16 @@ fi if [ ! -z "$RPMFILES" ]; then for i in `echo "$RPMFILES" | sed 's/,/ /g'`; do @@ -3022,7 +2927,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po rm -rf /tmp/gconfd-* /tmp/pulse-* /tmp/orbit-* find /tmp \( -context "*:file_t*" -o -context "*:unlabeled_t*" \) -exec chcon -t tmp_t {} \; find /var/tmp \( -context "*:file_t*" -o -context "*:unlabeled_t*" \) -exec chcon -t tmp_t {} \; -@@ -146,8 +143,7 @@ +@@ -146,8 +135,7 @@ fullrelabel() { logit "Cleaning out /tmp" @@ -3034,7 +2939,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/genhomedircon.8 policycoreutils-2.0.84/scripts/genhomedircon.8 --- nsapolicycoreutils/scripts/genhomedircon.8 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.84/scripts/genhomedircon.8 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/scripts/genhomedircon.8 2010-11-30 11:57:21.000000000 -0500 @@ -0,0 +1,37 @@ +.\" Hey, Emacs! This is an -*- nroff -*- source file. +.\" Copyright (c) 2010 Dan Walsh @@ -3075,7 +2980,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po +.I Dan Walsh diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.84/scripts/Makefile --- nsapolicycoreutils/scripts/Makefile 2010-05-19 14:45:51.000000000 -0400 -+++ policycoreutils-2.0.84/scripts/Makefile 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/scripts/Makefile 2010-11-30 11:57:21.000000000 -0500 @@ -14,6 +14,7 @@ install -m 755 genhomedircon $(SBINDIR) -mkdir -p $(MANDIR)/man8 @@ -3086,7 +2991,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po clean: diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/severify.py policycoreutils-2.0.84/scripts/severify.py --- nsapolicycoreutils/scripts/severify.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.84/scripts/severify.py 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/scripts/severify.py 2010-11-30 11:57:21.000000000 -0500 @@ -0,0 +1,21 @@ +#! /usr/bin/python -Es +import seobject @@ -3111,7 +3016,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po + diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/default_encoding/default_encoding.c policycoreutils-2.0.84/semanage/default_encoding/default_encoding.c --- nsapolicycoreutils/semanage/default_encoding/default_encoding.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.84/semanage/default_encoding/default_encoding.c 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/semanage/default_encoding/default_encoding.c 2010-11-30 11:57:21.000000000 -0500 @@ -0,0 +1,59 @@ +/* + * Authors: @@ -3174,7 +3079,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po +} diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/default_encoding/Makefile policycoreutils-2.0.84/semanage/default_encoding/Makefile --- nsapolicycoreutils/semanage/default_encoding/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.84/semanage/default_encoding/Makefile 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/semanage/default_encoding/Makefile 2010-11-30 11:57:21.000000000 -0500 @@ -0,0 +1,8 @@ +all: + LDFLAGS="" python setup.py build @@ -3186,7 +3091,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po + rm -rf build *~ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/default_encoding/policycoreutils/__init__.py policycoreutils-2.0.84/semanage/default_encoding/policycoreutils/__init__.py --- nsapolicycoreutils/semanage/default_encoding/policycoreutils/__init__.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.84/semanage/default_encoding/policycoreutils/__init__.py 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/semanage/default_encoding/policycoreutils/__init__.py 2010-11-30 11:57:21.000000000 -0500 @@ -0,0 +1,17 @@ +# +# Copyright (C) 2006,2007,2008, 2009 Red Hat, Inc. @@ -3207,7 +3112,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po +# diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/default_encoding/setup.py policycoreutils-2.0.84/semanage/default_encoding/setup.py --- nsapolicycoreutils/semanage/default_encoding/setup.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.84/semanage/default_encoding/setup.py 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/semanage/default_encoding/setup.py 2010-11-30 11:57:21.000000000 -0500 @@ -0,0 +1,38 @@ +# Authors: +# John Dennis @@ -3249,7 +3154,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po +) diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.84/semanage/semanage --- nsapolicycoreutils/semanage/semanage 2010-05-19 14:45:51.000000000 -0400 -+++ policycoreutils-2.0.84/semanage/semanage 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/semanage/semanage 2010-11-30 11:57:21.000000000 -0500 @@ -1,4 +1,4 @@ -#! /usr/bin/python -E +#! /usr/bin/python -Es @@ -3662,7 +3567,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po + errorExit(error.args[1]) diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.84/semanage/semanage.8 --- nsapolicycoreutils/semanage/semanage.8 2010-05-19 14:45:51.000000000 -0400 -+++ policycoreutils-2.0.84/semanage/semanage.8 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/semanage/semanage.8 2010-11-30 11:57:21.000000000 -0500 @@ -1,29 +1,69 @@ -.TH "semanage" "8" "2005111103" "" "" +.TH "semanage" "8" "20100223" "" "" @@ -3871,7 +3776,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po Examples by Thomas Bleher . diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.84/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2010-05-19 14:45:51.000000000 -0400 -+++ policycoreutils-2.0.84/semanage/seobject.py 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/semanage/seobject.py 2010-11-30 11:57:21.000000000 -0500 @@ -29,47 +29,12 @@ import gettext gettext.bindtextdomain(PROGNAME, "/usr/share/locale") @@ -4627,7 +4532,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po if use_file: diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sepolgen-ifgen/Makefile policycoreutils-2.0.84/sepolgen-ifgen/Makefile --- nsapolicycoreutils/sepolgen-ifgen/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.84/sepolgen-ifgen/Makefile 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/sepolgen-ifgen/Makefile 2010-11-30 11:57:21.000000000 -0500 @@ -0,0 +1,25 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr @@ -4656,7 +4561,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po +relabel: ; diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sepolgen-ifgen/sepolgen-ifgen-attr-helper.c policycoreutils-2.0.84/sepolgen-ifgen/sepolgen-ifgen-attr-helper.c --- nsapolicycoreutils/sepolgen-ifgen/sepolgen-ifgen-attr-helper.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.84/sepolgen-ifgen/sepolgen-ifgen-attr-helper.c 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/sepolgen-ifgen/sepolgen-ifgen-attr-helper.c 2010-11-30 11:57:21.000000000 -0500 @@ -0,0 +1,230 @@ +/* Authors: Frank Mayer + * and Karl MacMillan @@ -4890,7 +4795,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po +} diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.c policycoreutils-2.0.84/setfiles/restore.c --- nsapolicycoreutils/setfiles/restore.c 2010-05-19 14:45:51.000000000 -0400 -+++ policycoreutils-2.0.84/setfiles/restore.c 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/setfiles/restore.c 2010-11-30 11:57:21.000000000 -0500 @@ -1,4 +1,5 @@ #include "restore.h" +#include @@ -5074,7 +4979,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restorecon.8 policycoreutils-2.0.84/setfiles/restorecon.8 --- nsapolicycoreutils/setfiles/restorecon.8 2010-05-19 14:45:51.000000000 -0400 -+++ policycoreutils-2.0.84/setfiles/restorecon.8 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/setfiles/restorecon.8 2010-11-30 11:57:21.000000000 -0500 @@ -4,10 +4,10 @@ .SH "SYNOPSIS" @@ -5100,7 +5005,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po show changes in file labels. diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.h policycoreutils-2.0.84/setfiles/restore.h --- nsapolicycoreutils/setfiles/restore.h 2010-05-19 14:45:51.000000000 -0400 -+++ policycoreutils-2.0.84/setfiles/restore.h 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/setfiles/restore.h 2010-11-30 11:57:21.000000000 -0500 @@ -27,6 +27,7 @@ int hard_links; int verbose; @@ -5122,7 +5027,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po #endif diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.8 policycoreutils-2.0.84/setfiles/setfiles.8 --- nsapolicycoreutils/setfiles/setfiles.8 2010-05-19 14:45:51.000000000 -0400 -+++ policycoreutils-2.0.84/setfiles/setfiles.8 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/setfiles/setfiles.8 2010-11-30 11:57:21.000000000 -0500 @@ -31,6 +31,9 @@ .TP .B \-n @@ -5135,7 +5040,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po suppress non-error output. diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.84/setfiles/setfiles.c --- nsapolicycoreutils/setfiles/setfiles.c 2010-05-19 14:45:51.000000000 -0400 -+++ policycoreutils-2.0.84/setfiles/setfiles.c 2010-11-29 10:07:47.000000000 -0500 ++++ policycoreutils-2.0.84/setfiles/setfiles.c 2010-11-30 11:57:21.000000000 -0500 @@ -5,7 +5,6 @@ #include #include diff --git a/policycoreutils.spec b/policycoreutils.spec index 9bda627..0d25f48 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -7,7 +7,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.0.84 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -327,6 +327,9 @@ fi exit 0 %changelog +* Mon Nov 29 2010 Dan Walsh 2.0.84-3 +- Fix sandbox to show correct types in usage statement + * Mon Nov 29 2010 Dan Walsh 2.0.84-2 - Stop fixfiles from complaining about missing dirs