diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 198543e..ba5b0f7 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -128,9 +128,20 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po return newcats def translate(cats): +diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.60/semanage/semanage +--- nsapolicycoreutils/semanage/semanage 2008-11-14 17:10:15.000000000 -0500 ++++ policycoreutils-2.0.60/semanage/semanage 2009-01-05 14:07:44.000000000 -0500 +@@ -219,6 +219,7 @@ + 'seuser=', + 'store=', + 'range=', ++ 'locallist=', + 'level=', + 'roles=', + 'type=', diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.60/semodule/semodule.c --- nsapolicycoreutils/semodule/semodule.c 2008-08-28 09:34:24.000000000 -0400 -+++ policycoreutils-2.0.60/semodule/semodule.c 2008-12-15 15:34:54.000000000 -0500 ++++ policycoreutils-2.0.60/semodule/semodule.c 2009-01-06 08:56:37.000000000 -0500 @@ -60,24 +60,6 @@ free(commands); } @@ -201,7 +212,17 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po break; } case REMOVE_M:{ -@@ -429,9 +400,6 @@ +@@ -388,6 +359,9 @@ + mode_arg); + } + result = semanage_module_remove(sh, mode_arg); ++ if ( result == -2 ) { ++ continue; ++ } + break; + } + case LIST_M:{ +@@ -429,9 +403,6 @@ } } commit += do_commit[mode]; @@ -211,3 +232,4 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po if (result < 0) { fprintf(stderr, "%s: Failed on %s!\n", argv[0], mode_arg ? : "list"); +Binary files nsapolicycoreutils/semodule/semodule.o and policycoreutils-2.0.60/semodule/semodule.o differ diff --git a/policycoreutils.spec b/policycoreutils.spec index 270a5c6..1489c2a 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -6,7 +6,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.0.60 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -192,6 +192,9 @@ if [ "$1" -ge "1" ]; then fi %changelog +* Tue Jan 6 2009 Dan Walsh 2.0.60-7 +- Don't error out when removing a non existing module + * Mon Dec 15 2008 Dan Walsh 2.0.60-6 - fix audit2allow man page