[policycoreutils] Additional patch from Miroslav to handle role attributes

[Daniel J Walsh]

commit 06ab21ffa76ccfaf1319957c04bf4a29f3c22c0e
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Wed Jan 9 12:08:37 2013 -0500

    Additional patch from Miroslav to handle role attributes

 policycoreutils-sepolgen.patch |    4 ++--
 policycoreutils.spec           |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/policycoreutils-sepolgen.patch b/policycoreutils-sepolgen.patch
index 41aaa9f..0204d5d 100644
--- a/policycoreutils-sepolgen.patch
+++ b/policycoreutils-sepolgen.patch
@@ -13,7 +13,7 @@ index 73c60f6..d636091 100644
      output = subprocess.Popen(["/sbin/ausearch", "-m", "AVC,USER_AVC,MAC_POLICY_LOAD,DAEMON_START,SELINUX_ERR", "-ts", bootdate, boottime],
                                stdout=subprocess.PIPE).communicate()[0]
 diff --git a/sepolgen/src/sepolgen/refparser.py b/sepolgen/src/sepolgen/refparser.py
-index a4adbd8..6a3019c 100644
+index a4adbd8..7b76261 100644
 --- a/sepolgen/src/sepolgen/refparser.py
 +++ b/sepolgen/src/sepolgen/refparser.py
 @@ -91,8 +91,10 @@ tokens = (
@@ -79,7 +79,7 @@ index a4adbd8..6a3019c 100644
      p[0] = t
  
 +def p_roleattribute_def(p):
-+    '''typeattribute_def : ROLEATTRIBUTE IDENTIFIER comma_list SEMI'''
++    '''roleattribute_def : ROLEATTRIBUTE IDENTIFIER comma_list SEMI'''
 +    t = refpolicy.RoleAttribute()
 +    t.role = p[2]
 +    t.roleattributes.update(p[3])
diff --git a/policycoreutils.spec b/policycoreutils.spec
index c6eaa05..fda5e61 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -7,7 +7,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.1.13
-Release: 53%{?dist}
+Release: 54%{?dist}
 License: GPLv2
 Group:	 System Environment/Base
 # Based on git repository with tag 20101221
@@ -338,6 +338,9 @@ The policycoreutils-restorecond package contains the restorecond service.
 %{_bindir}/systemctl try-restart restorecond.service >/dev/null 2>&1 || :
 
 %changelog
+* Wed Jan 9 2013 Dan Walsh <dwalsh at redhat.com> - 2.1.12-54
+- Additional patch from Miroslav to handle role attributes
+
 * Wed Jan 9 2013 Dan Walsh <dwalsh at redhat.com> - 2.1.12-53
 - Update with Miroslav patch to handle role attributes
 - Update Translations