rpms/checkpolicy
6
0
Fork 0
Code Issues Pull Requests Releases Activity

":" should be allowed for file trans names

Browse Source
This commit is contained in:
Dan Walsh 2013-03-19 10:48:10 -04:00
parent 7a5e44fa80
commit 6bfe32f6aa
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
checkpolicy-rhat.patch
View File

@ -1,5 +1,5 @@
diff --git a/checkpolicy/policy_scan.l b/checkpolicy/policy_scan.l 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 --- a/checkpolicy/policy_scan.l
+++ b/checkpolicy/policy_scan.l +++ b/checkpolicy/policy_scan.l
@@ -240,7 +240,7 @@ HIGH { return(HIGH); } @@ -240,7 +240,7 @@ HIGH { return(HIGH); }
@ -7,7 +7,7 @@ index bba7667..f82c93b 100644
LOW { return(LOW); } LOW { return(LOW); }
"/"({alnum}|[_\.\-/])* { return(PATH); } "/"({alnum}|[_\.\-/])* { return(PATH); }
-\"({alnum}|[_\.\-\+\~])+\" { return(FILENAME); } -\"({alnum}|[_\.\-\+\~])+\" { return(FILENAME); }
+\"({alnum}|[_\.\-\+\~ ])+\" { return(FILENAME); } +\"({alnum}|[_\.\-\+\~\: ])+\" { return(FILENAME); }
{letter}({alnum}|[_\-])*([\.]?({alnum}|[_\-]))* { return(IDENTIFIER); } {letter}({alnum}|[_\-])*([\.]?({alnum}|[_\-]))* { return(IDENTIFIER); }
{alnum}*{letter}{alnum}* { return(FILESYSTEM); } {alnum}*{letter}{alnum}* { return(FILESYSTEM); }
{digit}+|0x{hexval}+ { return(NUMBER); } {digit}+|0x{hexval}+ { return(NUMBER); }

5
checkpolicy.spec
View File

@ -3,7 +3,7 @@
Summary: SELinux policy compiler Summary: SELinux policy compiler
Name: checkpolicy Name: checkpolicy
Version: 2.1.12 Version: 2.1.12
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2 License: GPLv2
Group: Development/System Group: Development/System
Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@ -56,6 +56,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_bindir}/sedispol %{_bindir}/sedispol
%changelog %changelog
* Tue Mar 18 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.12-3
- ":" should be allowed for file trans names
* Tue Mar 12 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.12-2 * Tue Mar 12 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.12-2
- Space should be allowed for file trans names - Space should be allowed for file trans names