From 5ba4edc96c74a9418e9793760131ae95aa1b00ca Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Fri, 2 Oct 2009 12:49:35 +0000
Subject: [PATCH] * Fri Oct 2 2009 Dan Walsh <dwalsh@redhat.com> 2.0.74-8 -
 More template fixes

---
 policycoreutils-gui.patch | 19 +++++--------------
 policycoreutils.spec      |  5 ++++-
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/policycoreutils-gui.patch b/policycoreutils-gui.patch
index 9063b2e..d8dcbd0 100644
--- a/policycoreutils-gui.patch
+++ b/policycoreutils-gui.patch
@@ -12251,8 +12251,8 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.74/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/executable.py	2009-10-01 12:03:05.000000000 -0400
-@@ -0,0 +1,368 @@
++++ policycoreutils-2.0.74/gui/templates/executable.py	2009-10-02 08:46:53.000000000 -0400
+@@ -0,0 +1,359 @@
 +# Copyright (C) 2007-2009 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -12374,20 +12374,11 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable
 +"""
 +
 +te_userapp_rules="""
-+########################################
-+#
-+# TEMPLATETYPE local policy
-+#
-+
-+## internal communication is often done using fifo and unix sockets.
-+allow TEMPLATETYPE_t self:fifo_file rw_file_perms;
++allow TEMPLATETYPE_t self:fifo_file manage_file_file_perms;
 +allow TEMPLATETYPE_t self:unix_stream_socket create_stream_socket_perms;
 +
 +files_read_etc_files(TEMPLATETYPE_t)
 +
-+libs_use_ld_so(TEMPLATETYPE_t)
-+libs_use_shared_libs(TEMPLATETYPE_t)
-+
 +miscfiles_read_localization(TEMPLATETYPE_t)
 +"""
 +
@@ -12515,9 +12506,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable
 +              type TEMPLATETYPE_t;
 +	')
 +
-+	role $2 types TEMPLATETYPE_t;
++	role $1 types TEMPLATETYPE_t;
 +
-+	TEMPLATETYPE_domtrans($1)
++	TEMPLATETYPE_domtrans($2)
 +
 +	ps_process_pattern($2, TEMPLATETYPE_t)
 +	allow $2 TEMPLATETYPE_t:process signal;
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 8741ca2..743b79d 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.74
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -296,6 +296,9 @@ fi
 exit 0
 
 %changelog
+* Fri Oct 2 2009 Dan Walsh <dwalsh@redhat.com> 2.0.74-8
+- More template fixes
+
 * Thu Oct 1 2009 Dan Walsh <dwalsh@redhat.com> 2.0.74-7
 - Fixes Templates