Refresh ldap patches for PHP 8.5

Author: shivammathur

config/patches/8.5/0015-temporary-path-fixes-for-multiarch.patch

@@ -9,10 +9,10 @@ Subject: temporary-path-fixes-for-multiarch
  3 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
-index ef58820..943864f 100644
+index 6d8867e02e4..5d2fbe1a382 100644
 --- a/ext/dba/config.m4
 +++ b/ext/dba/config.m4
-@@ -336,7 +336,7 @@ AC_DEFUN([PHP_DBA_DB_CHECK],[
+@@ -332,7 +332,7 @@ AC_DEFUN([PHP_DBA_DB_CHECK],[
    AS_VAR_IF([THIS_INCLUDE],,
      [AC_MSG_ERROR([DBA: Could not find necessary header file(s).])])
    for LIB in m4_normalize([$2]); do
@@ -21,8 +21,26 @@ index ef58820..943864f 100644
        lib_found="";
        PHP_TEMP_LDFLAGS([-L$THIS_PREFIX/$PHP_LIBDIR], [-l$LIB],
          [AC_LINK_IFELSE([AC_LANG_PROGRAM([#include "$THIS_INCLUDE"],
+diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4
+index 7d0229f6868..65503b8fd82 100644
+--- a/ext/ldap/config.m4
++++ b/ext/ldap/config.m4
+@@ -76,11 +76,11 @@ if test "$PHP_LDAP" != "no"; then
+     AH_TEMPLATE([HAVE_ORALDAP],
+       [Define to 1 if the ldap extension uses the Oracle Instant Client.])
+ 
+-    if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.a || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.$SHLIB_SUFFIX_NAME; then
++    if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$DEB_HOST_MULTIARCH/liblber.a || test -f $LDAP_LIBDIR/$DEB_HOST_MULTIARCH/liblber.$SHLIB_SUFFIX_NAME; then
+       PHP_ADD_LIBRARY_WITH_PATH([lber], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
+       PHP_ADD_LIBRARY_WITH_PATH([ldap], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
+ 
+-    elif test -f $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME.3 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libldap.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libldap.$SHLIB_SUFFIX_NAME.3 || test -f $LDAP_LIBDIR/libldap.3.dylib; then
++    elif test -f $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME.3 || test -f $LDAP_LIBDIR/$DEB_HOST_MULTIARCH/libldap.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$DEB_HOST_MULTIARCH/libldap.$SHLIB_SUFFIX_NAME.3 || test -f $LDAP_LIBDIR/libldap.3.dylib; then
+       PHP_ADD_LIBRARY_WITH_PATH([ldap], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
+ 
+     elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.12.1 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME.12.1; then
 diff --git a/ext/pdo_dblib/config.m4 b/ext/pdo_dblib/config.m4
-index 4cfea50..423623f 100644
+index 4cfea501c3e..423623f6467 100644
 --- a/ext/pdo_dblib/config.m4
 +++ b/ext/pdo_dblib/config.m4
 @@ -22,7 +22,7 @@ if test "$PHP_PDO_DBLIB" != "no"; then
@@ -34,3 +52,6 @@ index 4cfea50..423623f 100644
         AC_MSG_ERROR([[Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so]]])
      fi
 
+-- 
+2.49.0
+

config/patches/8.5/0024-php-5.4.8-ldap_r.patch

@@ -0,0 +1,23 @@
+From: Debian PHP Maintainers <pkg-php-maint@lists.alioth.debian.org>
+Date: Sat, 2 May 2015 10:26:56 +0200
+Subject: php-5.4.8-ldap_r
+
+Use -lldap_r by default.
+---
+ ext/ldap/config.m4 |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/ext/ldap/config.m4
++++ b/ext/ldap/config.m4
+@@ -76,7 +76,10 @@ if test "$PHP_LDAP" != "no"; then
+     AH_TEMPLATE([HAVE_ORALDAP],
+       [Define to 1 if the ldap extension uses the Oracle Instant Client.])
+ 
+-    if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$DEB_HOST_MULTIARCH/liblber.a || test -f $LDAP_LIBDIR/$DEB_HOST_MULTIARCH/liblber.$SHLIB_SUFFIX_NAME; then
++    if test -f $LDAP_LIBDIR/libldap_r.a || test -f $LDAP_LIBDIR/libldap_r.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$DEB_HOST_MULTIARCH/libldap_r.a || test -f $LDAP_LIBDIR/$DEB_HOST_MULTIARCH/libldap_r.$SHLIB_SUFFIX_NAME; then
++      PHP_ADD_LIBRARY_WITH_PATH([lber], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
++      PHP_ADD_LIBRARY_WITH_PATH([ldap_r], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
++    elif test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$DEB_HOST_MULTIARCH/liblber.a || test -f $LDAP_LIBDIR/$DEB_HOST_MULTIARCH/liblber.$SHLIB_SUFFIX_NAME; then
+       PHP_ADD_LIBRARY_WITH_PATH([lber], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
+       PHP_ADD_LIBRARY_WITH_PATH([ldap], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
+ 

config/patches/8.5/0045-Revert-Use-pkg-config-for-ext-ldap-without-a-directo.patch

@@ -21,6 +21,7 @@
 0021-expose_all_built_and_installed_apis.patch
 0022-Use-system-timezone.patch
 0023-php-fpm-do-reload-on-SIGHUP.patch
+0024-php-5.4.8-ldap_r.patch
 0025-php-5.4.9-fixheader.patch
 0026-php-5.6.0-noNO.patch
 0027-php-5.6.0-oldpcre.patch
@@ -40,6 +41,3 @@
 0042-Update-gcc-func-attr-macro.patch
 0043-scripts-php-.in-Explicitly-define-the-path-to-sed.patch
 0044-Remove-timestamps-from-phar.patch
-0045-Revert-Use-pkg-config-for-ext-ldap-without-a-directo.patch
-0046-temporary-path-fixes-for-multiarch-ldap.patch
-0047-php-5.4.8-ldap_r.patch