diff --git a/checkpolicy-2.1.11.tar.gz b/checkpolicy-2.1.11.tar.gz deleted file mode 100644 index a385277..0000000 --- a/checkpolicy-2.1.11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06acbc776134464d133669de82b7f7c7ebca376c307a3a3478544a42c5d050f1 -size 64151 diff --git a/checkpolicy-2.1.12.tgz b/checkpolicy-2.1.12.tgz new file mode 100644 index 0000000..dc206a9 --- /dev/null +++ b/checkpolicy-2.1.12.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26bb4506f8d50376d18f5c4a22681fe94bad0b573ea743bb51a4d022284ebe9e +size 65586 diff --git a/checkpolicy-rhat.patch b/checkpolicy-rhat.patch index 4539542..de668dd 100644 --- a/checkpolicy-rhat.patch +++ b/checkpolicy-rhat.patch @@ -1,13 +1,11 @@ -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"); +--- 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 fd25482..1086d93 100644 --- a/checkpolicy.changes +++ b/checkpolicy.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Mar 29 13:10:16 UTC 2013 - vcizek@suse.com + +- update to 2.1.12 + * Fix errors found by coverity + * implement default type policy syntax + * Free allocated memory when clean up / exit. +- changes in checkpolicy-rhat.patch: + * original hunk was merged upstream + * space should be allowed for file trans names + ------------------------------------------------------------------- Wed Jan 30 11:40:10 UTC 2013 - vcizek@suse.com diff --git a/checkpolicy.spec b/checkpolicy.spec index a231cf5..f529f6d 100644 --- a/checkpolicy.spec +++ b/checkpolicy.spec @@ -16,20 +16,21 @@ # -%define libsepol_ver 2.1.8 +%define libsepol_ver 2.1.9 BuildRequires: bison BuildRequires: flex-old BuildRequires: libselinux-devel BuildRequires: libsepol-devel-static >= %{libsepol_ver} Name: checkpolicy -Version: 2.1.11 +Version: 2.1.12 Release: 0 Url: http://userspace.selinuxproject.org/ Summary: SELinux policy compiler License: GPL-2.0+ Group: Productivity/Security -Source: http://userspace.selinuxproject.org/releases/20120216/%{name}-%{version}.tar.gz +#Source: http://userspace.selinuxproject.org/releases/20120216/%{name}-%{version}.tgz +Source: http://pkgs.fedoraproject.org/lookaside/pkgs/checkpolicy/%{name}-%{version}.tgz Patch0: %{name}-rhat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build