From: Howard Chu <hyc@openldap.org>
Date: Wed, 2 Jul 2014 22:51:52 +0000 (-0700)
Subject: Disallow BDB 6.0.20+
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=376c7947be0362e1309eca1ba7c40446b58e9392;p=openldap

Disallow BDB 6.0.20+
---

diff --git a/build/openldap.m4 b/build/openldap.m4
index 98b038183d..caf8fc2aa6 100644
--- a/build/openldap.m4
+++ b/build/openldap.m4
@@ -547,12 +547,18 @@ AC_DEFUN([OL_BDB_COMPAT],
 #ifndef DB_VERSION_MINOR
 #	define DB_VERSION_MINOR 0
 #endif
+#ifndef DB_VERSION_PATCH
+#	define DB_VERSION_PATCH 0
+#endif
 
-#define DB_VERSION_MM	((DB_VERSION_MAJOR<<8)|DB_VERSION_MINOR)
+#define DB_VERSION_FULL	((DB_VERSION_MAJOR<<16)|(DB_VERSION_MINOR<<8)|DB_VERSION_PATCH)
 
-/* require 4.4 or later */
-#if DB_VERSION_MM >= 0x0404
+/* require 4.4 or later, but less than 6.0.20 */
+#if DB_VERSION_FULL >= 0x040400 && DB_VERSION_FULL < 0x060014
 	__db_version_compat
+#endif
+#if DB_VERSION_FULL >= 0x060014
+#error "BerkeleyDB 6.0.20+ license is incompatible with LDAP"
 #endif
 	], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])])
 ])
diff --git a/configure b/configure
index 4c89fdc451..774dc3f09f 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: 84bfc8afb7ab27da80a7fcd61c212e89ba29ed41 .
+# From configure.in Id: 3d546aabd5e37f6f65888b8b00e64e309577f719 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65.
 #
@@ -15642,7 +15642,7 @@ done
 			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <gnutls/gnutls.h>
-#if GNUTLS_VERSION_NUMBER < 0x020d00
+#if GNUTLS_VERSION_NUMBER < 0x020c00
 #error "GnuTLS 2.12.0 or newer required"
 #endif
 _ACEOF
@@ -20378,13 +20378,19 @@ else
 #ifndef DB_VERSION_MINOR
 #	define DB_VERSION_MINOR 0
 #endif
+#ifndef DB_VERSION_PATCH
+#	define DB_VERSION_PATCH 0
+#endif
 
-#define DB_VERSION_MM	((DB_VERSION_MAJOR<<8)|DB_VERSION_MINOR)
+#define DB_VERSION_FULL	((DB_VERSION_MAJOR<<16)|(DB_VERSION_MINOR<<8)|DB_VERSION_PATCH)
 
-/* require 4.4 or later */
-#if DB_VERSION_MM >= 0x0404
+/* require 4.4 or later, but less than 6.0.20 */
+#if DB_VERSION_FULL >= 0x040400 && DB_VERSION_FULL < 0x060014
 	__db_version_compat
 #endif
+#if DB_VERSION_FULL >= 0x060014
+#error "BerkeleyDB 6.0.20+ license is incompatible with LDAP"
+#endif
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |