Hello community, here is the log from the commit of package php7 for openSUSE:Factory checked in at 2018-03-14 19:25:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php7 (Old) and /work/SRC/openSUSE:Factory/.php7.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php7" Wed Mar 14 19:25:56 2018 rev:34 rq:585278 version:7.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/php7/php7.changes 2018-02-21 14:09:11.627110813 +0100 +++ /work/SRC/openSUSE:Factory/.php7.new/php7.changes 2018-03-14 19:26:01.408933787 +0100 @@ -1,0 +2,35 @@ +Sat Mar 10 11:11:04 UTC 2018 - dims...@opensuse.org + +- BuildRequire pkgconfig(enchant) instead of enchant-devel: enchant + is moving to version 2.2, with an enchant-1 as compatibility + package. By using the pkgconfig symbol, we don't have to care for + the actual package name. + +------------------------------------------------------------------- +Fri Mar 9 16:52:13 UTC 2018 - pgaj...@suse.com + +- updated to 7.2.3: This is a security release with also contains + several minor bug fixes. + http://php.net/ChangeLog-7.php#7.2.3 +- removed upstreamed php7-pgsql-memory-leak.patch +- php7-systzdata-v15.patch refreshed and renamed to + php7-systzdata-v16.patch + +------------------------------------------------------------------- +Thu Feb 22 19:46:08 UTC 2018 - crrodrig...@opensuse.org + +- php7-honor-re2c-flags.patch: honor RE2C_FLAGS everywhere. +- remove generated lexers so they are recreated at build time + +------------------------------------------------------------------- +Thu Feb 22 18:46:32 UTC 2018 - crrodrig...@opensuse.org + +- php7-date-regenerate-lexers.patch: honor RE2C_FLAGS + +------------------------------------------------------------------- +Thu Feb 22 14:49:53 UTC 2018 - crrodrig...@opensuse.org + +- Support password_hash("...", PASSWORD_ARGON2I), buildrequire + libargon2 in supported products. + +------------------------------------------------------------------- Old: ---- php-7.2.2.tar.xz php-7.2.2.tar.xz.asc php7-pgsql-memory-leak.patch php7-systzdata-v15.patch New: ---- php-7.2.3.tar.xz php-7.2.3.tar.xz.asc php7-honor-re2c-flags.patch php7-systzdata-v16.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php7.spec ++++++ --- /var/tmp/diff_new_pack.WePtsy/_old 2018-03-14 19:26:03.292866893 +0100 +++ /var/tmp/diff_new_pack.WePtsy/_new 2018-03-14 19:26:03.304866467 +0100 @@ -23,7 +23,6 @@ %define extension_dir %{_libdir}/%{pkg_name}/extensions %define peardir %{_datadir}/%{pkg_name}/PEAR %define php_sysconf %{_sysconfdir}/%{pkg_name} -%bcond_with make_test # as soon as suhosin is ported to php7, these build_suhosin and # related conditions can be removed entirely %define build_suhosin 0 @@ -43,16 +42,19 @@ %define build_sodium 1 %endif %define system_gd 0 +%define build_argon2 0 %if %{?suse_version} >= 1500 %define system_gd 1 +%define build_argon2 1 %endif +%bcond_with make_test Name: php7 -Version: 7.2.2 +Version: 7.2.3 Release: 0 Summary: Interpreter for the PHP scripting language version 7 License: PHP-3.01 Group: Development/Languages/Other -Url: https://secure.php.net +URL: https://secure.php.net Source0: https://secure.php.net/distributions/php-%{version}.tar.xz Source1: php-suse-addons.tar.bz2 Source2: https://download.suhosin.org/suhosin-%{suhosin_version}.tar.gz @@ -72,7 +74,7 @@ Patch4: php7-no-build-date.patch Patch5: php7-pts.patch Patch6: php7-openssl.patch -Patch7: php7-systzdata-v15.patch +Patch7: php7-systzdata-v16.patch Patch8: php7-systemd-unit.patch Patch9: php7-depdb-path.patch Patch10: php7-embed.patch @@ -89,7 +91,8 @@ Patch15: php7-fix_net-snmp_disable_MD5.patch # should be upstreamed, will do later Patch17: php7-date-regenerate-lexers.patch -Patch18: php7-pgsql-memory-leak.patch +# https://bugs.php.net/bug.php?id=76030 +Patch19: php7-honor-re2c-flags.patch BuildRequires: apache-rpm-macros BuildRequires: apache2-devel BuildRequires: autoconf @@ -97,16 +100,9 @@ BuildRequires: curl BuildRequires: curl-devel BuildRequires: cyrus-sasl-devel -BuildRequires: enchant-devel BuildRequires: freetds-devel BuildRequires: freetype2-devel BuildRequires: gcc-c++ -%if %{system_gd} -BuildRequires: gd-devel -%else -BuildRequires: pkgconfig(libwebp) -BuildRequires: pkgconfig(xft) -%endif BuildRequires: gmp-devel BuildRequires: imap-devel BuildRequires: krb5-devel @@ -117,9 +113,6 @@ BuildRequires: libjpeg-devel BuildRequires: libopenssl-devel BuildRequires: libpng-devel -%if %{build_sodium} -BuildRequires: libsodium-devel -%endif BuildRequires: libtidy-devel BuildRequires: libtiff-devel BuildRequires: libtool @@ -138,6 +131,7 @@ BuildRequires: unixODBC-devel BuildRequires: update-alternatives BuildRequires: xz +BuildRequires: pkgconfig(enchant) BuildRequires: pkgconfig(xpm) BuildRequires: pkgconfig(zlib) # 10.3 does not install sendmail binary with the minimal system @@ -182,6 +176,18 @@ Obsoletes: php < %{version} Obsoletes: php5 Obsoletes: php7-mcrypt +%if %{system_gd} +BuildRequires: gd-devel +%else +BuildRequires: pkgconfig(libwebp) +BuildRequires: pkgconfig(xft) +%endif +%if %{build_sodium} +BuildRequires: libsodium-devel +%endif +%if %{build_argon2} +BuildRequires: pkgconfig(libargon2) +%endif %if 0%{?suse_version} >= 1320 BuildRequires: libzip-devel %endif @@ -1011,7 +1017,7 @@ %patch14 %patch15 %patch17 -p1 -%patch18 -p1 +%patch19 -p1 # Safety check for API version change. vapi=`sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h` @@ -1044,9 +1050,10 @@ mkdir -p build-fastcgi mkdir -p build-cli -#for parser in `find -name "*.re"`;do -# re2c -c --no-generation-date -gi "$parser" > ${parser%.*}.c -#done +#get parsers regenerated +for parser in `find -type f -name "*.re"`;do +rm -v ${parser%.*}.c +done rm -r ext/pcre/pcrelib @@ -1111,6 +1118,9 @@ %if 0%{?suse_version} >= 1320 --with-libzip \ %endif +%if %{build_argon2} + --with-password-argon2=%{_usr} \ +%endif "$@" || { cat config.log; exit 1; } # Some modules are builtin, reasons: # - libxml can not be shared (and is needed by PEAR) @@ -1148,7 +1158,7 @@ --bindir=%{_bindir} \ --disable-cli \ --disable-all \ - --localstatedir=/var + --localstatedir=%{_localstatedir} Build embed \ --enable-embed=shared \ @@ -1438,7 +1448,8 @@ %files %defattr(-, root, root) -%doc README* CODING_STANDARDS CREDITS EXTENSIONS LICENSE NEWS UPGRADING +%license LICENSE +%doc README* CODING_STANDARDS CREDITS EXTENSIONS NEWS UPGRADING %doc php-suse-addons/test.php5 %{_mandir}/man1/* %dir %{php_sysconf} ++++++ php-7.2.2.tar.xz -> php-7.2.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/php7/php-7.2.2.tar.xz /work/SRC/openSUSE:Factory/.php7.new/php-7.2.3.tar.xz differ: char 25, line 1 ++++++ php7-date-regenerate-lexers.patch ++++++ --- /var/tmp/diff_new_pack.WePtsy/_old 2018-03-14 19:26:03.528858514 +0100 +++ /var/tmp/diff_new_pack.WePtsy/_new 2018-03-14 19:26:03.532858372 +0100 @@ -17,8 +17,8 @@ +++ php-7.1.7/ext/date/Makefile.frag 2017-07-21 13:58:51.986357906 +0200 @@ -0,0 +1,6 @@ +$(srcdir)/lib/parse_date.c: $(srcdir)/lib/parse_date.re -+ @(cd $(top_srcdir); $(RE2C) --no-generation-date -b -o ext/date/lib/parse_date.c ext/date/lib/parse_date.re) ++ @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) -b --no-generation-date -o ext/date/lib/parse_date.c ext/date/lib/parse_date.re) + +$(srcdir)/lib/parse_iso_intervals.c: $(srcdir)/lib/parse_iso_intervals.re -+ @(cd $(top_srcdir); $(RE2C) --no-generation-date -b -o ext/date/lib/parse_iso_intervals.c ext/date/lib/parse_iso_intervals.re) ++ @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) -b --no-generation-date -o ext/date/lib/parse_iso_intervals.c ext/date/lib/parse_iso_intervals.re) + ++++++ php7-honor-re2c-flags.patch ++++++ Index: php-7.2.2/ext/standard/Makefile.frag =================================================================== --- php-7.2.2.orig/ext/standard/Makefile.frag +++ php-7.2.2/ext/standard/Makefile.frag @@ -1,9 +1,9 @@ $(srcdir)/var_unserializer.c: $(srcdir)/var_unserializer.re - @(cd $(top_srcdir); $(RE2C) --no-generation-date -b -o ext/standard/var_unserializer.c ext/standard/var_unserializer.re) + @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date -b -o ext/standard/var_unserializer.c ext/standard/var_unserializer.re) $(srcdir)/url_scanner_ex.c: $(srcdir)/url_scanner_ex.re - @(cd $(top_srcdir); $(RE2C) --no-generation-date -b -o ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.re) + @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date -b -o ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.re) $(builddir)/info.lo: $(builddir)/../../main/build-defs.h Index: php-7.2.2/ext/json/Makefile.frag =================================================================== --- php-7.2.2.orig/ext/json/Makefile.frag +++ php-7.2.2/ext/json/Makefile.frag @@ -1,5 +1,5 @@ $(srcdir)/json_scanner.c: $(srcdir)/json_scanner.re - $(RE2C) -t $(srcdir)/php_json_scanner_defs.h --no-generation-date -bci -o $@ $(srcdir)/json_scanner.re + $(RE2C) $(RE2C_FLAGS) -t $(srcdir)/php_json_scanner_defs.h --no-generation-date -bci -o $@ $(srcdir)/json_scanner.re $(srcdir)/json_parser.tab.c: $(srcdir)/json_parser.y $(YACC) --defines -l $(srcdir)/json_parser.y -o $@ Index: php-7.2.2/ext/phar/Makefile.frag =================================================================== --- php-7.2.2.orig/ext/phar/Makefile.frag +++ php-7.2.2/ext/phar/Makefile.frag @@ -1,9 +1,9 @@ $(srcdir)/phar_path_check.c: $(srcdir)/phar_path_check.re @(cd $(top_srcdir); \ if test -f ./php_phar.h; then \ - $(RE2C) --no-generation-date -b -o phar_path_check.c phar_path_check.re; \ + $(RE2C) $(RE2C_FLAGS) --no-generation-date -b -o phar_path_check.c phar_path_check.re; \ else \ - $(RE2C) --no-generation-date -b -o ext/phar/phar_path_check.c ext/phar/phar_path_check.re; \ + $(RE2C) $(RE2C_FLAGS) --no-generation-date -b -o ext/phar/phar_path_check.c ext/phar/phar_path_check.re; \ fi) pharcmd: $(builddir)/phar.php $(builddir)/phar.phar Index: php-7.2.2/ext/pdo/Makefile.frag =================================================================== --- php-7.2.2.orig/ext/pdo/Makefile.frag +++ php-7.2.2/ext/pdo/Makefile.frag @@ -7,7 +7,7 @@ PDO_HEADER_FILES= \ $(srcdir)/pdo_sql_parser.c: $(srcdir)/pdo_sql_parser.re - (cd $(top_srcdir); $(RE2C) --no-generation-date -o ext/pdo/pdo_sql_parser.c ext/pdo/pdo_sql_parser.re) + (cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date -o ext/pdo/pdo_sql_parser.c ext/pdo/pdo_sql_parser.re) install-pdo-headers: @echo "Installing PDO headers: $(INSTALL_ROOT)$(phpincludedir)/ext/pdo/" ++++++ php7-no-build-date.patch ++++++ --- /var/tmp/diff_new_pack.WePtsy/_old 2018-03-14 19:26:03.588856383 +0100 +++ /var/tmp/diff_new_pack.WePtsy/_new 2018-03-14 19:26:03.604855815 +0100 @@ -1,7 +1,7 @@ -Index: php-7.2.2/ext/standard/info.c +Index: php-7.2.3/ext/standard/info.c =================================================================== ---- php-7.2.2.orig/ext/standard/info.c 2018-01-30 11:33:46.000000000 +0100 -+++ php-7.2.2/ext/standard/info.c 2018-02-07 18:28:22.660632533 +0100 +--- php-7.2.3.orig/ext/standard/info.c 2018-02-27 17:33:02.000000000 +0100 ++++ php-7.2.3/ext/standard/info.c 2018-03-09 17:08:21.831512106 +0100 @@ -830,7 +830,7 @@ PHPAPI void php_print_info(int flag) php_info_print_box_end(); php_info_print_table_start(); @@ -20,10 +20,10 @@ #endif if (sapi_module.pretty_name) { -Index: php-7.2.2/sapi/cli/php_cli.c +Index: php-7.2.3/sapi/cli/php_cli.c =================================================================== ---- php-7.2.2.orig/sapi/cli/php_cli.c 2018-02-07 18:28:22.660632533 +0100 -+++ php-7.2.2/sapi/cli/php_cli.c 2018-02-07 18:34:12.278238172 +0100 +--- php-7.2.3.orig/sapi/cli/php_cli.c 2018-02-27 17:32:58.000000000 +0100 ++++ php-7.2.3/sapi/cli/php_cli.c 2018-03-09 17:08:21.831512106 +0100 @@ -697,8 +697,8 @@ static int do_cli(int argc, char **argv) goto out; @@ -35,10 +35,10 @@ #if ZTS "ZTS " #else -Index: php-7.2.2/sapi/cgi/cgi_main.c +Index: php-7.2.3/sapi/cgi/cgi_main.c =================================================================== ---- php-7.2.2.orig/sapi/cgi/cgi_main.c 2018-02-07 18:28:22.664632597 +0100 -+++ php-7.2.2/sapi/cgi/cgi_main.c 2018-02-07 18:36:10.200133504 +0100 +--- php-7.2.3.orig/sapi/cgi/cgi_main.c 2018-02-27 17:32:58.000000000 +0100 ++++ php-7.2.3/sapi/cgi/cgi_main.c 2018-03-09 17:08:21.831512106 +0100 @@ -2427,9 +2427,9 @@ consult the installation file that came SG(request_info).no_headers = 1; } @@ -51,15 +51,15 @@ #endif php_request_shutdown((void *) 0); fcgi_shutdown(); -Index: php-7.2.2/configure.ac +Index: php-7.2.3/configure.ac =================================================================== ---- php-7.2.2.orig/configure.ac 2018-02-07 18:28:22.664632597 +0100 -+++ php-7.2.2/configure.ac 2018-02-07 18:39:14.995286170 +0100 +--- php-7.2.3.orig/configure.ac 2018-03-09 17:08:21.831512106 +0100 ++++ php-7.2.3/configure.ac 2018-03-09 17:13:38.780976823 +0100 @@ -1269,10 +1269,12 @@ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLA EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS" # SOURCE_DATE_EPOCH for reproducible builds https://reproducible-builds.org/specs/source-date-epoch/ --PHP_BUILD_DATE=`date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d` +-PHP_BUILD_DATE=`date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d` +#totally fake, not used anywhere in userspace +PHP_BUILD_DATE="1970-01-01" AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date]) @@ -70,10 +70,10 @@ AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output]) PHP_OS=`uname | xargs` AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output]) -Index: php-7.2.2/sapi/fpm/fpm/fpm_main.c +Index: php-7.2.3/sapi/fpm/fpm/fpm_main.c =================================================================== ---- php-7.2.2.orig/sapi/fpm/fpm/fpm_main.c 2018-02-07 18:28:22.660632533 +0100 -+++ php-7.2.2/sapi/fpm/fpm/fpm_main.c 2018-02-07 18:32:20.376441703 +0100 +--- php-7.2.3.orig/sapi/fpm/fpm/fpm_main.c 2018-02-27 17:32:58.000000000 +0100 ++++ php-7.2.3/sapi/fpm/fpm/fpm_main.c 2018-03-09 17:08:21.831512106 +0100 @@ -1755,9 +1755,9 @@ int main(int argc, char *argv[]) SG(request_info).no_headers = 1; ++++++ php7-systzdata-v15.patch -> php7-systzdata-v16.patch ++++++ --- /work/SRC/openSUSE:Factory/php7/php7-systzdata-v15.patch 2017-12-13 11:57:51.462157741 +0100 +++ /work/SRC/openSUSE:Factory/.php7.new/php7-systzdata-v16.patch 2018-03-14 19:26:01.392934355 +0100 @@ -5,6 +5,7 @@ than embedding a copy. Discussed upstream but was not desired. History: +r16: refreshed (quilt) pgajdos r15: adapt for timelib 2017.05beta7 (in 7.2.0RC1) r14: improve check for valid tz file r13: adapt for upstream changes to use PHP allocator @@ -26,9 +27,10 @@ r2: add filesystem trawl to set up name alias index r1: initial revision -diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c ---- ./ext/date/lib/parse_tz.c.systzdata 2017-08-22 09:40:38.000000000 +0200 -+++ ./ext/date/lib/parse_tz.c 2017-08-22 12:16:00.370298079 +0200 +Index: php-7.2.3/ext/date/lib/parse_tz.c +=================================================================== +--- php-7.2.3.orig/ext/date/lib/parse_tz.c 2018-02-27 17:33:07.000000000 +0100 ++++ php-7.2.3/ext/date/lib/parse_tz.c 2018-03-09 17:34:16.050292149 +0100 @@ -25,8 +25,21 @@ #include "timelib.h" #include "timelib_private.h" @@ -493,8 +495,8 @@ +static int inmem_seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb) { int left = 0, right = tzdb->index_size - 1; - #ifdef HAVE_SETLOCALE -@@ -419,9 +859,48 @@ static int seek_to_tz_position(const uns + +@@ -400,9 +840,48 @@ static int seek_to_tz_position(const uns return 0; } @@ -542,8 +544,8 @@ +#endif } - const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(timelib_tzdb *tzdb, int *count) -@@ -433,7 +912,30 @@ const timelib_tzdb_index_entry *timelib_ + const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count) +@@ -414,7 +893,30 @@ const timelib_tzdb_index_entry *timelib_ int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb) { const unsigned char *tzf; @@ -575,7 +577,7 @@ } static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz) -@@ -475,12 +977,14 @@ static timelib_tzinfo* timelib_tzinfo_ct +@@ -456,12 +958,14 @@ static timelib_tzinfo* timelib_tzinfo_ct timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb, int *error_code) { const unsigned char *tzf; @@ -591,7 +593,7 @@ tmp = timelib_tzinfo_ctor(timezone); version = read_preamble(&tzf, tmp, &type); -@@ -503,6 +1007,29 @@ timelib_tzinfo *timelib_parse_tzfile(cha +@@ -484,6 +988,29 @@ timelib_tzinfo *timelib_parse_tzfile(cha timelib_tzinfo_dtor(tmp); return NULL; } @@ -621,7 +623,7 @@ if (version == 2 || version == 3) { if (!skip_64bit_preamble(&tzf, tmp)) { /* 64 bit preamble is not in place */ -@@ -520,6 +1047,9 @@ timelib_tzinfo *timelib_parse_tzfile(cha +@@ -501,6 +1028,9 @@ timelib_tzinfo *timelib_parse_tzfile(cha } else { set_default_location_and_comments(&tzf, tmp); } @@ -631,9 +633,10 @@ } else { *error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE; tmp = NULL; -diff -up ./ext/date/lib/timelib.m4.systzdata ./ext/date/lib/timelib.m4 ---- ./ext/date/lib/timelib.m4.systzdata 2017-08-22 09:40:38.000000000 +0200 -+++ ./ext/date/lib/timelib.m4 2017-08-22 11:32:29.357799927 +0200 +Index: php-7.2.3/ext/date/lib/timelib.m4 +=================================================================== +--- php-7.2.3.orig/ext/date/lib/timelib.m4 2018-02-27 17:33:07.000000000 +0100 ++++ php-7.2.3/ext/date/lib/timelib.m4 2018-03-09 17:34:16.050292149 +0100 @@ -81,3 +81,16 @@ io.h dnl Check for strtoll, atoll
