Update to 5.5.23 release.

1 files changed, 22 insertions, 17 deletions

diff --git a/databases/php55-odbc/files/patch-config.m4 b/databases/php55-odbc/files/patch-config.m4
index 6288933275d1..120ef4bee15a 100644
--- a/databases/php55-odbc/files/patch-config.m4
+++ b/databases/php55-odbc/files/patch-config.m4
@@ -1,12 +1,17 @@
---- config.m4.orig	2013-08-20 06:46:43.000000000 +0200
-+++ config.m4	2013-08-27 16:04:54.000000000 +0200
-@@ -99,9 +99,12 @@
- dnl
+--- config.m4.orig	2015-03-18 09:45:50.000000000 +0000
++++ config.m4	2015-04-01 08:24:25.857888541 +0000
+@@ -100,13 +100,17 @@
  dnl configure options
  dnl
+ 
 +PHP_ARG_ENABLE(odbc,,
-+[  --enable-odbc           Enable ODBC support with selected driver])
++[  --enable-odbc             Enable ODBC support with selected driver])
 +
++
+ PHP_ARG_WITH(odbcver,,
+ [  --with-odbcver[=HEX]      Force support for the passed ODBC version. A hex number is expected, default 0x0300.
+                              Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0300)
+ 
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(adabas,,
 -[  --with-adabas[=DIR]       Include Adabas D support [/usr/local]])
@@ -14,7 +19,7 @@
  
    if test "$PHP_ADABAS" != "no"; then
      AC_MSG_CHECKING([for Adabas support])
-@@ -128,7 +131,7 @@
+@@ -133,7 +137,7 @@
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(sapdb,,
@@ -23,7 +28,7 @@
  
    if test "$PHP_SAPDB" != "no"; then
      AC_MSG_CHECKING([for SAP DB support])
-@@ -146,7 +149,7 @@
+@@ -151,7 +155,7 @@
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(solid,,
@@ -32,7 +37,7 @@
  
    if test "$PHP_SOLID" != "no"; then
      AC_MSG_CHECKING(for Solid support)
-@@ -171,7 +174,7 @@
+@@ -176,7 +180,7 @@
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(ibm-db2,,
@@ -41,7 +46,7 @@
  
    if test "$PHP_IBM_DB2" != "no"; then
      AC_MSG_CHECKING(for IBM DB2 support)
-@@ -208,7 +211,7 @@
+@@ -213,7 +217,7 @@
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(ODBCRouter,,
@@ -50,7 +55,7 @@
  
    if test "$PHP_ODBCROUTER" != "no"; then
      AC_MSG_CHECKING(for ODBCRouter.com support)
-@@ -229,7 +232,7 @@
+@@ -234,7 +238,7 @@
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(empress,,
  [  --with-empress[=DIR]      Include Empress support [\$EMPRESSPATH]
@@ -59,7 +64,7 @@
  
    if test "$PHP_EMPRESS" != "no"; then
      AC_MSG_CHECKING(for Empress support)
-@@ -253,7 +256,7 @@
+@@ -258,7 +262,7 @@
  PHP_ARG_WITH(empress-bcs,,
  [  --with-empress-bcs[=DIR]
                            Include Empress Local Access support [\$EMPRESSPATH]
@@ -68,7 +73,7 @@
  
    if test "$PHP_EMPRESS_BCS" != "no"; then
      AC_MSG_CHECKING(for Empress local access support)
-@@ -291,7 +294,7 @@
+@@ -296,7 +300,7 @@
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(birdstep,,
@@ -77,7 +82,7 @@
    
    if test "$PHP_BIRDSTEP" != "no"; then
      AC_MSG_CHECKING(for Birdstep support)
-@@ -345,7 +348,7 @@
+@@ -350,7 +354,7 @@
                            running this configure script:
                              CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\"
                              LDFLAGS=-lunix
@@ -86,7 +91,7 @@
  
    if test "$PHP_CUSTOM_ODBC" != "no"; then
      AC_MSG_CHECKING(for a custom ODBC support)
-@@ -365,7 +368,7 @@
+@@ -370,7 +374,7 @@
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(iodbc,,
@@ -95,7 +100,7 @@
  
    if test "$PHP_IODBC" != "no"; then
      AC_MSG_CHECKING(for iODBC support)
-@@ -386,7 +389,7 @@
+@@ -406,7 +410,7 @@
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(esoob,,
@@ -104,7 +109,7 @@
  
    if test "$PHP_ESOOB" != "no"; then
      AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support)
-@@ -406,7 +409,7 @@
+@@ -426,7 +430,7 @@
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(unixODBC,,
@@ -113,7 +118,7 @@
  
    if test "$PHP_UNIXODBC" != "no"; then
      AC_MSG_CHECKING(for unixODBC support)
-@@ -427,7 +430,7 @@
+@@ -447,7 +451,7 @@
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(dbmaker,,