Fix excessive library dependencies

Make sure we only link with kerberos llibraries if kerberos features
are enabled. Otherwise we produce a binaruy that requires unused
libraries, which is a liability when we try to use it on a system
where they are not installed.

3 files changed, 53 insertions, 3 deletions

diff --git a/databases/nss_ldap/Makefile b/databases/nss_ldap/Makefile
index 601cc4cc644..50addbebbb9 100644
--- a/databases/nss_ldap/Makefile
+++ b/databases/nss_ldap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2016/03/05 11:28:12 jperkin Exp $
+# $NetBSD: Makefile,v 1.31 2016/04/22 15:04:24 manu Exp $
 
 DISTNAME=	nss_ldap-265
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	databases
 MASTER_SITES=	http://www.padl.com/download/
 
diff --git a/databases/nss_ldap/distinfo b/databases/nss_ldap/distinfo
index 75b64f772b2..808e8f22036 100644
--- a/databases/nss_ldap/distinfo
+++ b/databases/nss_ldap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 01:56:15 agc Exp $
+$NetBSD: distinfo,v 1.10 2016/04/22 15:04:24 manu Exp $
 
 SHA1 (nss_ldap-265.tar.gz) = 743581914fc8c9b4d33955c2cc7acd0c3c44a430
 RMD160 (nss_ldap-265.tar.gz) = 0513f1b62aface531145f739ec8e9867c77eb3ce
@@ -7,5 +7,6 @@ Size (nss_ldap-265.tar.gz) = 280976 bytes
 SHA1 (patch-ab) = 418fca750b9b6f40dd3a904af84fababf8c55022
 SHA1 (patch-af) = 7a09ee93a903dc7df256a50d9e904b74e6e5747f
 SHA1 (patch-ag) = 4fa04f6b577b7c5a6977403dae3e91a3faab4152
+SHA1 (patch-configure.in) = 45d86bcaae5ca27ad1ab5a8816720c40982f85c4
 SHA1 (patch-ldap-ethers.c) = 0e4e27e4f03e7e8a821aaddabb91c443f5d1db22
 SHA1 (patch-ldap-pwd.c) = 5d4720aaa88e2e7b46d1c1cde9648466b82598e1
diff --git a/databases/nss_ldap/patches/patch-configure.in b/databases/nss_ldap/patches/patch-configure.in
new file mode 100644
index 00000000000..0b02ceb7b7a
--- /dev/null
+++ b/databases/nss_ldap/patches/patch-configure.in
@@ -0,0 +1,49 @@
+$NetBSD: patch-configure.in,v 1.1 2016/04/22 15:04:24 manu Exp $
+
+Fix excessive library dependencies
+
+Make sure we only link with kerberos llibraries if kerberos features
+are enabled. Otherwise we produce a binaruy that requires unused
+libraries, which is a liability when we try to use it on a system
+where they are not installed.
+
+Submitted upstream as https://github.com/PADL/nss_ldap/pull/4
+
+--- configure.in.orig	2016-04-20 18:26:12.000000000 +0000
++++ configure.in	2016-04-21 04:11:19.000000000 +0000
+@@ -288,20 +288,24 @@
+ 
+ AC_CHECK_LIB(dl, dlopen,[LIBS="-ldl $LIBS"],,$LIBS)
+ dnl AC_CHECK_LIB(db, main,[LIBS="-ldb $LIBS"],,$LIBS)
+ 
+-AC_CHECK_LIB(gssapi, gss_krb5_ccache_name,[LIBS="-lgssapi $LIBS" found_gssapi_lib=yes],,$LIBS)
+-if test -z "$found_gssapi_lib"; then
+-  AC_CHECK_LIB(gssapi_krb5, gss_krb5_ccache_name,[LIBS="-lgssapi_krb5 $LIBS"],,$LIBS)
++if test "x$enable_configurable_krb5_ccname_env" = "xyes" -o \
++        "x$enable_configurable_krb5_ccname_gssapi" = "xyes" -o \
++        "x$enable_configurable_krb5_keytab" = "xyes" ; then
++  AC_CHECK_LIB(gssapi, gss_krb5_ccache_name,[LIBS="-lgssapi $LIBS" found_gssapi_lib=yes],,$LIBS)
++  if test -z "$found_gssapi_lib"; then
++    AC_CHECK_LIB(gssapi_krb5, gss_krb5_ccache_name,[LIBS="-lgssapi_krb5 $LIBS"],,$LIBS)
++  fi
++  
++  dnl Following checks probably not strictly necessary.
++  dnl AC_CHECK_LIB(crypto, main,[LIBS="-lcrypto $LIBS"],,$LIBS)
++  dnl AC_CHECK_LIB(ssl, main,[LIBS="-lssl $LIBS"],,$LIBS) 
++  AC_CHECK_LIB(com_err, main,[LIBS="-lcom_err $LIBS"],,$LIBS)
++  dnl AC_CHECK_LIB(k5crypto, main,[LIBS="-lk5crypto $LIBS"],,$LIBS)
++  AC_CHECK_LIB(krb5, main,[LIBS="-lkrb5 $LIBS"],,$LIBS)
++  dnl AC_CHECK_LIB(krb4, main,[LIBS="-lkrb4 $LIBS"],,$LIBS)
+ fi
+-
+-dnl Following checks probably not strictly necessary.
+-dnl AC_CHECK_LIB(crypto, main,[LIBS="-lcrypto $LIBS"],,$LIBS)
+-dnl AC_CHECK_LIB(ssl, main,[LIBS="-lssl $LIBS"],,$LIBS)
+-AC_CHECK_LIB(com_err, main,[LIBS="-lcom_err $LIBS"],,$LIBS)
+-dnl AC_CHECK_LIB(k5crypto, main,[LIBS="-lk5crypto $LIBS"],,$LIBS)
+-AC_CHECK_LIB(krb5, main,[LIBS="-lkrb5 $LIBS"],,$LIBS)
+-dnl AC_CHECK_LIB(krb4, main,[LIBS="-lkrb4 $LIBS"],,$LIBS)
+ AC_CHECK_LIB(sasl2, sasl_client_init)
+ 
+ if test -z "$found_ldap_lib" -a \( $with_ldap_lib = auto -o $with_ldap_lib = umich -o $with_ldap_lib = openldap \); then
+   AC_CHECK_LIB(lber, main)