From 6ba73950414d7b45e92a4ed425c291d10793f33e Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Wed, 9 Aug 2006 19:08:44 +0000
Subject: [PATCH] - Change netfilter stuff to be non-fatal so update can
 proceed.

---
 libsemanage-rhat.patch | 38 +++++++++++++++-----------------------
 libsemanage.spec       |  7 ++++++-
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/libsemanage-rhat.patch b/libsemanage-rhat.patch
index b186e8c..1c5e851 100644
--- a/libsemanage-rhat.patch
+++ b/libsemanage-rhat.patch
@@ -1,25 +1,17 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/conf-parse.y libsemanage-1.6.8/src/conf-parse.y
---- nsalibsemanage/src/conf-parse.y	2006-06-05 13:20:27.000000000 -0400
-+++ libsemanage-1.6.8/src/conf-parse.y	2006-06-16 13:27:59.000000000 -0400
-@@ -25,6 +25,7 @@
- #include <selinux/selinux.h>
- #include <semanage/handle.h>
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-1.6.13/src/semanage_store.c
+--- nsalibsemanage/src/semanage_store.c	2006-08-03 11:22:25.000000000 -0400
++++ libsemanage-1.6.13/src/semanage_store.c	2006-08-09 15:03:06.000000000 -0400
+@@ -1072,8 +1072,11 @@
  
-+#include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -187,7 +188,12 @@
- 	if ((conf->setfiles = calloc(1, sizeof(*(current_conf->setfiles)))) == NULL) {
- 		return -1;
- 	}
--	if ((conf->setfiles->path = strdup("/sbin/setfiles")) == NULL ||
-+	if (access("/sbin/setfiles",X_OK) == 0) {
-+		conf->setfiles->path = strdup("/sbin/setfiles");
-+	} else {
-+		conf->setfiles->path = strdup("/usr/sbin/setfiles");
-+	}
-+	if ((conf->setfiles->path == NULL) ||
- 	    (conf->setfiles->args = strdup("-q -c $@ $<")) == NULL) {
- 		return -1;
+ 	snprintf(store_nc, PATH_MAX, "%s%s", storepath, running_nc);
+ 	if (semanage_copy_file(active_nc, store_nc, sh->conf->file_mode) == -1) {
+-		ERR(sh, "Could not copy %s to %s.", active_nc, store_nc);
+-		goto cleanup;
++		INFO(sh, "Could not copy %s to %s.", active_nc, store_nc);
++		/* 
++		   ERR(sh, "Could not copy %s to %s.", active_nc, store_nc);
++		  goto cleanup;
++		*/
  	}
+ 
+ 	if (!sh->do_reload)
diff --git a/libsemanage.spec b/libsemanage.spec
index 315b5aa..a941d4f 100644
--- a/libsemanage.spec
+++ b/libsemanage.spec
@@ -3,10 +3,11 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
 Version: 1.6.13
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
+Patch: libsemanage-rhat.patch
 
 BuildRoot: %{_tmppath}/%{name}-buildroot
 BuildRequires: libselinux-devel >= %{libselinuxver} 
@@ -40,6 +41,7 @@ needed for developing applications that manipulate binary policies.
 
 %prep
 %setup -q
+%patch -p1 -b .rhat
 
 %build
 make clean
@@ -75,6 +77,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man3/*
 
 %changelog
+* Wed Aug 9 2006 Dan Walsh <dwalsh@redhat.com> - 1.6.13-2
+- Change netfilter stuff to be non-fatal so update can proceed.
+
 * Thu Aug 3 2006 Dan Walsh <dwalsh@redhat.com> - 1.6.13-1
 - Upgrade to latest from NSA
 	* Merged netfilter contexts support from Chris PeBenito.