From 335e675ec12ac875aa85dd3a47a7ee582da80da3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Adam=20Go=C5=82=C4=99biowski?= Date: Wed, 6 Mar 2019 16:21:03 +0100 Subject: [PATCH] updated systzdata patch to r17 from remi https://git.remirepo.net/cgit/rpms/php/php72.git/plain/php-7.2.16-systzdata-v17.patch --- php-systzdata.patch | 73 +++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/php-systzdata.patch b/php-systzdata.patch index 63ba1d8..640bff2 100644 --- a/php-systzdata.patch +++ b/php-systzdata.patch @@ -4,11 +4,9 @@ Add support for use of the system timezone database, rather than embedding a copy. Discussed upstream but was not desired. -(Few) upstream reports: -https://bugs.php.net/bug.php?id=53320 -https://bugs.php.net/bug.php?id=54250 - History: +r17: adapt for autotool change in 7.2.16RC1 +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 r13: adapt for upstream changes to use PHP allocator @@ -30,9 +28,32 @@ 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 ./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 +diff -up php-7.2.16RC1/ext/date/config0.m4.systzdata php-7.2.16RC1/ext/date/config0.m4 +--- php-7.2.16RC1/ext/date/config0.m4.systzdata 2019-02-19 11:22:22.223741585 +0100 ++++ php-7.2.16RC1/ext/date/config0.m4 2019-02-19 11:23:05.089111556 +0100 +@@ -10,6 +10,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.2.16RC1/ext/date/lib/parse_tz.c.systzdata php-7.2.16RC1/ext/date/lib/parse_tz.c +--- php-7.2.16RC1/ext/date/lib/parse_tz.c.systzdata 2019-02-19 11:13:22.000000000 +0100 ++++ php-7.2.16RC1/ext/date/lib/parse_tz.c 2019-02-19 11:19:40.245313535 +0100 @@ -25,8 +25,21 @@ #include "timelib.h" #include "timelib_private.h" @@ -270,7 +291,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c + } + + for (l = li[hash]; l; l = l->next) { -+ if (strcasecmp(l->name, name) == 0) ++ if (timelib_strcasecmp(l->name, name) == 0) + return l; + } + @@ -294,7 +315,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c +{ + const timelib_tzdb_index_entry *alpha = first, *beta = second; + -+ return strcasecmp(alpha->id, beta->id); ++ return timelib_strcasecmp(alpha->id, beta->id); +} + + @@ -497,8 +518,8 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c +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; } @@ -546,8 +567,8 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c +#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; @@ -579,7 +600,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c } 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; @@ -595,7 +616,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c 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; } @@ -625,7 +646,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c 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); } @@ -635,23 +656,3 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c } 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 -@@ -81,3 +81,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 -- 2.44.0