mirror of
https://git.freebsd.org/ports.git
synced 2025-06-08 06:10:30 -04:00
Changelog: Core: Fixed bug #77903 (ArrayIterator stops iterating after offsetSet call). CLI: Fixed bug #77794 (Incorrect Date header format in built-in server). EXIF: Fixed bug #77950 (Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG). Interbase: Fixed bug #72175 (Impossibility of creating multiple connections to Interbase with php 7.x). Intl: Fixed bug #77895 (IntlDateFormatter::create fails in strict mode if $locale = null). litespeed: LiteSpeed SAPI 7.3.1, better process management, new API function litespeed_finish_request(). LDAP: Fixed bug #77869 (Core dump when using server controls) (mcmic) Mail: Fixed bug #77821 (Potential heap corruption in TSendMail()). mbstring: Implemented FR #72777 (Implement regex stack limits for mbregex functions). MySQLi: Fixed bug #77773 (Unbuffered queries leak memory - MySQLi / mysqlnd). PCRE: Fixed bug #77827 (preg_match does not ignore \r in regex flags). PDO: Fixed bug #77849 (Disable cloning of PDO handle/connection objects). phpdbg: Fixed bug #76801 (too many open files). Fixed bug #77800 (phpdbg segfaults on listing some conditional breakpoints). Fixed bug #77805 (phpdbg build fails when readline is shared). Reflection: Fixed bug #77772 (ReflectionClass::getMethods(null) doesn't work). Fixed bug #77882 (Different behavior: always calls destructor). Standard: Fixed bug #77793 (Segmentation fault in extract() when overwriting reference with itself). Fixed bug #77844 (Crash due to null pointer in parse_ini_string with INI_SCANNER_TYPED). Fixed bug #77853 (Inconsistent substr_compare behaviour with empty haystack). Changelog taken from: https://www.php.net/ChangeLog-7.php#7.3.5 MFH: 2019Q2
68 lines
3 KiB
Text
68 lines
3 KiB
Text
--- acinclude.m4.orig 2018-12-04 16:12:30 UTC
|
|
+++ acinclude.m4
|
|
@@ -971,15 +971,9 @@ dnl ------------------------------------
|
|
if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
|
|
dnl ---------------------------------------------- CLI static module
|
|
[PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
|
|
- case "$PHP_SAPI" in
|
|
- cgi|embed|phpdbg[)]
|
|
- PHP_ADD_SOURCES($ext_dir,$2,$ac_extra,)
|
|
- EXT_STATIC="$EXT_STATIC $1;$ext_dir"
|
|
- ;;
|
|
- *[)]
|
|
- PHP_ADD_SOURCES($ext_dir,$2,$ac_extra,cli)
|
|
- ;;
|
|
- esac
|
|
+
|
|
+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi)
|
|
+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,fpm)
|
|
EXT_CLI_STATIC="$EXT_CLI_STATIC $1;$ext_dir"
|
|
fi
|
|
PHP_ADD_BUILD_DIR($ext_builddir)
|
|
@@ -1029,12 +1023,6 @@ You either need to build $1 shared or bu
|
|
build to be successful.
|
|
])
|
|
fi
|
|
- if test "x$is_it_enabled" = "xno" && test "x$3" != "xtrue"; then
|
|
- AC_MSG_ERROR([
|
|
-You've configured extension $1, which depends on extension $2,
|
|
-but you've either not enabled $2, or have disabled it.
|
|
-])
|
|
- fi
|
|
dnl Some systems require that we link $2 to $1 when building
|
|
])
|
|
|
|
@@ -2970,8 +2958,7 @@ dnl in GNU Make which causes the .d file
|
|
$abs_srcdir/$ac_provsrc:;
|
|
|
|
$ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
|
|
- CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@
|
|
-
|
|
+ CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@
|
|
\$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
|
|
|
|
EOF
|
|
@@ -2990,12 +2977,12 @@ dnl Always attempt to create both PIC an
|
|
$ac_bdir[$]ac_provsrc.lo: \$(PHP_DTRACE_OBJS)
|
|
echo "[#] Generated by Makefile for libtool" > \$[]@
|
|
@test -d "$dtrace_lib_dir" || mkdir $dtrace_lib_dir
|
|
- if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\]
|
|
+ if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\]
|
|
echo "pic_object=['].libs/$dtrace_prov_name[']" >> \$[]@ [;\\]
|
|
else [\\]
|
|
echo "pic_object='none'" >> \$[]@ [;\\]
|
|
fi
|
|
- if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $ac_bdir[$]ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\]
|
|
+ if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o $ac_bdir[$]ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\]
|
|
echo "non_pic_object=[']$dtrace_prov_name[']" >> \$[]@ [;\\]
|
|
else [\\]
|
|
echo "non_pic_object='none'" >> \$[]@ [;\\]
|
|
@@ -3007,7 +2994,7 @@ EOF
|
|
*)
|
|
cat>>Makefile.objects<<EOF
|
|
$ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS)
|
|
- CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
|
|
+ CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
|
|
|
|
EOF
|
|
;;
|