From b609a6d466ceb6aec7993e7deb96cf2c4990d999 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Tue, 30 Aug 2005 14:22:49 +0000
Subject: [PATCH] - Update from NSA Merged errno fix from Joshua Brindle
 (Tresys). Merged fix for semod_build_modules_list leak on error path from
 Serge     Hallyn (IBM). Bug found by Coverity. Merged several fixes from
 Serge Hallyn (IBM). Bugs found by Coverity. Fixed several other bugs and
 warnings. Merged patch to move module read/write code from libsemanage to
 libsepol     from Jason Tang (Tresys). Merged relay records patch from Ivan
 Gyurdiev. Merged key extract patch from Ivan Gyurdiev.

---
 .cvsignore             |  1 +
 libsemanage-rhat.patch | 11 +++++------
 libsemanage.spec       | 23 ++++-------------------
 sources                |  2 +-
 4 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index a97d000..f17d28c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 libsemanage-1.0.tgz
+libsemanage-1.1.4.tgz
diff --git a/libsemanage-rhat.patch b/libsemanage-rhat.patch
index e81b3d3..3ae2fad 100644
--- a/libsemanage-rhat.patch
+++ b/libsemanage-rhat.patch
@@ -1,5 +1,5 @@
---- libsemanage-1.1.4/src/semod.conf~	2005-08-30 09:24:00.000000000 -0400
-+++ libsemanage-1.1.4/src/semod.conf	2005-08-30 09:47:12.000000000 -0400
+--- libsemanage-1.1.4/src/semod.conf.rhat	2005-08-30 09:24:00.000000000 -0400
++++ libsemanage-1.1.4/src/semod.conf	2005-08-30 10:22:33.000000000 -0400
 @@ -16,10 +16,10 @@
  #  License along with this library; if not, write to the Free Software
  #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -22,8 +22,8 @@
  # by calling the setfiles utility.  As above, "$@" will be replaced
  # with the policy filename.  In addition "$<" will be replaced with
  # the file contexts filename.
---- libsemanage-1.1.4/src/Makefile~	2005-08-30 09:24:00.000000000 -0400
-+++ libsemanage-1.1.4/src/Makefile	2005-08-30 09:39:56.000000000 -0400
+--- libsemanage-1.1.4/src/Makefile.rhat	2005-08-30 09:24:00.000000000 -0400
++++ libsemanage-1.1.4/src/Makefile	2005-08-30 10:23:09.000000000 -0400
 @@ -4,7 +4,7 @@
  SHLIBDIR ?= $(DESTDIR)/lib
  INCLUDEDIR ?= $(PREFIX)/include
@@ -33,12 +33,11 @@
  
  LEX = flex
  LFLAGS = -s
-@@ -40,7 +40,7 @@
+@@ -40,7 +40,6 @@
  install: all
  	test -d $(LIBDIR) || install -m 755 -d $(LIBDIR)
  	install -m 644 $(LIBA) $(LIBDIR)
 -	install -m 644 -D semod.conf $(DEFAULT_SEMOD_CONF_LOCATION)
-+	install -m 644 -D semod.conf $(DESTDIR)/$(DEFAULT_SEMOD_CONF_LOCATION)
  
  clean: 
  	rm -f $(OBJS) $(LIBA) conf-scan.c conf-parse.c conf-parse.h
diff --git a/libsemanage.spec b/libsemanage.spec
index 637af43..f84dfc7 100644
--- a/libsemanage.spec
+++ b/libsemanage.spec
@@ -1,14 +1,12 @@
 Summary: SELinux binary policy manipulation library 
-Name: libsemanage
+Name: libsemanage-devel
 Version: 1.1.4
 Release: 1
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
 Patch: libsemanage-rhat.patch
-Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-buildroot
-Provides: libsemanage.so
 
 %description
 Security-enhanced Linux is a patch of the Linux® kernel and a number
@@ -26,17 +24,12 @@ It is used by checkpolicy (the policy compiler) and similar tools, as well
 as by programs like load_policy that need to perform specific transformations
 on binary policies such as customizing policy boolean settings.
 
-%package devel
-Summary: Header files and libraries used to build policy manipulation tools
-Group: Development/Libraries
-Requires: libsemanage = %{version}
-
-%description devel
+%description
 The semanage-devel package contains the static libraries and header files
 needed for developing applications that manipulate binary policies. 
 
 %prep
-%setup -q
+%setup -q -n libsemanage-%{version}
 %patch  -p1 -b .rhat
 
 %build
@@ -51,19 +44,11 @@ make DESTDIR="${RPM_BUILD_ROOT}" LIBDIR="${RPM_BUILD_ROOT}%{_libdir}" SHLIBDIR="
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files devel
+%files
 %defattr(-,root,root)
 %{_libdir}/libsemanage.a
 %{_includedir}/semanage/*.h
 
-%files
-%defattr(-,root,root)
-%config(noreplace) /etc/selinux/semod.conf
-
 %changelog
 * Thu Jul 7 2005 Dan Walsh <dwalsh@redhat.com> 1.0-1
 - Update from NSA
diff --git a/sources b/sources
index 6a63a08..0a65d18 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3ed4c2b4ed85eb00b1e7670ecdb8ca3c  libsemanage-1.0.tgz
+8b23484ef885b373eeb517c2b0db038c  libsemanage-1.1.4.tgz