- updated to 5.6.17

[packages/php.git] / php-db.patch

diff --git a/php-db.patch b/php-db.patch
index 07032ecd10e152661cff97bb9338b4675efde8db..fc0e4647c866d47106afa668a5fe48102a757790 100644 (file)
--- a/php-db.patch
+++ b/php-db.patch
@@ -1,8 +1,8 @@
---- php-5.3.16/ext/dba/config.m4.orig  2012-09-06 11:15:09.743002303 +0200
-+++ php-5.3.16/ext/dba/config.m4       2012-09-06 11:28:12.192974701 +0200
-@@ -287,6 +287,14 @@
+--- php-5.3.17/ext/dba/config.m4.orig  2016-01-13 10:20:20.966367491 +0000
++++ php-5.3.17/ext/dba/config.m4       2016-01-13 10:23:13.085367491 +0000
+@@ -326,6 +326,14 @@
        THIS_PREFIX=$i
-       THIS_INCLUDE=$i/db4/db.h
+       THIS_INCLUDE=$i/include/db5.3/db.h
        break
 +    elif test -f "$i/include/db5.3/db.h"; then
 +      THIS_PREFIX=$i
@@ -15,11 +15,11 @@
      elif test -f "$i/include/db5.1/db.h"; then
        THIS_PREFIX=$i
        THIS_INCLUDE=$i/include/db5.1/db.h
-@@ -329,7 +337,7 @@
+@@ -368,7 +376,7 @@
        break
      fi
    done
--  PHP_DBA_DB_CHECK(4, 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)])
+-  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)])
 +  PHP_DBA_DB_CHECK(4, db-5.3 db-5.2 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)])
  fi
  PHP_DBA_STD_RESULT(db4,Berkeley DB4)