Hello community, here is the log from the commit of package php7 for openSUSE:Factory checked in at 2019-02-24 17:05:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php7 (Old) and /work/SRC/openSUSE:Factory/.php7.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php7" Sun Feb 24 17:05:27 2019 rev:56 rq:674461 version:7.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/php7/php7.changes 2019-02-13 10:18:04.861341727 +0100 +++ /work/SRC/openSUSE:Factory/.php7.new.28833/php7.changes 2019-02-24 17:05:30.408620208 +0100 @@ -1,0 +2,9 @@ +Wed Feb 13 09:33:43 UTC 2019 - Petr Gajdos <pgaj...@suse.com> + +- updated to version 7.3.2: This is a bugfix release, with several + bug fixes included. See + http://php.net/ChangeLog-7.php#7.3.2 +- php7-systzdata-v16.patch modified and renamed to + php7-systzdata-v17.patch + +------------------------------------------------------------------- Old: ---- php-7.3.1.tar.xz php-7.3.1.tar.xz.asc php7-systzdata-v16.patch New: ---- php-7.3.2.tar.xz php-7.3.2.tar.xz.asc php7-systzdata-v17.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php7.spec ++++++ --- /var/tmp/diff_new_pack.4v9NLf/_old 2019-02-24 17:05:31.876619510 +0100 +++ /var/tmp/diff_new_pack.4v9NLf/_new 2019-02-24 17:05:31.876619510 +0100 @@ -40,7 +40,7 @@ %endif %bcond_without make_test Name: php7 -Version: 7.3.1 +Version: 7.3.2 Release: 0 Summary: Interpreter for the PHP scripting language version 7 License: PHP-3.01 @@ -62,7 +62,7 @@ Patch4: php7-no-build-date.patch Patch5: php7-pts.patch Patch6: php7-openssl.patch -Patch7: php7-systzdata-v16.patch +Patch7: php7-systzdata-v17.patch Patch8: php7-systemd-unit.patch Patch10: php7-embed.patch ## Bugfix patches @@ -998,7 +998,7 @@ : Update the pearver macro and rebuild. exit 1 fi -if [ %{version} != '7.3.1' ]; then +if [ %{version} != '7.3.2' ]; then echo 'check whether pcre.jit=0 workaround is still needed' echo 'https://bugs.php.net/bug.php?id=77260' exit 1 ++++++ php-7.3.1.tar.xz -> php-7.3.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/php7/php-7.3.1.tar.xz /work/SRC/openSUSE:Factory/.php7.new.28833/php-7.3.2.tar.xz differ: char 26, line 1 ++++++ php7-systzdata-v16.patch -> php7-systzdata-v17.patch ++++++ --- /work/SRC/openSUSE:Factory/php7/php7-systzdata-v16.patch 2018-03-14 19:26:01.392934355 +0100 +++ /work/SRC/openSUSE:Factory/.php7.new.28833/php7-systzdata-v17.patch 2019-02-24 17:05:29.860620468 +0100 @@ -5,6 +5,7 @@ than embedding a copy. Discussed upstream but was not desired. History: +r17: refreshed (quilt) pgajdos r16: refreshed (quilt) pgajdos r15: adapt for timelib 2017.05beta7 (in 7.2.0RC1) r14: improve check for valid tz file @@ -27,10 +28,10 @@ r2: add filesystem trawl to set up name alias index r1: initial revision -Index: php-7.2.3/ext/date/lib/parse_tz.c +Index: php-7.3.2/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 +--- php-7.3.2.orig/ext/date/lib/parse_tz.c 2019-02-05 14:10:11.000000000 +0100 ++++ php-7.3.2/ext/date/lib/parse_tz.c 2019-02-13 08:46:03.122460465 +0100 @@ -25,8 +25,21 @@ #include "timelib.h" #include "timelib_private.h" @@ -53,7 +54,7 @@ #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__)) # if defined(__LITTLE_ENDIAN__) -@@ -67,6 +80,11 @@ static int read_php_preamble(const unsig +@@ -87,6 +100,11 @@ static int read_php_preamble(const unsig { uint32_t version; @@ -65,7 +66,7 @@ /* read ID */ version = (*tzf)[3] - '0'; *tzf += 4; -@@ -374,7 +392,429 @@ void timelib_dump_tzinfo(timelib_tzinfo +@@ -411,7 +429,429 @@ void timelib_dump_tzinfo(timelib_tzinfo } } @@ -496,7 +497,7 @@ { int left = 0, right = tzdb->index_size - 1; -@@ -400,9 +840,48 @@ static int seek_to_tz_position(const uns +@@ -437,9 +877,48 @@ static int seek_to_tz_position(const uns return 0; } @@ -545,7 +546,7 @@ } 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_ +@@ -451,7 +930,30 @@ const timelib_tzdb_index_entry *timelib_ int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb) { const unsigned char *tzf; @@ -577,7 +578,7 @@ } static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz) -@@ -456,12 +958,14 @@ static timelib_tzinfo* timelib_tzinfo_ct +@@ -493,12 +995,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; @@ -593,37 +594,37 @@ tmp = timelib_tzinfo_ctor(timezone); version = read_preamble(&tzf, tmp, &type); -@@ -484,6 +988,29 @@ timelib_tzinfo *timelib_parse_tzfile(cha +@@ -507,6 +1011,29 @@ timelib_tzinfo *timelib_parse_tzfile(cha timelib_tzinfo_dtor(tmp); return NULL; } + +#ifdef HAVE_SYSTEM_TZDATA -+ if (memmap) { -+ const struct location_info *li; ++ if (memmap) { ++ const struct location_info *li; + -+ /* TZif-style - grok the location info from the system database, -+ * if possible. */ ++ /* TZif-style - grok the location info from the system database, ++ * if possible. */ + -+ if ((li = find_zone_info(system_location_table, timezone)) != NULL) { -+ tmp->location.comments = timelib_strdup(li->comment); -+ strncpy(tmp->location.country_code, li->code, 2); -+ tmp->location.longitude = li->longitude; -+ tmp->location.latitude = li->latitude; -+ tmp->bc = 1; -+ } -+ else { -+ set_default_location_and_comments(&tzf, tmp); -+ } -+ -+ /* Now done with the mmap segment - discard it. */ -+ munmap(memmap, maplen); -+ } else { ++ if ((li = find_zone_info(system_location_table, timezone)) != NULL) { ++ tmp->location.comments = timelib_strdup(li->comment); ++ strncpy(tmp->location.country_code, li->code, 2); ++ tmp->location.longitude = li->longitude; ++ tmp->location.latitude = li->latitude; ++ tmp->bc = 1; ++ } ++ else { ++ set_default_location_and_comments(&tzf, tmp); ++ } ++ ++ /* Now done with the mmap segment - discard it. */ ++ munmap(memmap, maplen); ++ } else { +#endif - if (version == 2 || version == 3) { - if (!skip_64bit_preamble(&tzf, tmp)) { - /* 64 bit preamble is not in place */ -@@ -501,6 +1028,9 @@ timelib_tzinfo *timelib_parse_tzfile(cha + if (version < 2 || version > 3) { + *error_code = TIMELIB_ERROR_UNSUPPORTED_VERSION; + timelib_tzinfo_dtor(tmp); +@@ -542,6 +1069,9 @@ timelib_tzinfo *timelib_parse_tzfile(cha } else { set_default_location_and_comments(&tzf, tmp); } @@ -633,11 +634,11 @@ } else { *error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE; tmp = NULL; -Index: php-7.2.3/ext/date/lib/timelib.m4 +Index: php-7.3.2/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 +--- php-7.3.2.orig/ext/date/lib/timelib.m4 2019-02-05 14:10:11.000000000 +0100 ++++ php-7.3.2/ext/date/lib/timelib.m4 2019-02-13 08:41:28.997293893 +0100 +@@ -78,3 +78,16 @@ io.h dnl Check for strtoll, atoll AC_CHECK_FUNCS(strtoll atoll strftime gettimeofday)
