update to 7.3.3RC1

adapt systzdata patch (v18)

3 files changed, 40 insertions, 29 deletions

diff --git a/failed.txt b/failed.txt
index e363302..1268e18 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,8 +1,8 @@
-===== 7.3.2 (2019-02-07)
+===== 7.3.3RC1 (2019-02-21)
 
 $ grep -r 'Tests failed' /var/lib/mock/{fc,el}*/build.log
 
-/var/lib/mock/el6i/build.log:Tests failed    :     0
+/var/lib/mock/el6i/build.log:Tests failed    :     2
 /var/lib/mock/el6x/build.log:Tests failed    :     0
 /var/lib/mock/el7x/build.log:Tests failed    :     0
 /var/lib/mock/el8x73/build.log:Tests failed  :    13
@@ -14,6 +14,9 @@ $ grep -r 'Tests failed' /var/lib/mock/{fc,el}*/build.log
 /var/lib/mock/fc29x/build.log:Tests failed    :    0
 
 
+el6i
+	1	Bug #60120 proc_open hangs with stdin/out with 2048+ bytes [ext/standard/tests/streams/proc_open_bug60120.phpt]
+	1	Bug #64438 proc_open hangs with stdin/out with 4097+ bytes [ext/standard/tests/streams/proc_open_bug64438.phpt]
 el8x:
 	5	buildroot issue with openssl under investigation
 
diff --git a/php-7.3.2-systzdata-v17.patch b/php-7.3.3-systzdata-v18.patch
index 2ae754f..eac3cc3 100644
--- a/php-7.3.2-systzdata-v17.patch
+++ b/php-7.3.3-systzdata-v18.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:
+r18: adapt for autotool change in 7.3.3RC1
 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)
@@ -28,9 +29,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 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
+diff -up php-7.3.3RC1/ext/date/config0.m4.systzdata php-7.3.3RC1/ext/date/config0.m4
+--- php-7.3.3RC1/ext/date/config0.m4.systzdata	2019-02-19 14:57:51.314601701 +0100
++++ php-7.3.3RC1/ext/date/config0.m4	2019-02-19 14:58:29.050812587 +0100
+@@ -9,6 +9,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.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/lib/parse_tz.c
+--- php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata	2019-02-19 12:18:27.000000000 +0100
++++ php-7.3.3RC1/ext/date/lib/parse_tz.c	2019-02-19 14:57:20.397428931 +0100
 @@ -25,8 +25,21 @@
  #include "timelib.h"
  #include "timelib_private.h"
@@ -630,23 +654,3 @@ diff -up php-7.3.2RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.2RC1/ext/date/li
  	} else {
  		*error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE;
  		tmp = NULL;
-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)
-+
-+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
diff --git a/php73.spec b/php73.spec
index 9313f9d..3e88271 100644
--- a/php73.spec
+++ b/php73.spec
@@ -118,9 +118,9 @@
 %global db_devel  libdb-devel
 %endif
 
-%global upver        7.3.2
-#global rcver        RC1
-#global lower        RC1
+%global upver        7.3.3
+%global rcver        RC1
+%global lower        RC1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
@@ -167,7 +167,7 @@ Patch9: php-7.0.7-curl.patch
 
 # Functional changes
 Patch40: php-7.2.4-dlopen.patch
-Patch42: php-7.3.2-systzdata-v17.patch
+Patch42: php-7.3.3-systzdata-v18.patch
 # See http://bugs.php.net/53436
 Patch43: php-7.3.0-phpize.patch
 # Use -lldap_r for OpenLDAP
@@ -2215,6 +2215,10 @@ fi
 
 
 %changelog
+* Tue Feb 19 2019 Remi Collet <remi@remirepo.net> - 7.3.3~RC1-1
+- update to 7.3.3RC1
+- adapt systzdata patch (v18)
+
 * Mon Feb 18 2019 Remi Collet <remi@remirepo.net> - 7.3.2-2
 - pdo_oci: backport PDOStatement::getColumnMeta from 7.4
 - rebuild using libicu62