From 0fdc47a89fd9e53a498cf02f833c2b4c61c327d4 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Jul 29 2008 18:06:14 +0000 Subject: * Tue Jul 29 2008 Dan Walsh 2.0.53-1 - Update to upstream * Change setfiles to validate all file_contexts files when using -c from Stephen Smalley. --- diff --git a/.cvsignore b/.cvsignore index 3ad4cde..6bce216 100644 --- a/.cvsignore +++ b/.cvsignore @@ -184,3 +184,4 @@ sepolgen-1.0.12.tgz policycoreutils-2.0.51.tgz policycoreutils-2.0.52.tgz sepolgen-1.0.13.tgz +policycoreutils-2.0.53.tgz diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index ea64edd..866f131 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -1,15 +1,15 @@ -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.52/Makefile +diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.52/Makefile --- nsapolicycoreutils/Makefile 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/Makefile 2008-07-29 09:06:28.000000000 -0400 ++++ policycoreutils-2.0.52/Makefile 2008-07-29 10:39:48.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.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.52/restorecond/restorecond.c +diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.52/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 2008-06-12 23:25:21.000000000 -0400 -+++ policycoreutils-2.0.52/restorecond/restorecond.c 2008-07-29 09:06:28.000000000 -0400 ++++ policycoreutils-2.0.52/restorecond/restorecond.c 2008-07-29 10:39:48.000000000 -0400 @@ -210,9 +210,10 @@ } @@ -36,9 +36,9 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po } free(scontext); close(fd); -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.52/semanage/semanage +diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.52/semanage/semanage --- nsapolicycoreutils/semanage/semanage 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/semanage/semanage 2008-07-29 09:12:29.000000000 -0400 ++++ policycoreutils-2.0.52/semanage/semanage 2008-07-29 10:39:48.000000000 -0400 @@ -45,13 +45,13 @@ def usage(message = ""): print _(""" @@ -227,9 +227,9 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po if object == "login": OBJECT.modify(target, seuser, serange) -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.52/semanage/semanage.8 +diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.52/semanage/semanage.8 --- nsapolicycoreutils/semanage/semanage.8 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/semanage/semanage.8 2008-07-29 09:06:28.000000000 -0400 ++++ policycoreutils-2.0.52/semanage/semanage.8 2008-07-29 10:39:48.000000000 -0400 @@ -3,9 +3,9 @@ semanage \- SELinux Policy Management tool @@ -264,9 +264,9 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po .I \-t, \-\-type SELinux Type for the object .TP -diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.52/semanage/seobject.py ---- nsapolicycoreutils/semanage/seobject.py 2008-07-02 17:19:15.000000000 -0400 -+++ policycoreutils-2.0.52/semanage/seobject.py 2008-07-29 09:06:28.000000000 -0400 +diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.52/semanage/seobject.py +--- nsapolicycoreutils/semanage/seobject.py 2008-07-29 09:15:39.000000000 -0400 ++++ policycoreutils-2.0.52/semanage/seobject.py 2008-07-29 10:39:48.000000000 -0400 @@ -330,20 +330,15 @@ for name in dirs: os.rmdir(os.path.join(root, name)) @@ -280,8 +280,8 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po rc = semanage_module_remove(self.sh, "permissive_%s" % n) if rc < 0: raise ValueError(_("Could not remove permissive domain %s (remove failed)") % name) -- rc = semanage_commit(self.sh) -- if rc < 0: +- rc = semanage_commit(self.sh) +- if rc < 0: + rc = semanage_commit(self.sh) + if rc < 0: raise ValueError(_("Could not remove permissive domain %s (commit failed)") % name) diff --git a/policycoreutils.spec b/policycoreutils.spec index fc9d3e6..f549e20 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -5,8 +5,8 @@ %define sepolgenver 1.0.13 Summary: SELinux policy core utilities Name: policycoreutils -Version: 2.0.52 -Release: 5%{?dist} +Version: 2.0.53 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -192,6 +192,10 @@ if [ "$1" -ge "1" ]; then fi %changelog +* Tue Jul 29 2008 Dan Walsh 2.0.53-1 +- Update to upstream + * Change setfiles to validate all file_contexts files when using -c from Stephen Smalley. + * Tue Jul 29 2008 Dan Walsh 2.0.52-6 - Fix boolean handling - Upgrade to latest sepolgen diff --git a/sources b/sources index d47a038..6c61460 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -311e95b3374fe1993fb91a303b6675b2 policycoreutils-2.0.52.tgz b6756a012c26f414e4a5f8f438ce2188 sepolgen-1.0.13.tgz +8fe5f8b78e156f770e990fe107577d2c policycoreutils-2.0.53.tgz