[Pkg-php-commits] [php/debian-sid] Import complete fix for Fix FTBFS with gold or ld --no-add-needed from Ubuntu (Closes: #615770)

[Ondřej Surý]

---
 debian/patches/configure-as-needed.patch |   45 ++++++++++++++++++++++++++++++
 debian/patches/debbug#615770.patch       |   13 --------
 debian/patches/series                    |    2 +-
 3 files changed, 46 insertions(+), 14 deletions(-)
 create mode 100644 debian/patches/configure-as-needed.patch
 delete mode 100644 debian/patches/debbug#615770.patch

diff --git a/debian/patches/configure-as-needed.patch b/debian/patches/configure-as-needed.patch
new file mode 100644
index 0000000..8203fed
--- /dev/null
+++ b/debian/patches/configure-as-needed.patch
@@ -0,0 +1,45 @@
+Description: Patching PHP 5.3.3 to build with GCC 4.5 and DSO libs
+Author: Clint Byrum <clint at ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/php5/+bug/676672
+
+--- a/ext/ldap/config.m4
++++ b/ext/ldap/config.m4
+@@ -50,7 +50,7 @@ AC_DEFUN([PHP_LDAP_SASL_CHECKS], [
+     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)
+--- a/ext/openssl/config0.m4
++++ b/ext/openssl/config0.m4
+@@ -17,6 +17,7 @@ if test "$PHP_OPENSSL" != "no"; then
+   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, 
+   [
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -2395,6 +2395,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
+     ])
+     LIBS=$old_LIBS
+     PHP_ADD_LIBRARY(ssl,,$1)
++    PHP_ADD_LIBRARY(crypto,,$1)
+ 
+     PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1)
+   fi
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -2397,6 +2397,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
+     ])
+     LIBS=$old_LIBS
+     PHP_ADD_LIBRARY(ssl,,$1)
++    PHP_ADD_LIBRARY(crypto,,$1)
+ 
+     PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1)
+   fi
diff --git a/debian/patches/debbug#615770.patch b/debian/patches/debbug#615770.patch
deleted file mode 100644
index 833ff16..0000000
--- a/debian/patches/debbug#615770.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/ext/openssl/config0.m4 b/ext/openssl/config0.m4
-index ee5e85c..c1c10ee 100644
---- a/ext/openssl/config0.m4
-+++ b/ext/openssl/config0.m4
-@@ -12,6 +12,8 @@ if test "$PHP_OPENSSL" != "no"; then
-   PHP_NEW_EXTENSION(openssl, openssl.c xp_ssl.c, $ext_shared)
-   PHP_SUBST(OPENSSL_SHARED_LIBADD)
- 
-+  PHP_ADD_LIBRARY(crypto)
-+
-   if test "$PHP_KERBEROS" != "no"; then
-     PHP_SETUP_KERBEROS(OPENSSL_SHARED_LIBADD)
-   fi
diff --git a/debian/patches/series b/debian/patches/series
index d720d90..6a8f642 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -58,5 +58,5 @@ fix-memory-leak-inside-highlight_string.patch
 fix-segfault-in-pgsql_stmt_execute-when-postgres-is-down.patch
 fix-segfault-when-node-is-NULL-in-simplexml.patch
 fix-segfault-when-using-several-cloned-intl-objects.patch
-debbug#615770.patch
 php-fpm-sysconfdir.patch
+configure-as-needed.patch
-- 
1.7.1