From 6f76c925ac01febdcfc294931f2826a48beb3c53 Mon Sep 17 00:00:00 2001
From: Oliver Eikemeier <eik@FreeBSD.org>
Date: Tue, 30 Nov 2004 14:27:00 +0000
Subject: update to OpenLDAP 2.2.19: - Fixed back-bdb cache bugs (OpenLDAP
 ITS#3356, #3358), ctxcsn memory leak - Added support for BDB 4.3 (depends on
 PR 73790)   NOTE: Don't use BDB 4.3 in production environments yet:  
 <http://www.openldap.org/lists/openldap-software/200411/msg00700.html>

For a complete change log see:
  /usr/local/share/doc/openldap/CHANGES
---
 net/openldap24-server/Makefile                     | 10 ++++++++--
 net/openldap24-server/distinfo                     |  4 ++--
 net/openldap24-server/files/extrapatch-Makefile.in |  6 +++---
 net/openldap24-server/files/patch-configure        | 10 +++++-----
 4 files changed, 18 insertions(+), 12 deletions(-)

(limited to 'net/openldap24-server')

diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 838466d53554..7c96b9236559 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		openldap
-PORTVERSION=		2.2.18
+PORTVERSION=		2.2.19
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -188,7 +188,13 @@ PLIST_SUB+=		BACK_BDB="@comment " \
 
 WITH_BDB_VER?=		42
 
-.if ${WITH_BDB_VER} == 42
+.if ${WITH_BDB_VER} == 43
+CONFIGURE_ARGS+=	--enable-bdb=${BACKEND_ENABLE} \
+			--enable-hdb=${BACKEND_ENABLE}
+PLIST_SUB+=		BACK_BDB=${BACKEND_PLIST} \
+			BACK_HDB=${BACKEND_PLIST}
+BDBLIB=			db-4.3.0
+.elif ${WITH_BDB_VER} == 42
 CONFIGURE_ARGS+=	--enable-bdb=${BACKEND_ENABLE} \
 			--enable-hdb=${BACKEND_ENABLE}
 PLIST_SUB+=		BACK_BDB=${BACKEND_PLIST} \
diff --git a/net/openldap24-server/distinfo b/net/openldap24-server/distinfo
index c6e8c2aa3190..00c8773fd414 100644
--- a/net/openldap24-server/distinfo
+++ b/net/openldap24-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (openldap-2.2.18.tgz) = f779a70d89d0024a62ebce1198c823ba
-SIZE (openldap-2.2.18.tgz) = 2574691
+MD5 (openldap-2.2.19.tgz) = e196c24c4eb714758c57d12f3b962bae
+SIZE (openldap-2.2.19.tgz) = 2601096
diff --git a/net/openldap24-server/files/extrapatch-Makefile.in b/net/openldap24-server/files/extrapatch-Makefile.in
index bb83ea2b572a..e274e6bd35f2 100644
--- a/net/openldap24-server/files/extrapatch-Makefile.in
+++ b/net/openldap24-server/files/extrapatch-Makefile.in
@@ -1,8 +1,8 @@
 --- Makefile.in.orig	Mon Apr  7 22:23:24 2003
 +++ Makefile.in	Thu Jul 10 17:43:35 2003
-@@ -10,9 +10,11 @@
- ## in file LICENSE in the top-level directory of the distribution.
- ##
+@@ -13,9 +13,11 @@
+ ## top-level directory of the distribution or, alternatively, at
+ ## <http://www.OpenLDAP.org/license.html>.
  
 -SUBDIRS= include libraries clients servers tests doc
 -CLEANDIRS=
diff --git a/net/openldap24-server/files/patch-configure b/net/openldap24-server/files/patch-configure
index 38e7c135ab71..7f32b0a770b9 100644
--- a/net/openldap24-server/files/patch-configure
+++ b/net/openldap24-server/files/patch-configure
@@ -1,6 +1,6 @@
 --- configure.orig	Tue Jul 27 18:33:12 2004
 +++ configure	Sat Aug 14 17:05:23 2004
-@@ -19497,7 +19497,7 @@
+@@ -20145,7 +20145,7 @@
  
  
  	if test $ol_cv_bdb_compat = yes ; then
@@ -9,21 +9,21 @@
  	elif test $ol_enable_bdb = yes ; then
  		{ echo "configure: error: BDB: BerkeleyDB version incompatible" 1>&2; exit 1; }
  	else
-@@ -20349,7 +20349,7 @@
+@@ -20997,7 +20997,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-liodbc  $LIBS"
 +LIBS="-liodbc  $LIBS  $LTHREAD_LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 20355 "configure"
+ #line 21003 "configure"
  #include "confdefs.h"
-@@ -20393,7 +20393,7 @@
+@@ -21041,7 +21041,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lodbc  $LIBS"
 +LIBS="-lodbc  $LIBS  $LTHREAD_LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 20399 "configure"
+ #line 21047 "configure"
  #include "confdefs.h"
-- 
cgit v1.2.3