Patch fix-ftbfs-and-dso.patch for Compile Failure Bug #53339

Patch version 2010-11-18 08:29 UTC

• 2010-11-18 08:29 UTC [diff to current]

Developer: clint@ubuntu.com

Description: Patching PHP 5.3.3 to build with GCC 4.5 and DSO libs
Author: Clint Byrum <clint@ubuntu.com>
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/php5/+bug/676672

Index: natty-dso-gcc4.5/ext/ldap/config.m4
===================================================================
--- natty-dso-gcc4.5.orig/ext/ldap/config.m4	2010-11-17 12:33:35.564222001 -0800
+++ natty-dso-gcc4.5/ext/ldap/config.m4	2010-11-17 12:34:40.634222002 -0800
@@ -50,7 +50,7 @@
     SASL_LIB="-L$LDAP_SASL_LIBDIR -lsasl2"
   fi
   
-  PHP_CHECK_LIBRARY(ldap, sasl_version,
+  PHP_CHECK_LIBRARY(sasl2, sasl_version,
   [
     PHP_ADD_INCLUDE($LDAP_SASL_INCDIR)
     PHP_ADD_LIBRARY_WITH_PATH(sasl2, $LDAP_SASL_LIBDIR, LDAP_SHARED_LIBADD)
Index: natty-dso-gcc4.5/ext/openssl/config0.m4
===================================================================
--- natty-dso-gcc4.5.orig/ext/openssl/config0.m4	2010-11-17 12:33:35.554222001 -0800
+++ natty-dso-gcc4.5/ext/openssl/config0.m4	2010-11-17 12:34:40.634222002 -0800
@@ -17,6 +17,7 @@
   fi
 
   AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
+  AC_CHECK_LIB(crypto, X509_free, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
 
   PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD, 
   [
Index: natty-dso-gcc4.5/acinclude.m4
===================================================================
--- natty-dso-gcc4.5.orig/acinclude.m4	2010-11-17 12:34:56.904222001 -0800
+++ natty-dso-gcc4.5/acinclude.m4	2010-11-17 12:35:48.684222000 -0800
@@ -2390,6 +2390,7 @@
     ])
     LIBS=$old_LIBS
     PHP_ADD_LIBRARY(ssl,,$1)
+    PHP_ADD_LIBRARY(crypto,,$1)
 
     PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1)
   fi
Index: natty-dso-gcc4.5/aclocal.m4
=== modified file 'aclocal.m4'
--- natty-dso-gcc4.5.orig/aclocal.m4	2010-08-01 11:58:54 +0000
+++ natty-dso-gcc4.5/aclocal.m4	2010-11-17 20:36:55 +0000
@@ -2392,6 +2392,7 @@
     ])
     LIBS=$old_LIBS
     PHP_ADD_LIBRARY(ssl,,$1)
+    PHP_ADD_LIBRARY(crypto,,$1)
 
     PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1)
   fi