[checkpolicy/f18] ":" should be allowed for file trans names

Daniel J Walsh dwalsh at fedoraproject.org
Wed Mar 20 01:10:28 UTC 2013


commit ce269b9102b4aa6f7f82fb689ad5309bbb483e4e
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Tue Mar 19 21:10:24 2013 -0400

    ":" should be allowed for file trans names

 checkpolicy-rhat.patch |    4 ++--
 checkpolicy.spec       |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/checkpolicy-rhat.patch b/checkpolicy-rhat.patch
index 2b1116b..0d673e9 100644
--- a/checkpolicy-rhat.patch
+++ b/checkpolicy-rhat.patch
@@ -1,5 +1,5 @@
 diff --git a/checkpolicy/policy_scan.l b/checkpolicy/policy_scan.l
-index bba7667..f82c93b 100644
+index bba7667..ab046cc 100644
 --- a/checkpolicy/policy_scan.l
 +++ b/checkpolicy/policy_scan.l
 @@ -240,7 +240,7 @@ HIGH				{ return(HIGH); }
@@ -7,7 +7,7 @@ index bba7667..f82c93b 100644
  LOW				{ return(LOW); }
  "/"({alnum}|[_\.\-/])*	        { return(PATH); }
 -\"({alnum}|[_\.\-\+\~])+\"	{ return(FILENAME); }
-+\"({alnum}|[_\.\-\+\~ ])+\"	{ return(FILENAME); }
++\"({alnum}|[_\.\-\+\~\: ])+\"	{ return(FILENAME); }
  {letter}({alnum}|[_\-])*([\.]?({alnum}|[_\-]))*	{ return(IDENTIFIER); }
  {alnum}*{letter}{alnum}*        { return(FILESYSTEM); }
  {digit}+|0x{hexval}+            { return(NUMBER); }
diff --git a/checkpolicy.spec b/checkpolicy.spec
index 22dfbae..967fe7b 100644
--- a/checkpolicy.spec
+++ b/checkpolicy.spec
@@ -3,7 +3,7 @@
 Summary: SELinux policy compiler
 Name: checkpolicy
 Version: 2.1.12
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Development/System
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -58,6 +58,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/sedispol
 
 %changelog
+* Tue Mar 19 2013 Dan Walsh <dwalsh at redhat.com> - 2.1.12-3
+- ":" should be allowed for file trans names
+
 * Tue Mar 12 2013 Dan Walsh <dwalsh at redhat.com> - 2.1.12-2
 - Space should be allowed for file trans names
 


More information about the scm-commits mailing list