[libselinux] Revert Eric Paris Patch for selinux_binary_policy_path

[Daniel J Walsh]

commit 852ea731d68425f68c629cbccc741acfb7b77b58
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Fri Jul 13 15:38:11 2012 -0400

    Revert Eric Paris Patch for selinux_binary_policy_path

 libselinux-rhat.patch |   31 +++++++++++--------------------
 libselinux.spec       |    5 ++++-
 2 files changed, 15 insertions(+), 21 deletions(-)
---
diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch
index 7f5eddb..3424edd 100644
--- a/libselinux-rhat.patch
+++ b/libselinux-rhat.patch
@@ -15,7 +15,7 @@ index 8263f32..9ef10fc 100644
  /*
   * Label operations
 diff --git a/libselinux/include/selinux/selinux.h b/libselinux/include/selinux/selinux.h
-index 6f483c9..84efe28 100644
+index 6f483c9..9a5509e 100644
 --- a/libselinux/include/selinux/selinux.h
 +++ b/libselinux/include/selinux/selinux.h
 @@ -139,7 +139,10 @@ struct av_decision {
@@ -61,9 +61,8 @@ index 6f483c9..84efe28 100644
  
  /* These functions return the paths to specific files under the 
     policy root directory. */
--extern const char *selinux_binary_policy_path(void);
 +extern const char *selinux_current_policy_path(void);
-+extern char *selinux_binary_policy_path(void);
+ extern const char *selinux_binary_policy_path(void);
 +extern char *selinux_binary_policy_path_min_max(int min, int *max);
  extern const char *selinux_failsafe_context_path(void);
  extern const char *selinux_removable_context_path(void);
@@ -814,7 +813,7 @@ index 2d7369e..eb292f2 100644
  	free(tmp_path);
  	return rc;
 diff --git a/libselinux/src/selinux_config.c b/libselinux/src/selinux_config.c
-index f42cb7c..908fdfc 100644
+index f42cb7c..cb65666 100644
 --- a/libselinux/src/selinux_config.c
 +++ b/libselinux/src/selinux_config.c
 @@ -9,6 +9,7 @@
@@ -836,13 +835,10 @@ index f42cb7c..908fdfc 100644
  
  /* Part of one-time lazy init */
  static pthread_once_t once = PTHREAD_ONCE_INIT;
-@@ -294,13 +297,63 @@ const char *selinux_removable_context_path(void)
+@@ -294,13 +297,57 @@ const char *selinux_removable_context_path(void)
  
  hidden_def(selinux_removable_context_path)
  
--const char *selinux_binary_policy_path(void)
--{
--	return get_path(BINPOLICY);
 +char *selinux_binary_policy_path_min_max(int min, int *max)
 +{
 +	int ret;
@@ -862,19 +858,14 @@ index f42cb7c..908fdfc 100644
 +err:
 +	free(path);
 +	return NULL;
- }
++}
 +hidden_def(selinux_binary_policy_path_min_max)
 +
-+char *selinux_binary_policy_path(void)
-+{
-+	int max;
-+
-+	max = security_policyvers();
-+	if (max < 0)
-+		return NULL;
- 
-+	return selinux_binary_policy_path_min_max(0, &max);
-+}
+ const char *selinux_binary_policy_path(void)
+ {
+ 	return get_path(BINPOLICY);
+ }
+-
  hidden_def(selinux_binary_policy_path)
  
 +const char *selinux_current_policy_path(void)
@@ -903,7 +894,7 @@ index f42cb7c..908fdfc 100644
  const char *selinux_file_context_path(void)
  {
  	return get_path(FILE_CONTEXTS);
-@@ -418,6 +471,19 @@ const char *selinux_virtual_image_context_path(void)
+@@ -418,6 +465,19 @@ const char *selinux_virtual_image_context_path(void)
  
  hidden_def(selinux_virtual_image_context_path)
  
diff --git a/libselinux.spec b/libselinux.spec
index 1360d16..38eec7f 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -8,7 +8,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.1.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: %{name}-%{version}.tgz
@@ -233,6 +233,9 @@ rm -rf %{buildroot}
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Fri Jul 13 2012 Dan Walsh <dwalsh at redhat.com> - 2.1.11-2
+- Revert Eric Paris Patch for selinux_binary_policy_path
+
 * Wed Jul 4 2012 Dan Walsh <dwalsh at redhat.com> - 2.1.11-1
 - Update to upstream 
 	* Fortify source now requires all code to be compiled with -O flag