[selinux-policy: 1771/3172] Fix incorrectly named files_lib_filetrans_shared_lib() interface in the libraries module.

[Daniel J Walsh]

commit 113b4fc4a24621378f608490cfdead465eeb2b76
Author: Chris PeBenito <cpebenito at tresys.com>
Date:   Thu Jun 28 17:25:46 2007 +0000

    Fix incorrectly named files_lib_filetrans_shared_lib() interface in the libraries module.

 Changelog                          |    2 ++
 policy/modules/admin/portage.te    |    4 ++--
 policy/modules/system/libraries.if |   32 +++++++++++++++++++++++++++++++-
 policy/modules/system/libraries.te |    2 +-
 4 files changed, 36 insertions(+), 4 deletions(-)
---
diff --git a/Changelog b/Changelog
index bb9f329..2322ce9 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,5 @@
+- Fix incorrectly named files_lib_filetrans_shared_lib() interface in the
+  libraries module.
 - Unified labeled networking policy from Paul Moore.
 - Use netmsg initial SID for MLS-only Netlabel packets, from Paul Moore.
 - Xen updates from Dan Walsh.
diff --git a/policy/modules/admin/portage.te b/policy/modules/admin/portage.te
index 0540613..e598786 100644
--- a/policy/modules/admin/portage.te
+++ b/policy/modules/admin/portage.te
@@ -1,5 +1,5 @@
 
-policy_module(portage,1.2.1)
+policy_module(portage,1.2.2)
 
 ########################################
 #
@@ -109,7 +109,7 @@ libs_use_shared_libs(gcc_config_t)
 libs_read_lib_files(gcc_config_t)
 libs_domtrans_ldconfig(gcc_config_t)
 libs_manage_shared_libs(gcc_config_t)
-files_lib_filetrans_shared_lib(gcc_config_t,file)
+lib_filetrans_shared_lib(gcc_config_t,file)
 # gcc-config creates a temp dir for the libs
 libs_manage_lib_dirs(gcc_config_t)
 
diff --git a/policy/modules/system/libraries.if b/policy/modules/system/libraries.if
index d6236bc..2e71bea 100644
--- a/policy/modules/system/libraries.if
+++ b/policy/modules/system/libraries.if
@@ -476,10 +476,40 @@ interface(`libs_relabel_shared_libs',`
 ##	</summary>
 ## </param>
 #
-interface(`files_lib_filetrans_shared_lib',`
+interface(`lib_filetrans_shared_lib',`
 	gen_require(`
 		type lib_t, shlib_t;
 	')
 
 	filetrans_pattern($1,lib_t,shlib_t,$2)
 ')
+
+########################################
+## <summary>
+##	Create an object in lib directories, with
+##	the shared libraries type using a type transition.  (Deprecated)
+## </summary>
+## <desc>
+##	<p>
+##	Create an object in lib directories, with
+##	the shared libraries type using a type transition.  (Deprecated)
+##	</p>
+##	<p>
+##	lib_filetrans_shared_lib() should be used instead.
+##	</p>
+## </desc>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <param name="object">
+##	<summary>
+##	The object class of the object being created.
+##	</summary>
+## </param>
+#
+interface(`files_lib_filetrans_shared_lib',`
+	refpolicywarn(`$0($*) has been deprecated, use lib_filetrans_shared_lib() instead.')
+	lib_filetrans_shared_lib($1,$2)
+')
diff --git a/policy/modules/system/libraries.te b/policy/modules/system/libraries.te
index 3f0b3a2..1230b63 100644
--- a/policy/modules/system/libraries.te
+++ b/policy/modules/system/libraries.te
@@ -1,5 +1,5 @@
 
-policy_module(libraries,1.6.2)
+policy_module(libraries,1.6.3)
 
 ########################################
 #