diff -pruN 7.2.9-1/appveyor/build_task.bat 7.2.10-0ubuntu1/appveyor/build_task.bat --- 7.2.9-1/appveyor/build_task.bat 2018-08-14 14:26:29.000000000 +0000 +++ 7.2.10-0ubuntu1/appveyor/build_task.bat 2018-09-11 07:06:08.000000000 +0000 @@ -19,7 +19,7 @@ if /i "%APPVEYOR_REPO_BRANCH:~0,4%" equ ) else ( set BRANCH=master ) -set STABILITY=staging +set STABILITY=stable set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%BRANCH%-%PHP_SDK_VC%-%PHP_SDK_ARCH% rem SDK is cached, deps info is cached as well echo Updating dependencies in %DEPS_DIR% diff -pruN 7.2.9-1/.appveyor.yml 7.2.10-0ubuntu1/.appveyor.yml --- 7.2.9-1/.appveyor.yml 2018-08-14 14:26:29.000000000 +0000 +++ 7.2.10-0ubuntu1/.appveyor.yml 2018-09-11 07:06:00.000000000 +0000 @@ -17,7 +17,7 @@ environment: PHP_BUILD_CACHE_BASE_DIR: c:\build-cache PHP_BUILD_OBJ_DIR: c:\obj PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk - PHP_BUILD_SDK_BRANCH: php-sdk-2.1.7 + PHP_BUILD_SDK_BRANCH: php-sdk-2.1.8 PHP_BUILD_CRT: vc15 # ext and env setup for tests #MYSQL_TEST_PASSWD: Password12! diff -pruN 7.2.9-1/configure 7.2.10-0ubuntu1/configure --- 7.2.9-1/configure 2018-08-14 14:26:29.000000000 +0000 +++ 7.2.10-0ubuntu1/configure 2018-09-11 07:06:07.000000000 +0000 @@ -1798,7 +1798,7 @@ Extensions: Enable PCRE valgrind support. Developers only! --without-sqlite3=DIR Do not include SQLite3 support. DIR is the prefix to SQLite3 installation directory. - --with-zlib=DIR Include ZLIB support (requires zlib >= 1.0.9) + --with-zlib=DIR Include ZLIB support (requires zlib >= 1.2.0.4) --with-zlib-dir= Define the location of zlib install directory --enable-bcmath Enable bc style precision math functions --with-bz2=DIR Include BZip2 support @@ -3655,7 +3655,7 @@ ac_config_headers="$ac_config_headers ma PHP_MAJOR_VERSION=7 PHP_MINOR_VERSION=2 -PHP_RELEASE_VERSION=9 +PHP_RELEASE_VERSION=10 PHP_EXTRA_VERSION="" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr $PHP_MAJOR_VERSION \* 10000 + $PHP_MINOR_VERSION \* 100 + $PHP_RELEASE_VERSION` @@ -9859,6 +9859,10 @@ EOF PHP_VAR_SUBST="$PHP_VAR_SUBST BUILD_PHPDBG_SHARED" + + + PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES sapi/phpdbg/phpdbg.1" + fi if test "$PHP_PHPDBG_WEBHELPER" != "no"; then @@ -21828,7 +21832,7 @@ EOF fi if test -z "$ZLIB_DIR"; then - as_fn_error $? "Cannot find libz" "$LINENO" 5 + as_fn_error $? "Cannot find zlib" "$LINENO" 5 fi case $ZLIB_DIR in @@ -21838,11 +21842,11 @@ EOF { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib version >= 1.2.0.4" >&5 $as_echo_n "checking for zlib version >= 1.2.0.4... " >&6; } - ZLIB_VERSION=`$EGREP "define ZLIB_VERSION" $ZLIB_DIR/include/zlib.h | $SED -e 's/[^0-9\.]//g'` + ZLIB_VERSION=`$EGREP "define ZLIB_VERSION" $ZLIB_INCDIR/zlib.h | $SED -e 's/[^0-9\.]//g'` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZLIB_VERSION" >&5 $as_echo "$ZLIB_VERSION" >&6; } if test `echo $ZLIB_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*1000000 + $2*10000 + $3*100 + $4}'` -lt 1020004; then - as_fn_error $? "libz version greater or equal to 1.2.0.4 required" "$LINENO" 5 + as_fn_error $? "zlib version greater or equal to 1.2.0.4 required" "$LINENO" 5 fi @@ -38419,106 +38423,6 @@ EOF PHP_VAR_SUBST="$PHP_VAR_SUBST GETTEXT_SHARED_LIBADD" - if test -n "$GETTEXT_LIBS"; then - - - if test "$ext_shared" = "yes"; then - GETTEXT_SHARED_LIBADD="-l$GETTEXT_LIBS $GETTEXT_SHARED_LIBADD" - if test -n "$GETTEXT_LIBDIR"; then - - if test "$GETTEXT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GETTEXT_LIBDIR" != "/usr/lib"; then - - if test -z "$GETTEXT_LIBDIR" || echo "$GETTEXT_LIBDIR" | grep '^/' >/dev/null ; then - ai_p=$GETTEXT_LIBDIR - else - - ep_dir=`echo $GETTEXT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'` - - ep_realdir=`(cd "$ep_dir" && pwd)` - ai_p="$ep_realdir"/`basename "$GETTEXT_LIBDIR"` - fi - - - if test "$ext_shared" = "yes"; then - GETTEXT_SHARED_LIBADD="-L$ai_p $GETTEXT_SHARED_LIBADD" - test -n "$ld_runpath_switch" && GETTEXT_SHARED_LIBADD="$ld_runpath_switch$ai_p $GETTEXT_SHARED_LIBADD" - else - - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" - - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" - - fi - - - fi - - fi - - fi - else - - - if test -n "$GETTEXT_LIBDIR"; then - - if test "$GETTEXT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GETTEXT_LIBDIR" != "/usr/lib"; then - - if test -z "$GETTEXT_LIBDIR" || echo "$GETTEXT_LIBDIR" | grep '^/' >/dev/null ; then - ai_p=$GETTEXT_LIBDIR - else - - ep_dir=`echo $GETTEXT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'` - - ep_realdir=`(cd "$ep_dir" && pwd)` - ai_p="$ep_realdir"/`basename "$GETTEXT_LIBDIR"` - fi - - - - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" - - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" - - fi - - - - fi - - fi - - - case $GETTEXT_LIBS in - c|c_r|pthread*) ;; - *) - LIBS="-l$GETTEXT_LIBS $LIBS" - ;; - esac - - - - - fi - - - fi - if test "$GETTEXT_INCDIR" != "/usr/include"; then @@ -38729,6 +38633,105 @@ fi LDFLAGS=$O_LDFLAGS + if test -n "$GETTEXT_LIBS"; then + + + if test "$ext_shared" = "yes"; then + GETTEXT_SHARED_LIBADD="-l$GETTEXT_LIBS $GETTEXT_SHARED_LIBADD" + if test -n "$GETTEXT_LIBDIR"; then + + if test "$GETTEXT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GETTEXT_LIBDIR" != "/usr/lib"; then + + if test -z "$GETTEXT_LIBDIR" || echo "$GETTEXT_LIBDIR" | grep '^/' >/dev/null ; then + ai_p=$GETTEXT_LIBDIR + else + + ep_dir=`echo $GETTEXT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'` + + ep_realdir=`(cd "$ep_dir" && pwd)` + ai_p="$ep_realdir"/`basename "$GETTEXT_LIBDIR"` + fi + + + if test "$ext_shared" = "yes"; then + GETTEXT_SHARED_LIBADD="-L$ai_p $GETTEXT_SHARED_LIBADD" + test -n "$ld_runpath_switch" && GETTEXT_SHARED_LIBADD="$ld_runpath_switch$ai_p $GETTEXT_SHARED_LIBADD" + else + + + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "LIBPATH$unique=set" + + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" + PHP_RPATHS="$PHP_RPATHS $ai_p" + + fi + + + fi + + fi + + fi + else + + + if test -n "$GETTEXT_LIBDIR"; then + + if test "$GETTEXT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GETTEXT_LIBDIR" != "/usr/lib"; then + + if test -z "$GETTEXT_LIBDIR" || echo "$GETTEXT_LIBDIR" | grep '^/' >/dev/null ; then + ai_p=$GETTEXT_LIBDIR + else + + ep_dir=`echo $GETTEXT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'` + + ep_realdir=`(cd "$ep_dir" && pwd)` + ai_p="$ep_realdir"/`basename "$GETTEXT_LIBDIR"` + fi + + + + + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "LIBPATH$unique=set" + + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" + PHP_RPATHS="$PHP_RPATHS $ai_p" + + fi + + + + fi + + fi + + + case $GETTEXT_LIBS in + c|c_r|pthread*) ;; + *) + LIBS="-l$GETTEXT_LIBS $LIBS" + ;; + esac + + + + + fi + + + fi fi @@ -95290,7 +95293,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext + echo '#line 97335 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -98727,7 +98730,7 @@ else LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" cat > conftest.$ac_ext <&5) + (eval echo "\"configure:98891: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "configure:98892: \$? = $ac_status" >&5 + echo "configure:98895: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -99183,11 +99186,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:99186: $lt_compile\"" >&5) + (eval echo "\"configure:99189: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "configure:99190: \$? = $ac_status" >&5 + echo "configure:99193: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -99287,11 +99290,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:99290: $lt_compile\"" >&5) + (eval echo "\"configure:99293: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "configure:99294: \$? = $ac_status" >&5 + echo "configure:99297: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -99751,7 +99754,7 @@ _LT_EOF # Determine the default libpath from the value encoded in an empty executable. cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"configure:103776: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "configure:103777: \$? = $ac_status" >&5 + echo "configure:103780: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -103874,11 +103877,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:103877: $lt_compile\"" >&5) + (eval echo "\"configure:103880: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "configure:103881: \$? = $ac_status" >&5 + echo "configure:103884: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized diff -pruN 7.2.9-1/configure.ac 7.2.10-0ubuntu1/configure.ac --- 7.2.9-1/configure.ac 2018-08-14 14:26:32.000000000 +0000 +++ 7.2.10-0ubuntu1/configure.ac 2018-09-11 07:06:00.000000000 +0000 @@ -107,7 +107,7 @@ int zend_sprintf(char *buffer, const cha PHP_MAJOR_VERSION=7 PHP_MINOR_VERSION=2 -PHP_RELEASE_VERSION=9 +PHP_RELEASE_VERSION=10 PHP_EXTRA_VERSION="" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` diff -pruN 7.2.9-1/debian/changelog 7.2.10-0ubuntu1/debian/changelog --- 7.2.9-1/debian/changelog 2018-08-19 06:56:13.000000000 +0000 +++ 7.2.10-0ubuntu1/debian/changelog 2018-09-13 13:38:55.000000000 +0000 @@ -1,37 +1,48 @@ -php7.2 (7.2.9-1) unstable; urgency=medium +php7.2 (7.2.10-0ubuntu1) cosmic; urgency=medium - [ Lior Kaplan ] - * Fix syntax typo + * SECURITY UPDATE: Update to 7.2.10 to fix security issues + - CVE-2015-9253 + - CVE-2018-14851 + - CVE-2018-14883 - [ Ondřej Surý ] - * New upstream version 7.2.9 - * Rebase patches for PHP 7.2.9 + -- Marc Deslauriers Thu, 13 Sep 2018 09:38:55 -0400 - -- Ondřej Surý Sun, 19 Aug 2018 06:56:13 +0000 +php7.2 (7.2.7-0ubuntu2) cosmic; urgency=medium -php7.2 (7.2.8-2) unstable; urgency=medium + * SECURITY UPDATE: 7.2.7 did not actually include the fix for the + CVE-2018-12882 exif security issue. This release adds backported + patches to fix the issue. + - debian/patches/CVE-2018-12882-1.patch: fix heap use after free in + _php_stream_free in ext/exif/exif.c, ext/exif/tests/bug76409.phpt. + - debian/patches/CVE-2018-12882-2.patch: fix test portability in + ext/exif/tests/bug76409.phpt. + - CVE-2018-12882 - * Build in a chroot which hasn't been usr-merged (Closes: #905187) + -- Marc Deslauriers Thu, 05 Jul 2018 09:35:23 -0400 - -- Lior Kaplan Thu, 02 Aug 2018 07:09:06 +0300 +php7.2 (7.2.7-0ubuntu1) cosmic; urgency=medium -php7.2 (7.2.8-1) unstable; urgency=medium + * SECURITY UPDATE: Update to 7.2.7 to fix security issue + - CVE-2018-12882 - [ Ondřej Surý ] - * New upstream version 7.2.8 - * Update the maintainer address (Closes: #899824) - * Add profile to all default-mysql-server alternatives - * Add libargon2-dev as new alternative build-dependency to libargon2-0-dev - * Update the Vcs-* links to salsa.d.o + -- Marc Deslauriers Tue, 03 Jul 2018 11:16:52 -0400 - -- Lior Kaplan Tue, 31 Jul 2018 20:02:21 +0300 +php7.2 (7.2.5-0ubuntu0.18.04.1) bionic-security; urgency=medium -php7.2 (7.2.4-1) unstable; urgency=medium + * SECURITY UPDATE: Update to 7.2.5 to fix security issues + - CVE-2018-10545, CVE-2018-10546, CVE-2018-10547, CVE-2018-10548, + CVE-2018-10549 + * d/p/0036-php-5.4.9-fixheader.patch: updated for new version. - * New upstream version 7.2.4 - * Rebase patches on top of new upstream release. + -- Marc Deslauriers Wed, 09 May 2018 13:21:02 -0400 + +php7.2 (7.2.3-1ubuntu1) bionic; urgency=medium - -- Ondřej Surý Thu, 05 Apr 2018 08:50:27 +0000 + * Merge with Debian unstable (LP: #1744148). Remaining changes: + - Drop dh-php from Recommends to Suggests so it can be demoted to + universe as it depends on xml2/universe. + + -- Nishanth Aravamudan Wed, 14 Mar 2018 15:03:58 -0700 php7.2 (7.2.3-1) unstable; urgency=medium @@ -53,6 +64,20 @@ php7.2 (7.2.2-2) unstable; urgency=mediu -- Ondřej Surý Tue, 06 Feb 2018 13:00:04 +0000 +php7.2 (7.2.2-1ubuntu2) bionic; urgency=medium + + * No-change rebuild against libcurl4 + + -- Steve Langasek Wed, 28 Feb 2018 08:43:55 +0000 + +php7.2 (7.2.2-1ubuntu1) bionic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Drop dh-php from Recommends to Suggests so it can be demoted to + universe as it depends on xml2/universe. + + -- Dimitri John Ledkov Fri, 09 Feb 2018 21:18:55 +0000 + php7.2 (7.2.2-1) unstable; urgency=medium * New upstream version 7.2.2 @@ -61,6 +86,20 @@ php7.2 (7.2.2-1) unstable; urgency=mediu -- Ondřej Surý Thu, 01 Feb 2018 15:19:04 +0000 +php7.2 (7.2.1-1ubuntu2) bionic; urgency=medium + + * d/control.in: also needs update to keep dh-php in universe. + + -- Nishanth Aravamudan Wed, 31 Jan 2018 10:36:35 -0800 + +php7.2 (7.2.1-1ubuntu1) bionic; urgency=medium + + * Drop dh-php from Recommends to Suggests so it can be demoted to + universe (LP #1590623). + + dh-php has gained a dependency on xml2 which is in universe. + + -- Nishanth Aravamudan Thu, 25 Jan 2018 11:32:42 -0800 + php7.2 (7.2.1-1) unstable; urgency=medium * Update the Vcs-* to salsa.d.o @@ -183,3 +222,4 @@ php7.2 (7.2.0~alpha3-1) experimental; ur * Update phpapi to 20160731 -- Ondřej Surý Thu, 06 Jul 2017 13:50:44 +0200 + diff -pruN 7.2.9-1/debian/control 7.2.10-0ubuntu1/debian/control --- 7.2.9-1/debian/control 2018-08-19 06:56:13.000000000 +0000 +++ 7.2.10-0ubuntu1/debian/control 2018-03-14 22:03:58.000000000 +0000 @@ -1,7 +1,8 @@ Source: php7.2 Section: php Priority: optional -Maintainer: Debian PHP Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian PHP Maintainers Uploaders: Ondřej Surý , Lior Kaplan Build-Depends: apache2-dev (>= 2.4), @@ -11,7 +12,7 @@ Build-Depends: apache2-dev (>= 2.4), chrpath, debhelper (>= 9), default-libmysqlclient-dev | libmysqlclient-dev, - default-mysql-server | mysql-server | virtual-mysql-server , + default-mysql-server | mysql-server | virtual-mysql-server, dh-apache2, dh-systemd (>= 1.3) [linux-any] | base-files (<< 7.2ubuntu5~) [linux-any], dpkg-dev (>= 1.16.1~), @@ -20,7 +21,7 @@ Build-Depends: apache2-dev (>= 2.4), freetds-dev, libapparmor-dev, libapr1-dev (>= 1.2.7-8), - libargon2-dev | libargon2-0-dev, + libargon2-0-dev, libbz2-dev, libc-client-dev, libcurl4-openssl-dev | libcurl-dev, @@ -76,7 +77,7 @@ Build-Depends: apache2-dev (>= 2.4), Build-Conflicts: bind-dev, libxmlrpc-core-c3-dev Standards-Version: 3.9.7 -Vcs-Git: https://salsa.debian.org/php-team/php.git +Vcs-Git: https://gitlab.com/deb.sury.org/php.git Vcs-Browser: https://gitlab.com/deb.sury.org/php Homepage: http://www.php.net/ @@ -223,8 +224,8 @@ Depends: autoconf (>= 2.63), ${perl:Depends} Conflicts: ${libtool:Conflicts} Architecture: any -Recommends: dh-php, - pkg-php-tools +Recommends: pkg-php-tools +Suggests: dh-php Description: Files for PHP7.2 module development This package provides the files from the PHP7.2 source needed for compiling additional modules. diff -pruN 7.2.9-1/debian/control.in 7.2.10-0ubuntu1/debian/control.in --- 7.2.9-1/debian/control.in 2018-08-19 06:56:13.000000000 +0000 +++ 7.2.10-0ubuntu1/debian/control.in 2018-03-14 22:03:58.000000000 +0000 @@ -1,7 +1,8 @@ Source: php@PHP_VERSION@ Section: php Priority: optional -Maintainer: Debian PHP Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian PHP Maintainers Uploaders: Ondřej Surý , Lior Kaplan Build-Depends: apache2-dev (>= 2.4), @@ -11,7 +12,7 @@ Build-Depends: apache2-dev (>= 2.4), chrpath, debhelper (>= 9), default-libmysqlclient-dev | libmysqlclient-dev, - default-mysql-server | mysql-server | virtual-mysql-server , + default-mysql-server | mysql-server | virtual-mysql-server, dh-apache2, dh-systemd (>= 1.3) [linux-any] | base-files (<< 7.2ubuntu5~) [linux-any], dpkg-dev (>= 1.16.1~), @@ -20,7 +21,7 @@ Build-Depends: apache2-dev (>= 2.4), freetds-dev, libapparmor-dev, libapr1-dev (>= 1.2.7-8), - libargon2-dev | libargon2-0-dev, + libargon2-0-dev, libbz2-dev, libc-client-dev, libcurl4-openssl-dev | libcurl-dev, @@ -76,7 +77,7 @@ Build-Depends: apache2-dev (>= 2.4), Build-Conflicts: bind-dev, libxmlrpc-core-c3-dev Standards-Version: 3.9.7 -Vcs-Git: https://salsa.debian.org/php-team/php.git +Vcs-Git: https://gitlab.com/deb.sury.org/php.git Vcs-Browser: https://gitlab.com/deb.sury.org/php Homepage: http://www.php.net/ @@ -223,8 +224,8 @@ Depends: autoconf (>= 2.63), ${perl:Depends} Conflicts: ${libtool:Conflicts} Architecture: any -Recommends: dh-php, - pkg-php-tools +Recommends: pkg-php-tools +Suggests: dh-php Description: Files for PHP@PHP_VERSION@ module development This package provides the files from the PHP@PHP_VERSION@ source needed for compiling additional modules. diff -pruN 7.2.9-1/debian/copyright 7.2.10-0ubuntu1/debian/copyright --- 7.2.9-1/debian/copyright 2018-08-19 06:56:13.000000000 +0000 +++ 7.2.10-0ubuntu1/debian/copyright 2018-03-14 22:00:53.000000000 +0000 @@ -123,7 +123,7 @@ License: BSD-3-clause Files: ext/mbstring/oniguruma/src/st.h ext/mbstring/oniguruma/src/st.c Copyright: 1989 Peter Moore -License: public-domain +License public-domain This is a public domain general purpose hash table package. Files: ext/mbstring/oniguruma/ diff -pruN 7.2.9-1/debian/patches/0001-libtool_fixes.patch 7.2.10-0ubuntu1/debian/patches/0001-libtool_fixes.patch --- 7.2.9-1/debian/patches/0001-libtool_fixes.patch 2018-08-19 06:56:13.000000000 +0000 +++ 7.2.10-0ubuntu1/debian/patches/0001-libtool_fixes.patch 2018-03-14 22:03:43.000000000 +0000 @@ -22,10 +22,10 @@ index 8bf35d3..7c7ee66 100644 dnl TSRM_PTHREAD diff --git a/configure.ac b/configure.ac -index 61d2c84..aa1abd6 100644 +index a002dff..41b7097 100644 --- a/configure.ac +++ b/configure.ac -@@ -1432,8 +1432,6 @@ AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], [ +@@ -1401,8 +1401,6 @@ AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], [ ]) AC_PROG_LIBTOOL diff -pruN 7.2.9-1/debian/patches/0002-static_openssl.patch 7.2.10-0ubuntu1/debian/patches/0002-static_openssl.patch --- 7.2.9-1/debian/patches/0002-static_openssl.patch 2018-08-19 06:56:13.000000000 +0000 +++ 7.2.10-0ubuntu1/debian/patches/0002-static_openssl.patch 2018-03-14 22:03:43.000000000 +0000 @@ -7,10 +7,10 @@ Subject: static_openssl 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 -index 1a692b7..ecf3276 100644 +index d42d708..e0daeb8 100644 --- a/acinclude.m4 +++ b/acinclude.m4 -@@ -2388,9 +2388,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ +@@ -2385,9 +2385,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ PHP_ADD_INCLUDE($OPENSSL_INCDIR) diff -pruN 7.2.9-1/debian/patches/0003-debian_quirks.patch 7.2.10-0ubuntu1/debian/patches/0003-debian_quirks.patch --- 7.2.9-1/debian/patches/0003-debian_quirks.patch 2018-08-19 06:56:13.000000000 +0000 +++ 7.2.10-0ubuntu1/debian/patches/0003-debian_quirks.patch 2018-03-14 22:03:43.000000000 +0000 @@ -14,10 +14,10 @@ Subject: debian_quirks 8 files changed, 22 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac -index aa1abd6..b8c47c2 100644 +index 41b7097..3b580ee 100644 --- a/configure.ac +++ b/configure.ac -@@ -1106,7 +1106,7 @@ if test "$PHP_CLI" = "no"; then +@@ -1078,7 +1078,7 @@ if test "$PHP_CLI" = "no"; then fi PHP_ARG_WITH(pear, [whether to install PEAR], @@ -26,7 +26,7 @@ index aa1abd6..b8c47c2 100644 --without-pear Do not install PEAR], DEFAULT, yes) if test "$PHP_PEAR" != "no"; then -@@ -1143,6 +1143,7 @@ dnl +@@ -1115,6 +1115,7 @@ dnl PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/pear/Makefile.frag,$abs_srcdir/pear,pear) fi @@ -34,7 +34,7 @@ index aa1abd6..b8c47c2 100644 dnl Configuring Zend and TSRM. dnl ------------------------------------------------------------------------- -@@ -1215,6 +1216,8 @@ dnl Build extension directory path +@@ -1187,6 +1188,8 @@ dnl Build extension directory path ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|$SED 's/#define ZEND_MODULE_API_NO //'` @@ -43,7 +43,7 @@ index aa1abd6..b8c47c2 100644 if test -z "$EXTENSION_DIR"; then extbasedir=$ZEND_MODULE_API_NO if test "$oldstyleextdir" = "yes"; then -@@ -1529,6 +1532,7 @@ $php_shtool mkdir -p scripts/man1 +@@ -1498,6 +1501,7 @@ $php_shtool mkdir -p scripts/man1 ALL_OUTPUT_FILES="php7.spec main/build-defs.h \ scripts/phpize scripts/man1/phpize.1 \ scripts/php-config scripts/man1/php-config.1 \ @@ -52,7 +52,7 @@ index aa1abd6..b8c47c2 100644 dnl diff --git a/ext/ext_skel b/ext/ext_skel -index 09a003c..2e71bf0 100755 +index d1b8a28..79cd5f6 100755 --- a/ext/ext_skel +++ b/ext/ext_skel @@ -70,7 +70,7 @@ if test -d "$extname" ; then @@ -65,7 +65,7 @@ index 09a003c..2e71bf0 100755 ## convert skel_dir to full path diff --git a/php.ini-development b/php.ini-development -index 8dbdba3..3e94ef8 100644 +index 83ed0fa..24f5f47 100644 --- a/php.ini-development +++ b/php.ini-development @@ -704,7 +704,7 @@ default_charset = "UTF-8" @@ -78,7 +78,7 @@ index 8dbdba3..3e94ef8 100644 ; Windows: "\path1;\path2" ;include_path = ".;c:\php\includes" diff --git a/php.ini-production b/php.ini-production -index bcb0828..05b8e90 100644 +index a8fb5c9..d3cd4ea 100644 --- a/php.ini-production +++ b/php.ini-production @@ -711,7 +711,7 @@ default_charset = "UTF-8" diff -pruN 7.2.9-1/debian/patches/0007-extension_api.patch 7.2.10-0ubuntu1/debian/patches/0007-extension_api.patch --- 7.2.9-1/debian/patches/0007-extension_api.patch 2018-08-19 06:56:13.000000000 +0000 +++ 7.2.10-0ubuntu1/debian/patches/0007-extension_api.patch 2018-03-14 22:03:43.000000000 +0000 @@ -8,10 +8,10 @@ Subject: extension_api 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index b8c47c2..8cb95eb 100644 +index 3b580ee..5785bdce 100644 --- a/configure.ac +++ b/configure.ac -@@ -1218,8 +1218,10 @@ ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modul +@@ -1190,8 +1190,10 @@ ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modul AC_SUBST(ZEND_MODULE_API_NO) @@ -23,7 +23,7 @@ index b8c47c2..8cb95eb 100644 if test "$oldstyleextdir" = "yes"; then if test "$PHP_DEBUG" = "1"; then part1=debug -@@ -1357,6 +1359,7 @@ PHP_SUBST(CXX) +@@ -1326,6 +1328,7 @@ PHP_SUBST(CXX) PHP_SUBST(CXXFLAGS) PHP_SUBST(CXXFLAGS_CLEAN) PHP_SUBST_OLD(DEBUG_CFLAGS) diff -pruN 7.2.9-1/debian/patches/0011-php.ini_securitynotes.patch 7.2.10-0ubuntu1/debian/patches/0011-php.ini_securitynotes.patch --- 7.2.9-1/debian/patches/0011-php.ini_securitynotes.patch 2018-08-19 06:56:13.000000000 +0000 +++ 7.2.10-0ubuntu1/debian/patches/0011-php.ini_securitynotes.patch 2018-03-14 22:00:53.000000000 +0000 @@ -7,7 +7,7 @@ Subject: php.ini_securitynotes 1 file changed, 6 insertions(+) diff --git a/php.ini-development b/php.ini-development -index 3e94ef8..a5b587b 100644 +index 24f5f47..fd37fcb 100644 --- a/php.ini-development +++ b/php.ini-development @@ -301,6 +301,12 @@ serialize_precision = -1 diff -pruN 7.2.9-1/debian/patches/0018-session_save_path.patch 7.2.10-0ubuntu1/debian/patches/0018-session_save_path.patch --- 7.2.9-1/debian/patches/0018-session_save_path.patch 2018-08-19 06:56:13.000000000 +0000 +++ 7.2.10-0ubuntu1/debian/patches/0018-session_save_path.patch 2018-03-14 22:00:53.000000000 +0000 @@ -22,7 +22,7 @@ index dd54e6f..165c357 100644 PHP_INI_ENTRY("session.save_handler", "files", PHP_INI_ALL, OnUpdateSaveHandler) STD_PHP_INI_BOOLEAN("session.auto_start", "0", PHP_INI_PERDIR, OnUpdateBool, auto_start, php_ps_globals, ps_globals) diff --git a/php.ini-development b/php.ini-development -index a5b587b..ca168b8 100644 +index fd37fcb..640544e 100644 --- a/php.ini-development +++ b/php.ini-development @@ -1347,7 +1347,7 @@ session.save_handler = files @@ -35,7 +35,7 @@ index a5b587b..ca168b8 100644 ; Whether to use strict session mode. ; Strict session mode does not accept uninitialized session ID and regenerate diff --git a/php.ini-production b/php.ini-production -index 05b8e90..7c84ff8 100644 +index d3cd4ea..1b17845 100644 --- a/php.ini-production +++ b/php.ini-production @@ -1348,7 +1348,7 @@ session.save_handler = files diff -pruN 7.2.9-1/debian/patches/0021-php-fpm-sysconfdir.patch 7.2.10-0ubuntu1/debian/patches/0021-php-fpm-sysconfdir.patch --- 7.2.9-1/debian/patches/0021-php-fpm-sysconfdir.patch 2018-08-19 06:56:13.000000000 +0000 +++ 7.2.10-0ubuntu1/debian/patches/0021-php-fpm-sysconfdir.patch 2018-03-14 22:00:53.000000000 +0000 @@ -7,10 +7,10 @@ Subject: php-fpm-sysconfdir 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c -index b93cd15..cda0728 100644 +index 8ab120a..c12b796 100644 --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c -@@ -1708,7 +1708,7 @@ int fpm_conf_init_main(int test_conf, int force_daemon) /* {{{ */ +@@ -1705,7 +1705,7 @@ int fpm_conf_init_main(int test_conf, int force_daemon) /* {{{ */ char *tmp; if (fpm_globals.prefix == NULL) { diff -pruN 7.2.9-1/debian/patches/0023-temporary-path-fixes-for-multiarch.patch 7.2.10-0ubuntu1/debian/patches/0023-temporary-path-fixes-for-multiarch.patch --- 7.2.9-1/debian/patches/0023-temporary-path-fixes-for-multiarch.patch 2018-08-19 06:56:13.000000000 +0000 +++ 7.2.10-0ubuntu1/debian/patches/0023-temporary-path-fixes-for-multiarch.patch 2018-03-14 22:03:43.000000000 +0000 @@ -12,10 +12,10 @@ Subject: temporary-path-fixes-for-multia 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 -index ecf3276..80ecb73 100644 +index e0daeb8..43292f2 100644 --- a/acinclude.m4 +++ b/acinclude.m4 -@@ -2278,7 +2278,7 @@ AC_DEFUN([PHP_SETUP_KERBEROS],[ +@@ -2275,7 +2275,7 @@ AC_DEFUN([PHP_SETUP_KERBEROS],[ fi for i in $PHP_KERBEROS; do @@ -24,7 +24,7 @@ index ecf3276..80ecb73 100644 PHP_KERBEROS_DIR=$i break fi -@@ -2357,7 +2357,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ +@@ -2354,7 +2354,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ if test -r $i/include/openssl/evp.h; then OPENSSL_INCDIR=$i/include fi diff -pruN 7.2.9-1/debian/patches/0024-hurd-noptrace.patch 7.2.10-0ubuntu1/debian/patches/0024-hurd-noptrace.patch --- 7.2.9-1/debian/patches/0024-hurd-noptrace.patch 2018-08-19 06:56:13.000000000 +0000 +++ 7.2.10-0ubuntu1/debian/patches/0024-hurd-noptrace.patch 2018-03-14 22:00:53.000000000 +0000 @@ -7,7 +7,7 @@ Subject: hurd-noptrace 1 file changed, 5 insertions(+) diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4 -index 8a9c60a..0676371 100644 +index e6a1a49..3340fa1 100644 --- a/sapi/fpm/config.m4 +++ b/sapi/fpm/config.m4 @@ -147,6 +147,11 @@ AC_DEFUN([AC_FPM_TRACE], diff -pruN 7.2.9-1/debian/patches/0025-php-5.3.9-mysqlnd.patch 7.2.10-0ubuntu1/debian/patches/0025-php-5.3.9-mysqlnd.patch --- 7.2.9-1/debian/patches/0025-php-5.3.9-mysqlnd.patch 2018-08-19 06:56:13.000000000 +0000 +++ 7.2.10-0ubuntu1/debian/patches/0025-php-5.3.9-mysqlnd.patch 2018-03-14 22:00:53.000000000 +0000 @@ -8,7 +8,7 @@ Subject: php-5.3.9-mysqlnd 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/mysqlnd/mysqlnd_connection.c b/ext/mysqlnd/mysqlnd_connection.c -index 1e0088b..3dff464 100644 +index ea3d1cb..df0b8c1 100644 --- a/ext/mysqlnd/mysqlnd_connection.c +++ b/ext/mysqlnd/mysqlnd_connection.c @@ -559,7 +559,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, get_scheme)(MYSQLND_CONN_DATA * conn, MYSQLND_ diff -pruN 7.2.9-1/debian/patches/0026-php-5.3.9-gnusrc.patch 7.2.10-0ubuntu1/debian/patches/0026-php-5.3.9-gnusrc.patch --- 7.2.9-1/debian/patches/0026-php-5.3.9-gnusrc.patch 2018-08-19 06:56:13.000000000 +0000 +++ 7.2.10-0ubuntu1/debian/patches/0026-php-5.3.9-gnusrc.patch 2018-03-14 22:03:43.000000000 +0000 @@ -29,7 +29,7 @@ index dbd30da..989912c 100644 /* +----------------------------------------------------------------------+ diff --git a/configure.ac b/configure.ac -index 8cb95eb..af799aa 100644 +index 5785bdce..ab2ea74 100644 --- a/configure.ac +++ b/configure.ac @@ -124,6 +124,8 @@ AC_DEFUN([PHP_EXT_DIR],[$config_m4_dir])dnl diff -pruN 7.2.9-1/debian/patches/0028-php-5.2.4-norpath.patch 7.2.10-0ubuntu1/debian/patches/0028-php-5.2.4-norpath.patch --- 7.2.9-1/debian/patches/0028-php-5.2.4-norpath.patch 2018-08-19 06:56:13.000000000 +0000 +++ 7.2.10-0ubuntu1/debian/patches/0028-php-5.2.4-norpath.patch 2018-03-14 22:03:43.000000000 +0000 @@ -7,7 +7,7 @@ Subject: php-5.2.4-norpath 1 file changed, 2 insertions(+) diff --git a/acinclude.m4 b/acinclude.m4 -index 80ecb73..c9f899c 100644 +index 43292f2..12f2f9c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -432,6 +432,7 @@ AC_DEFUN([PHP_EVAL_INCLINE],[ diff -pruN 7.2.9-1/debian/patches/0032-Use-system-timezone.patch 7.2.10-0ubuntu1/debian/patches/0032-Use-system-timezone.patch --- 7.2.9-1/debian/patches/0032-Use-system-timezone.patch 2018-08-19 06:56:13.000000000 +0000 +++ 7.2.10-0ubuntu1/debian/patches/0032-Use-system-timezone.patch 2018-03-14 22:03:43.000000000 +0000 @@ -14,10 +14,10 @@ To be used in tandem with use_embedded_t 1 file changed, 17 insertions(+) diff --git a/ext/date/php_date.c b/ext/date/php_date.c -index a60422b..75d8d4c 100644 +index 2df19f7..4320617 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c -@@ -1015,6 +1015,23 @@ static char* guess_timezone(const timelib_tzdb *tzdb) +@@ -1014,6 +1014,23 @@ static char* guess_timezone(const timelib_tzdb *tzdb) DATEG(timezone_valid) = 1; return DATEG(default_timezone); } diff -pruN 7.2.9-1/debian/patches/0036-php-5.4.9-fixheader.patch 7.2.10-0ubuntu1/debian/patches/0036-php-5.4.9-fixheader.patch --- 7.2.9-1/debian/patches/0036-php-5.4.9-fixheader.patch 2018-08-19 06:56:13.000000000 +0000 +++ 7.2.10-0ubuntu1/debian/patches/0036-php-5.4.9-fixheader.patch 2018-05-09 17:21:02.000000000 +0000 @@ -7,10 +7,10 @@ Make generated php_config.h constant acr configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index af799aa..add3d4a 100644 ---- a/configure.ac -+++ b/configure.ac +Index: php-7.2.5/configure.ac +=================================================================== +--- php-7.2.5.orig/configure.ac 2018-05-09 13:36:15.314325761 -0400 ++++ php-7.2.5/configure.ac 2018-05-09 13:36:15.310325758 -0400 @@ -1310,7 +1310,7 @@ PHP_BUILD_DATE=`date -u +%Y-%m-%d` fi AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date]) diff -pruN 7.2.9-1/debian/patches/0039-hack-phpdbg-to-explicitly-link-with-libedit.patch 7.2.10-0ubuntu1/debian/patches/0039-hack-phpdbg-to-explicitly-link-with-libedit.patch --- 7.2.9-1/debian/patches/0039-hack-phpdbg-to-explicitly-link-with-libedit.patch 2018-08-19 06:56:13.000000000 +0000 +++ 7.2.10-0ubuntu1/debian/patches/0039-hack-phpdbg-to-explicitly-link-with-libedit.patch 2018-09-13 13:38:55.000000000 +0000 @@ -6,11 +6,11 @@ Subject: hack-phpdbg-to-explicitly-link- sapi/phpdbg/config.m4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/sapi/phpdbg/config.m4 b/sapi/phpdbg/config.m4 -index 9fb4e62..a55199a 100644 ---- a/sapi/phpdbg/config.m4 -+++ b/sapi/phpdbg/config.m4 -@@ -25,7 +25,9 @@ if test "$BUILD_PHPDBG" = "" && test "$PHP_PHPDBG" != "no"; then +Index: php-7.2.10/sapi/phpdbg/config.m4 +=================================================================== +--- php-7.2.10.orig/sapi/phpdbg/config.m4 2018-09-13 10:02:03.882657488 -0400 ++++ php-7.2.10/sapi/phpdbg/config.m4 2018-09-13 10:02:03.882657488 -0400 +@@ -25,7 +25,9 @@ if test "$BUILD_PHPDBG" = "" && test "$P PHP_PHPDBG_FILES="phpdbg.c phpdbg_parser.c phpdbg_lexer.c phpdbg_prompt.c phpdbg_help.c phpdbg_break.c phpdbg_print.c phpdbg_bp.c phpdbg_opcode.c phpdbg_list.c phpdbg_utils.c phpdbg_info.c phpdbg_cmd.c phpdbg_set.c phpdbg_frame.c phpdbg_watch.c phpdbg_btree.c phpdbg_sigsafe.c phpdbg_wait.c phpdbg_io.c phpdbg_eol.c phpdbg_out.c" if test "$PHP_READLINE" != "no" -o "$PHP_LIBEDIT" != "no"; then @@ -19,5 +19,5 @@ index 9fb4e62..a55199a 100644 +# Temporary hack until this gets fixed + PHPDBG_EXTRA_LIBS="-ledit -ltermcap" fi - + PHP_SUBST(PHP_PHPDBG_CFLAGS) diff -pruN 7.2.9-1/debian/patches/0042-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch 7.2.10-0ubuntu1/debian/patches/0042-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch --- 7.2.9-1/debian/patches/0042-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch 2018-08-19 06:56:13.000000000 +0000 +++ 7.2.10-0ubuntu1/debian/patches/0042-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch 2018-03-14 22:00:53.000000000 +0000 @@ -1,4 +1,4 @@ -From: =?utf-8?b?T25kxZllaiBTdXLDvQ==?= +From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= Date: Wed, 29 Jul 2015 14:37:55 +0200 Subject: Remove W3C validation icon to not expose the reader's IP address to potential tracking. diff -pruN 7.2.9-1/debian/patches/0043-Don-t-put-INSTALL_ROOT-into-phar.phar-exec-stanza.patch 7.2.10-0ubuntu1/debian/patches/0043-Don-t-put-INSTALL_ROOT-into-phar.phar-exec-stanza.patch --- 7.2.9-1/debian/patches/0043-Don-t-put-INSTALL_ROOT-into-phar.phar-exec-stanza.patch 2018-08-19 06:56:13.000000000 +0000 +++ 7.2.10-0ubuntu1/debian/patches/0043-Don-t-put-INSTALL_ROOT-into-phar.phar-exec-stanza.patch 2018-03-14 22:00:53.000000000 +0000 @@ -1,4 +1,4 @@ -From: =?utf-8?b?T25kxZllaiBTdXLDvQ==?= +From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= Date: Fri, 4 Dec 2015 15:53:50 +0100 Subject: Don't put $(INSTALL_ROOT) into phar.phar exec stanza diff -pruN 7.2.9-1/debian/patches/0044-XMLRPC-EPI-library-has-to-be-linked-as-lxmlrpc-epi.patch 7.2.10-0ubuntu1/debian/patches/0044-XMLRPC-EPI-library-has-to-be-linked-as-lxmlrpc-epi.patch --- 7.2.9-1/debian/patches/0044-XMLRPC-EPI-library-has-to-be-linked-as-lxmlrpc-epi.patch 2018-08-19 06:56:13.000000000 +0000 +++ 7.2.10-0ubuntu1/debian/patches/0044-XMLRPC-EPI-library-has-to-be-linked-as-lxmlrpc-epi.patch 2018-03-14 22:03:43.000000000 +0000 @@ -1,4 +1,4 @@ -From: =?utf-8?b?T25kxZllaiBTdXLDvQ==?= +From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= Date: Fri, 18 Dec 2015 08:29:15 +0100 Subject: XMLRPC-EPI library has to be linked as -lxmlrpc-epi diff -pruN 7.2.9-1/debian/patches/0045-Really-expand-libdir-datadir-into-EXPANDED_LIBDIR-DA.patch 7.2.10-0ubuntu1/debian/patches/0045-Really-expand-libdir-datadir-into-EXPANDED_LIBDIR-DA.patch --- 7.2.9-1/debian/patches/0045-Really-expand-libdir-datadir-into-EXPANDED_LIBDIR-DA.patch 2018-08-19 06:56:13.000000000 +0000 +++ 7.2.10-0ubuntu1/debian/patches/0045-Really-expand-libdir-datadir-into-EXPANDED_LIBDIR-DA.patch 2018-03-14 22:03:43.000000000 +0000 @@ -1,4 +1,4 @@ -From: =?utf-8?b?T25kxZllaiBTdXLDvQ==?= +From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= Date: Mon, 14 Mar 2016 16:09:34 +0100 Subject: Really expand $libdir/$datadir into @EXPANDED_LIBDIR/DATADIR@ @@ -7,10 +7,10 @@ Subject: Really expand $libdir/$datadir 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index add3d4a..6266a8d 100644 +index 6c6a385..57e84ac 100644 --- a/configure.ac +++ b/configure.ac -@@ -1265,9 +1265,9 @@ EXPANDED_LOCALSTATEDIR=`eval echo $localstatedir` +@@ -1237,9 +1237,9 @@ EXPANDED_LOCALSTATEDIR=`eval echo $localstatedir` EXPANDED_BINDIR=`eval echo $bindir` EXPANDED_SBINDIR=`eval echo $sbindir` EXPANDED_MANDIR=`eval echo $mandir` diff -pruN 7.2.9-1/debian/rules 7.2.10-0ubuntu1/debian/rules --- 7.2.9-1/debian/rules 2018-08-19 06:56:13.000000000 +0000 +++ 7.2.10-0ubuntu1/debian/rules 2018-03-14 22:00:53.000000000 +0000 @@ -91,15 +91,9 @@ LIBTOOL_VERSION := $(shell dpkg-query -f # Disable the test now RUN_TESTS := yes -ifeq (nocheck,$(filter nocheck,$(DEB_BUILD_PROFILES))) - $(warning Disabling tests due DEB_BUILD_PROFILES) - DEB_BUILD_OPTIONS += nocheck +ifeq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) + $(warning Disabling checks due DEB_BUILD_OPTIONS) RUN_TESTS := no -else - ifeq (nocheck,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - $(warning Disabling tests due DEB_BUILD_OPTIONS) - RUN_TESTS := no - endif endif ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),hurd-i386 mips mipsel ppc64 ppc64el armel armhf arm64 kfreebsd-amd64 kfreebsd-i386)) $(warning Disabling checks on $(DEB_HOST_ARCH)) diff -pruN 7.2.9-1/ext/bz2/bz2.c 7.2.10-0ubuntu1/ext/bz2/bz2.c --- 7.2.9-1/ext/bz2/bz2.c 2018-08-14 14:26:32.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/bz2/bz2.c 2018-09-11 07:06:02.000000000 +0000 @@ -75,7 +75,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_bzerror, 0) ZEND_ARG_INFO(0, bz) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_bzcompress, 0, 0, 2) +ZEND_BEGIN_ARG_INFO_EX(arginfo_bzcompress, 0, 0, 1) ZEND_ARG_INFO(0, source) ZEND_ARG_INFO(0, blocksize) ZEND_ARG_INFO(0, workfactor) diff -pruN 7.2.9-1/ext/com_dotnet/com_iterator.c 7.2.10-0ubuntu1/ext/com_dotnet/com_iterator.c --- 7.2.9-1/ext/com_dotnet/com_iterator.c 2018-08-14 14:26:43.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/com_dotnet/com_iterator.c 2018-09-11 07:06:05.000000000 +0000 @@ -82,7 +82,7 @@ static void com_iter_get_key(zend_object } } -static int com_iter_move_forwards(zend_object_iterator *iter) +static void com_iter_move_forwards(zend_object_iterator *iter) { struct php_com_iterator *I = (struct php_com_iterator*)Z_PTR(iter->data); unsigned long n_fetched; @@ -103,18 +103,18 @@ static int com_iter_move_forwards(zend_o } else { /* indicate that there are no more items */ I->key = (ulong)-1; - return FAILURE; + return; } } else { /* safe array */ if (I->key >= (ULONG) I->sa_max) { I->key = (ulong)-1; - return FAILURE; + return; } I->key++; if (php_com_safearray_get_elem(&I->safe_array, &I->v, (LONG)I->key) == 0) { I->key = (ulong)-1; - return FAILURE; + return; } } @@ -122,7 +122,6 @@ static int com_iter_move_forwards(zend_o php_com_zval_from_variant(&ptr, &I->v, I->code_page); /* php_com_wrap_variant(ptr, &I->v, I->code_page); */ ZVAL_COPY_VALUE(&I->zdata, &ptr); - return SUCCESS; } diff -pruN 7.2.9-1/ext/com_dotnet/com_saproxy.c 7.2.10-0ubuntu1/ext/com_dotnet/com_saproxy.c --- 7.2.9-1/ext/com_dotnet/com_saproxy.c 2018-08-14 14:26:43.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/com_dotnet/com_saproxy.c 2018-09-11 07:06:05.000000000 +0000 @@ -514,15 +514,13 @@ static void saproxy_iter_get_key(zend_ob } } -static int saproxy_iter_move_forwards(zend_object_iterator *iter) +static void saproxy_iter_move_forwards(zend_object_iterator *iter) { php_com_saproxy_iter *I = (php_com_saproxy_iter*)Z_PTR(iter->data); if (++I->key >= I->imax) { I->key = -1; - return FAILURE; } - return SUCCESS; } static zend_object_iterator_funcs saproxy_iter_funcs = { diff -pruN 7.2.9-1/ext/com_dotnet/com_typeinfo.c 7.2.10-0ubuntu1/ext/com_dotnet/com_typeinfo.c --- 7.2.9-1/ext/com_dotnet/com_typeinfo.c 2018-08-14 14:26:43.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/com_dotnet/com_typeinfo.c 2018-09-11 07:06:05.000000000 +0000 @@ -223,9 +223,9 @@ PHP_COM_DOTNET_API int php_com_import_ty } /* Type-library stuff */ -void php_com_typelibrary_dtor(void *pDest) +void php_com_typelibrary_dtor(zval *pDest) { - ITypeLib **Lib = (ITypeLib**)pDest; + ITypeLib **Lib = (ITypeLib**)Z_PTR_P(pDest); ITypeLib_Release(*Lib); } diff -pruN 7.2.9-1/ext/com_dotnet/php_com_dotnet_internal.h 7.2.10-0ubuntu1/ext/com_dotnet/php_com_dotnet_internal.h --- 7.2.9-1/ext/com_dotnet/php_com_dotnet_internal.h 2018-08-14 14:26:43.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/com_dotnet/php_com_dotnet_internal.h 2018-09-11 07:06:05.000000000 +0000 @@ -174,7 +174,7 @@ PHP_COM_DOTNET_API ITypeLib *php_com_loa PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib(char *search_string, int codepage); PHP_COM_DOTNET_API int php_com_import_typelib(ITypeLib *TL, int mode, int codepage); -void php_com_typelibrary_dtor(void *pDest); +void php_com_typelibrary_dtor(zval *pDest); ITypeInfo *php_com_locate_typeinfo(char *typelibname, php_com_dotnet_object *obj, char *dispname, int sink); int php_com_process_typeinfo(ITypeInfo *typeinfo, HashTable *id_to_name, int printdef, GUID *guid, int codepage); diff -pruN 7.2.9-1/ext/ext_skel 7.2.10-0ubuntu1/ext/ext_skel --- 7.2.9-1/ext/ext_skel 2018-08-14 14:26:41.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/ext_skel 2018-09-11 07:06:02.000000000 +0000 @@ -120,9 +120,9 @@ dnl [ --with-$extname Inclu dnl Otherwise use enable: -dnl PHP_ARG_ENABLE($extname, whether to enable $extname support, +PHP_ARG_ENABLE($extname, whether to enable $extname support, dnl Make sure that the comment is aligned: -dnl [ --enable-$extname Enable $extname support]) +[ --enable-$extname Enable $extname support]) if test "\$PHP_$EXTNAME" != "no"; then dnl Write more examples of tests here... @@ -197,7 +197,7 @@ cat >config.w32 < 0) { - out_left = buf_growth - out_left; + out_left = buf_growth; smart_str_alloc(d, out_left, 0); out_p = ZSTR_VAL((d)->s) + ZSTR_LEN((d)->s); @@ -496,7 +496,7 @@ static php_iconv_err_t _php_iconv_append } } else { for (;;) { - out_left = buf_growth - out_left; + out_left = buf_growth; smart_str_alloc(d, out_left, 0); out_p = ZSTR_VAL((d)->s) + ZSTR_LEN((d)->s); @@ -1535,7 +1535,10 @@ static php_iconv_err_t _php_iconv_mime_d break; default: /* first letter of a non-encoded word */ - _php_iconv_appendc(pretval, *p1, cd_pl); + err = _php_iconv_appendc(pretval, *p1, cd_pl); + if (err != PHP_ICONV_ERR_SUCCESS) { + goto out; + } encoded_word = NULL; if ((mode & PHP_ICONV_MIME_DECODE_STRICT)) { scan_stat = 12; @@ -1546,6 +1549,9 @@ static php_iconv_err_t _php_iconv_mime_d case 1: /* expecting a delimiter */ if (*p1 != '?') { + if (*p1 == '\r' || *p1 == '\n') { + --p1; + } err = _php_iconv_appendl(pretval, encoded_word, (size_t)((p1 + 1) - encoded_word), cd_pl); if (err != PHP_ICONV_ERR_SUCCESS) { goto out; @@ -1571,6 +1577,23 @@ static php_iconv_err_t _php_iconv_mime_d case '*': /* new style delimiter: locale id follows */ scan_stat = 10; break; + + case '\r': case '\n': /* not an encoded-word */ + --p1; + _php_iconv_appendc(pretval, '=', cd_pl); + _php_iconv_appendc(pretval, '?', cd_pl); + err = _php_iconv_appendl(pretval, csname, (size_t)((p1 + 1) - csname), cd_pl); + if (err != PHP_ICONV_ERR_SUCCESS) { + goto out; + } + csname = NULL; + if ((mode & PHP_ICONV_MIME_DECODE_STRICT)) { + scan_stat = 12; + } + else { + scan_stat = 0; + } + continue; } if (scan_stat != 2) { char tmpbuf[80]; diff -pruN 7.2.9-1/ext/iconv/tests/bug55146.phpt 7.2.10-0ubuntu1/ext/iconv/tests/bug55146.phpt --- 7.2.9-1/ext/iconv/tests/bug55146.phpt 1970-01-01 00:00:00.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/iconv/tests/bug55146.phpt 2018-09-11 07:06:02.000000000 +0000 @@ -0,0 +1,36 @@ +--TEST-- +Bug #55146 (iconv_mime_decode_headers() skips some headers) +--SKIPIF-- + +--FILE-- + +===DONE=== +--EXPECT-- +array(2) { + ["X-Header-One"]=> + string(24) "H4sIAAAAAAAAA+NgFlsCAAA=" + ["X-Header-Two"]=> + string(17) "XtLePq6GTMn8G68F0" +} +array(2) { + ["X-Header-One"]=> + string(1) "=" + ["X-Header-Two"]=> + string(17) "XtLePq6GTMn8G68F0" +} +===DONE=== diff -pruN 7.2.9-1/ext/iconv/tests/bug60494.phpt 7.2.10-0ubuntu1/ext/iconv/tests/bug60494.phpt --- 7.2.9-1/ext/iconv/tests/bug60494.phpt 1970-01-01 00:00:00.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/iconv/tests/bug60494.phpt 2018-09-11 07:06:02.000000000 +0000 @@ -0,0 +1,23 @@ +--TEST-- +Bug #60494 (iconv_mime_decode does ignore special characters) +--SKIPIF-- + +--FILE-- + +===DONE=== +--EXPECTF-- +Notice: iconv_mime_decode(): Detected an illegal character in input string in %s on line %d +bool(false) + +Notice: iconv_mime_decode(): Detected an illegal character in input string in %s on line %d +bool(false) + +Notice: iconv_mime_decode(): Detected an illegal character in input string in %s on line %d +bool(false) +===DONE=== diff -pruN 7.2.9-1/ext/iconv/tests/bug63839.phpt 7.2.10-0ubuntu1/ext/iconv/tests/bug63839.phpt --- 7.2.9-1/ext/iconv/tests/bug63839.phpt 1970-01-01 00:00:00.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/iconv/tests/bug63839.phpt 2018-09-11 07:06:02.000000000 +0000 @@ -0,0 +1,71 @@ +--TEST-- +Bug #63839 (iconv_mime_decode_headers function is skipping headers) +--SKIPIF-- + +--FILE-- + +To: +Subject: Reply Is? white side-LED =? in Help +Date: Sat, 22 Dec 2012 +Message-ID: <006f01cde00e$d9f79da0$8de6d8e0> +MIME-Version: 1.0 +Content-Type: multipart/alternative; + boundary="----=_NextPart_000_0070_01CDE03C.F3AFD9A0" +X-Mailer: Microsoft Office Outlook 12.0 +Thread-Index: Ac3gDtcH2huHjzYcQVmFJPPoWjJogA== +Content-Language: en-us + +'; +var_dump(iconv_mime_decode_headers($headers, ICONV_MIME_DECODE_CONTINUE_ON_ERROR)); +var_dump(iconv_mime_decode_headers($headers, ICONV_MIME_DECODE_STRICT)); +?> +===DONE=== +--EXPECT-- +array(10) { + ["From"]=> + string(19) ""xyz" " + ["To"]=> + string(13) "" + ["Subject"]=> + string(35) "Reply Is? white side-LED =? in Help" + ["Date"]=> + string(16) "Sat, 22 Dec 2012" + ["Message-ID"]=> + string(32) "<006f01cde00e$d9f79da0$8de6d8e0>" + ["MIME-Version"]=> + string(3) "1.0" + ["Content-Type"]=> + string(75) "multipart/alternative; boundary="----=_NextPart_000_0070_01CDE03C.F3AFD9A0"" + ["X-Mailer"]=> + string(29) "Microsoft Office Outlook 12.0" + ["Thread-Index"]=> + string(32) "Ac3gDtcH2huHjzYcQVmFJPPoWjJogA==" + ["Content-Language"]=> + string(5) "en-us" +} +array(10) { + ["From"]=> + string(19) ""xyz" " + ["To"]=> + string(13) "" + ["Subject"]=> + string(35) "Reply Is? white side-LED =? in Help" + ["Date"]=> + string(16) "Sat, 22 Dec 2012" + ["Message-ID"]=> + string(32) "<006f01cde00e$d9f79da0$8de6d8e0>" + ["MIME-Version"]=> + string(3) "1.0" + ["Content-Type"]=> + string(75) "multipart/alternative; boundary="----=_NextPart_000_0070_01CDE03C.F3AFD9A0"" + ["X-Mailer"]=> + string(29) "Microsoft Office Outlook 12.0" + ["Thread-Index"]=> + string(32) "Ac3gDtcH2huHjzYcQVmFJPPoWjJogA==" + ["Content-Language"]=> + string(5) "en-us" +} +===DONE=== diff -pruN 7.2.9-1/ext/iconv/tests/bug68180.phpt 7.2.10-0ubuntu1/ext/iconv/tests/bug68180.phpt --- 7.2.9-1/ext/iconv/tests/bug68180.phpt 1970-01-01 00:00:00.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/iconv/tests/bug68180.phpt 2018-09-11 07:06:02.000000000 +0000 @@ -0,0 +1,16 @@ +--TEST-- +Bug #68180 (iconv_mime_decode can return extra characters in a header) +--SKIPIF-- + +--FILE-- + +===DONE=== +--EXPECT-- +string(183) "『【外資系戦略コンサルが集結】トップコンサルタントと話せるコンサル業界研究セミナー』へのエントリーありがとうございました。" +===DONE=== diff -pruN 7.2.9-1/ext/intl/msgformat/msgformat_helpers.cpp 7.2.10-0ubuntu1/ext/intl/msgformat/msgformat_helpers.cpp --- 7.2.9-1/ext/intl/msgformat/msgformat_helpers.cpp 2018-08-14 14:26:38.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/intl/msgformat/msgformat_helpers.cpp 2018-09-11 07:06:06.000000000 +0000 @@ -27,6 +27,7 @@ #include #include #include +#include #include @@ -333,6 +334,24 @@ static void umsg_set_timezone(MessageFor return; /* already done */ } + /* There is a bug in ICU which prevents MessageFormatter::getFormats() + to handle more than 10 formats correctly. The enumerator could be + used to walk through the present formatters using getFormat(), which + however seems to provide just a readonly access. This workaround + prevents crash when there are > 10 formats but doesn't set any error. + As a result, only DateFormatters with > 10 subformats are affected. + This workaround should be ifdef'd out, when the bug has been fixed + in ICU. */ + icu::StringEnumeration* fnames = mf->getFormatNames(err.code); + if (!fnames || U_FAILURE(err.code)) { + return; + } + count = fnames->count(err.code); + delete fnames; + if (count > 10) { + return; + } + formats = mf->getFormats(count); if (formats == NULL) { diff -pruN 7.2.9-1/ext/intl/tests/bug74484_MessageFormatter.phpt 7.2.10-0ubuntu1/ext/intl/tests/bug74484_MessageFormatter.phpt --- 7.2.9-1/ext/intl/tests/bug74484_MessageFormatter.phpt 1970-01-01 00:00:00.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/intl/tests/bug74484_MessageFormatter.phpt 2018-09-11 07:06:06.000000000 +0000 @@ -0,0 +1,33 @@ +--TEST-- +Bug #74484 MessageFormatter::formatMessage memory corruption with 11+ named placeholder +--SKIPIF-- + +--FILE-- + 1, + 'b' => 2, + 'c' => 3, + 'd' => 4, + 'e' => 5, + 'f' => 6, + 'g' => 7, + 'h' => 8, + 'i' => 9, + 'j' => 10, + 'k' => 11, + 'l' => 12 +); + +var_dump(MessageFormatter::formatMessage('en_US', $text, $vars)); + +?> +==DONE== +--EXPECT-- +string(26) "1 2 3 4 5 6 7 8 9 10 11 12" +==DONE== diff -pruN 7.2.9-1/ext/libxml/libxml.c 7.2.10-0ubuntu1/ext/libxml/libxml.c --- 7.2.9-1/ext/libxml/libxml.c 2018-08-14 14:26:41.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/libxml/libxml.c 2018-09-11 07:06:04.000000000 +0000 @@ -591,12 +591,12 @@ static xmlParserInputPtr _php_libxml_ext if (ID != NULL) { ZVAL_STRING(¶ms[0], ID); } else { - ZVAL_UNDEF(¶ms[0]); + ZVAL_NULL(¶ms[0]); } if (URL != NULL) { ZVAL_STRING(¶ms[1], URL); } else { - ZVAL_UNDEF(¶ms[1]); + ZVAL_NULL(¶ms[1]); } ctxzv = ¶ms[2]; array_init_size(ctxzv, 4); diff -pruN 7.2.9-1/ext/libxml/tests/bug76777.phpt 7.2.10-0ubuntu1/ext/libxml/tests/bug76777.phpt --- 7.2.9-1/ext/libxml/tests/bug76777.phpt 1970-01-01 00:00:00.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/libxml/tests/bug76777.phpt 2018-09-11 07:06:04.000000000 +0000 @@ -0,0 +1,43 @@ +--TEST-- +Bug #76777 (first parameter of libxml_set_external_entity_loader callback undefined) +--SKIPIF-- + +--FILE-- + + +EOF; + +$xsd=<< + + + + +EOF; + +libxml_set_external_entity_loader(function($p,$s,$c) { + var_dump($p,$s,$c); + die(); +}); + +$dom=new DOMDocument($xml); +$dom->schemaValidateSource($xsd); +?> +--EXPECTF-- +NULL +string(15) "nonexistent.xsd" +array(4) { + ["directory"]=> + NULL + ["intSubName"]=> + NULL + ["extSubURI"]=> + NULL + ["extSubSystem"]=> + NULL +} diff -pruN 7.2.9-1/ext/mbstring/mbstring.c 7.2.10-0ubuntu1/ext/mbstring/mbstring.c --- 7.2.9-1/ext/mbstring/mbstring.c 2018-08-14 14:26:40.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/mbstring/mbstring.c 2018-09-11 07:06:03.000000000 +0000 @@ -702,7 +702,7 @@ static sapi_post_entry mbstr_post_entrie /* }}} */ /* {{{ static int php_mb_parse_encoding_list() - * Return 0 if input contains any illegal encoding, otherwise 1. + * Return FAILURE if input contains any illegal encoding, otherwise SUCCESS. * Even if any illegal encoding is detected the result may contain a list * of parsed encodings. */ @@ -779,7 +779,7 @@ php_mb_parse_encoding_list(const char *v *entry++ = encoding; n++; } else { - ret = 0; + ret = FAILURE; } } p1 = p2 + 1; @@ -795,7 +795,7 @@ php_mb_parse_encoding_list(const char *v if (return_list) { *return_list = NULL; } - ret = 0; + ret = FAILURE; } if (return_size) { *return_size = n; @@ -808,7 +808,7 @@ php_mb_parse_encoding_list(const char *v /* }}} */ /* {{{ static int php_mb_parse_encoding_array() - * Return 0 if input contains any illegal encoding, otherwise 1. + * Return FAILURE if input contains any illegal encoding, otherwise SUCCESS. * Even if any illegal encoding is detected the result may contain a list * of parsed encodings. */ diff -pruN 7.2.9-1/ext/mbstring/tests/bug76704.phpt 7.2.10-0ubuntu1/ext/mbstring/tests/bug76704.phpt --- 7.2.9-1/ext/mbstring/tests/bug76704.phpt 1970-01-01 00:00:00.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/mbstring/tests/bug76704.phpt 2018-09-11 07:06:03.000000000 +0000 @@ -0,0 +1,16 @@ +--TEST-- +Bug #76704 (mb_detect_order return value varies based on argument type) +--SKIPIF-- + +--FILE-- + +===DONE=== +--EXPECT-- +bool(false) +bool(false) +===DONE=== diff -pruN 7.2.9-1/ext/opcache/ZendAccelerator.c 7.2.10-0ubuntu1/ext/opcache/ZendAccelerator.c --- 7.2.9-1/ext/opcache/ZendAccelerator.c 2018-08-14 14:26:42.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/opcache/ZendAccelerator.c 2018-09-11 07:06:04.000000000 +0000 @@ -1253,6 +1253,13 @@ static void zend_accel_add_key(char *key } } +static zend_always_inline zend_bool is_phar_file(zend_string *filename) +{ + return filename && ZSTR_LEN(filename) >= sizeof(".phar") && + !memcmp(ZSTR_VAL(filename) + ZSTR_LEN(filename) - (sizeof(".phar")-1), ".phar", sizeof(".phar")-1) && + !strstr(ZSTR_VAL(filename), "://"); +} + #ifdef HAVE_OPCACHE_FILE_CACHE static zend_persistent_script *store_script_in_file_cache(zend_persistent_script *new_persistent_script) { @@ -1277,10 +1284,7 @@ static zend_persistent_script *store_scr zend_shared_alloc_destroy_xlat_table(); - new_persistent_script->is_phar = - new_persistent_script->script.filename && - strstr(ZSTR_VAL(new_persistent_script->script.filename), ".phar") && - !strstr(ZSTR_VAL(new_persistent_script->script.filename), "://"); + new_persistent_script->is_phar = is_phar_file(new_persistent_script->script.filename); /* Consistency check */ if ((char*)new_persistent_script->mem + new_persistent_script->size != (char*)ZCG(mem)) { @@ -1402,10 +1406,7 @@ static zend_persistent_script *cache_scr zend_shared_alloc_destroy_xlat_table(); - new_persistent_script->is_phar = - new_persistent_script->script.filename && - strstr(ZSTR_VAL(new_persistent_script->script.filename), ".phar") && - !strstr(ZSTR_VAL(new_persistent_script->script.filename), "://"); + new_persistent_script->is_phar = is_phar_file(new_persistent_script->script.filename); /* Consistency check */ if ((char*)new_persistent_script->mem + new_persistent_script->size != (char*)ZCG(mem)) { diff -pruN 7.2.9-1/ext/openssl/tests/bug76705.pem 7.2.10-0ubuntu1/ext/openssl/tests/bug76705.pem --- 7.2.9-1/ext/openssl/tests/bug76705.pem 1970-01-01 00:00:00.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/openssl/tests/bug76705.pem 2018-09-11 07:06:04.000000000 +0000 @@ -0,0 +1,50 @@ +-----BEGIN CERTIFICATE----- +MIIDjjCCAnagAwIBAgIJAJCtQJeo8gdyMA0GCSqGSIb3DQEBCwUAMFwxCzAJBgNV +BAYTAkdCMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQg +Q29tcGFueSBMdGQxGDAWBgNVBAMMD29wZW5zc2wucGhwLm5ldDAeFw0xODA4MTkx +ODQxMzdaFw0yODA4MTYxODQxMzdaMFwxCzAJBgNVBAYTAkdCMRUwEwYDVQQHDAxE +ZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQgQ29tcGFueSBMdGQxGDAWBgNV +BAMMD29wZW5zc2wucGhwLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBALqnJTvXG3o47uPpaJI+rjCfwWAvX8lqUPD05jYCEckYOCQZDze0qAzxJRnl +dJS4V/sEWgqtroJm+AuasEd7GFhuTWG72eo4Gq8kJHt2+ev68yIfxtOvV4gDcN3w +9Mkk66q661Jg2oMnWK518VpiQQaNRKQtVkjrLf0DG+WRjx1Y6BFpx8mw699lepfk +IYhblg1JulmIQ99FnE3xkuJ9gsh74BrBD4CxwBAHk3WFB6nnrMW++4rG1gexOCdB +fikGALEZDjH5iPjNT1c7Los3CVDldHLTDHHUKEM3w/hp5d2lw67eUpoGrxwbnXF5 +nngdFHe2QJNd5jN2TFICJkcIZb8CAwEAAaNTMFEwHQYDVR0OBBYEFAfXyCoG/LwU +8eoV8bdp1859DnjCMB8GA1UdIwQYMBaAFAfXyCoG/LwU8eoV8bdp1859DnjCMA8G +A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBADLZHI4YYvgmKVmtzvow +kqhljnR14WVeVgr/zfGbRwgeiyokG+BAb0yaNAWO5QYJH8rrx2+1pTq4alAvkoQm +2mjJu5d4Dfyb7Cmiz8EeITbfZUmX/JZJIOTrXUx5NiIndB6zJf3Bzq2oqeeENW7E +zKLmBpiOhywoVdzhGTGOxJo7nlXhzkQleQ+N1NgDjIyFSSkKyuXpdUjhD8Pm+/x9 +0oJIU1pcCVFmavjwFmAEPTD+xNiXZDhndWElEmb6q5yJzbPbxQmCwYpNOknQXKRA ++ERVRVyaMmO286CONAhSO2cP9P/Ss7NSt28kXNGux1zSeXsRjMx8ICUqtaG99ZhD +bdo= +-----END CERTIFICATE----- +-----BEGIN PRIVATE KEY----- +MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC6pyU71xt6OO7j +6WiSPq4wn8FgL1/JalDw9OY2AhHJGDgkGQ83tKgM8SUZ5XSUuFf7BFoKra6CZvgL +mrBHexhYbk1hu9nqOBqvJCR7dvnr+vMiH8bTr1eIA3Dd8PTJJOuquutSYNqDJ1iu +dfFaYkEGjUSkLVZI6y39AxvlkY8dWOgRacfJsOvfZXqX5CGIW5YNSbpZiEPfRZxN +8ZLifYLIe+AawQ+AscAQB5N1hQep56zFvvuKxtYHsTgnQX4pBgCxGQ4x+Yj4zU9X +Oy6LNwlQ5XRy0wxx1ChDN8P4aeXdpcOu3lKaBq8cG51xeZ54HRR3tkCTXeYzdkxS +AiZHCGW/AgMBAAECggEBAKTTTyT9uoz+0649gpOKeGYF3Uzj6NFDakCt8tEEmNIc +6g6udmq5xKDRHfM1VfKyqzbGTAEcCHutFCOjMUGeKQyGMx04NqIHc0DwSKsikGZb +z/J1Xy21rDU23KeQzYkGann04DN5xdyFlWFSU5R+KW/wtgnI42Y3EABai3r5RAkj +4s5GzXhKygdcyDbhv+bcllQi3iAIZExjo6rMN+lmkdP90w/Bjvp4hagCqxEoAh7c +60PVHfSa5oxd4l9/ni0tddtmkaiwEyxVRDDdduGquOtS3tbThCOzoOeXvbhWCjc2 +QmYAymKAe6G2LxmCUTUz6iPxTQPBAT1q2DFuUpBoOwECgYEA8IFZyooC8lO3WJSX +sPSOKRryO/TKrtWJY2Mh8gZpVlK8OrLZzpv+odPtIpKMvljlNRd0HTonnVrfB7jy +6MQN8r6Go+Q9Xy0fYUEoPapdzPvfiYx93KqYIFpg2BrZZFOLN3Ptp7kOhej1KJNe +DCiN2nk1l+Kp1I22ONYLSwR90D8CgYEAxq2bzaNvzkiIWpKucD9P1DJAVw91QJ3t +Ll/IF4+d6TPxKq7HKq/3FZSBTL49y7QXScryMR6H92syY0Jnax2erq8iVTc+KBqi +9j85A9LQi50qo/0AY4Fly3GrDENAohvCBt66OLrINbem5J+tY2pJHOWqzljaXzKx ++u7F/YaACoECgYEAgcUpz/F7+YlWasNyvhaXBnL1tYg2PPQXd7sru83d1Kg7zGho +weTGFkelsnvk2WhZ9LW8/3A7o9o+cYpH93SiGhLXz2L+Anb0caOYtP1SM6LMUQmv +d/vMrdhWXQTPvCSf/8HbwB5ISdUTQ1uQ6XqQYAv68QNqo7f7VNuZqFa6FD0CgYEA +tV/GLYv3xNUYjb78uoJB6VDaxd/Zxdymq0BLlZ7JpRyDHNkj/4dWxP+mrp26Il3N +KNO6GDdsHuZgwJbdfL80nvpJGIxvFQOEI9OBxEjPk7UuOTj+AtkdSgYCBhbbSWKX +1de9H478uXVoSaywCGL+TgAo12nsKR5JtvAGFbWU7IECgYADfyGWKiRpHUmxn/OH +9vkiISASRrh3YqdDtqij16pYc+VRC9/jUvGRtYAb7x0j6kO9zh3wkZlUXoPIH+zn +uBmiIY401DNbWe9rM7IeZOg88+WCLmZ6onMew752O7VUm6VotPOuUvYA5pQRZkma +aDvX/slF+5i+zgN6JKaqqppzQA== +-----END PRIVATE KEY----- diff -pruN 7.2.9-1/ext/openssl/tests/bug76705.phpt 7.2.10-0ubuntu1/ext/openssl/tests/bug76705.phpt --- 7.2.9-1/ext/openssl/tests/bug76705.phpt 1970-01-01 00:00:00.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/openssl/tests/bug76705.phpt 2018-09-11 07:06:04.000000000 +0000 @@ -0,0 +1,43 @@ +--TEST-- +Bug #76705: unusable ssl => peer_fingerprint in stream_context_create() +--SKIPIF-- + +--FILE-- + [ + 'local_cert' => __DIR__ . '/bug76705.pem' + ]]); + + $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx); + phpt_notify(); + + @stream_socket_accept($server, 1); +CODE; + +$clientCode = <<<'CODE' + $serverUri = "ssl://127.0.0.1:64323"; + $clientFlags = STREAM_CLIENT_CONNECT; + $clientCtx = stream_context_create(['ssl' => [ + 'verify_peer' => true, + 'peer_name' => 'openssl.php.net', + 'allow_self_signed' => true, + 'peer_fingerprint' => [ + 'sha256' => '4A524F3617E41BCCA1370ED9E89C9A7A83C28F0F342C490296D362869BDF1DA8', + ] + ]]); + + phpt_wait(); + var_dump(stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx)); +CODE; + +include 'ServerClientTestCase.inc'; +ServerClientTestCase::getInstance()->run($clientCode, $serverCode); +?> +--EXPECTF-- +resource(%d) of type (stream) diff -pruN 7.2.9-1/ext/openssl/xp_ssl.c 7.2.10-0ubuntu1/ext/openssl/xp_ssl.c --- 7.2.9-1/ext/openssl/xp_ssl.c 2018-08-14 14:26:46.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/openssl/xp_ssl.c 2018-09-11 07:06:04.000000000 +0000 @@ -481,6 +481,7 @@ static zend_bool php_openssl_matches_com static int php_openssl_apply_peer_verification_policy(SSL *ssl, X509 *peer, php_stream *stream) /* {{{ */ { zval *val = NULL; + zval *peer_fingerprint; char *peer_name = NULL; int err, must_verify_peer, @@ -498,6 +499,7 @@ static int php_openssl_apply_peer_verifi : sslsock->is_client; must_verify_fingerprint = GET_VER_OPT("peer_fingerprint"); + peer_fingerprint = val; if ((must_verify_peer || must_verify_peer_name || must_verify_fingerprint) && peer == NULL) { php_error_docref(NULL, E_WARNING, "Could not get peer certificate"); @@ -529,8 +531,8 @@ static int php_openssl_apply_peer_verifi /* If a peer_fingerprint match is required this trumps peer and peer_name verification */ if (must_verify_fingerprint) { - if (Z_TYPE_P(val) == IS_STRING || Z_TYPE_P(val) == IS_ARRAY) { - if (!php_openssl_x509_fingerprint_match(peer, val)) { + if (Z_TYPE_P(peer_fingerprint) == IS_STRING || Z_TYPE_P(peer_fingerprint) == IS_ARRAY) { + if (!php_openssl_x509_fingerprint_match(peer, peer_fingerprint)) { php_error_docref(NULL, E_WARNING, "peer_fingerprint match failure" ); diff -pruN 7.2.9-1/ext/pdo_sqlite/tests/bug70221.phpt 7.2.10-0ubuntu1/ext/pdo_sqlite/tests/bug70221.phpt --- 7.2.9-1/ext/pdo_sqlite/tests/bug70221.phpt 2018-08-14 14:26:33.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/pdo_sqlite/tests/bug70221.phpt 2018-09-11 07:06:05.000000000 +0000 @@ -12,7 +12,11 @@ function _test() { return 42; } $db->sqliteCreateFunction('test', '_test', 0); print("Everything is fine, no exceptions here\n"); unset($db); -@unlink($dbfile); +?> +--CLEAN-- + --EXPECT-- Everything is fine, no exceptions here diff -pruN 7.2.9-1/ext/spl/spl_directory.c 7.2.10-0ubuntu1/ext/spl/spl_directory.c --- 7.2.9-1/ext/spl/spl_directory.c 2018-08-14 14:26:40.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/spl/spl_directory.c 2018-09-11 07:06:04.000000000 +0000 @@ -1245,6 +1245,9 @@ SPL_METHOD(SplFileInfo, getLinkTarget) zend_replace_error_handling(EH_THROW, spl_ce_RuntimeException, &error_handling); + if (intern->file_name == NULL) { + spl_filesystem_object_get_file_name(intern); + } #if defined(PHP_WIN32) || HAVE_SYMLINK if (intern->file_name == NULL) { php_error_docref(NULL, E_WARNING, "Empty filename"); diff -pruN 7.2.9-1/ext/spl/spl_iterators.c 7.2.10-0ubuntu1/ext/spl/spl_iterators.c --- 7.2.9-1/ext/spl/spl_iterators.c 2018-08-14 14:26:40.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/spl/spl_iterators.c 2018-09-11 07:06:04.000000000 +0000 @@ -2208,7 +2208,7 @@ SPL_METHOD(RegexIterator, getPregFlags) if (intern->u.regex.use_flags) { RETURN_LONG(intern->u.regex.preg_flags); } else { - return; + RETURN_LONG(0); } } /* }}} */ diff -pruN 7.2.9-1/ext/spl/tests/bug68175.phpt 7.2.10-0ubuntu1/ext/spl/tests/bug68175.phpt --- 7.2.9-1/ext/spl/tests/bug68175.phpt 1970-01-01 00:00:00.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/spl/tests/bug68175.phpt 2018-09-11 07:06:04.000000000 +0000 @@ -0,0 +1,18 @@ +--TEST-- +Bug #68175 (RegexIterator pregFlags are NULL instead of 0) +--FILE-- +getMode(), + $regex->getFlags(), + $regex->getPregFlags() +); +?> +===DONE=== +--EXPECT-- +int(0) +int(0) +int(0) +===DONE=== diff -pruN 7.2.9-1/ext/spl/tests/bug68825.phpt 7.2.10-0ubuntu1/ext/spl/tests/bug68825.phpt --- 7.2.9-1/ext/spl/tests/bug68825.phpt 1970-01-01 00:00:00.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/spl/tests/bug68825.phpt 2018-09-11 07:06:04.000000000 +0000 @@ -0,0 +1,25 @@ +--TEST-- +Bug #68825 (Exception in DirectoryIterator::getLinkTarget()) +--FILE-- +getFilename()) { + var_dump($entry->getLinkTarget()); + } +} +?> +===DONE=== +--EXPECTF-- +string(%d) "%s%eext%espl%etests%ebug68825.php" +===DONE=== +--CLEAN-- + diff -pruN 7.2.9-1/ext/standard/array.c 7.2.10-0ubuntu1/ext/standard/array.c --- 7.2.9-1/ext/standard/array.c 2018-08-14 14:26:37.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/standard/array.c 2018-09-11 07:06:02.000000000 +0000 @@ -5977,6 +5977,7 @@ PHP_FUNCTION(array_reduce) } else { zval_ptr_dtor(&args[1]); zval_ptr_dtor(&args[0]); + zval_ptr_dtor(&result); return; } } ZEND_HASH_FOREACH_END(); diff -pruN 7.2.9-1/ext/standard/tests/array/bug76778.phpt 7.2.10-0ubuntu1/ext/standard/tests/array/bug76778.phpt --- 7.2.9-1/ext/standard/tests/array/bug76778.phpt 1970-01-01 00:00:00.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/standard/tests/array/bug76778.phpt 2018-09-11 07:06:02.000000000 +0000 @@ -0,0 +1,18 @@ +--TEST-- +Bug #76778 (array_reduce leaks memory if callback throws exception) +--FILE-- + +===DONE=== +--EXPECT-- +===DONE=== diff -pruN 7.2.9-1/ext/zlib/config0.m4 7.2.10-0ubuntu1/ext/zlib/config0.m4 --- 7.2.9-1/ext/zlib/config0.m4 2018-08-14 14:26:42.000000000 +0000 +++ 7.2.10-0ubuntu1/ext/zlib/config0.m4 2018-09-11 07:06:02.000000000 +0000 @@ -3,7 +3,7 @@ dnl $Id$ dnl PHP_ARG_WITH(zlib,for ZLIB support, -[ --with-zlib[=DIR] Include ZLIB support (requires zlib >= 1.0.9)]) +[ --with-zlib[=DIR] Include ZLIB support (requires zlib >= 1.2.0.4)]) PHP_ARG_WITH(zlib-dir,if the location of ZLIB install directory is defined, [ --with-zlib-dir= Define the location of zlib install directory], no, no) @@ -33,7 +33,7 @@ if test "$PHP_ZLIB" != "no" || test "$PH fi if test -z "$ZLIB_DIR"; then - AC_MSG_ERROR(Cannot find libz) + AC_MSG_ERROR(Cannot find zlib) fi case $ZLIB_DIR in @@ -42,10 +42,10 @@ if test "$PHP_ZLIB" != "no" || test "$PH esac AC_MSG_CHECKING([for zlib version >= 1.2.0.4]) - ZLIB_VERSION=`$EGREP "define ZLIB_VERSION" $ZLIB_DIR/include/zlib.h | $SED -e 's/[[^0-9\.]]//g'` + ZLIB_VERSION=`$EGREP "define ZLIB_VERSION" $ZLIB_INCDIR/zlib.h | $SED -e 's/[[^0-9\.]]//g'` AC_MSG_RESULT([$ZLIB_VERSION]) if test `echo $ZLIB_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*1000000 + $2*10000 + $3*100 + $4}'` -lt 1020004; then - AC_MSG_ERROR([libz version greater or equal to 1.2.0.4 required]) + AC_MSG_ERROR([zlib version greater or equal to 1.2.0.4 required]) fi PHP_CHECK_LIBRARY(z, gzgets, [ diff -pruN 7.2.9-1/.gitignore 7.2.10-0ubuntu1/.gitignore --- 7.2.9-1/.gitignore 2018-08-14 14:26:29.000000000 +0000 +++ 7.2.10-0ubuntu1/.gitignore 2018-09-11 07:06:00.000000000 +0000 @@ -191,6 +191,7 @@ sapi/fpm/fpm/php-cgi sapi/phpdbg/phpdbg_parser.c sapi/phpdbg/phpdbg_parser.h sapi/phpdbg/phpdbg +sapi/phpdbg/phpdbg.1 scripts/php-config scripts/phpize scripts/man1/*.1 diff -pruN 7.2.9-1/main/php_version.h 7.2.10-0ubuntu1/main/php_version.h --- 7.2.9-1/main/php_version.h 2018-08-14 14:26:32.000000000 +0000 +++ 7.2.10-0ubuntu1/main/php_version.h 2018-09-11 07:06:00.000000000 +0000 @@ -2,7 +2,7 @@ /* edit configure.ac to change version number */ #define PHP_MAJOR_VERSION 7 #define PHP_MINOR_VERSION 2 -#define PHP_RELEASE_VERSION 9 +#define PHP_RELEASE_VERSION 10 #define PHP_EXTRA_VERSION "" -#define PHP_VERSION "7.2.9" -#define PHP_VERSION_ID 70209 +#define PHP_VERSION "7.2.10" +#define PHP_VERSION_ID 70210 diff -pruN 7.2.9-1/Makefile.global 7.2.10-0ubuntu1/Makefile.global --- 7.2.9-1/Makefile.global 2018-08-14 14:26:32.000000000 +0000 +++ 7.2.10-0ubuntu1/Makefile.global 2018-09-11 07:06:07.000000000 +0000 @@ -121,7 +121,7 @@ distclean: clean rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h rm -f php7.spec main/build-defs.h scripts/phpize rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak - rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 ext/phar/phar.1 ext/phar/phar.phar.1 + rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 sapi/phpdbg/phpdbg.1 ext/phar/phar.1 ext/phar/phar.phar.1 rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html rm -f ext/iconv/php_have_bsd_iconv.h ext/iconv/php_have_glibc_iconv.h ext/iconv/php_have_ibm_iconv.h ext/iconv/php_have_iconv.h ext/iconv/php_have_libiconv.h ext/iconv/php_iconv_aliased_libiconv.h ext/iconv/php_iconv_supports_errno.h ext/iconv/php_php_iconv_h_path.h ext/iconv/php_php_iconv_impl.h rm -f ext/phar/phar.phar ext/phar/phar.php diff -pruN 7.2.9-1/NEWS 7.2.10-0ubuntu1/NEWS --- 7.2.9-1/NEWS 2018-08-14 14:26:29.000000000 +0000 +++ 7.2.10-0ubuntu1/NEWS 2018-09-11 07:06:00.000000000 +0000 @@ -1,5 +1,69 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| +13 Sep 2018, PHP 7.2.10 + +- Core: + . Fixed bug #76754 (parent private constant in extends class memory leak). + (Laruence) + . Fixed bug #72443 (Generate enabled extension). (petk) + . Fixed bug #75797 (Memory leak when using class_alias() in non-debug mode). + (Massimiliano Braglia) + +- Apache2: + . Fixed bug #76582 (Apache bucket brigade sometimes becomes invalid). (stas) + +- Bz2: + . Fixed arginfo for bzcompress. (Tyson Andre) + +- gettext: + . Fixed bug #76517 (incorrect restoring of LDFLAGS). (sji) + +- iconv: + . Fixed bug #68180 (iconv_mime_decode can return extra characters in a + header). (cmb) + . Fixed bug #63839 (iconv_mime_decode_headers function is skipping headers). + (cmb) + . Fixed bug #60494 (iconv_mime_decode does ignore special characters). (cmb) + . Fixed bug #55146 (iconv_mime_decode_headers() skips some headers). (cmb) + +- intl: + . Fixed bug #74484 (MessageFormatter::formatMessage memory corruption with + 11+ named placeholders). (Anatol) + +- libxml: + . Fixed bug #76777 ("public id" parameter of libxml_set_external_entity_loader + callback undefined). (Ville Hukkamäki) + +- mbstring: + . Fixed bug #76704 (mb_detect_order return value varies based on argument + type). (cmb) + +- Opcache: + . Fixed bug #76747 (Opcache treats path containing "test.pharma.tld" as a phar + file). (Laruence) + +- OpenSSL: + . Fixed bug #76705 (unusable ssl => peer_fingerprint in + stream_context_create()). (Jakub Zelenka) + +- phpdbg: + . Fixed bug #76595 (phpdbg man page contains outdated information). + (Kevin Abel) + +- SPL: + . Fixed bug #68825 (Exception in DirectoryIterator::getLinkTarget()). (cmb) + . Fixed bug #68175 (RegexIterator pregFlags are NULL instead of 0). (Tim + Siebels) + +- Standard: + . Fixed bug #76778 (array_reduce leaks memory if callback throws exception). + (cmb) + +- zlib: + . Fixed bug #65988 (Zlib version check fails when an include/zlib/ style dir + is passed to the --with-zlib configure option). (Jay Bonci) + . Fixed bug #76709 (Minimal required zlib library is 1.2.0.4). (petk) + 16 Aug 2018, PHP 7.2.9 - Calendar: diff -pruN 7.2.9-1/sapi/apache2handler/sapi_apache2.c 7.2.10-0ubuntu1/sapi/apache2handler/sapi_apache2.c --- 7.2.9-1/sapi/apache2handler/sapi_apache2.c 2018-08-14 14:26:29.000000000 +0000 +++ 7.2.10-0ubuntu1/sapi/apache2handler/sapi_apache2.c 2018-09-11 07:06:00.000000000 +0000 @@ -712,6 +712,7 @@ zend_first_try { if (!parent_req) { php_apache_request_dtor(r); ctx->request_processed = 1; + apr_brigade_cleanup(brigade); bucket = apr_bucket_eos_create(r->connection->bucket_alloc); APR_BRIGADE_INSERT_TAIL(brigade, bucket); diff -pruN 7.2.9-1/sapi/phpdbg/config.m4 7.2.10-0ubuntu1/sapi/phpdbg/config.m4 --- 7.2.9-1/sapi/phpdbg/config.m4 2018-08-14 14:26:29.000000000 +0000 +++ 7.2.10-0ubuntu1/sapi/phpdbg/config.m4 2018-09-11 07:06:00.000000000 +0000 @@ -27,17 +27,17 @@ if test "$BUILD_PHPDBG" = "" && test "$P if test "$PHP_READLINE" != "no" -o "$PHP_LIBEDIT" != "no"; then PHPDBG_EXTRA_LIBS="$PHP_READLINE_LIBS" fi - + PHP_SUBST(PHP_PHPDBG_CFLAGS) PHP_SUBST(PHP_PHPDBG_FILES) PHP_SUBST(PHPDBG_EXTRA_LIBS) - + PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/phpdbg/Makefile.frag], [$abs_srcdir/sapi/phpdbg], [$abs_builddir/sapi/phpdbg]) PHP_SELECT_SAPI(phpdbg, program, $PHP_PHPDBG_FILES, $PHP_PHPDBG_CFLAGS, [$(SAPI_PHPDBG_PATH)]) BUILD_BINARY="sapi/phpdbg/phpdbg" BUILD_SHARED="sapi/phpdbg/libphpdbg.la" - + BUILD_PHPDBG="\$(LIBTOOL) --mode=link \ \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \ \$(PHP_GLOBAL_OBJS) \ @@ -63,6 +63,8 @@ if test "$BUILD_PHPDBG" = "" && test "$P PHP_SUBST(BUILD_SHARED) PHP_SUBST(BUILD_PHPDBG) PHP_SUBST(BUILD_PHPDBG_SHARED) + + PHP_OUTPUT(sapi/phpdbg/phpdbg.1) fi if test "$PHP_PHPDBG_WEBHELPER" != "no"; then diff -pruN 7.2.9-1/sapi/phpdbg/Makefile.frag 7.2.10-0ubuntu1/sapi/phpdbg/Makefile.frag --- 7.2.9-1/sapi/phpdbg/Makefile.frag 2018-08-14 14:26:29.000000000 +0000 +++ 7.2.10-0ubuntu1/sapi/phpdbg/Makefile.frag 2018-09-11 07:06:00.000000000 +0000 @@ -28,7 +28,7 @@ install-phpdbg: $(BUILD_BINARY) @$(INSTALL) -m 0755 $(BUILD_BINARY) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT) @echo "Installing phpdbg man page: $(INSTALL_ROOT)$(mandir)/man1/" @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 - @$(INSTALL_DATA) $(srcdir)/phpdbg.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phpdbg$(program_suffix).1 + @$(INSTALL_DATA) sapi/phpdbg/phpdbg.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phpdbg$(program_suffix).1 clean-phpdbg: @echo "Cleaning phpdbg object files ..." diff -pruN 7.2.9-1/sapi/phpdbg/phpdbg.1 7.2.10-0ubuntu1/sapi/phpdbg/phpdbg.1 --- 7.2.9-1/sapi/phpdbg/phpdbg.1 2018-08-14 14:26:29.000000000 +0000 +++ 7.2.10-0ubuntu1/sapi/phpdbg/phpdbg.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,59 +0,0 @@ -.TH PHPDBG 1 -.SH NAME -phpdbg \- The interactive PHP debugger -.SH SYNOPSIS -.B phpdbg -[OPTION] -[\fB\-e\fIFILE\fR] -.SH DESCRIPTION -.B phpdbg -a lightweight, powerful, easy to use debugging platform for PHP5. -.SH OPTIONS -The following switches are implemented (just like cli SAPI): -.TP -.BR \-n -No \fBphp.ini\fR file will be used -.TP -.BR \-c \fIpath\fB|\fIfile\fR -Look for \fBphp.ini\fR file in the directory \fIpath\fR or use the specified \fIfile\fR -.TP -.BR \-z \fIfile\fR -Load Zend extension \fIfile\fR -.TP -.BR \-d \fIfoo\fB[=\fIbar\fB]\fR -Define INI entry \fIfoo\fR with value \fIbar\fR -.PP The following switches change the default behaviour of phpdbg: -.TP -.BR \-v -Disables quietness -.TP -.BR \-s -Enabled stepping -.TP -.BR -e \fIfile\fR -Sets execution context -.TP -.BR \-b -Disables use of colour on the console -.TP -.BR \-I -Ignore .phpdbginit (default init file) -.TP -.BR \-i \fIpath\fB|\ffile\fR -Override .phpgdbinit location (implies -I) -.TP -.BR \-O \fIfile\fR -Set oplog output to \fIfile\fR -.TP -.BR \-q -Do not print banner on startup -.TP -.BR \-r -Jump straight to run -.TP -.BR \-E -Enable step through eval() -.SH NOTES -Passing -rr will cause phpdbg to quit after execution, rather than returning to the console -.SH AUTHOR -Written by Felipe Pena, Joe Watkins and Bob Weinand, formatted by Ondřej Surý for Debian project. diff -pruN 7.2.9-1/sapi/phpdbg/phpdbg.1.in 7.2.10-0ubuntu1/sapi/phpdbg/phpdbg.1.in --- 7.2.9-1/sapi/phpdbg/phpdbg.1.in 1970-01-01 00:00:00.000000000 +0000 +++ 7.2.10-0ubuntu1/sapi/phpdbg/phpdbg.1.in 2018-09-11 07:06:00.000000000 +0000 @@ -0,0 +1,150 @@ +.TH @program_prefix@phpdbg 1 "2018" "The PHP Group" "Scripting Language" +.SH NAME +@program_prefix@phpdbg \- The interactive PHP debugger +.SH SYNOPSIS +.B @program_prefix@phpdbg +[options] +[\fIfile\fP] +[\fIargs...\fP] +.SH DESCRIPTION +.B phpdbg +is a lightweight, powerful, easy to use debugging platform for PHP. +.SH OPTIONS +.TP 15 +.B \-c \fIpath\fB|\fIfile\fR +Look for +.B php.ini +file in the directory +.IR path +or use the specified +.IR file +.TP +.B \-d \fIfoo\fP[=\fIbar\fP] +Define INI entry +.IR foo +with value +.IR bar +.TP +.B \-n +No +.B php.ini +file will be used +.TP +.B \-z \fIfile\fR +Load Zend extension +.IR file +.TP +.BR \-q +Do not print banner on startup +.TP +.B \-v +Enable oplog output +.TP +.B \-b +Disables use of color on the console +.TP +.B \-i \fIpath\fB|\fIfile\fR +Override .phpgdbinit location (implies -I) +.TP +.B \-I +Ignore .phpdbginit (default init file) +.TP +.B \-O \fIfile\fR +Set oplog output to +.IR file +.TP +.B \-r +Jump straight to run +.TP +.B -e +Generate extended information for debugger/profiler +.TP +.B \-E +Enable step through eval() +.TP +.B \-s \fIdelimiter\fP +Read code to execute from stdin with an optional +.IR delimiter +.TP +.B \-S \fIsapi_name\fP +Override SAPI name +.TP +.B \-l \fIport\fP +Setup remote console port +.TP +.B \-a \fIaddress\fP +Setup remote console bind address +.TP +.B \-x +Enable XML output +.TP +.B \-p \fIopcode\fP +Output opcodes and quit +.TP +.B \-h +Print the help overview +.TP +.B \-V +Version number +.TP +.IR args.\|.\|. +Arguments passed to script. Use +.B '\-\-' +.IR args +when first argument starts with +.B '\-' +or script is read from stdin +.SH NOTES +Passing +.B \-rr +will cause +.B phpdbg +to quit after execution, rather than returning to the console +.SH FILES +.TP 15 +.B php.ini +The standard configuration file +.TP +.B .phpdbginit +The init file +.SH SEE ALSO +The online manual can be found at +.PD 0 +.P +.B http://php.net/manual/book.phpdbg.php +.PD 1 +.SH BUGS +You can view the list of known bugs or report any new bug you +found at +.PD 0 +.P +.B http://bugs.php.net/ +.PD 1 +.SH AUTHORS +Written by Felipe Pena, Joe Watkins and Bob Weinand, formatted by Ondřej Surý for Debian project. +.P +A List of active developers can be found at +.PD 0 +.P +.B http://www.php.net/credits.php +.PD 1 +.P +And last but not least PHP was developed with the help of a huge amount of +contributors all around the world. +.SH VERSION INFORMATION +This manpage describes \fBphpdbg\fP, for PHP version @PHP_VERSION@. +.SH COPYRIGHT +Copyright \(co 1997\-2018 The PHP Group +.LP +This source file is subject to version 3.01 of the PHP license, +that is bundled with this package in the file LICENSE, and is +available through the world-wide-web at the following url: +.PD 0 +.P +.B http://www.php.net/license/3_01.txt +.PD 1 +.P +If you did not receive a copy of the PHP license and are unable to +obtain it through the world-wide-web, please send a note to +.B license@php.net +so we can mail you a copy immediately. diff -pruN 7.2.9-1/win32/build/mkdist.php 7.2.10-0ubuntu1/win32/build/mkdist.php --- 7.2.9-1/win32/build/mkdist.php 2018-08-14 14:26:32.000000000 +0000 +++ 7.2.10-0ubuntu1/win32/build/mkdist.php 2018-09-11 07:06:06.000000000 +0000 @@ -123,7 +123,11 @@ function get_depends($module) } } - $per_module_deps[basename($module)][] = $dep; + if (!isset($per_module_deps[basename($module)]) || !in_array($dep, $per_module_deps[basename($module)])) { + $per_module_deps[basename($module)][] = $dep; + //recursively check dll dependencies + get_depends($dep); + } } fclose($pipes[1]); proc_close($proc); @@ -335,10 +339,6 @@ Add ADD_DLLS to add extra DLLs like dyna deps. For example, libenchant.dll loads libenchant_myspell.dll or libenchant_ispell.dll */ -$ICU_DLLS = $php_build_dir . '/bin/icu*.dll'; -foreach (glob($ICU_DLLS) as $filename) { - copy($filename, "$dist_dir/" . basename($filename)); -} $ENCHANT_DLLS = array( array('', 'glib-2.dll'), array('', 'gmodule-2.dll'), diff -pruN 7.2.9-1/Zend/tests/bug76754.phpt 7.2.10-0ubuntu1/Zend/tests/bug76754.phpt --- 7.2.9-1/Zend/tests/bug76754.phpt 1970-01-01 00:00:00.000000000 +0000 +++ 7.2.10-0ubuntu1/Zend/tests/bug76754.phpt 2018-09-11 07:06:07.000000000 +0000 @@ -0,0 +1,18 @@ +--TEST-- +Bug #76754 (parent private constant in extends class memory leak) +--INI-- +opcache.enable=0 +opcache.enable_cli=0 +--FILE-- + +okey +--EXPECT-- +okey diff -pruN 7.2.9-1/Zend/zend_API.c 7.2.10-0ubuntu1/Zend/zend_API.c --- 7.2.9-1/Zend/zend_API.c 2018-08-14 14:26:32.000000000 +0000 +++ 7.2.10-0ubuntu1/Zend/zend_API.c 2018-09-11 07:06:06.000000000 +0000 @@ -2774,12 +2774,15 @@ ZEND_API zend_class_entry *zend_register ZEND_API int zend_register_class_alias_ex(const char *name, size_t name_len, zend_class_entry *ce) /* {{{ */ { zend_string *lcname; + int persistent; + + persistent = ce->type != ZEND_USER_CLASS; if (name[0] == '\\') { - lcname = zend_string_alloc(name_len-1, 1); + lcname = zend_string_alloc(name_len-1, persistent); zend_str_tolower_copy(ZSTR_VAL(lcname), name+1, name_len-1); } else { - lcname = zend_string_alloc(name_len, 1); + lcname = zend_string_alloc(name_len, persistent); zend_str_tolower_copy(ZSTR_VAL(lcname), name, name_len); } diff -pruN 7.2.9-1/Zend/zend_opcode.c 7.2.10-0ubuntu1/Zend/zend_opcode.c --- 7.2.9-1/Zend/zend_opcode.c 2018-08-14 14:26:32.000000000 +0000 +++ 7.2.10-0ubuntu1/Zend/zend_opcode.c 2018-09-11 07:06:07.000000000 +0000 @@ -297,8 +297,8 @@ ZEND_API void destroy_zend_class(zval *z } } } ZEND_HASH_FOREACH_END(); - zend_hash_destroy(&ce->constants_table); } + zend_hash_destroy(&ce->constants_table); if (ce->num_interfaces > 0 && ce->interfaces) { efree(ce->interfaces); }