From ac4ffcbdd300dff21a12a49992cca397325e46decac3ea02a8f061fe10be8780 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 4 Jul 2009 07:48:08 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/checkpolicy?expand=0&rev=3 --- checkpolicy-2.0.16.tar.bz2 | 3 --- checkpolicy-2.0.19.tar.bz2 | 3 +++ checkpolicy-rhat.patch | 13 +++++++++++++ checkpolicy.changes | 14 ++++++++++++++ checkpolicy.spec | 20 +++++++++----------- 5 files changed, 39 insertions(+), 14 deletions(-) delete mode 100644 checkpolicy-2.0.16.tar.bz2 create mode 100644 checkpolicy-2.0.19.tar.bz2 create mode 100644 checkpolicy-rhat.patch diff --git a/checkpolicy-2.0.16.tar.bz2 b/checkpolicy-2.0.16.tar.bz2 deleted file mode 100644 index 1fda175..0000000 --- a/checkpolicy-2.0.16.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ee4dbe0a51738b808a8cf64153f906a28478b21ba8d0481b63e9e7a440d78fb7 -size 49380 diff --git a/checkpolicy-2.0.19.tar.bz2 b/checkpolicy-2.0.19.tar.bz2 new file mode 100644 index 0000000..e1477ff --- /dev/null +++ b/checkpolicy-2.0.19.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b25bddea9854fbdfe3ec21bb9d21ab6a6b2650862684fc6092e489b2ca315c4d +size 49315 diff --git a/checkpolicy-rhat.patch b/checkpolicy-rhat.patch new file mode 100644 index 0000000..4539542 --- /dev/null +++ b/checkpolicy-rhat.patch @@ -0,0 +1,13 @@ +diff --exclude-from=exclude -N -u -r nsacheckpolicy/module_compiler.c checkpolicy-2.0.18/module_compiler.c +--- nsacheckpolicy/module_compiler.c 2008-10-14 13:57:54.000000000 -0400 ++++ checkpolicy-2.0.18/module_compiler.c 2008-10-28 10:10:03.000000000 -0400 +@@ -904,8 +904,7 @@ + return -1; + } + case -2:{ +- yyerror("duplicate declaration of type/attribute"); +- return -1; ++ return 0; + } + case -1:{ + yyerror("could not require type/attribute here"); diff --git a/checkpolicy.changes b/checkpolicy.changes index 679f8c6..8f24ea2 100644 --- a/checkpolicy.changes +++ b/checkpolicy.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Jun 23 12:29:42 CEST 2009 - prusnak@suse.cz + +- require libsepol-devel-static + +------------------------------------------------------------------- +Wed May 27 13:52:37 CEST 2009 - prusnak@suse.cz + +- updated to 2.0.19 + * fix alias field in module format, caused by boundary format change + from Caleb Case + * properly escape regex symbols in the lexer from Stephen Smalley + * add bounds support from KaiGai Kohei + ------------------------------------------------------------------- Mon Oct 20 18:03:54 CEST 2008 - prusnak@suse.cz diff --git a/checkpolicy.spec b/checkpolicy.spec index 0052fae..a82a172 100644 --- a/checkpolicy.spec +++ b/checkpolicy.spec @@ -1,7 +1,7 @@ # -# spec file for package checkpolicy (Version 2.0.16) +# spec file for package checkpolicy (Version 2.0.19) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,19 +17,20 @@ # norootforbuild -%define libsepol_ver 2.0.32 +%define libsepol_ver 2.0.35 BuildRequires: bison flex-old -BuildRequires: libsepol-devel >= %{libsepol_ver} +BuildRequires: libsepol-devel-static >= %{libsepol_ver} BuildRequires: libselinux-devel Name: checkpolicy -Version: 2.0.16 -Release: 27 +Version: 2.0.19 +Release: 1 Url: http://www.nsa.gov/selinux/ License: GPL v2 or later Group: Productivity/Security Summary: SELinux policy compiler Source: %{name}-%{version}.tar.bz2 +Patch0: %{name}-rhat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -50,8 +51,10 @@ required for building policies. %prep %setup -q +%patch0 -p1 %build +make clean make LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" cd test make LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" @@ -76,8 +79,3 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/sedispol %changelog -* Mon Oct 20 2008 prusnak@suse.cz -- use flex-old for building (using flex does not build refpolicy) -* Tue Jul 15 2008 prusnak@suse.cz -- initial version 2.0.16 - * based on Fedora package by Dan Walsh