From b2007524b21e09f29251830aba3272d860a0129e Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Mon, 11 Jan 2016 12:16:37 +0000 Subject: - Update lang/php55 to 5.5.31 - Update lang/php56 to 5.6.17 MFH: 2016Q1 Security: 6b771fe2-b84e-11e5-92f9-485d605f4717 --- databases/php56-dba/files/patch-config.m4 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'databases') diff --git a/databases/php56-dba/files/patch-config.m4 b/databases/php56-dba/files/patch-config.m4 index 1df828460e05..30f662138374 100644 --- a/databases/php56-dba/files/patch-config.m4 +++ b/databases/php56-dba/files/patch-config.m4 @@ -1,8 +1,8 @@ ---- config.m4.orig 2012-11-21 06:12:20.000000000 +0100 -+++ config.m4 2012-12-12 10:18:42.000000000 +0100 -@@ -320,6 +320,38 @@ +--- config.m4.orig 2016-01-06 15:14:47 UTC ++++ config.m4 +@@ -324,6 +324,38 @@ 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/db.h"; then + THIS_PREFIX=$i @@ -39,12 +39,12 @@ elif test -f "$i/include/db5.1/db.h"; then THIS_PREFIX=$i THIS_INCLUDE=$i/include/db5.1/db.h -@@ -362,7 +394,7 @@ +@@ -366,7 +398,7 @@ if test "$PHP_DB4" != "no"; then 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 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 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)]) fi PHP_DBA_STD_RESULT(db4,Berkeley DB4) -- cgit v1.2.3