From 997b60dcc13d08d1835cf00af8401a85d94a19e7 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 18 Apr 2006 20:53:54 +0000 Subject: [PATCH] * Mon Apr 18 2006 Dan Walsh 1.30.6-2 - Ship avc.py --- policycoreutils-rhat.patch | 21 +++++++++++++++++++++ policycoreutils.spec | 6 +++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 352dbc7..29f750a 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -1076,6 +1076,27 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/avc.py polic + rec += self.seRules[i].out(self.verbose)+"\n" + return rec + +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-1.30.6/audit2allow/Makefile +--- nsapolicycoreutils/audit2allow/Makefile 2005-01-21 09:01:35.000000000 -0500 ++++ policycoreutils-1.30.6/audit2allow/Makefile 2006-04-18 16:51:11.000000000 -0400 +@@ -3,6 +3,8 @@ + BINDIR ?= $(PREFIX)/bin + MANDIR ?= $(PREFIX)/share/man + LOCALEDIR ?= /usr/share/locale ++PYLIBVER ?= python2.4 ++PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER) + + TARGETS=audit2allow + +@@ -13,6 +15,8 @@ + install -m 755 $(TARGETS) $(BINDIR) + -mkdir -p $(MANDIR)/man1 + install -m 644 audit2allow.1 $(MANDIR)/man1/ ++ test -d $(PYTHONLIBDIR)/site-packages || install -m 755 -d $(PYTHONLIBDIR)/site-packages ++ install -m 755 avc.py $(PYTHONLIBDIR)/site-packages + + clean: + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.30.6/restorecond/restorecond.conf --- nsapolicycoreutils/restorecond/restorecond.conf 2006-03-29 11:08:21.000000000 -0500 +++ policycoreutils-1.30.6/restorecond/restorecond.conf 2006-04-14 13:50:16.000000000 -0400 diff --git a/policycoreutils.spec b/policycoreutils.spec index 72d383f..808f668 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -5,7 +5,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.30.6 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -101,6 +101,7 @@ rm -rf ${RPM_BUILD_ROOT} %config %{_sysconfdir}/pam.d/run_init %config(noreplace) %{_sysconfdir}/sestatus.conf %{_libdir}/python2.4/site-packages/seobject.py* +%{_libdir}/python2.4/site-packages/avc.py* %attr(755,root,root) /etc/rc.d/init.d/restorecond %config(noreplace) /etc/selinux/restorecond.conf @@ -108,6 +109,9 @@ rm -rf ${RPM_BUILD_ROOT} /sbin/service restorecond condrestart %changelog +* Mon Apr 18 2006 Dan Walsh 1.30.6-2 +- Ship avc.py + * Fri Apr 14 2006 Dan Walsh 1.30.6-1 - Add /etc/samba/secrets.tdb to restorecond.conf - Update from upstream