[policycoreutils] Allow filename transitions to use + in a file name

[Daniel J Walsh]

commit 186fd9068cdcf7ce26741a5fd3c84fd376def7fc
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Tue Apr 3 18:58:26 2012 -0400

    Allow filename transitions to use + in a file name

 policycoreutils-sepolgen.patch |   13 +++++++++++++
 policycoreutils.spec           |    9 ++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)
---
diff --git a/policycoreutils-sepolgen.patch b/policycoreutils-sepolgen.patch
index fa82054..57fd46e 100644
--- a/policycoreutils-sepolgen.patch
+++ b/policycoreutils-sepolgen.patch
@@ -70,3 +70,16 @@ index 4882999..9dc2d32 100644
                                      types.append(i)
                              if len(types) == 1:
                                  rule.comment += "#!!!! The source type '%s' can write to a '%s' of the following type:\n# %s\n" % ( av.src_type, av.obj_class, ", ".join(types))
+diff --git a/sepolgen/src/sepolgen/refparser.py b/sepolgen/src/sepolgen/refparser.py
+index 9a79340..a4adbd8 100644
+--- a/sepolgen/src/sepolgen/refparser.py
++++ b/sepolgen/src/sepolgen/refparser.py
+@@ -245,7 +245,7 @@ def t_refpolicywarn(t):
+     t.lexer.lineno += 1
+ 
+ def t_IDENTIFIER(t):
+-    r'[a-zA-Z_\$\"][a-zA-Z0-9_\-\.\$\*\"~]*'
++    r'[a-zA-Z_\$\"][a-zA-Z0-9_\-\+\.\$\*\"~]*'
+     # Handle any keywords
+     t.type = reserved.get(t.value,'IDENTIFIER')
+     return t
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 3c3bb1f..06249e6 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -7,7 +7,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.1.11
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group:	 System Environment/Base
 # Based on git repository with tag 20101221
@@ -342,8 +342,11 @@ fi
 %{_bindir}/systemctl try-restart restorecond.service >/dev/null 2>&1 || :
 
 %changelog
-* Fri Mar 29 2012 Dan Walsh <dwalsh at redhat.com> - 2.1.11-2
-- Change policycoreutils-python to require -devel package
+* Tue Apr 3 2012 Dan Walsh <dwalsh at redhat.com> - 2.1.11-3
+- Allow filename transitions to use + in a file name
+
+* Fri Mar 30 2012 Dan Walsh <dwalsh at redhat.com> - 2.1.11-2
+- Change policycoreutils-python to require selinux-policy-devel package
 
 * Thu Mar 29 2012 Dan Walsh <dwalsh at redhat.com> - 2.1.11-1
 - Update to upstream