[policycoreutils/f17] * Tue Jul 3 2012 Miroslav Grepl <mgrepl at redhat.com> - 2.1.11-19.2 - Fix polgen templates to get the

[Miroslav Grepl]

commit 235c664466e4ff21af7c9871cf54fa27d77bf174
Author: Miroslav Grepl <mgrepl at redhat.com>
Date:   Tue Jul 3 16:23:43 2012 +0200

    * Tue Jul 3 2012 Miroslav Grepl <mgrepl at redhat.com> - 2.1.11-19.2
    - Fix polgen templates to get the correct interface description

 policycoreutils-templates.patch |   31 +++++++++++++++++++++++++++++++
 policycoreutils.spec            |    7 ++++++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/policycoreutils-templates.patch b/policycoreutils-templates.patch
new file mode 100644
index 0000000..90b722b
--- /dev/null
+++ b/policycoreutils-templates.patch
@@ -0,0 +1,31 @@
+--- policycoreutils-2.1.11/gui/templates/executable.py~	2012-07-03 14:59:45.654659236 +0200
++++ policycoreutils-2.1.11/gui/templates/executable.py	2012-07-03 15:02:44.226663311 +0200
+@@ -212,7 +212,7 @@
+ 
+ ########################################
+ ## <summary>
+-##	Transition to TEMPLATETYPE.
++##	Execute TEMPLATETYPE in the TEMPLATETYPE domain.
+ ## </summary>
+ ## <param name=\"domain\">
+ ## <summary>
+@@ -423,7 +423,7 @@
+ 	allow $2 system_r;
+ """
+ 
+-if_end_admin="""\
++if_end_admin="""
+ 	optional_policy(`
+ 		systemd_passwd_agent_exec($1)
+ 		systemd_read_fifo_file_passwd_run($1)
+--- policycoreutils-2.1.11/gui/templates/unit_file.py~	2012-07-03 15:03:15.089664014 +0200
++++ policycoreutils-2.1.11/gui/templates/unit_file.py	2012-07-03 15:03:50.931664833 +0200
+@@ -48,7 +48,7 @@
+ 	')
+ 
+ 	systemd_exec_systemctl($1)
+-        systemd_read_fifo_file_password_run($1)
++	systemd_read_fifo_file_password_run($1)
+ 	allow $1 TEMPLATETYPE_unit_file_t:file read_file_perms;
+ 	allow $1 TEMPLATETYPE_unit_file_t:service manage_service_perms;
+ 
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 714a96b..4fe5613 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -7,7 +7,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.1.11
-Release: 19.1%{?dist}
+Release: 19.2%{?dist}
 License: GPLv2
 Group:	 System Environment/Base
 # Based on git repository with tag 20101221
@@ -25,6 +25,7 @@ Source10: restorecond.service
 Patch:	 policycoreutils-rhat.patch
 Patch4:	 policycoreutils-sepolgen.patch
 Patch5:	 policycoreutils-semanage.patch
+Patch6:	 policycoreutils-templates.patch
 Obsoletes: policycoreutils < 2.0.61-2
 Conflicts: filesystem < 3
 Provides: /sbin/fixfiles
@@ -67,6 +68,7 @@ context.
 %patch -p2 -b .rhat
 %patch4 -p2 -b .sepolgen -d sepolgen-%{sepolgenver}
 %patch5 -p1
+%patch6 -p1
 
 %build
 make LSPP_PRIV=y SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fPIE" LDFLAGS="-pie -Wl,-z,relro" all 
@@ -342,6 +344,9 @@ fi
 %{_bindir}/systemctl try-restart restorecond.service >/dev/null 2>&1 || :
 
 %changelog
+* Tue Jul 3 2012 Miroslav Grepl <mgrepl at redhat.com> - 2.1.11-19.2
+- Fix polgen templates to get the correct interface description
+
 * Fri Jun 29 2012 Miroslav Grepl <mgrepl at redhat.com> - 2.1.11-19.1
 - Fix semanage and handling of reload variable