[nfs-utils] gssd: Don't link with libgssapi_krb5 (bz 784908)

[Steve Dickson]

commit f1299789649963f985d6669625e7feb301dd8c61
Author: Steve Dickson <steved at redhat.com>
Date:   Thu Mar 22 15:26:22 2012 -0400

    gssd: Don't link with libgssapi_krb5 (bz 784908)
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

 nfs-utils-1.2.5-gssd-nolibgssapi-krb5.patch |   26 ++++++++++++++++++++++++++
 nfs-utils.spec                              |    3 +++
 2 files changed, 29 insertions(+), 0 deletions(-)
---
diff --git a/nfs-utils-1.2.5-gssd-nolibgssapi-krb5.patch b/nfs-utils-1.2.5-gssd-nolibgssapi-krb5.patch
new file mode 100644
index 0000000..222396c
--- /dev/null
+++ b/nfs-utils-1.2.5-gssd-nolibgssapi-krb5.patch
@@ -0,0 +1,26 @@
+commit 880e2efecb4469573a5c2e89aee4963f29288f88
+Author: Steve Dickson <steved at redhat.com>
+Date:   Thu Jan 26 14:56:13 2012 -0500
+
+    rpc.gssd: Links directly with libgssapi_krb5 which not needed.
+    
+    rpc.gssd and rpc.svcgssd both link with the libgssapi_krb5 and
+    libgssglue libraries which is not needed since libgssglue
+    will dynamically load the gssapi interface defined in the
+    /etc/gssapi_mech.conf. Most likely the libgssapi_krb5 library.
+    
+    Signed-off-by: Steve Dickson <steved at redhat.com>
+
+diff --git a/aclocal/kerberos5.m4 b/aclocal/kerberos5.m4
+index dfa5738..7574e2d 100644
+--- a/aclocal/kerberos5.m4
++++ b/aclocal/kerberos5.m4
+@@ -31,7 +31,7 @@ AC_DEFUN([AC_KERBEROS_V5],[
+     fi
+     if test "$K5CONFIG" != ""; then
+       KRBCFLAGS=`$K5CONFIG --cflags`
+-      KRBLIBS=`$K5CONFIG --libs gssapi`
++      KRBLIBS=`$K5CONFIG --libs`
+       K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(4),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'`
+       AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number])
+       if test -f $dir/include/gssapi/gssapi_krb5.h -a \
diff --git a/nfs-utils.spec b/nfs-utils.spec
index b72e671..21c7c85 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -33,6 +33,7 @@ Patch002: nfs-utils-1.2.4-mountshortcut.patch
 Patch003: nfs-utils-1.2.5-libidmap-hide-syms.patch
 Patch004: nfs-utils-1.2.5-nfsd-new-default.patch
 Patch005: nfs-utils-1.2.5-gssd-usercreds.patch
+Patch006: nfs-utils-1.2.5-gssd-nolibgssapi-krb5.patch
 
 Patch100: nfs-utils-1.2.1-statdpath-man.patch
 Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@@ -94,6 +95,7 @@ This package also contains the mount.nfs and umount.nfs program.
 %patch003 -p1
 %patch004 -p1
 %patch005 -p1
+%patch006 -p1
 
 %patch100 -p1
 %patch101 -p1
@@ -285,6 +287,7 @@ fi
 %changelog
 * Thu Mar 22 2012 Steve Dickson <steved at redhat.com> 1.2.5-14
 - gssd: Look for user creds in user defined directory (bz 786993)
+- gssd: Don't link with libgssapi_krb5 (bz 784908)
 
 * Fri Mar 16 2012 Steve Dickson <steved at redhat.com> 1.2.5-13
 - Make sure statd is start before NFS mounts (bz 786050)