9cae5e
diff -up php-7.2.0alpha0/ext/dba/config.m4.libdb php-7.2.0alpha0/ext/dba/config.m4
9cae5e
--- php-7.2.0alpha0/ext/dba/config.m4.libdb	2017-05-29 08:56:06.000000000 +0200
9cae5e
+++ php-7.2.0alpha0/ext/dba/config.m4	2017-05-29 09:13:52.014823282 +0200
9cae5e
@@ -346,61 +346,13 @@ if test "$PHP_DB4" != "no"; then
9cae5e
   dbdp4="/usr/local/BerkeleyDB.4."
9cae5e
   dbdp5="/usr/local/BerkeleyDB.5."
9cae5e
   for i in $PHP_DB4 ${dbdp5}1 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6 ${dbdp4}5 ${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do
9cae5e
-    if test -f "$i/db5/db.h"; then
9cae5e
-      THIS_PREFIX=$i
9cae5e
-      THIS_INCLUDE=$i/db5/db.h
9cae5e
-      break
9cae5e
-    elif test -f "$i/db4/db.h"; then
9cae5e
-      THIS_PREFIX=$i
9cae5e
-      THIS_INCLUDE=$i/db4/db.h
9cae5e
-      break
9cae5e
-    elif test -f "$i/include/db5.3/db.h"; then
9cae5e
-      THIS_PREFIX=$i
9cae5e
-      THIS_INCLUDE=$i/include/db5.3/db.h
9cae5e
-      break
9cae5e
-    elif test -f "$i/include/db5.1/db.h"; then
9cae5e
-      THIS_PREFIX=$i
9cae5e
-      THIS_INCLUDE=$i/include/db5.1/db.h
9cae5e
-      break
9cae5e
-    elif test -f "$i/include/db5.0/db.h"; then
9cae5e
-      THIS_PREFIX=$i
9cae5e
-      THIS_INCLUDE=$i/include/db5.0/db.h
9cae5e
-      break
9cae5e
-    elif test -f "$i/include/db4.8/db.h"; then
9cae5e
-      THIS_PREFIX=$i
9cae5e
-      THIS_INCLUDE=$i/include/db4.8/db.h
9cae5e
-      break
9cae5e
-    elif test -f "$i/include/db4.7/db.h"; then
9cae5e
-      THIS_PREFIX=$i
9cae5e
-      THIS_INCLUDE=$i/include/db4.7/db.h
9cae5e
-      break
9cae5e
-    elif test -f "$i/include/db4.6/db.h"; then
9cae5e
-      THIS_PREFIX=$i
9cae5e
-      THIS_INCLUDE=$i/include/db4.6/db.h
9cae5e
-      break
9cae5e
-    elif test -f "$i/include/db4.5/db.h"; then
9cae5e
-      THIS_PREFIX=$i
9cae5e
-      THIS_INCLUDE=$i/include/db4.5/db.h
9cae5e
-      break
9cae5e
-    elif test -f "$i/include/db4/db.h"; then
9cae5e
-      THIS_PREFIX=$i
9cae5e
-      THIS_INCLUDE=$i/include/db4/db.h
9cae5e
-      break
9cae5e
-    elif test -f "$i/include/db/db4.h"; then
9cae5e
-      THIS_PREFIX=$i
9cae5e
-      THIS_INCLUDE=$i/include/db/db4.h
9cae5e
-      break
9cae5e
-    elif test -f "$i/include/db4.h"; then
9cae5e
-      THIS_PREFIX=$i
9cae5e
-      THIS_INCLUDE=$i/include/db4.h
9cae5e
-      break
9cae5e
-    elif test -f "$i/include/db.h"; then
9cae5e
+    if test -f "$i/include/db.h"; then
9cae5e
       THIS_PREFIX=$i
9cae5e
       THIS_INCLUDE=$i/include/db.h
9cae5e
       break
9cae5e
     fi
9cae5e
   done
9cae5e
-  PHP_DBA_DB_CHECK(4, db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
9cae5e
+  PHP_DBA_DB_CHECK(4, db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
9cae5e
 fi
9cae5e
 PHP_DBA_STD_RESULT(db4,Berkeley DB4)
9cae5e
 
9cae5e
diff -up php-7.2.0alpha0/ext/dba/dba.c.libdb php-7.2.0alpha0/ext/dba/dba.c
9cae5e
--- php-7.2.0alpha0/ext/dba/dba.c.libdb	2017-05-29 09:16:15.736628202 +0200
9cae5e
+++ php-7.2.0alpha0/ext/dba/dba.c	2017-05-29 09:16:20.494654746 +0200
9cae5e
@@ -53,6 +53,10 @@
9cae5e
 #include "php_tcadb.h"
9cae5e
 #include "php_lmdb.h"
9cae5e
 
9cae5e
+#ifdef DB4_INCLUDE_FILE
9cae5e
+#include DB4_INCLUDE_FILE
9cae5e
+#endif
9cae5e
+
9cae5e
 /* {{{ arginfo */
9cae5e
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2)
9cae5e
 	ZEND_ARG_INFO(0, path)
9cae5e
@@ -558,6 +562,10 @@ PHP_MINFO_FUNCTION(dba)
9cae5e
 
9cae5e
 	php_info_print_table_start();
9cae5e
  	php_info_print_table_row(2, "DBA support", "enabled");
9cae5e
+#ifdef DB_VERSION_STRING
9cae5e
+ 	php_info_print_table_row(2, "libdb header version", DB_VERSION_STRING);
9cae5e
+ 	php_info_print_table_row(2, "libdb library version", db_version(NULL, NULL, NULL));
9cae5e
+#endif
9cae5e
 	if (handlers.s) {
9cae5e
 		smart_str_0(&handlers);
9cae5e
 		php_info_print_table_row(2, "Supported handlers", ZSTR_VAL(handlers.s));