From 69181ce9f3e56816a39d5c954bf011f236a7160d Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Feb 18 2009 21:54:40 +0000
Subject: - Latest update from NSA

Fix alias field in module format, caused by boundary format change from
    Caleb Case.

---

diff --git a/.cvsignore b/.cvsignore
index f2a7a31..475cf1b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -68,3 +68,6 @@ checkpolicy-2.0.13.tgz
 checkpolicy-2.0.14.tgz
 checkpolicy-2.0.15.tgz
 checkpolicy-2.0.16.tgz
+checkpolicy-2.0.17.tgz
+checkpolicy-2.0.18.tgz
+checkpolicy-2.0.19.tgz
diff --git a/checkpolicy-rhat.patch b/checkpolicy-rhat.patch
index a2d0115..13ff43c 100644
--- a/checkpolicy-rhat.patch
+++ b/checkpolicy-rhat.patch
@@ -1,23 +1,13 @@
---- checkpolicy/policy_parse.y	2008-05-05 14:45:13 UTC (rev 2877)
-+++ checkpolicy/policy_parse.y	2008-05-05 15:12:17 UTC (rev 2878)
-@@ -723,6 +723,7 @@
-                         ;
- version_identifier      : VERSION_IDENTIFIER
-                         { if (insert_id(yytext,0)) return -1; }
-+                        | ipv4_addr_def /* version can look like ipv4 address */
-                         ;
- avrules_block           : avrule_decls avrule_user_defs
-                         ;
-
-
-This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
-
--------------------------------------------------------------------------
-This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
-Don't miss this year's exciting event. There's still time to save $100. 
-Use priority code J8TL2D2. 
-http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
-_______________________________________________
-Selinux-commits mailing list
-Selinux-commits@lists.sourceforge.net
-https://lists.sourceforge.net/lists/listinfo/selinux-commits
+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.spec b/checkpolicy.spec
index fad7700..2ee774d 100644
--- a/checkpolicy.spec
+++ b/checkpolicy.spec
@@ -1,11 +1,12 @@
-%define libsepolver 2.0.32-1
+%define libsepolver 2.0.35-1
 Summary: SELinux policy compiler
 Name: checkpolicy
-Version: 2.0.16
-Release: 3%{?dist}
+Version: 2.0.19
+Release: 1%{?dist}
 License: GPLv2
 Group: Development/System
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
+Patch: checkpolicy-rhat.patch
 
 BuildRoot: %{_tmppath}/%{name}-buildroot
 BuildRequires: byacc bison flex libsepol-static >= %{libsepolver} libselinux-devel
@@ -26,6 +27,7 @@ Only required for building policies.
 
 %prep
 %setup -q
+%patch -p1 -b .rhat
 
 %build
 make clean
@@ -53,6 +55,18 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/sedispol
 
 %changelog
+* Wed Feb 18 2009 Dan Walsh <dwalsh@redhat.com> - 2.0.19-1
+- Latest update from NSA
+	* Fix alias field in module format, caused by boundary format change
+	  from Caleb Case.
+
+* Fri Jan 30 2009 Dan Walsh <dwalsh@redhat.com> - 2.0.18-1
+- Latest update from NSA
+	* Properly escape regex symbols in the lexer from Stephen Smalley.
+	* Add bounds support from KaiGai Kohei.
+
+* Tue Oct 28 2008 Dan Walsh <dwalsh@redhat.com> - 2.0.16-4
+
 * Mon Jul 7 2008 Dan Walsh <dwalsh@redhat.com> - 2.0.16-3
 - Rebuild with new libsepol
 
diff --git a/sources b/sources
index 76d79cf..fe56b5a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f80b657be256d01dd3f1c0e42301cbd4  checkpolicy-2.0.16.tgz
+7f6b0a4cb49e62f0eb1fef28e1da117e  checkpolicy-2.0.19.tgz