- fix openldap-smbk5pwd so that it links with -ldes on NetBSD

  (otherwise Undefined PLT symbol "des_set_odd_parity")
- make sure OpenLDAP links with pkgsrc's libfetch as base libfetch
  may be linked with a different OpenSSL than OpenLDAP.

4 files changed, 10 insertions, 7 deletions

diff --git a/databases/openldap-smbk5pwd/Makefile b/databases/openldap-smbk5pwd/Makefile
index 9a7c88dda5b..15430b7119c 100644
--- a/databases/openldap-smbk5pwd/Makefile
+++ b/databases/openldap-smbk5pwd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/03/08 05:01:03 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2012/09/28 12:28:53 manu Exp $
 
 PKGNAME=	${DISTNAME:S/-/-smbk5pwd-/}
 COMMENT=	Samba and Kerberos password sync for OpenLDAP
@@ -35,7 +35,7 @@ LIBS+=		-lkrb5 -lkadm5srv
 CPPFLAGS+=	-DDO_SAMBA
 .endif
 
-MAKE_ENV+=	LIBS=${LIBS:M*:Q}
+MAKE_ENV+=	EXTRA_LIBS=${LIBS:M*:Q}
 
 .include "../../databases/openldap/Makefile.common"
 .include "../../databases/openldap-client/buildlink3.mk"
diff --git a/databases/openldap/Makefile.common b/databases/openldap/Makefile.common
index 46353392767..38088c53153 100644
--- a/databases/openldap/Makefile.common
+++ b/databases/openldap/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2012/08/06 13:33:38 adam Exp $
+# $NetBSD: Makefile.common,v 1.33 2012/09/28 12:28:53 manu Exp $
 #
 # used by databases/openldap-client/Makefile
 # used by databases/openldap-cloak/Makefile
@@ -87,6 +87,9 @@ DB_CONFIG?=		# empty
 
 PTHREAD_OPTS+=		require
 
+# This avoids linking with base libfetch.so, which depends on base OpenSSL.
+# causing crashes when openldap-client is linked with pkgsrc OpenSSL.
+.include "../../net/libfetch/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index 611bbbb0f1a..0d3685f6bb7 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.86 2012/08/06 13:33:38 adam Exp $
+$NetBSD: distinfo,v 1.87 2012/09/28 12:28:53 manu Exp $
 
 SHA1 (openldap-2.4.32.tgz) = 294d5e9711bcb6850188ed895eeb986d43b62664
 RMD160 (openldap-2.4.32.tgz) = 5d5cfa9c9bb798a1655c2fc30ac4483f4fb04e95
@@ -13,7 +13,7 @@ SHA1 (patch-am) = fb8f3e7699f8b2ef55c066cdc6216522c101c7f3
 SHA1 (patch-an) = 3e904d05a3e69930259329ca821d3bbf7dd54eb2
 SHA1 (patch-ao) = 4fcbbfd4d6be792392e3646123022aeaf25923e3
 SHA1 (patch-contrib_slapd-modules_nops_slapo-nops.5) = f32352f19361b7e9aa5b038ae8578def7c08fa47
-SHA1 (patch-da) = 39f51d21b06d03ffc9d83fd39e88f5b6af1d4f60
+SHA1 (patch-da) = 49c267f09ba7d1a3290bb0b6b273e85296962c0d
 SHA1 (patch-dd) = 9c74118ff0b2232bda729c9917082fceef41dd16
 SHA1 (patch-de) = be3833817205483b62cf3216b27f53a951621198
 SHA1 (patch-libraries_libmdb_mdb.c) = 2ba3d25dfb1aa6b5e81eed77a46ad58aa74733b5
diff --git a/databases/openldap/patches/patch-da b/databases/openldap/patches/patch-da
index 74c3507af15..55ddc63992d 100644
--- a/databases/openldap/patches/patch-da
+++ b/databases/openldap/patches/patch-da
@@ -1,4 +1,4 @@
-$NetBSD: patch-da,v 1.5 2012/03/13 19:57:11 adam Exp $
+$NetBSD: patch-da,v 1.6 2012/09/28 12:28:53 manu Exp $
 
 --- contrib/slapd-modules/smbk5pwd/Makefile.orig	2012-02-29 17:37:09.000000000 +0000
 +++ contrib/slapd-modules/smbk5pwd/Makefile
@@ -23,7 +23,7 @@ $NetBSD: patch-da,v 1.5 2012/03/13 19:57:11 adam Exp $
  SSL_LIB=-lcrypto
  LDAP_LIB=-lldap_r -llber
 -LIBS=$(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB)
-+LIBS=$(LDAP_LIB) $(SSL_LIB)
++LIBS=$(LDAP_LIB) $(SSL_LIB) ${EXTRA_LIBS}
  
  prefix=/usr/local
  exec_prefix=$(prefix)