From 194a87a8e384c7de54e54de412888a048d5740240b4035f83acc28a96be7d789 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 7 Nov 2013 10:18:30 +0000 Subject: [PATCH] Accepting request 205367 from home:posophe:branches:security:SELinux - Update to version 2.2 * Fix hyphen usage in man pages * handle-unknown / -U required argument fix * Support overriding Makefile PATH and LIBDIR * Support space and : in filenames - Remove checkpolicy-rhat.patch; fixed on upstream OBS-URL: https://build.opensuse.org/request/show/205367 OBS-URL: https://build.opensuse.org/package/show/security:SELinux/checkpolicy?expand=0&rev=25 --- checkpolicy-2.1.12.tar.gz | 3 --- checkpolicy-2.2.tar.gz | 3 +++ checkpolicy-rhat.patch | 11 ----------- checkpolicy.changes | 10 ++++++++++ checkpolicy.spec | 8 +++----- 5 files changed, 16 insertions(+), 19 deletions(-) delete mode 100644 checkpolicy-2.1.12.tar.gz create mode 100644 checkpolicy-2.2.tar.gz delete mode 100644 checkpolicy-rhat.patch diff --git a/checkpolicy-2.1.12.tar.gz b/checkpolicy-2.1.12.tar.gz deleted file mode 100644 index 9f2f253..0000000 --- a/checkpolicy-2.1.12.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e6a0ac539b74859b4262b317eb90d9914deb15e7aa509659f47724d50fe2ecc6 -size 64354 diff --git a/checkpolicy-2.2.tar.gz b/checkpolicy-2.2.tar.gz new file mode 100644 index 0000000..3137501 --- /dev/null +++ b/checkpolicy-2.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ff6698f4d4cb59c9c916e348187d533ada4107f90c253ef7304905934e9adf8 +size 64458 diff --git a/checkpolicy-rhat.patch b/checkpolicy-rhat.patch deleted file mode 100644 index de668dd..0000000 --- a/checkpolicy-rhat.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- checkpolicy/policy_scan.l -+++ checkpolicy/policy_scan.l -@@ -240,7 +240,7 @@ HIGH { return(HIGH); } - low | - LOW { return(LOW); } - "/"({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.changes b/checkpolicy.changes index feb3c32..65682a5 100644 --- a/checkpolicy.changes +++ b/checkpolicy.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Oct 31 13:41:13 UTC 2013 - p.drouand@gmail.com + +- Update to version 2.2 + * Fix hyphen usage in man pages + * handle-unknown / -U required argument fix + * Support overriding Makefile PATH and LIBDIR + * Support space and : in filenames +- Remove checkpolicy-rhat.patch; fixed on upstream + ------------------------------------------------------------------- Thu Jun 27 14:29:19 UTC 2013 - vcizek@suse.com diff --git a/checkpolicy.spec b/checkpolicy.spec index c549502..6521a43 100644 --- a/checkpolicy.spec +++ b/checkpolicy.spec @@ -16,21 +16,20 @@ # -%define libsepol_ver 2.1.9 +%define libsepol_ver 2.2 BuildRequires: bison BuildRequires: flex-old BuildRequires: libselinux-devel BuildRequires: libsepol-devel-static >= %{libsepol_ver} Name: checkpolicy -Version: 2.1.12 +Version: 2.2 Release: 0 Url: http://userspace.selinuxproject.org/ Summary: SELinux policy compiler License: GPL-2.0+ Group: Productivity/Security -Source: http://userspace.selinuxproject.org/releases/20130423/%{name}-%{version}.tar.gz -Patch0: %{name}-rhat.patch +Source: http://userspace.selinuxproject.org/releases/20131030/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -51,7 +50,6 @@ required for building policies. %prep %setup -q -%patch0 -p1 %build make clean