Update to 5.2.4 release.

3 files changed, 161 insertions, 84 deletions

diff --git a/databases/php5-dba/files/patch-config.m4 b/databases/php5-dba/files/patch-config.m4
index 6205c8331286..e8947bd39982 100644
--- a/databases/php5-dba/files/patch-config.m4
+++ b/databases/php5-dba/files/patch-config.m4
@@ -1,52 +1,42 @@
---- config.m4.orig	Tue Dec  5 18:54:52 2006
-+++ config.m4	Wed Feb  7 12:47:51 2007
-@@ -244,6 +244,22 @@
-         THIS_PREFIX=$i
-         THIS_INCLUDE=$i/db4/db.h
-         break
-+      elif test -f "$i/include/db44/db.h"; then
-+        THIS_PREFIX=$i
-+        THIS_INCLUDE=$i/include/db44/db.h
-+        break
-+      elif test -f "$i/include/db43/db.h"; then
-+        THIS_PREFIX=$i
-+        THIS_INCLUDE=$i/include/db43/db.h
-+        break
-+      elif test -f "$i/include/db42/db.h"; then
-+        THIS_PREFIX=$i
-+        THIS_INCLUDE=$i/include/db42/db.h
-+        break
-+      elif test -f "$i/include/db41/db.h"; then
-+        THIS_PREFIX=$i
-+        THIS_INCLUDE=$i/include/db41/db.h
-+        break
-       elif test -f "$i/include/db4/db.h"; then
-         THIS_PREFIX=$i
-         THIS_INCLUDE=$i/include/db4/db.h
-@@ -493,7 +509,7 @@
-     PHP_DBA_STD_ATTACH
-   fi
- ],[
--  if test "$PHP_DBA" != "no" && test "$HAVE_DBA" = "1"; then
-+  if test "$PHP_DBA" != "no" || test "$HAVE_DBA" = "1"; then
-     PHP_DBA_BUILTIN_CDB
-   fi
- ])
-@@ -511,7 +527,7 @@
-     PHP_DBA_BUILTIN_INI
-   fi
- ],[
--  if test "$PHP_DBA" != "no" && test "$HAVE_DBA" = "1"; then
-+  if test "$PHP_DBA" != "no" || test "$HAVE_DBA" = "1"; then
-     PHP_DBA_BUILTIN_INI
-   fi
- ])
-@@ -532,7 +548,7 @@
-     PHP_DBA_BUILTIN_FLATFILE
-   fi
- ],[
--  if test "$PHP_DBA" != "no" && test "$HAVE_DBA" = "1"; then
-+  if test "$PHP_DBA" != "no" || test "$HAVE_DBA" = "1"; then
-     PHP_DBA_BUILTIN_FLATFILE
-   fi
- ])
+--- config.m4.orig	2007-07-19 12:50:16.000000000 +0200
++++ config.m4	2007-09-13 17:24:16.000000000 +0200
+@@ -279,6 +279,30 @@
+       THIS_PREFIX=$i
+       THIS_INCLUDE=$i/db4/db.h
+       break
++    elif test -f "$i/include/db46/db.h"; then
++      THIS_PREFIX=$i
++      THIS_INCLUDE=$i/include/db46/db.h
++      break
++    elif test -f "$i/include/db45/db.h"; then
++      THIS_PREFIX=$i
++      THIS_INCLUDE=$i/include/db45/db.h
++      break
++    elif test -f "$i/include/db44/db.h"; then
++      THIS_PREFIX=$i
++      THIS_INCLUDE=$i/include/db44/db.h
++      break
++    elif test -f "$i/include/db43/db.h"; then
++      THIS_PREFIX=$i
++      THIS_INCLUDE=$i/include/db43/db.h
++      break
++    elif test -f "$i/include/db42/db.h"; then
++      THIS_PREFIX=$i
++      THIS_INCLUDE=$i/include/db42/db.h
++      break
++    elif test -f "$i/include/db41/db.h"; then
++      THIS_PREFIX=$i
++      THIS_INCLUDE=$i/include/db41/db.h
++      break
+     elif test -f "$i/include/db4.5/db.h"; then
+       THIS_PREFIX=$i
+       THIS_INCLUDE=$i/include/db4.5/db.h
+@@ -301,7 +325,7 @@
+       break
+     fi
+   done
+-  PHP_DBA_DB_CHECK(4, 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-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)
+ 
diff --git a/databases/php5-mysqli/files/patch-mysqli_api.c b/databases/php5-mysqli/files/patch-mysqli_api.c
deleted file mode 100644
index 3a1d4d3abb02..000000000000
--- a/databases/php5-mysqli/files/patch-mysqli_api.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- mysqli_api.c.orig	Thu Jul 12 09:52:10 2007
-+++ mysqli_api.c	Thu Jul 12 09:52:24 2007
-@@ -141,13 +141,13 @@
- 		switch (types[ofs]) {
- 			case 'd': /* Double */
- 				bind[ofs].buffer_type = MYSQL_TYPE_DOUBLE;
--				bind[ofs].buffer = (gptr)&Z_DVAL_PP(args[i]);
-+				bind[ofs].buffer = (void*)&Z_DVAL_PP(args[i]);
- 				bind[ofs].is_null = &stmt->param.is_null[ofs];
- 				break;
- 
- 			case 'i': /* Integer */
- 				bind[ofs].buffer_type = MYSQL_TYPE_LONG;
--				bind[ofs].buffer = (gptr)&Z_LVAL_PP(args[i]);
-+				bind[ofs].buffer = (void*)&Z_LVAL_PP(args[i]);
- 				bind[ofs].is_null = &stmt->param.is_null[ofs];
- 				break;
- 
-@@ -600,11 +600,11 @@
- 						break;
- 					case MYSQL_TYPE_DOUBLE:
- 						convert_to_double_ex(&stmt->param.vars[i]);
--						stmt->stmt->params[i].buffer = (gptr)&Z_LVAL_PP(&stmt->param.vars[i]);
-+						stmt->stmt->params[i].buffer = (void*)&Z_LVAL_PP(&stmt->param.vars[i]);
- 						break;
- 					case MYSQL_TYPE_LONG:
- 						convert_to_long_ex(&stmt->param.vars[i]);
--						stmt->stmt->params[i].buffer = (gptr)&Z_LVAL_PP(&stmt->param.vars[i]);
-+						stmt->stmt->params[i].buffer = (void*)&Z_LVAL_PP(&stmt->param.vars[i]);
- 						break;
- 					default:
- 						break;
diff --git a/databases/php5-odbc/files/patch-config.m4 b/databases/php5-odbc/files/patch-config.m4
new file mode 100644
index 000000000000..97178e4029c7
--- /dev/null
+++ b/databases/php5-odbc/files/patch-config.m4
@@ -0,0 +1,119 @@
+--- config.m4.orig	2007-09-14 08:03:08.000000000 +0200
++++ config.m4	2007-09-14 08:14:21.000000000 +0200
+@@ -101,7 +101,7 @@
+ dnl
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(adabas,,
+-[  --with-adabas[=DIR]     Include Adabas D support [/usr/local]])
++[  --with-adabas[=DIR]     Include Adabas D support [/usr/local]], no, no)
+ 
+   if test "$PHP_ADABAS" != "no"; then
+     AC_MSG_CHECKING([for Adabas support])
+@@ -128,7 +128,7 @@
+ 
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(sapdb,,
+-[  --with-sapdb[=DIR]      Include SAP DB support [/usr/local]])
++[  --with-sapdb[=DIR]      Include SAP DB support [/usr/local]], no, no)
+ 
+   if test "$PHP_SAPDB" != "no"; then
+     AC_MSG_CHECKING([for SAP DB support])
+@@ -146,7 +146,7 @@
+ 
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(solid,,
+-[  --with-solid[=DIR]      Include Solid support [/usr/local/solid]])
++[  --with-solid[=DIR]      Include Solid support [/usr/local/solid]], no, no)
+ 
+   if test "$PHP_SOLID" != "no"; then
+     AC_MSG_CHECKING(for Solid support)
+@@ -171,7 +171,7 @@
+ 
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(ibm-db2,,
+-[  --with-ibm-db2[=DIR]    Include IBM DB2 support [/home/db2inst1/sqllib]])
++[  --with-ibm-db2[=DIR]    Include IBM DB2 support [/home/db2inst1/sqllib]], no, no)
+ 
+   if test "$PHP_IBM_DB2" != "no"; then
+     AC_MSG_CHECKING(for IBM DB2 support)
+@@ -208,7 +208,7 @@
+ 
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(ODBCRouter,,
+-[  --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]])
++[  --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]], no, no)
+ 
+   if test "$PHP_ODBCROUTER" != "no"; then
+     AC_MSG_CHECKING(for ODBCRouter.com support)
+@@ -229,7 +229,7 @@
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(empress,,
+ [  --with-empress[=DIR]    Include Empress support [\$EMPRESSPATH]
+-                          (Empress Version >= 8.60 required)])
++                          (Empress Version >= 8.60 required)], no, no)
+ 
+   if test "$PHP_EMPRESS" != "no"; then
+     AC_MSG_CHECKING(for Empress support)
+@@ -253,7 +253,7 @@
+ PHP_ARG_WITH(empress-bcs,,
+ [  --with-empress-bcs[=DIR]
+                           Include Empress Local Access support [\$EMPRESSPATH]
+-                          (Empress Version >= 8.60 required)])
++                          (Empress Version >= 8.60 required)], no, no)
+ 
+   if test "$PHP_EMPRESS_BCS" != "no"; then
+     AC_MSG_CHECKING(for Empress local access support)
+@@ -291,7 +291,7 @@
+ 
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(birdstep,,
+-[  --with-birdstep[=DIR]   Include Birdstep support [/usr/local/birdstep]])
++[  --with-birdstep[=DIR]   Include Birdstep support [/usr/local/birdstep]], no, no)
+   
+   if test "$PHP_BIRDSTEP" != "no"; then
+     AC_MSG_CHECKING(for Birdstep support)
+@@ -346,7 +346,7 @@
+                           running this configure script:
+                               CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\"
+                               LDFLAGS=-lunix
+-                              CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"])
++                              CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"], no, no)
+ 
+   if test "$PHP_CUSTOM_ODBC" != "no"; then
+     AC_MSG_CHECKING(for a custom ODBC support)
+@@ -366,7 +366,7 @@
+ 
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(iodbc,,
+-[  --with-iodbc[=DIR]      Include iODBC support [/usr/local]])
++[  --with-iodbc[=DIR]      Include iODBC support [/usr/local]], no, no)
+ 
+   if test "$PHP_IODBC" != "no"; then
+     AC_MSG_CHECKING(for iODBC support)
+@@ -387,7 +387,7 @@
+ 
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(esoob,,
+-[  --with-esoob[=DIR]      Include Easysoft OOB support [/usr/local/easysoft/oob/client]])
++[  --with-esoob[=DIR]      Include Easysoft OOB support [/usr/local/easysoft/oob/client]], no, no)
+ 
+   if test "$PHP_ESOOB" != "no"; then
+     AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support)
+@@ -407,7 +407,7 @@
+ 
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(unixODBC,,
+-[  --with-unixODBC[=DIR]   Include unixODBC support [/usr/local]])
++[  --with-unixODBC[=DIR]   Include unixODBC support [/usr/local]], no)
+ 
+   if test "$PHP_UNIXODBC" != "no"; then
+     AC_MSG_CHECKING(for unixODBC support)
+@@ -428,7 +428,7 @@
+ 
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(dbmaker,,
+-[  --with-dbmaker[=DIR]    Include DBMaker support])
++[  --with-dbmaker[=DIR]    Include DBMaker support], no, no)
+ 
+   if test "$PHP_DBMAKER" != "no"; then
+     AC_MSG_CHECKING(for DBMaker support)