- rediff patches, merged duplicate triggers

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

diff --git a/php-db.patch b/php-db.patch
index 7b3a8dfd44fedf4c7f490c3311528a27c14518cf..c10ead5232a174d08e7a854970f34f03de591891 100644 (file)
--- a/php-db.patch
+++ b/php-db.patch
@@ -1,8 +1,9 @@
---- php-5.6.17/ext/dba/config.m4~      2016-01-11 00:04:19.000000000 +0200
-+++ php-5.6.17/ext/dba/config.m4       2016-01-11 00:05:56.899471849 +0200
-@@ -287,6 +287,14 @@
+diff -urNp -x '*.orig' php-5.6.40.org/ext/dba/config.m4 php-5.6.40/ext/dba/config.m4
+--- php-5.6.40.org/ext/dba/config.m4   2021-08-23 23:20:23.472399605 +0200
++++ php-5.6.40/ext/dba/config.m4       2021-08-23 23:20:24.499065191 +0200
+@@ -326,6 +326,14 @@ if test "$PHP_DB4" != "no"; then
        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,7 +16,7 @@
      elif test -f "$i/include/db5.1/db.h"; then
        THIS_PREFIX=$i
        THIS_INCLUDE=$i/include/db5.1/db.h
-@@ -376,7 +376,7 @@
+@@ -368,7 +376,7 @@ if test "$PHP_DB4" != "no"; then
        break
      fi
    done