rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.184, 1.185 policycoreutils.spec, 1.261, 1.262
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Apr 20 16:05:52 UTC 2006
Author: dwalsh
Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31432
Modified Files:
policycoreutils-rhat.patch policycoreutils.spec
Log Message:
* Thu Apr 20 2006 Dan Walsh <dwalsh at redhat.com> 1.30.6-3
- Fix check for "msg"
policycoreutils-rhat.patch:
audit2allow/Makefile | 4
audit2allow/audit2allow | 474 ++-------------------------------------
audit2allow/audit2allow.1 | 5
audit2allow/avc.py | 519 +++++++++++++++++++++++++++++++++++++++++++
restorecond/restorecond.conf | 2
semanage/semanage | 2
semanage/seobject.py | 14 -
setsebool/setsebool.8 | 2
8 files changed, 579 insertions(+), 443 deletions(-)
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- policycoreutils-rhat.patch 18 Apr 2006 20:53:54 -0000 1.184
+++ policycoreutils-rhat.patch 20 Apr 2006 16:05:33 -0000 1.185
@@ -1,6 +1,6 @@
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30.6/audit2allow/audit2allow
--- nsapolicycoreutils/audit2allow/audit2allow 2006-03-29 15:35:22.000000000 -0500
-+++ policycoreutils-1.30.6/audit2allow/audit2allow 2006-04-14 15:07:36.000000000 -0400
++++ policycoreutils-1.30.6/audit2allow/audit2allow 2006-04-20 09:47:19.000000000 -0400
@@ -24,431 +24,8 @@
# 02111-1307 USA
#
@@ -483,7 +483,13 @@
usage()
input=open("/var/log/messages", "r")
auditlogs=1
-@@ -551,9 +131,8 @@
+@@ -547,13 +127,14 @@
+ module=a
+ outfile=a+".te"
+ buildPP=1
++ if not os.path.exists("/usr/bin/checkmodule"):
++ errorExit("-M Requires the checkmodule command, you need to install the checkpolicy rpm package")
+ output=open(outfile, "w")
if o == "-r" or o == "--requires":
requires=1
if o == "-t" or o == "--tefile":
@@ -495,7 +501,7 @@
if o == "-R" or o == "--reference":
ref_ind=True
-@@ -565,25 +144,38 @@
+@@ -565,25 +146,38 @@
if o == "-v" or o == "--verbose":
verbose=1
@@ -541,7 +547,7 @@
cmd="checkmodule %s -m -o %s.mod %s.te" % (get_mls_flag(), module, module)
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-1.30.6/audit2allow/audit2allow.1
--- nsapolicycoreutils/audit2allow/audit2allow.1 2006-03-10 09:48:04.000000000 -0500
-+++ policycoreutils-1.30.6/audit2allow/audit2allow.1 2006-04-14 13:50:16.000000000 -0400
++++ policycoreutils-1.30.6/audit2allow/audit2allow.1 2006-04-20 09:47:19.000000000 -0400
@@ -98,6 +98,11 @@
.PP
.SH EXAMPLE
@@ -556,8 +562,8 @@
$ cat /var/log/audit/audit.log | audit2allow >> domains/misc/local.te
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/avc.py policycoreutils-1.30.6/audit2allow/avc.py
--- nsapolicycoreutils/audit2allow/avc.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.30.6/audit2allow/avc.py 2006-04-14 15:46:22.000000000 -0400
-@@ -0,0 +1,518 @@
++++ policycoreutils-1.30.6/audit2allow/avc.py 2006-04-20 11:53:56.000000000 -0400
+@@ -0,0 +1,519 @@
+#! /usr/bin/env python
+# Copyright (C) 2006 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -909,10 +915,10 @@
+ found=1
+ else:
+ dict.append(i)
-+ if found:
-+ self.translate(dict)
-+ found=0
-+ dict=[]
++ if found:
++ self.translate(dict)
++ found=0
++ dict=[]
+ line = input.readline()
+
+
@@ -988,10 +994,11 @@
+ key=("allow", scontext.type, tcontext.type, AVC["tclass"])
+ if key not in self.seRules.keys():
+ self.seRules[key]=serule(key)
-+ if "name" not in AVC.keys():
-+ AVC["name"]=""
-+ if "comm" not in AVC.keys():
-+ AVC["comm"]=""
++
++ avckeys=AVC.keys()
++ for i in ( "name", "comm", "msg" ):
++ if i not in avckeys:
++ AVC[i]=""
+
+ self.add_avc(AVC)
+ self.seRules[key].add((AVC["access"], AVC["msg"], AVC["comm"], AVC["name"]))
@@ -1078,7 +1085,7 @@
+
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
++++ policycoreutils-1.30.6/audit2allow/Makefile 2006-04-20 09:47:19.000000000 -0400
@@ -3,6 +3,8 @@
BINDIR ?= $(PREFIX)/bin
MANDIR ?= $(PREFIX)/share/man
@@ -1099,7 +1106,7 @@
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
++++ policycoreutils-1.30.6/restorecond/restorecond.conf 2006-04-20 09:47:19.000000000 -0400
@@ -1,4 +1,6 @@
/etc/resolv.conf
+/etc/samba/secrets.tdb
@@ -1109,7 +1116,7 @@
+~/.mozilla/plugins/libflashplayer.so
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.30.6/semanage/semanage
--- nsapolicycoreutils/semanage/semanage 2006-04-14 13:10:51.000000000 -0400
-+++ policycoreutils-1.30.6/semanage/semanage 2006-04-14 13:50:16.000000000 -0400
++++ policycoreutils-1.30.6/semanage/semanage 2006-04-20 09:47:19.000000000 -0400
@@ -292,6 +292,8 @@
errorExit("Options Error " + error.msg)
except ValueError, error:
@@ -1121,7 +1128,7 @@
except KeyboardInterrupt, error:
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.30.6/semanage/seobject.py
--- nsapolicycoreutils/semanage/seobject.py 2006-04-14 13:10:51.000000000 -0400
-+++ policycoreutils-1.30.6/semanage/seobject.py 2006-04-14 13:52:19.000000000 -0400
++++ policycoreutils-1.30.6/semanage/seobject.py 2006-04-20 09:47:19.000000000 -0400
@@ -455,6 +455,8 @@
semanage_user_free(u)
@@ -1161,7 +1168,7 @@
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setsebool/setsebool.8 policycoreutils-1.30.6/setsebool/setsebool.8
--- nsapolicycoreutils/setsebool/setsebool.8 2005-11-04 15:37:49.000000000 -0500
-+++ policycoreutils-1.30.6/setsebool/setsebool.8 2006-04-14 13:50:16.000000000 -0400
++++ policycoreutils-1.30.6/setsebool/setsebool.8 2006-04-20 09:47:19.000000000 -0400
@@ -17,7 +17,7 @@
are not changed.
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- policycoreutils.spec 18 Apr 2006 20:53:54 -0000 1.261
+++ policycoreutils.spec 20 Apr 2006 16:05:35 -0000 1.262
@@ -5,7 +5,7 @@
Summary: SELinux policy core utilities.
Name: policycoreutils
Version: 1.30.6
-Release: 2
+Release: 3
License: GPL
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -106,10 +106,13 @@
%config(noreplace) /etc/selinux/restorecond.conf
%post
-/sbin/service restorecond condrestart
+[ -x /sbin/service ] && /sbin/service restorecond condrestart
%changelog
-* Mon Apr 18 2006 Dan Walsh <dwalsh at redhat.com> 1.30.6-2
+* Thu Apr 20 2006 Dan Walsh <dwalsh at redhat.com> 1.30.6-3
+- Fix check for "msg"
+
+* Mon Apr 17 2006 Dan Walsh <dwalsh at redhat.com> 1.30.6-2
- Ship avc.py
* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 1.30.6-1
More information about the fedora-cvs-commits
mailing list