From f530d30afaf593b4830caedc76f74c8f26553f09 Mon Sep 17 00:00:00 2001
From: Dan Walsh <dwalsh@redhat.com>
Date: Fri, 15 Apr 2011 14:10:50 -0400
Subject: [PATCH] Add "-" ass a file type

---
 checkpolicy-rhat.patch | 7 ++++---
 checkpolicy.spec       | 7 +++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/checkpolicy-rhat.patch b/checkpolicy-rhat.patch
index db9277b..7456318 100644
--- a/checkpolicy-rhat.patch
+++ b/checkpolicy-rhat.patch
@@ -335,18 +335,19 @@ index 8c29e2b..8274d36 100644
                          ;
  avrules_block           : avrule_decls avrule_user_defs
 diff --git a/checkpolicy/policy_scan.l b/checkpolicy/policy_scan.l
-index 48128a8..427c189 100644
+index 48128a8..1331c04 100644
 --- a/checkpolicy/policy_scan.l
 +++ b/checkpolicy/policy_scan.l
-@@ -218,9 +218,12 @@ PERMISSIVE			{ return(PERMISSIVE); }
+@@ -218,9 +218,13 @@ PERMISSIVE			{ return(PERMISSIVE); }
  "/"({alnum}|[_\.\-/])*	        { return(PATH); }
  {letter}({alnum}|[_\-])*([\.]?({alnum}|[_\-]))*	{ return(IDENTIFIER); }
  {digit}+|0x{hexval}+            { return(NUMBER); }
 +{alnum}*                        { return(FILENAME); }
++\.({alnum}|[_\.\-])*	        { return(FILENAME); }
  {digit}{1,3}(\.{digit}{1,3}){3}    { return(IPV4_ADDR); }
  {hexval}{0,4}":"{hexval}{0,4}":"({hexval}|[:.])*  { return(IPV6_ADDR); }
  {digit}+(\.({alnum}|[_.])*)?    { return(VERSION_IDENTIFIER); }
-+{alnum}+([_\.]|{alnum})+      { return(FILENAME); }
++{letter}+([-_\.]|{alnum})+      { return(FILENAME); }
 +([_\.]){alnum}+                 { return(FILENAME); }
  #line[ ]1[ ]\"[^\n]*\"		{ set_source_file(yytext+9); }
  #line[ ]{digit}+	        { source_lineno = atoi(yytext+6)-1; }
diff --git a/checkpolicy.spec b/checkpolicy.spec
index 8e63e6e..722cdde 100644
--- a/checkpolicy.spec
+++ b/checkpolicy.spec
@@ -2,7 +2,7 @@
 Summary: SELinux policy compiler
 Name: checkpolicy
 Version: 2.0.24
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Development/System
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -55,7 +55,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/sedispol
 
 %changelog
-* Tue Apr 29 2011 Dan Walsh <dwalsh@redhat.com> - 2.0.24-1
+* Fri Apr 15 2011 Dan Walsh <dwalsh@redhat.com> - 2.0.24-2
+- Add "-" ass a file type
+
+* Tue Apr 12 2011 Dan Walsh <dwalsh@redhat.com> - 2.0.24-1
 -Update to upstream
 	* Add new class field in role_transition by Harry Ciao.