[Pkg-php-commits] r1128 - in php5/trunk/debian: . patches

[Raphael Geissert]

tags 494230 pending
thanks

Author: atomo64-guest
Date: 2008-08-09 04:30:50 +0000 (Sat, 09 Aug 2008)
New Revision: 1128

Added:
   php5/trunk/debian/patches/deprecated_freetds_check.patch
Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/patches/series
Log:
fix the freetds detection routine, Closes: #494230

Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2008-07-25 02:57:06 UTC (rev 1127)
+++ php5/trunk/debian/changelog	2008-08-09 04:30:50 UTC (rev 1128)
@@ -16,6 +16,9 @@
     - usr/lib/php5/build/run-tests.php is not meant to be used directly
   * debian/control: bumped Standards Version to 3.8.0, no changes needed
   * bad_whatis_entries.patch: fixes the whatis entries of all the manpages
+  * deprecated_freetds_check.patch: fixes the freetds detection routine
+    + Closes: #494230
+    - Thanks to jklowden at freetds.org and the Gentoo folks for the path
   * debian/libapache2-mod-php5*-{prerm,postinst}:
     - Create a status file when removing the package (but not purging)
        while having the mod enabled so reinstallation of the package

Added: php5/trunk/debian/patches/deprecated_freetds_check.patch
===================================================================
--- php5/trunk/debian/patches/deprecated_freetds_check.patch	                        (rev 0)
+++ php5/trunk/debian/patches/deprecated_freetds_check.patch	2008-08-09 04:30:50 UTC (rev 1128)
@@ -0,0 +1,88 @@
+Allow ext/mssql and ext/pdo_dblib to build with >=freetds-0.82
+Original patch by jklowden at freetds dot org
+ext/pdo_dblib patch by matthias at dsx ado at
+Rediffed for Gentoo (wrong direction)
+http://bugs.php.net/bug.php?id=44991
+
+diff -r 57e37b68a255 -r f1222f67e562 ext/mssql/config.m4
+--- a/ext/mssql/config.m4	Tue Jul 01 19:37:24 2008 +0200
++++ b/ext/mssql/config.m4	Thu Jul 17 11:35:57 2008 +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)
+diff -r 57e37b68a255 -r f1222f67e562 ext/pdo_dblib/config.m4
+--- a/ext/pdo_dblib/config.m4	Tue Jul 01 19:37:24 2008 +0200
++++ b/ext/pdo_dblib/config.m4	Thu Jul 17 11:35:57 2008 +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)

Modified: php5/trunk/debian/patches/series
===================================================================
--- php5/trunk/debian/patches/series	2008-07-25 02:57:06 UTC (rev 1127)
+++ php5/trunk/debian/patches/series	2008-08-09 04:30:50 UTC (rev 1128)
@@ -34,3 +34,4 @@
 CVE-2008-2829.patch
 libedit_is_editline.patch
 bad_whatis_entries.patch
+deprecated_freetds_check.patch