-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
This patch looks good to me. acked.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAk9x4D4ACgkQrlYvE4MpobMjZACgkTYCLy91++YluozukiLMCRTL
lR4AnjSYeHkyLZtt0Y+zWuds8QOWX5Zc
=9Eui
-----END PGP SIGNATURE-----
>From 70edfd3330981ff39afd27272de0076b49c5f417 Mon Sep 17 00:00:00 2001
From: Laurent Bigonville <bigon@xxxxxxxxxx>
Date: Mon, 26 Mar 2012 20:45:49 +0200
Subject: [PATCH 72/73] libselinux -- Hide unnecessarily-exported library
destructors
Hi,
Description: Hide unnecessarily-exported library destructors
This change was extracted from the old monolithic Debian patch. I have not
been able to find an explanation for why it is needed, but it should be
forwarded upstream for review.
.
Author: Unknown
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
---
libselinux/src/matchpathcon.c | 2 +-
libselinux/src/setrans_client.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libselinux/src/matchpathcon.c b/libselinux/src/matchpathcon.c
index ca87bd2..c18ea47 100644
--- a/libselinux/src/matchpathcon.c
+++ b/libselinux/src/matchpathcon.c
@@ -295,7 +295,7 @@ static void matchpathcon_thread_destructor(void __attribute__((unused)) *ptr)
void __attribute__((destructor)) matchpathcon_lib_destructor(void);
-void __attribute__((destructor)) matchpathcon_lib_destructor(void)
+void hidden __attribute__((destructor)) matchpathcon_lib_destructor(void)
{
if (destructor_key_initialized)
__selinux_key_delete(destructor_key);
diff --git a/libselinux/src/setrans_client.c b/libselinux/src/setrans_client.c
index 9432f49..502e9db 100644
--- a/libselinux/src/setrans_client.c
+++ b/libselinux/src/setrans_client.c
@@ -255,7 +255,7 @@ static void setrans_thread_destructor(void __attribute__((unused)) *unused)
void __attribute__((destructor)) setrans_lib_destructor(void);
-void __attribute__((destructor)) setrans_lib_destructor(void)
+void hidden __attribute__((destructor)) setrans_lib_destructor(void)
{
if (destructor_key_initialized)
__selinux_key_delete(destructor_key);
--
1.7.9.3
