From 54939fac9aa8682b3b8044b6e36894bdecf99974 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Oct 25 2005 22:03:43 +0000
Subject: - Add selinux_translations_path


---

diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch
index 0a34354..5b26a4b 100644
--- a/libselinux-rhat.patch
+++ b/libselinux-rhat.patch
@@ -1,15 +1,62 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/get_default_context_with_level.3 libselinux-1.27.10/man/man3/get_default_context_with_level.3
---- nsalibselinux/man/man3/get_default_context_with_level.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-1.27.10/man/man3/get_default_context_with_level.3	2005-10-17 13:58:54.000000000 -0400
-@@ -0,0 +1 @@
-+.so man3/get_ordered_context_list.3
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/get_default_context_with_rolelevel.3 libselinux-1.27.10/man/man3/get_default_context_with_rolelevel.3
---- nsalibselinux/man/man3/get_default_context_with_rolelevel.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-1.27.10/man/man3/get_default_context_with_rolelevel.3	2005-10-17 13:58:41.000000000 -0400
-@@ -0,0 +1 @@
-+.so man3/get_ordered_context_list.3
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/get_ordered_context_list_with_level.3 libselinux-1.27.10/man/man3/get_ordered_context_list_with_level.3
---- nsalibselinux/man/man3/get_ordered_context_list_with_level.3	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-1.27.10/man/man3/get_ordered_context_list_with_level.3	2005-10-17 13:59:03.000000000 -0400
-@@ -0,0 +1 @@
-+.so man3/get_ordered_context_list.3
+diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h libselinux-1.27.14/include/selinux/selinux.h
+--- nsalibselinux/include/selinux/selinux.h	2005-10-25 15:15:53.000000000 -0400
++++ libselinux-1.27.14/include/selinux/selinux.h	2005-10-25 17:54:34.000000000 -0400
+@@ -359,6 +359,7 @@
+ extern const char *selinux_customizable_types_path(void);
+ extern const char *selinux_users_path(void);
+ extern const char *selinux_usersconf_path(void);
++extern const char *selinux_translations_path(void);
+ extern const char *selinux_path(void);
+ 
+ /* Check a permission in the passwd class.
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/file_path_suffixes.h libselinux-1.27.14/src/file_path_suffixes.h
+--- nsalibselinux/src/file_path_suffixes.h	2005-10-25 15:15:53.000000000 -0400
++++ libselinux-1.27.14/src/file_path_suffixes.h	2005-10-25 17:53:04.000000000 -0400
+@@ -13,3 +13,4 @@
+ S_(CUSTOMIZABLE_TYPES, "/contexts/customizable_types")
+ S_(USERS_DIR, "/users/")
+ S_(SEUSERS, "/seusers")
++S_(TRANSLATIONS, "/setrans.conf")
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_config.c libselinux-1.27.14/src/selinux_config.c
+--- nsalibselinux/src/selinux_config.c	2005-10-25 15:15:53.000000000 -0400
++++ libselinux-1.27.14/src/selinux_config.c	2005-10-25 17:53:41.000000000 -0400
+@@ -32,7 +32,8 @@
+ #define CUSTOMIZABLE_TYPES    11
+ #define USERS_DIR         12
+ #define SEUSERS           13
+-#define NEL               14
++#define TRANSLATIONS      14
++#define NEL               15
+ 
+ /* New layout is relative to SELINUXDIR/policytype. */
+ static char *file_paths[NEL];
+@@ -303,10 +304,16 @@
+ const char *selinux_users_path() {
+   return get_path(USERS_DIR);
+ }
++hidden_def(selinux_users_path)
++
+ const char *selinux_usersconf_path() {
+   return get_path(SEUSERS);
+ }
+-
+-hidden_def(selinux_users_path)
+ hidden_def(selinux_usersconf_path)
+ 
++const char *selinux_translations_path() 
++{
++  return get_path(TRANSLATIONS);
++}
++hidden_def(selinux_translations_path)
++
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_internal.h libselinux-1.27.14/src/selinux_internal.h
+--- nsalibselinux/src/selinux_internal.h	2005-10-25 15:15:53.000000000 -0400
++++ libselinux-1.27.14/src/selinux_internal.h	2005-10-25 18:01:47.000000000 -0400
+@@ -60,6 +60,7 @@
+ hidden_proto(matchpathcon_init)
+ hidden_proto(selinux_users_path)
+ hidden_proto(selinux_usersconf_path);
++hidden_proto(selinux_translations_path);
+ hidden_proto(selinux_getenforcemode);
+ 
+ extern int context_translations hidden;
diff --git a/libselinux.spec b/libselinux.spec
index 1d6f175..b85e26e 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -2,10 +2,11 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 1.27.14
-Release: 1
+Release: 2
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
+Patch: libselinux-rhat.patch
 
 Prereq: libsetrans 
 Requires: libsepol >= %{libsepolver}
@@ -38,6 +39,7 @@ needed for developing SELinux applications.
 
 %prep
 %setup -q
+%patch -p1 -b .rhat
 
 %build
 make CFLAGS="-g %{optflags}"
@@ -90,6 +92,9 @@ exit 0
 %{_mandir}/man8/*
 
 %changelog
+* Tue Oct 25 2005 Dan Walsh <dwalsh@redhat.com> 1.9.24-2
+- Add selinux_translations_path
+
 * Tue Oct 25 2005 Dan Walsh <dwalsh@redhat.com> 1.9.24-1
 - Update to latest from NSA
 	* Merged selinux_path() and selinux_homedir_context_path()