This commit was manufactured by cvs2git to create branch 'unlabeled-1.2.4'.

Cherrypick from master 2008-06-16 08:44:01 UTC Arkadiusz Miśkiewicz <arekm@maven.pl> '- one more part':
    php-tds.patch -> 1.2
    php-uint32_t.patch -> 1.2

diff --git a/php-tds.patch b/php-tds.patch
new file mode 100644 (file)
index 0000000..77d93f5
--- /dev/null
+++ b/php-tds.patch
@@ -0,0 +1,91 @@
+--- php/ext/mssql/config.m4~   2007-07-03 19:25:34.000000000 +0200
++++ php/ext/mssql/config.m4    2008-06-16 10:28:41.960540536 +0200
+@@ -10,11 +10,11 @@
+ 
+   if test "$PHP_MSSQL" = "yes"; then
+     for i in /usr/local /usr; do
+-      if test -f $i/include/tds.h; then
++      if test -f $i/include/sybdb.h; then
+         FREETDS_INSTALLATION_DIR=$i
+         FREETDS_INCLUDE_DIR=$i/include
+         break
+-      elif test -f $i/include/freetds/tds.h; then
++      elif test -f $i/include/freetds/sybdb.h; then
+         FREETDS_INSTALLATION_DIR=$i
+         FREETDS_INCLUDE_DIR=$i/include/freetds
+         break
+@@ -27,10 +27,10 @@
+ 
+   elif test "$PHP_MSSQL" != "no"; then
+ 
+-    if test -f $PHP_MSSQL/include/tds.h; then
++    if test -f $PHP_MSSQL/include/sybdb.h; then
+       FREETDS_INSTALLATION_DIR=$PHP_MSSQL
+       FREETDS_INCLUDE_DIR=$PHP_MSSQL/include
+-    elif test -f $PHP_MSSQL/include/freetds/tds.h; then
++    elif test -f $PHP_MSSQL/include/freetds/sybdb.h; then
+       FREETDS_INSTALLATION_DIR=$PHP_MSSQL
+       FREETDS_INCLUDE_DIR=$PHP_MSSQL/include/freetds
+     else
+@@ -38,8 +38,8 @@
+     fi
+   fi  
+ 
+-  if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so"; then
+-     AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so])
++  if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then
++     AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so])
+   fi
+ 
+   PHP_ADD_INCLUDE($FREETDS_INCLUDE_DIR)
+--- php/ext/pdo_dblib/config.m4~       2007-07-03 19:25:34.000000000 +0200
++++ php/ext/pdo_dblib/config.m4        2008-06-16 10:31:41.526355657 +0200
+@@ -13,11 +13,11 @@
+   if test "$PHP_PDO_DBLIB" = "yes"; then
+ 
+     for i in /usr/local /usr; do
+-      if test -f $i/include/tds.h; then
++      if test -f $i/include/sybdb.h; then
+         PDO_FREETDS_INSTALLATION_DIR=$i
+         PDO_FREETDS_INCLUDE_DIR=$i/include
+         break
+-      elif test -f $i/include/freetds/tds.h; then
++      elif test -f $i/include/freetds/sybdb.h; then
+         PDO_FREETDS_INSTALLATION_DIR=$i
+         PDO_FREETDS_INCLUDE_DIR=$i/include/freetds
+         break;
+@@ -30,10 +30,10 @@
+ 
+   elif test "$PHP_PDO_DBLIB" != "no"; then
+ 
+-    if test -f $PHP_PDO_DBLIB/include/tds.h; then
++    if test -f $PHP_PDO_DBLIB/include/sybdb.h; then
+       PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
+       PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include
+-    elif test -f $PHP_PDO_DBLIB/include/freetds/tds.h; then
++    elif test -f $PHP_PDO_DBLIB/include/freetds/sybdb.h; then
+       PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
+       PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include/freetds
+     else
+@@ -45,8 +45,8 @@
+     PHP_LIBDIR=lib
+   fi
+ 
+-  if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so"; then
+-     AC_MSG_ERROR(Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so])
++  if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then
++     AC_MSG_ERROR(Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so])
+   fi
+ 
+   PHP_ADD_INCLUDE($PDO_FREETDS_INCLUDE_DIR)
+--- php/ext/sybase_ct/config.m4~       2007-07-03 19:25:35.000000000 +0200
++++ php/ext/sybase_ct/config.m4        2008-06-16 10:42:20.463792334 +0200
+@@ -31,7 +31,7 @@
+   fi
+   
+   PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD)
+-  if test -f $SYBASE_CT_INCDIR/tds.h; then
++  if test -f $SYBASE_CT_INCDIR/sybdb.h; then
+     PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
+     SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
+   else

diff --git a/php-uint32_t.patch b/php-uint32_t.patch
new file mode 100644 (file)
index 0000000..5bd1bf0
--- /dev/null
+++ b/php-uint32_t.patch
@@ -0,0 +1,12 @@
+adds missing include in zend_strtod.c (caused build to fail on sparc)
+
+--- php-5.0.3/Zend/zend_strtod.c~      2004-12-14 09:41:35.000000000 +0100
++++ php-5.0.3/Zend/zend_strtod.c       2004-12-21 08:45:10.050119856 +0100
+@@ -90,6 +90,7 @@
+  */
+ 
+ #include <zend_strtod.h>
++#include <stdint.h>
+ 
+ #if defined(LIBC_SCCS) && !defined(lint)
+ static char *rcsid = "$OpenBSD: strtod.c,v 1.19 2004/02/03 16:52:11 drahn Exp $";