From 70c74b9bdda1a40e0121b3253d8d483c640877f6 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 21 Mar 2006 15:49:19 +0000 Subject: [PATCH] * Tue Mar 21 2006 Dan Walsh 1.30.1-1 - Make audit2allow translate dontaudit as well as allow rules - Update from upstream * Merged semanage labeling prefix patch from Ivan Gyurdiev. --- .cvsignore | 1 + policycoreutils-rhat.patch | 26 -------------------------- policycoreutils.spec | 9 +++++++-- sources | 2 +- 4 files changed, 9 insertions(+), 29 deletions(-) diff --git a/.cvsignore b/.cvsignore index 327fcc1..1ae21f5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -94,3 +94,4 @@ policycoreutils-1.29.23.tgz policycoreutils-1.29.26.tgz policycoreutils-1.29.27.tgz policycoreutils-1.30.tgz +policycoreutils-1.30.1.tgz diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 199f406..1507963 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -1004,29 +1004,3 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policyc exit $? fi LogReadOnly -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.30/semanage/seobject.py ---- nsapolicycoreutils/semanage/seobject.py 2006-03-10 09:48:05.000000000 -0500 -+++ policycoreutils-1.30/semanage/seobject.py 2006-03-20 22:51:07.000000000 -0500 -@@ -549,7 +549,7 @@ - raise ValueError("Could not list roles for user %s" % name) - - roles = string.join(rlist, ' '); -- ddict[semanage_user_get_name(u)] = (semanage_user_get_mlslevel(u), semanage_user_get_mlsrange(u), roles) -+ ddict[semanage_user_get_name(u)] = (semanage_user_get_prefix(u), semanage_user_get_mlslevel(u), semanage_user_get_mlsrange(u), roles) - - return ddict - -@@ -559,10 +559,10 @@ - keys.sort() - if is_mls_enabled == 1: - if heading: -- print "\n%-15s %-10s %-30s" % ("", "MLS/", "MLS/") -- print "%-15s %-10s %-30s %s\n" % ("SELinux User", "MCS Level", "MCS Range", "SELinux Roles") -+ print "\n%-15s %-10s %-10s %-30s" % ("", "Labeling", "MLS/", "MLS/") -+ print "%-15s %-10s %-10s %-30s %s\n" % ("SELinux User", "Prefix", "MCS Level", "MCS Range", "SELinux Roles") - for k in keys: -- print "%-15s %-10s %-30s %s" % (k, translate(ddict[k][0]), translate(ddict[k][1]), ddict[k][2]) -+ print "%-15s %-10s %-10s %-30s %s" % (k, ddict[k][0], translate(ddict[k][1]), translate(ddict[k][2]), ddict[k][3]) - else: - if heading: - print "%-15s %s\n" % ("SELinux User", "SELinux Roles") diff --git a/policycoreutils.spec b/policycoreutils.spec index e5a046c..a40ad82 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -4,8 +4,8 @@ %define libselinuxver 1.30-1 Summary: SELinux policy core utilities. Name: policycoreutils -Version: 1.30 -Release: 5 +Version: 1.30.1 +Release: 1 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -107,6 +107,11 @@ rm -rf ${RPM_BUILD_ROOT} service restorecond condrestart %changelog +* Tue Mar 21 2006 Dan Walsh 1.30.1-1 +- Make audit2allow translate dontaudit as well as allow rules +- Update from upstream + * Merged semanage labeling prefix patch from Ivan Gyurdiev. + * Tue Mar 21 2006 Dan Walsh 1.30-5 - Fix audit2allow to retrieve dontaudit rules diff --git a/sources b/sources index d81be33..b673f14 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e017bfddf27e124cef2743496dcfcc49 policycoreutils-1.30.tgz +a1f4732b7c4d047a437d489b620a2895 policycoreutils-1.30.1.tgz