From 7a614e6d42304759f828f4abf6fd60aadc71e533 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 22 Jan 2019 14:56:04 +0100 Subject: [PATCH] update to 7.3.2RC1 update system tzdata patch for timelib 2018.01 --- ...v16.patch => php-7.3.2-systzdata-v17.patch | 38 +++++++++---------- php.spec | 14 ++++--- sources | 2 +- 3 files changed, 28 insertions(+), 26 deletions(-) rename php-7.2.3-systzdata-v16.patch => php-7.3.2-systzdata-v17.patch (93%) diff --git a/php-7.2.3-systzdata-v16.patch b/php-7.3.2-systzdata-v17.patch similarity index 93% rename from php-7.2.3-systzdata-v16.patch rename to php-7.3.2-systzdata-v17.patch index e488beb..2ae754f 100644 --- a/php-7.2.3-systzdata-v16.patch +++ b/php-7.3.2-systzdata-v17.patch @@ -5,6 +5,7 @@ Add support for use of the system timezone database, rather than embedding a copy. Discussed upstream but was not desired. History: +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) r14: improve check for valid tz file @@ -27,9 +28,9 @@ r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert) r2: add filesystem trawl to set up name alias index r1: initial revision -diff -up php-7.2.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.2.3RC1/ext/date/lib/parse_tz.c ---- php-7.2.3RC1/ext/date/lib/parse_tz.c.systzdata 2018-02-13 20:18:34.000000000 +0100 -+++ php-7.2.3RC1/ext/date/lib/parse_tz.c 2018-02-14 06:14:23.484804852 +0100 +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 @@ -25,8 +25,21 @@ #include "timelib.h" #include "timelib_private.h" @@ -52,7 +53,7 @@ diff -up php-7.2.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.2.3RC1/ext/date/li #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; @@ -64,7 +65,7 @@ diff -up php-7.2.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.2.3RC1/ext/date/li /* 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 } } @@ -495,7 +496,7 @@ diff -up php-7.2.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.2.3RC1/ext/date/li { 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; } @@ -544,7 +545,7 @@ diff -up php-7.2.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.2.3RC1/ext/date/li } 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; @@ -576,7 +577,7 @@ diff -up php-7.2.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.2.3RC1/ext/date/li } 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; @@ -592,11 +593,10 @@ diff -up php-7.2.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.2.3RC1/ext/date/li tmp = timelib_tzinfo_ctor(timezone); version = read_preamble(&tzf, tmp, &type); -@@ -484,6 +988,29 @@ timelib_tzinfo *timelib_parse_tzfile(cha - timelib_tzinfo_dtor(tmp); - return NULL; +@@ -537,11 +1041,36 @@ timelib_tzinfo *timelib_parse_tzfile(cha } -+ + skip_posix_string(&tzf, tmp); + +#ifdef HAVE_SYSTEM_TZDATA + if (memmap) { + const struct location_info *li; @@ -619,10 +619,8 @@ diff -up php-7.2.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.2.3RC1/ext/date/li + 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 (type == TIMELIB_TZINFO_PHP) { + read_location(&tzf, tmp); } else { set_default_location_and_comments(&tzf, tmp); } @@ -632,10 +630,10 @@ diff -up php-7.2.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.2.3RC1/ext/date/li } else { *error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE; tmp = NULL; -diff -up php-7.2.3RC1/ext/date/lib/timelib.m4.systzdata php-7.2.3RC1/ext/date/lib/timelib.m4 ---- php-7.2.3RC1/ext/date/lib/timelib.m4.systzdata 2018-02-13 20:18:34.000000000 +0100 -+++ php-7.2.3RC1/ext/date/lib/timelib.m4 2018-02-14 06:11:54.273089963 +0100 -@@ -81,3 +81,16 @@ io.h +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) diff --git a/php.spec b/php.spec index 770331c..d92d6d1 100644 --- a/php.spec +++ b/php.spec @@ -58,13 +58,13 @@ %global with_lmdb 0 %endif -%global upver 7.3.1 -#global rcver RC1 +%global upver 7.3.2 +%global rcver RC1 Summary: PHP scripting language for creating dynamic web sites Name: php -Version: %{upver}%{?rcver:~%%{rcver}} -Release: 2%{?dist} +Version: %{upver}%{?rcver:~%{rcver}} +Release: 1%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -100,7 +100,7 @@ Patch8: php-7.2.0-libdb.patch # Functional changes Patch40: php-7.2.4-dlopen.patch -Patch42: php-7.2.3-systzdata-v16.patch +Patch42: php-7.3.2-systzdata-v17.patch # See http://bugs.php.net/53436 Patch43: php-7.3.0-phpize.patch # Use -lldap_r for OpenLDAP @@ -1556,6 +1556,10 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || : %changelog +* Tue Jan 22 2019 Remi Collet - 7.3.2~RC1-1 +- update to 7.3.2RC1 +- update system tzdata patch for timelib 2018.01 + * Mon Jan 14 2019 Björn Esser - 7.3.1-2 - Rebuilt for libcrypt.so.2 (#1666033) diff --git a/sources b/sources index 725f572..96c413a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-7.3.1.tar.xz) = 0663d90537fe3901cad00ba1056782050b8a61e8edb49f01851add4992df21d23aee3e9468e32b76b7f53ffd513f1ba10c9513c549e247d796416ed176355348 +SHA512 (php-7.3.2RC1.tar.xz) = 73f8c84480c72f97ce2d8d853f33bdb3e5b8be6bfcd973e6dd306676f6874e3960080f2e7ad8082999dff64caaaa337d85d760039c6f2c25c6c5670f50580443