From 0a55a60c6710ac8cc3e201eb9d8388d1c9f1daca Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 29 Apr 2015 15:16:12 +0200 Subject: php55-php: 5.5.25RC1 --- php-5.5.24-datetests.patch | 258 ----------------------------------------- php-5.5.25-newzic.patch | 160 ------------------------- php-5.5.25-oldpcre.patch | 39 +++++++ php-5.5.25-systzdata-v12.patch | 35 +++--- php.spec | 19 ++- 5 files changed, 72 insertions(+), 439 deletions(-) delete mode 100644 php-5.5.25-newzic.patch create mode 100644 php-5.5.25-oldpcre.patch diff --git a/php-5.5.24-datetests.patch b/php-5.5.24-datetests.patch index 9e78cc7..81f42f6 100644 --- a/php-5.5.24-datetests.patch +++ b/php-5.5.24-datetests.patch @@ -25,264 +25,6 @@ Backport various fix from 5.6 [timezone_type] => 3 [timezone] => GB-Eire ) -From cd93b120c3cfb129bca7365f48015c46abeb0333 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Sat, 18 Apr 2015 07:47:47 +0200 -Subject: [PATCH] Make date transitions tests more flexible - -zic in recent glibc (2.20) introduce a new transitionn -so use a range to avoid failure when total number -of transitions is different (243/244) ---- - ext/date/tests/DateTimeZone_getTransitions_basic1.phpt | 6 +++--- - ext/date/tests/timezone_transitions_get_basic1.phpt | 10 +++++----- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt b/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt -index f3640d1..d178080 100644 ---- a/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt -+++ b/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt -@@ -16,7 +16,7 @@ date_default_timezone_set("Europe/London"); - // Create a DateTimeZone object - $tz = new DateTimeZone("Europe/London"); - --$tran = $tz->getTransitions(); -+$tran = $tz->getTransitions(-306972000, -37241999); - - if (!is_array($tran)) { - echo "TEST FAILED: Expected an array\n"; -@@ -25,14 +25,14 @@ if (!is_array($tran)) { - echo "\n-- Total number of transitions: " . count($tran). " --\n"; - - echo "\n-- Format a sample entry for Spring 1963 --\n"; --var_dump( $tran[97] ); -+var_dump( $tran[6] ); - - ?> - ===DONE=== - --EXPECT-- - *** Testing DateTimeZone::getTransitions() : basic functionality *** - ---- Total number of transitions: 243 -- -+-- Total number of transitions: 18 -- - - -- Format a sample entry for Spring 1963 -- - array(5) { -diff --git a/ext/date/tests/timezone_transitions_get_basic1.phpt b/ext/date/tests/timezone_transitions_get_basic1.phpt -index eb6cf99..97c5f0c 100644 ---- a/ext/date/tests/timezone_transitions_get_basic1.phpt -+++ b/ext/date/tests/timezone_transitions_get_basic1.phpt -@@ -18,24 +18,24 @@ $tz = timezone_open("Europe/London"); - - $tran = timezone_transitions_get($tz); - --echo "\n-- Get all transitions --\n"; --$tran = timezone_transitions_get($tz); -+echo "\n-- Get all 60s transitions --\n"; -+$tran = timezone_transitions_get($tz, -306972000, -37241999); - var_dump( gettype($tran) ); - - echo "\n-- Total number of transitions: " . count($tran). " --\n"; - - echo "\n-- Format a sample entry pfor Spring 1963 --\n"; --var_dump( $tran[97] ); -+var_dump( $tran[6] ); - - ?> - ===DONE=== - --EXPECT-- - *** Testing timezone_transitions_get() : basic functionality *** - ---- Get all transitions -- -+-- Get all 60s transitions -- - string(5) "array" - ---- Total number of transitions: 243 -- -+-- Total number of transitions: 18 -- - - -- Format a sample entry pfor Spring 1963 -- - array(5) { --- -2.1.4 - -From 984f4b09e028b93e6ab3b738d9bde670fca6fc95 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Sat, 18 Apr 2015 09:11:39 +0200 -Subject: [PATCH] relax bigbang content (new zic) - ---- - ext/date/tests/bug48058.phpt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/ext/date/tests/bug48058.phpt b/ext/date/tests/bug48058.phpt -index 46a1918..87d2190 100644 ---- a/ext/date/tests/bug48058.phpt -+++ b/ext/date/tests/bug48058.phpt -@@ -20,10 +20,10 @@ array(5) { - ["time"]=> - string(%d) "%s" - ["offset"]=> -- int(3600) -+ int(%s) - ["isdst"]=> -- bool(true) -+ bool(%s) - ["abbr"]=> -- string(3) "BST" -+ string(%d) "%s" - } - 10000002008-02-28T12:00:00+0000 --- -2.1.4 - -From 3c81e945a3c61ea3ec00eeb946e95a1f9b92b956 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Sat, 18 Apr 2015 09:28:29 +0200 -Subject: [PATCH] relax test for date < INT32_MIN (new zic) - ---- - ext/date/tests/mktime-3-64bit.phpt | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -diff --git a/ext/date/tests/mktime-3-64bit.phpt b/ext/date/tests/mktime-3-64bit.phpt -index a3649cd..cbb441f 100644 ---- a/ext/date/tests/mktime-3-64bit.phpt -+++ b/ext/date/tests/mktime-3-64bit.phpt -@@ -24,7 +24,7 @@ foreach ($tzs as $tz) { - echo "\n"; - } - ?> ----EXPECT-- -+--EXPECTF-- - America/Toronto - Y: 0 - January 2000-01-01T01:01:01-0500 - Y: 69 - January 2069-01-01T01:01:01-0500 -@@ -32,11 +32,11 @@ Y: 70 - January 1970-01-01T01:01:01-0500 - Y: 71 - January 1971-01-01T01:01:01-0500 - Y: 99 - January 1999-01-01T01:01:01-0500 - Y: 100 - January 2000-01-01T01:01:01-0500 --Y: 101 - January 0101-01-01T01:01:01-0500 --Y: 105 - January 0105-01-01T01:01:01-0500 --Y: 110 - January 0110-01-01T01:01:01-0500 --Y: 1900 - January 1900-01-01T01:01:01-0500 --Y: 1901 - January 1901-01-01T01:01:01-0500 -+Y: 101 - January 0101-01-01T01:01:01-0%d -+Y: 105 - January 0105-01-01T01:01:01-0%d -+Y: 110 - January 0110-01-01T01:01:01-0%d -+Y: 1900 - January 1900-01-01T01:01:01-0%d -+Y: 1901 - January 1901-01-01T01:01:01-0%d - Y: 1902 - January 1902-01-01T01:01:01-0500 - Y: 1999 - January 1999-01-01T01:01:01-0500 - Y: 2000 - January 2000-01-01T01:01:01-0500 -@@ -49,11 +49,11 @@ Y: 70 - January 1970-01-01T01:01:01+0100 - Y: 71 - January 1971-01-01T01:01:01+0100 - Y: 99 - January 1999-01-01T01:01:01+0100 - Y: 100 - January 2000-01-01T01:01:01+0100 --Y: 101 - January 0101-01-01T01:01:01+0100 --Y: 105 - January 0105-01-01T01:01:01+0100 --Y: 110 - January 0110-01-01T01:01:01+0100 --Y: 1900 - January 1900-01-01T01:01:01+0100 --Y: 1901 - January 1901-01-01T01:01:01+0100 -+Y: 101 - January 0101-01-01T01:01:01+0%d -+Y: 105 - January 0105-01-01T01:01:01+0%d -+Y: 110 - January 0110-01-01T01:01:01+0%d -+Y: 1900 - January 1900-01-01T01:01:01+0%d -+Y: 1901 - January 1901-01-01T01:01:01+0%d - Y: 1902 - January 1902-01-01T01:01:01+0100 - Y: 1999 - January 1999-01-01T01:01:01+0100 - Y: 2000 - January 2000-01-01T01:01:01+0100 --- -2.1.4 - -From 3bbfb96e1a1eef0a6cf6891532f9ac419c95dbd8 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Sat, 18 Apr 2015 09:37:06 +0200 -Subject: [PATCH] ignore second value for huge timestamp test (new zic) - ---- - ext/date/tests/getdate_variation7.phpt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ext/date/tests/getdate_variation7.phpt b/ext/date/tests/getdate_variation7.phpt -index 2088fa1..c757ac7 100644 ---- a/ext/date/tests/getdate_variation7.phpt -+++ b/ext/date/tests/getdate_variation7.phpt -@@ -27,7 +27,7 @@ var_dump( getdate($timestamp) ); - -- Testing getdate\(\) function by passing float 12.3456789000e10 value to timestamp -- - array\(11\) { - \["seconds"\]=> -- int\((36|0)\) -+ int\((.+)\) - \["minutes"\]=> - int\((43|0)\) - \["hours"\]=> -@@ -53,7 +53,7 @@ array\(11\) { - -- Testing getdate\(\) function by passing float -12.3456789000e10 value to timestamp -- - array\(11\) { - \["seconds"\]=> -- int\((44|12|20)\) -+ int\((.+)\) - \["minutes"\]=> - int\((39|23)\) - \["hours"\]=> --- -2.1.4 - -From 1302eb7f7275c3f0b2b3af964dde91c44b769bbc Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Sat, 18 Apr 2015 10:00:15 +0200 -Subject: [PATCH] relax tests with huge year (new zic) - ---- - ext/date/tests/DateTime_add-massive.phpt | 6 +++--- - ext/date/tests/DateTime_diff-massive.phpt | 6 +++--- - ext/date/tests/DateTime_sub-massive.phpt | 6 +++--- - 3 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/ext/date/tests/DateTime_add-massive.phpt b/ext/date/tests/DateTime_add-massive.phpt -index ca5bef9..6093d05 100644 ---- a/ext/date/tests/DateTime_add-massive.phpt -+++ b/ext/date/tests/DateTime_add-massive.phpt -@@ -10,6 +10,6 @@ define('PHPT_DATETIME_SHOW', PHPT_DATETIME_SHOW_ADD); - require 'DateTime_data-massive.inc'; - - ?> ----EXPECT-- --test_massive_positive: ADD: -333333-01-01 16:18:02 EST + P+666666Y0M0DT0H0M0S = **333333-01-01 16:18:02 EST** --test_massive_negative: ADD: 333333-01-01 16:18:02 EST + P-666666Y0M0DT0H0M0S = **-333333-01-01 16:18:02 EST** -+--EXPECTF-- -+test_massive_positive: ADD: -333333-01-01 16:18:02 %s + P+666666Y0M0DT0H0M0S = **333333-01-01 16:18:02 %s** -+test_massive_negative: ADD: 333333-01-01 16:18:02 %s + P-666666Y0M0DT0H0M0S = **-333333-01-01 16:18:02 %s** -diff --git a/ext/date/tests/DateTime_diff-massive.phpt b/ext/date/tests/DateTime_diff-massive.phpt -index 2199f84..12a7d0f 100644 ---- a/ext/date/tests/DateTime_diff-massive.phpt -+++ b/ext/date/tests/DateTime_diff-massive.phpt -@@ -10,6 +10,6 @@ define('PHPT_DATETIME_SHOW', PHPT_DATETIME_SHOW_DIFF); - require 'DateTime_data-massive.inc'; - - ?> ----EXPECT-- --test_massive_positive: DIFF: 333333-01-01 16:18:02 EST - -333333-01-01 16:18:02 EST = **P+666666Y0M0DT0H0M0S** --test_massive_negative: DIFF: -333333-01-01 16:18:02 EST - 333333-01-01 16:18:02 EST = **P-666666Y0M0DT0H0M0S** -+--EXPECTF-- -+test_massive_positive: DIFF: 333333-01-01 16:18:02 %s - -333333-01-01 16:18:02 %s = **P+666666Y0M0DT0H%s** -+test_massive_negative: DIFF: -333333-01-01 16:18:02 %s - 333333-01-01 16:18:02 %s = **P-666666Y0M0DT0H%s** -diff --git a/ext/date/tests/DateTime_sub-massive.phpt b/ext/date/tests/DateTime_sub-massive.phpt -index a0520ec..e143056 100644 ---- a/ext/date/tests/DateTime_sub-massive.phpt -+++ b/ext/date/tests/DateTime_sub-massive.phpt -@@ -10,6 +10,6 @@ define('PHPT_DATETIME_SHOW', PHPT_DATETIME_SHOW_SUB); - require 'DateTime_data-massive.inc'; - - ?> ----EXPECT-- --test_massive_positive: SUB: 333333-01-01 16:18:02 EST - P+666666Y0M0DT0H0M0S = **-333333-01-01 16:18:02 EST** --test_massive_negative: SUB: -333333-01-01 16:18:02 EST - P-666666Y0M0DT0H0M0S = **333333-01-01 16:18:02 EST** -+--EXPECTF-- -+test_massive_positive: SUB: 333333-01-01 16:18:02 %s - P+666666Y0M0DT0H0M0S = **-333333-01-01 16:18:02 %s** -+test_massive_negative: SUB: -333333-01-01 16:18:02 %s - P-666666Y0M0DT0H0M0S = **333333-01-01 16:18:02 %s** --- -2.1.4 From 7cbd8f8b8a662c1e74cb1c97dac6f606f8f477c9 Mon Sep 17 00:00:00 2001 From: krakjoe Date: Thu, 21 Aug 2014 10:03:48 +0100 diff --git a/php-5.5.25-newzic.patch b/php-5.5.25-newzic.patch deleted file mode 100644 index d260dad..0000000 --- a/php-5.5.25-newzic.patch +++ /dev/null @@ -1,160 +0,0 @@ -From 957aa220aa175a874f429f97701eede0f1ef14d3 Mon Sep 17 00:00:00 2001 -From: Derick Rethans -Date: Sun, 26 Apr 2015 11:04:16 +0100 -Subject: [PATCH] Fixed location reading due to file format changes - ---- - ext/date/lib/parse_tz.c | 61 ++- - ext/date/lib/timezonedb.h | 1166 ++++++++++++++++++++++----------------------- - 2 files changed, 640 insertions(+), 587 deletions(-) - -diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c -index ec7c6d3..89b8af7 100644 ---- a/ext/date/lib/parse_tz.c -+++ b/ext/date/lib/parse_tz.c -@@ -49,9 +49,12 @@ - #define timelib_conv_int(l) ((l & 0x000000ff) << 24) + ((l & 0x0000ff00) << 8) + ((l & 0x00ff0000) >> 8) + ((l & 0xff000000) >> 24) - #endif - --static void read_preamble(const unsigned char **tzf, timelib_tzinfo *tz) -+static int read_preamble(const unsigned char **tzf, timelib_tzinfo *tz) - { -- /* skip ID */ -+ uint32_t version; -+ -+ /* read ID */ -+ version = (*tzf)[3] - '0'; - *tzf += 4; - - /* read BC flag */ -@@ -63,8 +66,10 @@ static void read_preamble(const unsigned char **tzf, timelib_tzinfo *tz) - tz->location.country_code[2] = '\0'; - *tzf += 2; - -- /* skip read of preamble */ -+ /* skip rest of preamble */ - *tzf += 13; -+ -+ return version; - } - - static void read_header(const unsigned char **tzf, timelib_tzinfo *tz) -@@ -81,6 +86,14 @@ static void read_header(const unsigned char **tzf, timelib_tzinfo *tz) - *tzf += sizeof(buffer); - } - -+static void skip_transistions_64bit(const unsigned char **tzf, timelib_tzinfo *tz) -+{ -+ if (tz->timecnt) { -+ *tzf += (sizeof(int64_t) * (tz->timecnt + 1)); -+ *tzf += (sizeof(unsigned char) * (tz->timecnt + 1)); -+ } -+} -+ - static void read_transistions(const unsigned char **tzf, timelib_tzinfo *tz) - { - int32_t *buffer = NULL; -@@ -111,6 +124,21 @@ static void read_transistions(const unsigned char **tzf, timelib_tzinfo *tz) - tz->trans_idx = cbuffer; - } - -+static void skip_types_64bit(const unsigned char **tzf, timelib_tzinfo *tz) -+{ -+ *tzf += sizeof(unsigned char) * 6 * tz->typecnt; -+ *tzf += sizeof(char) * tz->charcnt; -+ if (tz->leapcnt) { -+ *tzf += sizeof(int64_t) * tz->leapcnt * 2; -+ } -+ if (tz->ttisstdcnt) { -+ *tzf += sizeof(unsigned char) * tz->ttisstdcnt; -+ } -+ if (tz->ttisgmtcnt) { -+ *tzf += sizeof(unsigned char) * tz->ttisgmtcnt; -+ } -+} -+ - static void read_types(const unsigned char **tzf, timelib_tzinfo *tz) - { - unsigned char *buffer; -@@ -194,6 +222,18 @@ static void read_types(const unsigned char **tzf, timelib_tzinfo *tz) - } - } - -+static void skip_posix_string(const unsigned char **tzf, timelib_tzinfo *tz) -+{ -+ int n_count = 0; -+ -+ do { -+ if (*tzf[0] == '\n') { -+ n_count++; -+ } -+ (*tzf)++; -+ } while (n_count < 2); -+} -+ - static void read_location(const unsigned char **tzf, timelib_tzinfo *tz) - { - uint32_t buffer[3]; -@@ -312,18 +352,31 @@ int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb) - return (seek_to_tz_position(&tzf, timezone, tzdb)); - } - -+static void skip_2nd_header_and_data(const unsigned char **tzf, timelib_tzinfo *tz) -+{ -+ *tzf += 20; /* skip 2nd header (preamble) */ -+ *tzf += sizeof(int32_t) * 6; /* Counts */ -+} -+ - timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb) - { - const unsigned char *tzf; - timelib_tzinfo *tmp; -+ int version; - - if (seek_to_tz_position(&tzf, timezone, tzdb)) { - tmp = timelib_tzinfo_ctor(timezone); - -- read_preamble(&tzf, tmp); -+ version = read_preamble(&tzf, tmp); - read_header(&tzf, tmp); - read_transistions(&tzf, tmp); - read_types(&tzf, tmp); -+ if (version == 2) { -+ skip_2nd_header_and_data(&tzf, tmp); -+ skip_transistions_64bit(&tzf, tmp); -+ skip_types_64bit(&tzf, tmp); -+ skip_posix_string(&tzf, tmp); -+ } - read_location(&tzf, tmp); - } else { - tmp = NULL; --- -2.1.4 - -From b5e5098c50397ed910a79ac1d64b7d0fff2c02e1 Mon Sep 17 00:00:00 2001 -From: Matteo Beccati -Date: Tue, 28 Apr 2015 10:57:18 +0200 -Subject: [PATCH] Fix segfault in ext/date since 957aa2 - ---- - ext/date/lib/parse_tz.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c -index 89b8af7..32ed639 100644 ---- a/ext/date/lib/parse_tz.c -+++ b/ext/date/lib/parse_tz.c -@@ -89,8 +89,8 @@ static void read_header(const unsigned char **tzf, timelib_tzinfo *tz) - static void skip_transistions_64bit(const unsigned char **tzf, timelib_tzinfo *tz) - { - if (tz->timecnt) { -- *tzf += (sizeof(int64_t) * (tz->timecnt + 1)); -- *tzf += (sizeof(unsigned char) * (tz->timecnt + 1)); -+ *tzf += (sizeof(int64_t) * (tz->timecnt)); -+ *tzf += (sizeof(unsigned char) * (tz->timecnt)); - } - } - --- -2.1.4 - diff --git a/php-5.5.25-oldpcre.patch b/php-5.5.25-oldpcre.patch new file mode 100644 index 0000000..df6edb2 --- /dev/null +++ b/php-5.5.25-oldpcre.patch @@ -0,0 +1,39 @@ +diff -up ./ext/pcre/tests/bug37911.phpt.pcre834 ./ext/pcre/tests/bug37911.phpt +--- ./ext/pcre/tests/bug37911.phpt.pcre834 2014-03-26 14:10:18.285452752 +0100 ++++ ./ext/pcre/tests/bug37911.phpt 2014-03-26 14:10:40.028526763 +0100 +@@ -37,5 +37,5 @@ array(3) { + string(4) "blub" + } + +-Warning: preg_replace_callback(): Compilation failed: group name must start with a non-digit at offset %d in %sbug37911.php on line %d ++Warning: preg_replace_callback(): Numeric named subpatterns are not allowed in %sbug37911.php on line %d + NULL +diff -up ./ext/pcre/tests/grep2.phpt.pcre834 ./ext/pcre/tests/grep2.phpt +--- ./ext/pcre/tests/grep2.phpt.pcre834 2014-03-26 14:08:26.583072531 +0100 ++++ ./ext/pcre/tests/grep2.phpt 2014-03-26 14:09:09.345218089 +0100 +@@ -40,12 +40,6 @@ array(1) { + string(1) "1" + } + bool(true) +-array(3) { +- [5]=> +- string(1) "a" +- ["xyz"]=> +- string(2) "q6" +- [6]=> +- string(3) "h20" ++array(0) { + } +-bool(false) ++bool(true) +diff -up ./ext/pcre/tests/match_flags3.phpt.pcre834 ./ext/pcre/tests/match_flags3.phpt +--- ./ext/pcre/tests/match_flags3.phpt.pcre834 2014-03-26 14:06:48.792739665 +0100 ++++ ./ext/pcre/tests/match_flags3.phpt 2014-03-26 14:07:31.820886128 +0100 +@@ -42,5 +42,5 @@ array(1) { + } + } + +-Warning: preg_match(): Compilation failed: group name must start with a non-digit at offset %d in %smatch_flags3.php on line %d ++Warning: preg_match(): Numeric named subpatterns are not allowed in %smatch_flags3.php on line %d + bool(false) +diff -up ./ext/standard/tests/strings/setlocale_variation2.phpt.pcre834 ./ext/standard/tests/strings/setlocale_variation2.phpt diff --git a/php-5.5.25-systzdata-v12.patch b/php-5.5.25-systzdata-v12.patch index 1b3aec4..c4e56ae 100644 --- a/php-5.5.25-systzdata-v12.patch +++ b/php-5.5.25-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-5.5.25/ext/date/lib/parse_tz.c.systzdata php-5.5.25/ext/date/lib/parse_tz.c ---- php-5.5.25/ext/date/lib/parse_tz.c.systzdata 2015-04-28 12:24:43.763230404 +0200 -+++ php-5.5.25/ext/date/lib/parse_tz.c 2015-04-28 12:29:11.179410687 +0200 +diff -up php-5.5.25RC1/ext/date/lib/parse_tz.c.systzdata php-5.5.25RC1/ext/date/lib/parse_tz.c +--- php-5.5.25RC1/ext/date/lib/parse_tz.c.systzdata 2015-04-29 11:24:07.000000000 +0200 ++++ php-5.5.25RC1/ext/date/lib/parse_tz.c 2015-04-29 14:21:29.069617493 +0200 @@ -20,6 +20,16 @@ #include "timelib.h" @@ -574,8 +574,8 @@ diff -up php-5.5.25/ext/date/lib/parse_tz.c.systzdata php-5.5.25/ext/date/lib/pa + return (inmem_seek_to_tz_position(&tzf, timezone, tzdb)); } - static void skip_2nd_header_and_data(const unsigned char **tzf, timelib_tzinfo *tz) -@@ -361,23 +859,53 @@ static void skip_2nd_header_and_data(con + static void skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz) +@@ -374,24 +872,54 @@ static void read_64bit_header(const unsi timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb) { const unsigned char *tzf; @@ -593,10 +593,13 @@ diff -up php-5.5.25/ext/date/lib/parse_tz.c.systzdata php-5.5.25/ext/date/lib/pa read_transistions(&tzf, tmp); read_types(&tzf, tmp); - if (version == 2) { -- skip_2nd_header_and_data(&tzf, tmp); -- skip_transistions_64bit(&tzf, tmp); -- skip_types_64bit(&tzf, tmp); +- skip_64bit_preamble(&tzf, tmp); +- read_64bit_header(&tzf, tmp); +- skip_64bit_transistions(&tzf, tmp); +- skip_64bit_types(&tzf, tmp); - skip_posix_string(&tzf, tmp); +- } +- read_location(&tzf, tmp); + +#ifdef HAVE_SYSTEM_TZDATA + if (memmap) { @@ -624,21 +627,21 @@ diff -up php-5.5.25/ext/date/lib/parse_tz.c.systzdata php-5.5.25/ext/date/lib/pa +#endif + { + if (version == 2) { -+ skip_2nd_header_and_data(&tzf, tmp); -+ skip_transistions_64bit(&tzf, tmp); -+ skip_types_64bit(&tzf, tmp); ++ skip_64bit_preamble(&tzf, tmp); ++ read_64bit_header(&tzf, tmp); ++ skip_64bit_transistions(&tzf, tmp); ++ skip_64bit_types(&tzf, tmp); + skip_posix_string(&tzf, tmp); + } + /* PHP-style - use the embedded info. */ + read_location(&tzf, tmp); - } -- read_location(&tzf, tmp); ++ } } else { tmp = NULL; } -diff -up php-5.5.25/ext/date/lib/timelib.m4.systzdata php-5.5.25/ext/date/lib/timelib.m4 ---- php-5.5.25/ext/date/lib/timelib.m4.systzdata 2015-04-15 12:43:00.000000000 +0200 -+++ php-5.5.25/ext/date/lib/timelib.m4 2015-04-28 12:24:43.765230413 +0200 +diff -up php-5.5.25RC1/ext/date/lib/timelib.m4.systzdata php-5.5.25RC1/ext/date/lib/timelib.m4 +--- php-5.5.25RC1/ext/date/lib/timelib.m4.systzdata 2015-04-29 11:24:07.000000000 +0200 ++++ php-5.5.25RC1/ext/date/lib/timelib.m4 2015-04-29 14:16:11.211251692 +0200 @@ -78,3 +78,17 @@ stdlib.h dnl Check for strtoll, atoll diff --git a/php.spec b/php.spec index d4cac81..042d720 100644 --- a/php.spec +++ b/php.spec @@ -127,12 +127,12 @@ %global db_devel libdb-devel %endif -#global rcver RC1 -%global rpmrel 2 +%global rcver RC1 +%global rpmrel 1 Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php -Version: 5.5.24 +Version: 5.5.25 %if 0%{?rcver:1} Release: 0.%{rpmrel}.%{rcver}%{?dist} %else @@ -174,7 +174,6 @@ Patch21: php-5.4.7-odbctimer.patch # Functional changes Patch40: php-5.4.0-dlopen.patch -Patch41: php-5.5.25-newzic.patch Patch42: php-5.5.25-systzdata-v12.patch # See http://bugs.php.net/53436 Patch43: php-5.4.0-phpize.patch @@ -195,6 +194,8 @@ Patch91: php-5.3.7-oci8conf.patch # Fixes for tests (300+) # Factory is droped from system tzdata + upstream patch for new zic Patch300: php-5.5.24-datetests.patch +# Revert changes for pcre < 8.34 +Patch301: php-5.5.25-oldpcre.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -860,7 +861,6 @@ support for using the enchant library to PHP. %patch21 -p1 -b .odbctimer %patch40 -p1 -b .dlopen -%patch41 -p1 -b .newzic %patch42 -p1 -b .systzdata %patch43 -p1 -b .headers %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 @@ -877,6 +877,12 @@ support for using the enchant library to PHP. # Fixes for tests %patch300 -p1 -b .datetests +%if %{with_libpcre} +%if 0%{?fedora} < 21 +# Only apply when system libpcre < 8.34 +%patch301 -p1 -b .pcre834 +%endif +%endif # Prevent %%doc confusion over LICENSE files cp Zend/LICENSE Zend/ZEND_LICENSE @@ -1749,6 +1755,9 @@ fi %changelog +* Wed Apr 29 2015 Remi Collet 5.5.25-0.1.RC1 +- update to 5.5.25RC1 + * Tue Apr 28 2015 Remi Collet 5.5.24-2 - test build (new zic) -- cgit