openldap: update to 2.6.8

6 files changed, 7 insertions, 103 deletions

diff --git a/package/openldap/Makefile b/package/openldap/Makefile
index 2471893d1..601802d60 100644
--- a/package/openldap/Makefile
+++ b/package/openldap/Makefile
@@ -4,13 +4,13 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		openldap
-PKG_VERSION:=		2.6.0
+PKG_VERSION:=		2.6.8
 PKG_RELEASE:=		1
-PKG_HASH:=		b71c580eac573e9aba15d95f33dd4dd08f2ed4f0d7fc09e08ad4be7ed1e41a4f
+PKG_HASH:=		48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e
 PKG_DESCR:=		ldap client libraries
 PKG_SECTION:=		libs/misc
-PKG_DEPENDS:=		libsasl2 libdb libuuid libncurses libressl
-PKG_BUILDDEP:=		cyrus-sasl db util-linux libressl
+PKG_DEPENDS:=		libsasl2 libuuid libncurses libressl
+PKG_BUILDDEP:=		cyrus-sasl util-linux libressl
 PKG_NEEDS:=		threads c++
 PKG_URL:=		http://www.openldap.org/
 PKG_SITES:=		https://openldap.org/software/download/OpenLDAP/openldap-release/
@@ -39,7 +39,7 @@ $(eval $(call PKG_template,OPENLDAP_SLAPD,openldap-slapd,${PKG_VERSION}-${PKG_RE
 CONFIGURE_ENV+=		ac_cv_func_memcmp_working=yes
 CONFIGURE_ARGS+= 	--enable-slapd \
 			--libexecdir=/usr/sbin \
-			--enable-bdb \
+			--disable-bdb \
 			--disable-hdb \
 			--disable-relay \
 			--enable-dynamic \
diff --git a/package/openldap/files/slapd.conf b/package/openldap/files/slapd.conf
index 3a065043b..df18922e5 100644
--- a/package/openldap/files/slapd.conf
+++ b/package/openldap/files/slapd.conf
@@ -13,9 +13,9 @@ argsfile	/var/run/slapd.args
 # moduleload	back_ldap.la
 
 #######################################################################
-# BDB database definitions
+# MDB database definitions
 #######################################################################
-database	bdb
+database	mdb
 suffix		"o=openadk"
 rootdn		"cn=admin,o=openadk"
 # Cleartext passwords, especially for the rootdn, should
diff --git a/package/openldap/patches/patch-Makefile_in b/package/openldap/patches/patch-Makefile_in
deleted file mode 100644
index c248c3f7e..000000000
--- a/package/openldap/patches/patch-Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- openldap-2.4.23.orig/Makefile.in	2010-04-13 22:22:14.000000000 +0200
-+++ openldap-2.4.23/Makefile.in	2011-03-04 20:59:55.000000000 +0100
-@@ -13,7 +13,7 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
--SUBDIRS= include libraries clients servers tests doc
-+SUBDIRS= include libraries clients servers
- CLEANDIRS=
- INSTALLDIRS= 
- 
diff --git a/package/openldap/patches/patch-configure b/package/openldap/patches/patch-configure
deleted file mode 100644
index 248f06e8a..000000000
--- a/package/openldap/patches/patch-configure
+++ /dev/null
@@ -1,33 +0,0 @@
---- openldap-2.4.42.orig/configure	2015-08-14 17:25:28.000000000 +0200
-+++ openldap-2.4.42/configure	2015-10-22 07:28:53.000000000 +0200
-@@ -22223,29 +22223,10 @@ $as_echo "$as_me: WARNING: Strong authen
- 	fi
- fi
- 
--if test $cross_compiling != yes && test "$ac_cv_mingw32" != yes ; then
--	dev=no
--	if test -r /dev/urandom ; then
--		dev="/dev/urandom";
--	elif test -r /idev/urandom ; then
--		dev="/idev/urandom";
--	elif test -r /dev/srandom ; then
--		dev="/dev/srandom";
--	elif test -r /dev/random ; then
--		dev="/dev/random";
--	elif test -r /idev/random ; then
--		dev="/idev/random";
--	fi
--
--	if test $dev != no ; then
--
- cat >>confdefs.h <<_ACEOF
--#define URANDOM_DEVICE "$dev"
-+#define URANDOM_DEVICE "/dev/urandom"
- _ACEOF
- 
--	fi
--fi
--
- ol_link_fetch=no
- if test $ol_with_fetch != no ; then
- 	ol_LIBS=$LIBS
diff --git a/package/openldap/patches/patch-configure_in b/package/openldap/patches/patch-configure_in
deleted file mode 100644
index 5bd5b2503..000000000
--- a/package/openldap/patches/patch-configure_in
+++ /dev/null
@@ -1,31 +0,0 @@
---- openldap-2.4.42.orig/configure.in	2015-08-14 17:25:28.000000000 +0200
-+++ openldap-2.4.42/configure.in	2015-10-22 07:23:38.000000000 +0200
-@@ -2147,26 +2147,8 @@ else
- 	fi
- fi
- 
--dnl ----------------------------------------------------------------
--dnl Check for entropy sources
--if test $cross_compiling != yes && test "$ac_cv_mingw32" != yes ; then
--	dev=no
--	if test -r /dev/urandom ; then
--		dev="/dev/urandom";
--	elif test -r /idev/urandom ; then
--		dev="/idev/urandom";
--	elif test -r /dev/srandom ; then
--		dev="/dev/srandom";
--	elif test -r /dev/random ; then
--		dev="/dev/random";
--	elif test -r /idev/random ; then
--		dev="/idev/random";
--	fi
--
--	if test $dev != no ; then
--		AC_DEFINE_UNQUOTED(URANDOM_DEVICE,"$dev",[set to urandom device])
--	fi
--fi
-+# set unconditionally to /dev/urandom for Linux cross-compilation
-+AC_DEFINE_UNQUOTED(URANDOM_DEVICE,"/dev/urandom",[set to urandom device])
- 
- dnl ----------------------------------------------------------------
- dnl
diff --git a/package/openldap/patches/patch-libraries_librewrite_rewrite-int_h b/package/openldap/patches/patch-libraries_librewrite_rewrite-int_h
deleted file mode 100644
index a80083bc2..000000000
--- a/package/openldap/patches/patch-libraries_librewrite_rewrite-int_h
+++ /dev/null
@@ -1,21 +0,0 @@
---- openldap-2.4.36.orig/libraries/librewrite/rewrite-int.h	2013-08-16 20:12:59.000000000 +0200
-+++ openldap-2.4.36/libraries/librewrite/rewrite-int.h	2013-11-01 14:30:43.000000000 +0100
-@@ -40,12 +40,18 @@
- 
- #include <rewrite.h>
- 
-+/*
-+#undef malloc
- #define malloc(x)	ber_memalloc(x)
-+#undef calloc
- #define calloc(x,y)	ber_memcalloc(x,y)
-+#undef realloc
- #define realloc(x,y)	ber_memrealloc(x,y)
-+#undef free
- #define free(x)	ber_memfree(x)
- #undef strdup
- #define	strdup(x)	ber_strdup(x)
-+*/
- 
- /* Uncomment to use ldap pvt threads */
- #define USE_REWRITE_LDAP_PVT_THREADS