summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-09-10 17:38:20 +0200
committerRemi Collet <remi@remirepo.net>2019-09-10 17:38:20 +0200
commit989d700b06a38ddc54019c4a2554244686a2c807 (patch)
treec99fab37cf197cdb6411ebfa14e2b14a21413810
parentc0a009a249ef3a82a8f6ad4ba3a67a412a9e336a (diff)
v7.3.10RC1
-rw-r--r--c43fc204b1639a8aa6c6212202def29b3c4cf611.patch32
-rw-r--r--failed.txt6
-rw-r--r--php73.spec14
3 files changed, 44 insertions, 8 deletions
diff --git a/c43fc204b1639a8aa6c6212202def29b3c4cf611.patch b/c43fc204b1639a8aa6c6212202def29b3c4cf611.patch
new file mode 100644
index 0000000..c641f80
--- /dev/null
+++ b/c43fc204b1639a8aa6c6212202def29b3c4cf611.patch
@@ -0,0 +1,32 @@
+From c43fc204b1639a8aa6c6212202def29b3c4cf611 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@php.net>
+Date: Tue, 10 Sep 2019 16:28:35 +0200
+Subject: [PATCH] Raise minimal GCC version, Test with 4.8 is OK With 4.4:
+ error: #pragma GCC diagnostic not allowed inside functions
+
+---
+ ext/intl/idn/idn.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ext/intl/idn/idn.c b/ext/intl/idn/idn.c
+index 60d7b829d84e..96eac77048a0 100644
+--- a/ext/intl/idn/idn.c
++++ b/ext/intl/idn/idn.c
+@@ -226,7 +226,7 @@ static void php_intl_idn_to(INTERNAL_FUNCTION_PARAMETERS,
+ #if defined(__clang__)
+ # pragma clang diagnostic push
+ # pragma clang diagnostic ignored "-Wdeprecated-declarations"
+-#elif ZEND_GCC_VERSION >= 4002
++#elif ZEND_GCC_VERSION >= 4008
+ # pragma GCC diagnostic push
+ # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ #endif
+@@ -237,7 +237,7 @@ static void php_intl_idn_to(INTERNAL_FUNCTION_PARAMETERS,
+ }
+ #if defined(__clang__)
+ # pragma clang diagnostic pop
+-#elif ZEND_GCC_VERSION >= 4002
++#elif ZEND_GCC_VERSION >= 4008
+ # pragma GCC diagnostic pop
+ #endif
+ efree(ustring);
diff --git a/failed.txt b/failed.txt
index 3d019f4..bedca8d 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 7.3.9 (2019-08-29)
+===== 7.3.10RC1 (2019-09-12)
$ grep -r 'Tests failed' /var/lib/mock/{fc,el}*/build.log
@@ -15,9 +15,7 @@ $ grep -r 'Tests failed' /var/lib/mock/{fc,el}*/build.log
el6i
- 1 Bug #60120 proc_open hangs with stdin/out with 2048+ bytes [ext/standard/tests/streams/proc_open_bug60120.phpt]
-el8x, fc28i, fc28x:
- 6 Bug #78338 (Array cross-border reading in PCRE) [ext/pcre/tests/bug78338.phpt]
+ 1 Bug #70470 (Built-in server truncates headers spanning over TCP packets) [sapi/cli/tests/bug70470.phpt]
el8x:
5 buildroot issue with openssl under investigation
diff --git a/php73.spec b/php73.spec
index bdc7231..fa0abf9 100644
--- a/php73.spec
+++ b/php73.spec
@@ -116,13 +116,12 @@
%global db_devel libdb-devel
%endif
-%global upver 7.3.9
-#global rcver RC1
-#global lower RC1
+%global upver 7.3.10
+%global rcver RC1
Summary: PHP scripting language for creating dynamic web sites
Name: php
-Version: %{upver}%{?rcver:~%{lower}}
+Version: %{upver}%{?rcver:~%{rcver}}
Release: 1%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
@@ -181,6 +180,7 @@ Patch48: php-7.3.3-pdooci.patch
Patch91: php-7.2.0-oci8conf.patch
# Upstream fixes (100+)
+Patch100: https://github.com/php/php-src/commit/c43fc204b1639a8aa6c6212202def29b3c4cf611.patch
# Security fixes (200+)
@@ -1150,6 +1150,7 @@ low-level PHP extension for the libsodium cryptographic library.
%patch91 -p1 -b .remi-oci8
# upstream patches
+%patch100 -p1 -b .up
# security patches
@@ -1193,6 +1194,8 @@ rm ext/date/tests/bug33414-1.phpt
rm ext/date/tests/bug33415-2.phpt
rm ext/date/tests/date_modify-1.phpt
%endif
+# too fast builder
+rm ext/date/tests/bug73837.phpt
# Should be skipped but fails sometime
rm ext/standard/tests/file/file_get_contents_error001.phpt
# fails sometime
@@ -2234,6 +2237,9 @@ fi
%changelog
+* Tue Sep 10 2019 Remi Collet <remi@remirepo.net> - 7.3.10~RC1-1
+- update to 7.3.10RC1
+
* Wed Aug 28 2019 Remi Collet <remi@remirepo.net> - 7.3.9-1
- Update to 7.3.9 - http://www.php.net/releases/7_3_9.php