Skip to content

Commit d10ddc1

Browse files
shivammathurshivammathur
committed
Update ldap patches for PHP 8.5
1 parent e6d0ffc commit d10ddc1

File tree

5 files changed

+171
-22
lines changed

5 files changed

+171
-22
lines changed

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,6 @@ index ef58820..943864f 100644
2121
lib_found="";
2222
PHP_TEMP_LDFLAGS([-L$THIS_PREFIX/$PHP_LIBDIR], [-l$LIB],
2323
[AC_LINK_IFELSE([AC_LANG_PROGRAM([#include "$THIS_INCLUDE"],
24-
diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4
25-
index 447e9dd..38e9a07 100644
26-
--- a/ext/ldap/config.m4
27-
+++ b/ext/ldap/config.m4
28-
@@ -72,11 +72,11 @@ if test "$PHP_LDAP" != "no"; then
29-
AH_TEMPLATE([HAVE_ORALDAP],
30-
[Define to 1 if the ldap extension uses the Oracle Instant Client.])
31-
32-
- 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
33-
+ 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
34-
PHP_ADD_LIBRARY_WITH_PATH([lber], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
35-
PHP_ADD_LIBRARY_WITH_PATH([ldap], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
36-
37-
- 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
38-
+ 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
39-
PHP_ADD_LIBRARY_WITH_PATH([ldap], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
40-
41-
elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.12.1 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME.12.1; then
4224
diff --git a/ext/pdo_dblib/config.m4 b/ext/pdo_dblib/config.m4
4325
index 4cfea50..423623f 100644
4426
--- a/ext/pdo_dblib/config.m4

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

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
From a0954304442fadf4555f596de4834bf671f0041b Mon Sep 17 00:00:00 2001
2+
From: Shivam Mathur <shivam_jpr@hotmail.com>
3+
Date: Mon, 3 Mar 2025 09:31:20 +0000
4+
Subject: [PATCH] Revert "Use pkg-config for ext/ldap without a directory
5+
(#17441)"
6+
7+
This reverts commit 367787134761f8c0e90ea2b1dd402b6c5795c687.
8+
---
9+
ext/ldap/config.m4 | 82 +++++++++++++++++++++-------------------------
10+
1 file changed, 37 insertions(+), 45 deletions(-)
11+
12+
diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4
13+
index 09be81f6da..bb57d636dd 100644
14+
--- a/ext/ldap/config.m4
15+
+++ b/ext/ldap/config.m4
16+
@@ -38,7 +38,6 @@ AC_DEFUN([PHP_LDAP_CHECKS], [
17+
LDAP_LIBDIR=$1
18+
fi
19+
fi
20+
- PHP_LDAP_PKGCONFIG=false
21+
])
22+
23+
PHP_ARG_WITH([ldap],
24+
@@ -60,53 +59,52 @@ if test "$PHP_LDAP" != "no"; then
25+
[-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
26+
27+
AS_VAR_IF([PHP_LDAP], [yes], [
28+
- PKG_CHECK_MODULES([LDAP], [lber ldap])
29+
- PHP_LDAP_PKGCONFIG=true
30+
+ for i in /usr/local /usr; do
31+
+ PHP_LDAP_CHECKS([$i])
32+
+ done
33+
], [PHP_LDAP_CHECKS([$PHP_LDAP])])
34+
35+
- AS_IF([test "$PHP_LDAP_PKGCONFIG" = true], [
36+
- PHP_EVAL_INCLINE([$LDAP_CFLAGS])
37+
- PHP_EVAL_LIBLINE([$LDAP_LIBS], [LDAP_SHARED_LIBADD])
38+
- ], [
39+
- AS_VAR_IF([LDAP_DIR],, [AC_MSG_ERROR([Cannot find ldap.h])])
40+
+ AS_VAR_IF([LDAP_DIR],, [AC_MSG_ERROR([Cannot find ldap.h])])
41+
42+
- dnl -pc removal is a hack for clang
43+
- MACHINE_INCLUDES=$($CC -dumpmachine | $SED 's/-pc//')
44+
+ dnl -pc removal is a hack for clang
45+
+ MACHINE_INCLUDES=$($CC -dumpmachine | $SED 's/-pc//')
46+
47+
- AH_TEMPLATE([HAVE_ORALDAP],
48+
- [Define to 1 if the ldap extension uses the Oracle Instant Client.])
49+
+ AH_TEMPLATE([HAVE_ORALDAP],
50+
+ [Define to 1 if the ldap extension uses the Oracle Instant Client.])
51+
52+
- 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
53+
- PHP_ADD_LIBRARY_WITH_PATH([lber], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
54+
- PHP_ADD_LIBRARY_WITH_PATH([ldap], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
55+
+ 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
56+
+ PHP_ADD_LIBRARY_WITH_PATH([lber], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
57+
+ PHP_ADD_LIBRARY_WITH_PATH([ldap], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
58+
59+
- 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
60+
- PHP_ADD_LIBRARY_WITH_PATH([ldap], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
61+
+ 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
62+
+ PHP_ADD_LIBRARY_WITH_PATH([ldap], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
63+
64+
- elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.12.1 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME.12.1; then
65+
- PHP_ADD_LIBRARY_WITH_PATH([clntsh], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
66+
- AC_DEFINE([HAVE_ORALDAP], [1])
67+
+ elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.12.1 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME.12.1; then
68+
+ PHP_ADD_LIBRARY_WITH_PATH([clntsh], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
69+
+ AC_DEFINE([HAVE_ORALDAP], [1])
70+
71+
- elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.11.1 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then
72+
- PHP_ADD_LIBRARY_WITH_PATH([clntsh], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
73+
- AC_DEFINE([HAVE_ORALDAP], [1])
74+
+ elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.11.1 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then
75+
+ PHP_ADD_LIBRARY_WITH_PATH([clntsh], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
76+
+ AC_DEFINE([HAVE_ORALDAP], [1])
77+
78+
- elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME; then
79+
- PHP_ADD_LIBRARY_WITH_PATH([clntsh], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
80+
- AC_DEFINE([HAVE_ORALDAP], [1])
81+
+ elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME; then
82+
+ PHP_ADD_LIBRARY_WITH_PATH([clntsh], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
83+
+ AC_DEFINE([HAVE_ORALDAP], [1])
84+
85+
- else
86+
- AC_MSG_ERROR([Cannot find ldap libraries in $LDAP_LIBDIR.])
87+
- fi
88+
+ else
89+
+ AC_MSG_ERROR([Cannot find ldap libraries in $LDAP_LIBDIR.])
90+
+ fi
91+
92+
- PHP_ADD_INCLUDE([$LDAP_INCDIR])
93+
+ PHP_ADD_INCLUDE([$LDAP_INCDIR])
94+
+ PHP_SUBST([LDAP_SHARED_LIBADD])
95+
+ AC_DEFINE([HAVE_LDAP], [1],
96+
+ [Define to 1 if the PHP extension 'ldap' is available.])
97+
98+
- dnl Save original values
99+
- _SAVE_CPPFLAGS=$CPPFLAGS
100+
- _SAVE_LIBS=$LIBS
101+
- CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR"
102+
- LIBS="$LIBS $LDAP_SHARED_LIBADD"
103+
- ])
104+
+ dnl Save original values
105+
+ _SAVE_CPPFLAGS=$CPPFLAGS
106+
+ _SAVE_LIBS=$LIBS
107+
+ CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR"
108+
+ LIBS="$LIBS $LDAP_SHARED_LIBADD"
109+
110+
dnl Check for 3 arg ldap_set_rebind_proc
111+
AC_CACHE_CHECK([for 3 arg ldap_set_rebind_proc],
112+
@@ -134,12 +132,6 @@ if test "$PHP_LDAP" != "no"; then
113+
ldap_whoami_s
114+
]))
115+
116+
- AS_IF([test "$PHP_LDAP_PKGCONFIG" = false], [
117+
- dnl Restore original values
118+
- CPPFLAGS=$_SAVE_CPPFLAGS
119+
- LIBS=$_SAVE_LIBS
120+
- ])
121+
-
122+
dnl SASL check
123+
AS_VAR_IF([PHP_LDAP_SASL], [no],, [
124+
PKG_CHECK_MODULES([SASL], [libsasl2])
125+
@@ -154,7 +146,7 @@ if test "$PHP_LDAP" != "no"; then
126+
[AC_CHECK_FUNC([ldap_simple_bind_s],,
127+
[AC_MSG_ERROR([LDAP library build check failed.])])])
128+
129+
- PHP_SUBST([LDAP_SHARED_LIBADD])
130+
- AC_DEFINE([HAVE_LDAP], [1],
131+
- [Define to 1 if the PHP extension 'ldap' is available.])
132+
+ dnl Restore original values
133+
+ CPPFLAGS=$_SAVE_CPPFLAGS
134+
+ LIBS=$_SAVE_LIBS
135+
fi
136+
--
137+
2.47.1
138+

‎config/patches/8.5/0046-temporary-path-fixes-for-multiarch-ldap.patch‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
From: Debian PHP Maintainers <pkg-php-maint@lists.alioth.debian.org>
2+
Date: Sat, 2 May 2015 10:26:54 +0200
3+
Subject: temporary-path-fixes-for-multiarch
4+
5+
---
6+
ext/ldap/config.m4 | 4 ++--
7+
1 files changed, 2 insertions(+), 2 deletions(-)
8+
9+
diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4
10+
index 447e9dd..38e9a07 100644
11+
--- a/ext/ldap/config.m4
12+
+++ b/ext/ldap/config.m4
13+
@@ -72,11 +72,11 @@ if test "$PHP_LDAP" != "no"; then
14+
AH_TEMPLATE([HAVE_ORALDAP],
15+
[Define to 1 if the ldap extension uses the Oracle Instant Client.])
16+
17+
- 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
18+
+ 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
19+
PHP_ADD_LIBRARY_WITH_PATH([lber], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
20+
PHP_ADD_LIBRARY_WITH_PATH([ldap], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
21+
22+
- 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
23+
+ 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
24+
PHP_ADD_LIBRARY_WITH_PATH([ldap], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
25+
26+
elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.12.1 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME.12.1; then
27+

config/patches/8.5/0024-php-5.4.8-ldap_r.patch renamed to config/patches/8.5/0047-php-5.4.8-ldap_r.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ Use -lldap_r by default.
99

1010
--- a/ext/ldap/config.m4
1111
+++ b/ext/ldap/config.m4
12-
@@ -71,7 +71,10 @@ if test "$PHP_LDAP" != "no"; then
13-
dnl -pc removal is a hack for clang
14-
MACHINE_INCLUDES=$($CC -dumpmachine | $SED 's/-pc//')
12+
@@ -72,7 +72,10 @@ if test "$PHP_LDAP" != "no"; then
13+
AH_TEMPLATE([HAVE_ORALDAP],
14+
[Define to 1 if the ldap extension uses the Oracle Instant Client.])
1515

1616
- 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
1717
+ 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

‎config/patches/8.5/series‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
0021-expose_all_built_and_installed_apis.patch
2222
0022-Use-system-timezone.patch
2323
0023-php-fpm-do-reload-on-SIGHUP.patch
24-
0024-php-5.4.8-ldap_r.patch
2524
0025-php-5.4.9-fixheader.patch
2625
0026-php-5.6.0-noNO.patch
2726
0027-php-5.6.0-oldpcre.patch
@@ -41,3 +40,6 @@
4140
0042-Update-gcc-func-attr-macro.patch
4241
0043-scripts-php-.in-Explicitly-define-the-path-to-sed.patch
4342
0044-Remove-timestamps-from-phar.patch
43+
0045-Revert-Use-pkg-config-for-ext-ldap-without-a-directo.patch
44+
0046-temporary-path-fixes-for-multiarch-ldap.patch
45+
0047-php-5.4.8-ldap_r.patch

0 commit comments

Comments
 (0)