Author: dwalsh
Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28835
Modified Files:
policycoreutils-gui.patch policycoreutils.spec
Log Message:
* Fri Aug 31 2007 Dan Walsh <dwalsh(a)redhat.com> 2.0.25-8
- Fix generated code for admin policy
policycoreutils-gui.patch:
Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- policycoreutils-gui.patch 31 Aug 2007 19:10:10 -0000 1.26
+++ policycoreutils-gui.patch 31 Aug 2007 21:17:12 -0000 1.27
@@ -8762,7 +8762,7 @@
+ app.stand_alone()
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py
policycoreutils-2.0.25/gui/templates/executable.py
--- nsapolicycoreutils/gui/templates/executable.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/executable.py 2007-08-31 15:07:36.000000000
-0400
++++ policycoreutils-2.0.25/gui/templates/executable.py 2007-08-31 15:41:21.000000000
-0400
@@ -0,0 +1,222 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -8964,12 +8964,12 @@
+"""
+
+if_initscript_admin="""
-+ # Allow $2 to restart the apache service
-+ TEMPLATETYPE_script_domtrans($2)
-+ domain_role_change_exemption($2)
-+ domain_obj_id_change_exemption($2)
-+ role_transition $1_r TEMPLATETYPE_script_exec_t system_r;
-+ allow $1_r system_r;
++ # Allow $1 to restart the apache service
++ TEMPLATETYPE_script_domtrans($1)
++ domain_role_change_exemption($1)
++ domain_obj_id_change_exemption($1)
++ role_transition $2 TEMPLATETYPE_script_exec_t system_r;
++ allow $2 system_r;
+"""
+
+if_end_admin="""
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -r1.442 -r1.443
--- policycoreutils.spec 31 Aug 2007 19:10:10 -0000 1.442
+++ policycoreutils.spec 31 Aug 2007 21:17:12 -0000 1.443
@@ -6,7 +6,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.0.25
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPLv2+
Group: System Environment/Base
Source:
http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -200,6 +200,9 @@
fi
%changelog
+* Fri Aug 31 2007 Dan Walsh <dwalsh(a)redhat.com> 2.0.25-8
+- Fix generated code for admin policy
+
* Fri Aug 31 2007 Dan Walsh <dwalsh(a)redhat.com> 2.0.25-7
- Lots of fixes for role templates