[policycoreutils/f17] Fix sepolgen handling of unit files.
Daniel J Walsh
dwalsh at fedoraproject.org
Wed Mar 21 14:28:03 UTC 2012
commit 354dee2a71e5888ff2440c3866a5406c640f50fd
Author: Dan Walsh <dwalsh at redhat.com>
Date: Wed Mar 21 10:27:58 2012 -0400
Fix sepolgen handling of unit files.
policycoreutils-gui.patch | 10 ++++++----
policycoreutils.spec | 5 ++++-
2 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/policycoreutils-gui.patch b/policycoreutils-gui.patch
index ce83c3b..aadbe82 100644
--- a/policycoreutils-gui.patch
+++ b/policycoreutils-gui.patch
@@ -13262,8 +13262,8 @@ diff -up policycoreutils-2.1.10/gui/templates/tmp.py.gui policycoreutils-2.1.10/
+"""
diff -up policycoreutils-2.1.10/gui/templates/unit_file.py.gui policycoreutils-2.1.10/gui/templates/unit_file.py
--- policycoreutils-2.1.10/gui/templates/unit_file.py.gui 2012-02-01 08:40:34.000000000 -0500
-+++ policycoreutils-2.1.10/gui/templates/unit_file.py 2012-03-08 10:20:11.249956943 -0500
-@@ -0,0 +1,70 @@
++++ policycoreutils-2.1.10/gui/templates/unit_file.py 2012-03-21 10:26:36.038417308 -0400
+@@ -0,0 +1,72 @@
+# Copyright (C) 2012 Red Hat
+# see file 'COPYING' for use and warranty information
+#
@@ -13316,7 +13316,7 @@ diff -up policycoreutils-2.1.10/gui/templates/unit_file.py.gui policycoreutils-2
+ systemd_exec_systemctl($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 all_service_perms;
++ allow $1 TEMPLATETYPE_unit_file_t:service manage_service_perms;
+
+ ps_process_pattern($1, TEMPLATETYPE_t)
+')
@@ -13324,10 +13324,12 @@ diff -up policycoreutils-2.1.10/gui/templates/unit_file.py.gui policycoreutils-2
+"""
+
+if_admin_types="""
-+ type TEMPLATETYPE_unit_file_t;"""
++ type TEMPLATETYPE_unit_file_t;"""
+
+if_admin_rules="""
+ TEMPLATETYPE_systemctl($1)
++ admin_pattern($1, TEMPLATETYPE_unit_file_t)
++ allow $1 TEMPLATETYPE_unit_file_t:service all_service_perms;
+"""
+
+########################### File Context ##################################
diff --git a/policycoreutils.spec b/policycoreutils.spec
index a6ebf8b..c20b918 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -7,7 +7,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.1.10
-Release: 28%{?dist}
+Release: 29%{?dist}
License: GPLv2
Group: System Environment/Base
# Based on git repository with tag 20101221
@@ -343,6 +343,9 @@ fi
%{_bindir}/systemctl try-restart restorecond.service >/dev/null 2>&1 || :
%changelog
+* Wed Mar 21 2012 Dan Walsh <dwalsh at redhat.com> - 2.1.10-29
+- Fix sepolgen handling of unit files.
+
* Thu Mar 8 2012 Dan Walsh <dwalsh at redhat.com> - 2.1.10-28
- Require selinux-policy-doc
More information about the scm-commits
mailing list