--- libselinux-1.17.13/include/selinux/selinux.h.rhat 2004-09-20 15:47:27.000000000 -0400 +++ libselinux-1.17.13/include/selinux/selinux.h 2004-09-22 08:04:05.071173016 -0400 @@ -197,6 +197,7 @@ policy root directory. */ extern const char *selinux_binary_policy_path(void); extern const char *selinux_failsafe_context_path(void); +extern const char *selinux_removable_context_path(void); extern const char *selinux_default_context_path(void); extern const char *selinux_user_contexts_path(void); extern const char *selinux_file_context_path(void); --- libselinux-1.17.13/src/selinux_config.c.rhat 2004-09-20 15:47:27.000000000 -0400 +++ libselinux-1.17.13/src/selinux_config.c 2004-09-22 08:04:05.074172687 -0400 @@ -25,7 +25,8 @@ #define DEFAULT_TYPE 6 #define BOOLEANS 7 #define MEDIA_CONTEXTS 8 -#define NEL 9 +#define REMOVABLE_CONTEXT 9 +#define NEL 10 /* New layout is relative to SELINUXDIR/policytype. */ static char *file_paths[NEL]; @@ -192,6 +193,11 @@ } hidden_def(selinux_failsafe_context_path) +const char *selinux_removable_context_path() { + return get_path(REMOVABLE_CONTEXT); +} +hidden_def(selinux_removable_context_path) + const char *selinux_binary_policy_path() { return get_path(BINPOLICY); } --- libselinux-1.17.13/src/dso.h.rhat 2004-09-20 15:47:27.000000000 -0400 +++ libselinux-1.17.13/src/dso.h 2004-09-22 08:04:21.655368887 -0400 @@ -7,8 +7,13 @@ # define __hidden_proto(fct, internal) \ extern __typeof (fct) internal; \ extern __typeof (fct) fct __asm (#internal) hidden; -# define hidden_def(fct) \ +# ifdef __alpha__ +# define hidden_def(fct) \ + asm (".globl " #fct "\n" #fct " = " #fct "_internal"); +# else +# define hidden_def(fct) \ asm (".globl " #fct "\n.set " #fct ", " #fct "_internal"); +#endif #else # define hidden # define hidden_proto(fct) --- libselinux-1.17.13/src/selinux_internal.h.rhat 2004-09-20 15:47:27.000000000 -0400 +++ libselinux-1.17.13/src/selinux_internal.h 2004-09-22 08:04:05.076172467 -0400 @@ -16,6 +16,7 @@ hidden_proto(security_getenforce) hidden_proto(selinux_default_context_path) hidden_proto(selinux_failsafe_context_path) +hidden_proto(selinux_removable_context_path) hidden_proto(selinux_file_context_path) hidden_proto(selinux_user_contexts_path) hidden_proto(selinux_booleans_path) --- libselinux-1.17.13/src/compat_file_path.h.rhat 2004-09-20 15:47:27.000000000 -0400 +++ libselinux-1.17.13/src/compat_file_path.h 2004-09-22 08:04:05.072172906 -0400 @@ -8,3 +8,5 @@ S_(DEFAULT_TYPE, SECURITYDIR "/default_type") S_(BOOLEANS, SECURITYDIR "/booleans") S_(MEDIA_CONTEXTS, SECURITYDIR "/default_media") +S_(REMOVABLE_CONTEXT, SECURITYDIR "/removable_context") + --- libselinux-1.17.13/src/file_path_suffixes.h.rhat 2004-09-20 15:47:27.000000000 -0400 +++ libselinux-1.17.13/src/file_path_suffixes.h 2004-09-22 08:04:05.073172796 -0400 @@ -8,3 +8,4 @@ S_(DEFAULT_TYPE, "/contexts/default_type") S_(BOOLEANS, "/booleans") S_(MEDIA_CONTEXTS, "/contexts/files/media") +S_(REMOVABLE_CONTEXT, "/contexts/removable_context")