SOURCES: php4-tds.patch (NEW), php4-mime_magic.patch (NEW) - new tds; don't...

[arekm]

Author: arekm                        Date: Mon Jun 16 09:07:17 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- new tds; don't fail if magic file is missing

---- Files affected:
SOURCES:
   php4-tds.patch (NONE -> 1.1)  (NEW), php4-mime_magic.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/php4-tds.patch
diff -u /dev/null SOURCES/php4-tds.patch:1.1
--- /dev/null	Mon Jun 16 11:07:18 2008
+++ SOURCES/php4-tds.patch	Mon Jun 16 11:07:11 2008
@@ -0,0 +1,41 @@
+--- 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
+--- php-4.4.8/ext/mssql/config.m4.org	2008-06-16 11:00:30.226183384 +0200
++++ php-4.4.8/ext/mssql/config.m4	2008-06-16 11:00:54.402222204 +0200
+@@ -13,7 +13,7 @@
+   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
+         break
+       fi
+@@ -25,15 +25,15 @@
+ 
+   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
+     else
+       AC_MSG_ERROR(Directory $PHP_MSSQL is not a FreeTDS installation directory)
+     fi
+   fi  
+ 
+-  if test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libtds.so"; then
+-     AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib64/libtds.[a|so])
++  if test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libsybdb.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libsybdb.so"; then
++     AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib64/libsybdb.[a|so])
+   fi
+ 
+   MSSQL_INCDIR=$FREETDS_INSTALLATION_DIR/include

================================================================
Index: SOURCES/php4-mime_magic.patch
diff -u /dev/null SOURCES/php4-mime_magic.patch:1.1
--- /dev/null	Mon Jun 16 11:07:18 2008
+++ SOURCES/php4-mime_magic.patch	Mon Jun 16 11:07:12 2008
@@ -0,0 +1,11 @@
+--- php-5.2.6/ext/mime_magic/config.m4	2007-07-03 19:25:34.000000000 +0200
++++ php-5.2.6.new/ext/mime_magic/config.m4	2008-06-16 09:32:48.996084697 +0200
+@@ -18,8 +18,6 @@
+   if test "$PHP_MIME_MAGIC" != "yes"; then
+     if test -f $PHP_MIME_MAGIC; then
+       PHP_MIME_MAGIC_FILE_PATH=$PHP_MIME_MAGIC
+-    else
+-      AC_MSG_ERROR([File '$PHP_MIME_MAGIC' not found!])
+     fi
+   else
+     MAGIC_MIME_LOCATIONS="/usr/local/apache/conf/magic /usr/local/etc/apache/conf/magic /etc/apache/magic /etc/httpd/conf/magic /usr/share/magic.mime /usr/share/misc/magic.mime /etc/magic.mime"
================================================================