From e9ff6dfd95115f96d3e37e9680e148739e611c67 Mon Sep 17 00:00:00 2001 From: Dan Walsh Date: Nov 14 2011 16:35:35 +0000 Subject: Allow ~ in a filename --- diff --git a/checkpolicy-rhat.patch b/checkpolicy-rhat.patch index f2fee6a..1b33470 100644 --- a/checkpolicy-rhat.patch +++ b/checkpolicy-rhat.patch @@ -1,3 +1,16 @@ +diff --git a/checkpolicy/policy_scan.l b/checkpolicy/policy_scan.l +index 5ee27f8..b4b9066 100644 +--- a/checkpolicy/policy_scan.l ++++ b/checkpolicy/policy_scan.l +@@ -222,7 +222,7 @@ POLICYCAP { return(POLICYCAP); } + permissive | + PERMISSIVE { return(PERMISSIVE); } + "/"({alnum}|[_\.\-/])* { return(PATH); } +-\"({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/test/Makefile b/checkpolicy/test/Makefile index 65cf901..0731e89 100644 --- a/checkpolicy/test/Makefile diff --git a/checkpolicy.spec b/checkpolicy.spec index 64343fc..a53a5c7 100644 --- a/checkpolicy.spec +++ b/checkpolicy.spec @@ -3,7 +3,7 @@ Summary: SELinux policy compiler Name: checkpolicy Version: 2.1.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Development/System Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz @@ -56,6 +56,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_bindir}/sedispol %changelog +* Mon Nov 14 2011 Dan Walsh - 2.1.6-2 +- Allow ~ in a filename + * Fri Nov 4 2011 Dan Walsh - 2.1.6-1 - Upgrade to upstream * Revert "checkpolicy: Redo filename/filesystem syntax to support filename trans rules"