From 93779e5bffa822d2bfe25897c21a905fd5421bb3 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 23 Feb 2006 21:33:36 +0000 Subject: [PATCH] * Thu Feb 23 2006 Dan Walsh 1.29.26-2 - Change audit2allow to use devel instead of refpolicy --- policycoreutils-rhat.patch | 4 ++-- policycoreutils.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 7f41d19..4d462c2 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -29,7 +29,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow + def __init__(self): + self.dict={} + try: -+ fd=open("/usr/share/selinux/refpolicy/include/support/obj_perm_sets.spt") ++ fd=open("/usr/share/selinux/devel/include/support/obj_perm_sets.spt") + except IOError, error: + raise IOError("Reference policy generation requires the policy development package.\n%s" % error) + records=fd.read().split("\n") @@ -53,7 +53,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow + def __init__(self): + self.dict={} + trans=accessTrans() -+ (input, output) = os.popen2("awk -f - /usr/share/selinux/refpolicy/include/*/*.if 2> /dev/null") ++ (input, output) = os.popen2("awk -f - /usr/share/selinux/devel/include/*/*.if 2> /dev/null") + input.write(awk_script) + input.close() + records=output.read().split("\n") diff --git a/policycoreutils.spec b/policycoreutils.spec index 5ce40f9..30fac82 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -5,7 +5,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.29.26 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -98,7 +98,10 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/python2.4/site-packages/seobject.py* %changelog -* Mon Feb 13 2006 Dan Walsh 1.29.26-1 +* Thu Feb 23 2006 Dan Walsh 1.29.26-2 +- Change audit2allow to use devel instead of refpolicy + +* Mon Feb 20 2006 Dan Walsh 1.29.26-1 - Update from upstream * Merged semanage bug fix patch from Ivan Gyurdiev. * Merged improve bindings patch from Ivan Gyurdiev.