Hello community, here is the log from the commit of package php7 for openSUSE:Factory checked in at 2019-03-12 09:48:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php7 (Old) and /work/SRC/openSUSE:Factory/.php7.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php7" Tue Mar 12 09:48:38 2019 rev:58 rq:683878 version:7.3.3 Changes: -------- --- /work/SRC/openSUSE:Factory/php7/php7.changes 2019-03-01 20:27:13.862043067 +0100 +++ /work/SRC/openSUSE:Factory/.php7.new.28833/php7.changes 2019-03-12 09:48:44.339593985 +0100 @@ -1,0 +2,17 @@ +Fri Mar 8 10:13:08 UTC 2019 - [email protected] + +- updated to 7.3.3: This is a security release which also contains + several bug fixes. See + http://www.php.net/ChangeLog-7.php#7.3.3 +- deleted patches + - php-systzdata-v17.patch (upstreamed) +- added patches + + php-systzdata-v18.patch (thanks to remirepo) + +------------------------------------------------------------------- +Tue Mar 5 11:36:22 UTC 2019 - [email protected] + +- asan_build: build ASAN included +- debug_build: build more suitable for debugging + +------------------------------------------------------------------- @@ -16,13 +33,13 @@ - - php7-crypt-tests.patch (upstreamed) - - php7-date-regenerate-lexers.patch (upstreamed) - - php7-embed.patch (upstreamed) - - php7-fix_net-snmp_disable_MD5.patch (upstreamed) - - php7-ini.patch (upstreamed) - - php7-no-build-date.patch (upstreamed) - - php7-odbc-cmp-int-cast.patch (upstreamed) - - php7-openssl.patch (upstreamed) - - php7-php-config.patch (upstreamed) - - php7-phpize.patch (upstreamed) - - php7-pts.patch (upstreamed) - - php7-systemd-unit.patch (upstreamed) - - php7-systzdata-v17.patch (upstreamed) + - php7-crypt-tests.patch + - php7-date-regenerate-lexers.patch + - php7-embed.patch + - php7-fix_net-snmp_disable_MD5.patch + - php7-ini.patch + - php7-no-build-date.patch + - php7-odbc-cmp-int-cast.patch + - php7-openssl.patch + - php7-php-config.patch + - php7-phpize.patch + - php7-pts.patch + - php7-systemd-unit.patch + - php7-systzdata-v17.patch Old: ---- php-7.3.2.tar.xz php-7.3.2.tar.xz.asc php-systzdata-v17.patch New: ---- php-7.3.3.tar.xz php-7.3.3.tar.xz.asc php-systzdata-v18.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php7.spec ++++++ --- /var/tmp/diff_new_pack.sgFHcc/_old 2019-03-12 09:48:47.447593365 +0100 +++ /var/tmp/diff_new_pack.sgFHcc/_new 2019-03-12 09:48:47.471593360 +0100 @@ -16,6 +16,8 @@ # +%define debug_build 0 +%define asan_build 0 %global apiver 20180731 %global zendver 20180731 %global pearver 1.10.7 @@ -40,7 +42,7 @@ %endif %bcond_with make_test Name: php7 -Version: 7.3.2 +Version: 7.3.3 Release: 0 Summary: Interpreter for the PHP scripting language version 7 License: PHP-3.01 @@ -62,7 +64,7 @@ Patch4: php-no-build-date.patch Patch5: php-pts.patch Patch6: php-openssl.patch -Patch7: php-systzdata-v17.patch +Patch7: php-systzdata-v18.patch Patch8: php-systemd-unit.patch Patch10: php-embed.patch ## Bugfix patches @@ -998,7 +1000,7 @@ : Update the pearver macro and rebuild. exit 1 fi -if [ %{version} != '7.3.2' ]; then +if [ %{version} != '7.3.3' ]; then echo 'check whether pcre.jit=0 workaround is still needed' echo 'https://bugs.php.net/bug.php?id=77260' exit 1 @@ -1037,6 +1039,10 @@ CFLAGS="$CFLAGS -I/usr/include/firebird" CXXFLAGS="$CXXFLAGS -I/usr/include/firebird" %endif +%if %{debug_build} +CFLAGS="$CFLAGS -Og" +CXXFLAGS="$CXXFLAGS -Og" +%endif export CFLAGS export CXXFLAGS export LDFLAGS="-pie" @@ -1106,6 +1112,11 @@ if [ $sapi == apache2 ]; then sed -i 's/libphp/mod_php/' Makefile fi +%if %{asan_build} + sed -i -e 's/\(^CFLAGS.*\)/\1 -fsanitize=address/' \ + -e 's/\(^EXTRA_LIBS =.*\)/\1 -lasan/' \ + Makefile +%endif make %{?_smp_mflags} PHP_PEAR_PHP_BIN=%{_bindir}/php} popd } @@ -1218,6 +1229,10 @@ --disable-cgi %check +%if %{asan_build} +# ASAN needs /proc to be mounted +exit 0 +%endif cd build-cli # check if we link against system libcrypt if [ -z "$(ldd sapi/cli/php | grep libcrypt.so)" ]; then ++++++ php-7.3.2.tar.xz -> php-7.3.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/php7/php-7.3.2.tar.xz /work/SRC/openSUSE:Factory/.php7.new.28833/php-7.3.3.tar.xz differ: char 26, line 1 ++++++ php-systzdata-v17.patch -> php-systzdata-v18.patch ++++++ --- /work/SRC/openSUSE:Factory/php7/php-systzdata-v17.patch 2019-03-01 20:27:13.838043072 +0100 +++ /work/SRC/openSUSE:Factory/.php7.new.28833/php-systzdata-v18.patch 2019-03-12 09:48:44.235594006 +0100 @@ -5,6 +5,7 @@ than embedding a copy. Discussed upstream but was not desired. History: +r18: adapt for autotool change in 7.3.3RC1 r17: adapt for timelib 2018.01 (in 7.3.2RC1) r16: adapt for timelib 2017.06 (in 7.2.3RC1) r15: adapt for timelib 2017.05beta7 (in 7.2.0RC1) @@ -28,9 +29,32 @@ r2: add filesystem trawl to set up name alias index r1: initial revision -diff -up php-7.3.2RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.2RC1/ext/date/lib/parse_tz.c ---- php-7.3.2RC1/ext/date/lib/parse_tz.c.systzdata 2019-01-22 13:20:08.000000000 +0100 -+++ php-7.3.2RC1/ext/date/lib/parse_tz.c 2019-01-22 14:30:46.655691222 +0100 +diff -up php-7.3.3RC1/ext/date/config0.m4.systzdata php-7.3.3RC1/ext/date/config0.m4 +--- php-7.3.3RC1/ext/date/config0.m4.systzdata 2019-02-19 14:57:51.314601701 +0100 ++++ php-7.3.3RC1/ext/date/config0.m4 2019-02-19 14:58:29.050812587 +0100 +@@ -9,6 +9,19 @@ io.h + dnl Check for strtoll, atoll + AC_CHECK_FUNCS(strtoll atoll) + ++PHP_ARG_WITH(system-tzdata, for use of system timezone data, ++[ --with-system-tzdata[=DIR] to specify use of system timezone data], ++no, no) ++ ++if test "$PHP_SYSTEM_TZDATA" != "no"; then ++ AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used]) ++ ++ if test "$PHP_SYSTEM_TZDATA" != "yes"; then ++ AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA", ++ [Define for location of system timezone data]) ++ fi ++fi ++ + PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1" + timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c + lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c" +diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/lib/parse_tz.c +--- php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata 2019-02-19 12:18:27.000000000 +0100 ++++ php-7.3.3RC1/ext/date/lib/parse_tz.c 2019-02-19 14:57:20.397428931 +0100 @@ -25,8 +25,21 @@ #include "timelib.h" #include "timelib_private.h" @@ -630,23 +654,3 @@ } else { *error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE; tmp = NULL; -diff -up php-7.3.2RC1/ext/date/lib/timelib.m4.systzdata php-7.3.2RC1/ext/date/lib/timelib.m4 ---- php-7.3.2RC1/ext/date/lib/timelib.m4.systzdata 2019-01-22 13:20:08.000000000 +0100 -+++ php-7.3.2RC1/ext/date/lib/timelib.m4 2019-01-22 13:47:07.807374084 +0100 -@@ -78,3 +78,16 @@ io.h - - dnl Check for strtoll, atoll - AC_CHECK_FUNCS(strtoll atoll strftime gettimeofday) -+ -+PHP_ARG_WITH(system-tzdata, for use of system timezone data, -+[ --with-system-tzdata[=DIR] to specify use of system timezone data], -+no, no) -+ -+if test "$PHP_SYSTEM_TZDATA" != "no"; then -+ AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used]) -+ -+ if test "$PHP_SYSTEM_TZDATA" != "yes"; then -+ AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA", -+ [Define for location of system timezone data]) -+ fi -+fi
