From c2b28e3158d3ab86c94b99c264608e3f719747ae Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Tue, 13 Sep 2005 21:21:50 +0000
Subject: [PATCH] - Go back to original libsetrans code

---
 libselinux-rhat.patch | 19 -------------------
 libselinux.spec       |  7 +++++--
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch
index 8fba2d7..5905c9c 100644
--- a/libselinux-rhat.patch
+++ b/libselinux-rhat.patch
@@ -14,7 +14,6 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h lib
    selinux_policy_root reads the /etc/selinux/config file and returns 
    the directory path under which the compiled policy file and context 
    configuration files exist.
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/init.c libselinux-1.26/src/init.c
 --- nsalibselinux/src/init.c	2005-09-01 13:21:11.000000000 -0400
 +++ libselinux-1.26/src/init.c	2005-09-12 17:13:20.000000000 -0400
 @@ -8,6 +8,7 @@
@@ -25,23 +24,6 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/init.c libselinux-1.26/sr
  
  #include "dso.h"
  #include "policy.h"
-@@ -85,9 +86,14 @@
- static void init_translations(void)
- {
- #ifdef SHARED
-+	char *path[PATH_MAX];
-+	char *type=NULL;
- 	int (*lib_trans_init)(void) = NULL;
--
--	translation_lib_handle = dlopen("libsetrans.so.0", RTLD_NOW);
-+	selinux_getpolicytype(&type);
-+	if (!type) return;
-+	snprintf(path, PATH_MAX-1, "/$LIB/selinux/%s/libsetrans.so.0", type);
-+	free(type);
-+	translation_lib_handle = dlopen(path, RTLD_NOW);
- 	if (!translation_lib_handle)
- 		return;
- 
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-1.26/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2005-08-24 09:07:11.000000000 -0400
 +++ libselinux-1.26/src/matchpathcon.c	2005-09-12 17:05:37.000000000 -0400
@@ -124,7 +106,6 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux
  					goto finish;
  			}
  
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_config.c libselinux-1.26/src/selinux_config.c
 --- nsalibselinux/src/selinux_config.c	2005-03-17 14:56:21.000000000 -0500
 +++ libselinux-1.26/src/selinux_config.c	2005-09-13 12:46:22.682193000 -0400
 @@ -85,6 +85,29 @@
diff --git a/libselinux.spec b/libselinux.spec
index e907d4b..41c8411 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -1,11 +1,11 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 1.26
-Release: 2
+Release: 4
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
-Prereq: libsetrans >= 0.1.4-3
+Prereq: libsetrans 
 Patch: libselinux-rhat.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
@@ -86,6 +86,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/*
 
 %changelog
+* Tue Sep 12 2005 Dan Walsh <dwalsh@redhat.com> 1.26-3
+- Go back to original libsetrans code
+
 * Mon Sep 12 2005 Dan Walsh <dwalsh@redhat.com> 1.26-2
 - Eliminate forth param from mls context when mls is not enabled.