From 1f935e2ec727df0660af833b7bab9065e34a0511 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Aug 12 2005 02:46:49 +0000
Subject: - Update from NSA

Merged several fixes for error handling paths in the AVC sidtab,
    matchpathcon, booleans, context, and get_context_list code from Serge
    Hallyn (IBM). Bugs found by Coverity.
Removed setupns; migrated to pam.
Merged patches to rename checkPasswdAccess() from Joshua Brindle. Original
    symbol is temporarily retained for compatibility until all callers are
    updated.

---

diff --git a/.cvsignore b/.cvsignore
index 4e1a6bb..5935bb2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -39,3 +39,4 @@ libselinux-1.23.10.tgz
 libselinux-1.23.11.tgz
 libselinux-1.24.1.tgz
 libselinux-1.24.2.tgz
+libselinux-1.25.2.tgz
diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch
index 82d9f02..c6be2d9 100644
--- a/libselinux-rhat.patch
+++ b/libselinux-rhat.patch
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxenabled.8 libselinux-1.24.1/man/man8/selinuxenabled.8
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxenabled.8 libselinux-1.24.2/man/man8/selinuxenabled.8
 --- nsalibselinux/man/man8/selinuxenabled.8	2004-11-02 14:26:19.000000000 -0500
-+++ libselinux-1.24.1/man/man8/selinuxenabled.8	2005-07-18 15:13:13.000000000 -0400
++++ libselinux-1.24.2/man/man8/selinuxenabled.8	2005-08-05 09:47:55.000000000 -0400
 @@ -7,7 +7,7 @@
  .SH "DESCRIPTION"
  .B selinuxenabled
@@ -10,4 +10,3 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxenabled.8 lib
  
  .SH AUTHOR	
  Dan Walsh, <dwalsh@redhat.com>
- 
diff --git a/libselinux.spec b/libselinux.spec
index 5436a5e..31b1ce9 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -1,6 +1,6 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 1.24.2
+Version: 1.25.2
 Release: 1
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
@@ -85,6 +85,16 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/*
 
 %changelog
+* Thu Aug 11 2005 Dan Walsh <dwalsh@redhat.com> 1.25.2-1
+- Update from NSA
+	* Merged several fixes for error handling paths in the
+	  AVC sidtab, matchpathcon, booleans, context, and get_context_list
+	  code from Serge Hallyn (IBM).   Bugs found by Coverity.
+	* Removed setupns; migrated to pam.
+	* Merged patches to rename checkPasswdAccess() from Joshua Brindle.
+	  Original symbol is temporarily retained for compatibility until 
+	  all callers are updated.
+
 * Mon Jul 18 2005 Dan Walsh <dwalsh@redhat.com> 1.24.2-1
 - Update makefiles
 
diff --git a/sources b/sources
index 6f3ccab..bd64f4a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-c3a827ad8f38eaefb82478cf80a641d7  libselinux-1.24.1.tgz
-c3d9ac9aded7cb2ec4be16be11d59049  libselinux-1.24.2.tgz
+5f639f125d663ed859d91c570472f3e5  libselinux-1.25.2.tgz