[nfs-utils/f16] rpc.idmap: Hide global symbols from libidmap plugins (bz 797332)

[Steve Dickson]

commit 052d21809c078b2e6569bee6b6b7729ecc90897b
Author: Steve Dickson <steved at redhat.com>
Date:   Fri Mar 16 10:55:24 2012 -0400

    rpc.idmap: Hide global symbols from libidmap plugins (bz 797332)
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

 nfs-utils-1.2.5-libidmap-hide-syms.patch |   26 ++++++++++++++++++++++++++
 nfs-utils.spec                           |    5 ++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/nfs-utils-1.2.5-libidmap-hide-syms.patch b/nfs-utils-1.2.5-libidmap-hide-syms.patch
new file mode 100644
index 0000000..15a5272
--- /dev/null
+++ b/nfs-utils-1.2.5-libidmap-hide-syms.patch
@@ -0,0 +1,26 @@
+commit 3ce15aeaa66a2f523c6fa92bfe818734bdedfcea
+Author: Noah Friedman <friedman at splode.com>
+Date:   Thu Mar 15 12:52:50 2012 -0400
+
+    rpc.idmap: Hide global symbols from libidmap plugins
+    
+    This patch limits the visibility of the symbols in the nfs-utils
+    conffile.c so that they are only visible to programs linked directly to
+    it.  This forces the objects dynamically loaded via libnfsidmap to use
+    the functions defined in that shared library instead.
+    
+    Signed-off-by: Steve Dickson <steved at redhat.com>
+
+diff --git a/support/nfs/conffile.c b/support/nfs/conffile.c
+index 2f1e235..5015e94 100644
+--- a/support/nfs/conffile.c
++++ b/support/nfs/conffile.c
+@@ -49,6 +49,8 @@
+ #include "conffile.h"
+ #include "xlog.h"
+ 
++#pragma GCC visibility push(hidden)
++
+ static void conf_load_defaults(void);
+ static int conf_set(int , char *, char *, char *, 
+ 	char *, int , int );
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 5771b08..1ebbbdf 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -29,6 +29,7 @@ Source52: nfs-server.postconfig
 %define nfs_configs %{SOURCE50} %{SOURCE51} %{SOURCE52} 
 
 Patch001: nfs-utils-1.2.6-rc3.patch
+Patch002: nfs-utils-1.2.5-libidmap-hide-syms.patch
 
 Patch100: nfs-utils-1.2.1-statdpath-man.patch
 Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@@ -85,6 +86,7 @@ This package also contains the mount.nfs and umount.nfs program.
 %setup -q
 
 %patch001 -p1
+%patch002 -p1
 
 %patch100 -p1
 %patch101 -p1
@@ -273,8 +275,9 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
-* Thu Mar 15 2012 Steve Dickson <steved at redhat.com> 1.2.5-5
+* Fri Mar 16 2012 Steve Dickson <steved at redhat.com> 1.2.5-5
 - Make sure statd is start before NFS mounts (bz 786050)
+- rpc.idmap: Hide global symbols from libidmap plugins (bz 797332)
 
 * Mon Jan 16 2012 Steve Dickson <steved at redhat.com> 1.2.5-4
 - Reworked how the nfsd service requires the rpcbind service (bz 768550)