diff options
Diffstat (limited to 'php-7.0.0-systzdata-v12.patch')
| -rw-r--r-- | php-7.0.0-systzdata-v12.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/php-7.0.0-systzdata-v12.patch b/php-7.0.0-systzdata-v12.patch index af5b3a6..560faef 100644 --- a/php-7.0.0-systzdata-v12.patch +++ b/php-7.0.0-systzdata-v12.patch @@ -20,9 +20,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-src-dd0b602381fad375d8f29a97f25f099be7c9db35/ext/date/lib/parse_tz.c.systzdata php-src-dd0b602381fad375d8f29a97f25f099be7c9db35/ext/date/lib/parse_tz.c ---- php-src-dd0b602381fad375d8f29a97f25f099be7c9db35/ext/date/lib/parse_tz.c.systzdata 2015-05-07 07:46:56.000000000 +0200 -+++ php-src-dd0b602381fad375d8f29a97f25f099be7c9db35/ext/date/lib/parse_tz.c 2015-05-07 08:31:21.444876177 +0200 +diff -up php-7.0.0RC1/ext/date/lib/parse_tz.c.systzdata php-7.0.0RC1/ext/date/lib/parse_tz.c +--- php-7.0.0RC1/ext/date/lib/parse_tz.c.systzdata 2015-08-18 23:39:24.000000000 +0200 ++++ php-7.0.0RC1/ext/date/lib/parse_tz.c 2015-08-22 07:54:38.097258458 +0200 @@ -20,6 +20,16 @@ #include "timelib.h" @@ -40,12 +40,12 @@ diff -up php-src-dd0b602381fad375d8f29a97f25f099be7c9db35/ext/date/lib/parse_tz. #include <stdio.h> #ifdef HAVE_LOCALE_H -@@ -31,7 +41,12 @@ - #else +@@ -32,8 +42,12 @@ #include <strings.h> #endif -+ + +#ifndef HAVE_SYSTEM_TZDATA + #define TIMELIB_SUPPORTS_V2DATA #include "timezonedb.h" +#endif + @@ -53,7 +53,7 @@ diff -up php-src-dd0b602381fad375d8f29a97f25f099be7c9db35/ext/date/lib/parse_tz. #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__)) # if defined(__LITTLE_ENDIAN__) -@@ -53,6 +68,11 @@ static int read_preamble(const unsigned +@@ -55,6 +69,11 @@ static int read_preamble(const unsigned { uint32_t version; @@ -65,7 +65,7 @@ diff -up php-src-dd0b602381fad375d8f29a97f25f099be7c9db35/ext/date/lib/parse_tz. /* read ID */ version = (*tzf)[3] - '0'; *tzf += 4; -@@ -296,7 +316,418 @@ void timelib_dump_tzinfo(timelib_tzinfo +@@ -298,7 +317,418 @@ void timelib_dump_tzinfo(timelib_tzinfo } } @@ -485,7 +485,7 @@ diff -up php-src-dd0b602381fad375d8f29a97f25f099be7c9db35/ext/date/lib/parse_tz. { int left = 0, right = tzdb->index_size - 1; #ifdef HAVE_SETLOCALE -@@ -335,21 +766,88 @@ static int seek_to_tz_position(const uns +@@ -337,21 +767,88 @@ static int seek_to_tz_position(const uns return 0; } @@ -575,7 +575,7 @@ diff -up php-src-dd0b602381fad375d8f29a97f25f099be7c9db35/ext/date/lib/parse_tz. } static void skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz) -@@ -374,24 +872,54 @@ static void read_64bit_header(const unsi +@@ -376,24 +873,54 @@ static void read_64bit_header(const unsi timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb) { const unsigned char *tzf; @@ -639,9 +639,9 @@ diff -up php-src-dd0b602381fad375d8f29a97f25f099be7c9db35/ext/date/lib/parse_tz. } else { tmp = NULL; } -diff -up php-src-dd0b602381fad375d8f29a97f25f099be7c9db35/ext/date/lib/timelib.m4.systzdata php-src-dd0b602381fad375d8f29a97f25f099be7c9db35/ext/date/lib/timelib.m4 ---- php-src-dd0b602381fad375d8f29a97f25f099be7c9db35/ext/date/lib/timelib.m4.systzdata 2015-05-07 07:46:56.000000000 +0200 -+++ php-src-dd0b602381fad375d8f29a97f25f099be7c9db35/ext/date/lib/timelib.m4 2015-05-07 08:27:21.541863417 +0200 +diff -up php-7.0.0RC1/ext/date/lib/timelib.m4.systzdata php-7.0.0RC1/ext/date/lib/timelib.m4 +--- php-7.0.0RC1/ext/date/lib/timelib.m4.systzdata 2015-08-18 23:39:24.000000000 +0200 ++++ php-7.0.0RC1/ext/date/lib/timelib.m4 2015-08-22 07:47:34.854055364 +0200 @@ -78,3 +78,17 @@ stdlib.h dnl Check for strtoll, atoll |