summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-09-26 09:08:10 +0200
committerRemi Collet <remi@remirepo.net>2018-09-26 09:08:10 +0200
commit61e88e19f7b6aaac6c4c0696ca7a597a29da649f (patch)
treea1e53cb01dd8fbf8040c9ee67ab5947fef6de033
parenta1dbb57fb367a407ace5513fb71a1382dbbca319 (diff)
update to 7.2.11RC1
use oracle client library version 18.3
-rw-r--r--be50a72715c141befe6f34ece660745da894aaf3.patch37
-rw-r--r--c1729272b17a1fe893d1a54e423d3b71470f3ee8.patch22
-rw-r--r--cd0a37994e3cbf1f0aa1174155d3d662cefe2e7a.patch38
-rw-r--r--failed.txt2
-rw-r--r--php72.spec16
5 files changed, 8 insertions, 107 deletions
diff --git a/be50a72715c141befe6f34ece660745da894aaf3.patch b/be50a72715c141befe6f34ece660745da894aaf3.patch
deleted file mode 100644
index 2bcf82d..0000000
--- a/be50a72715c141befe6f34ece660745da894aaf3.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From be50a72715c141befe6f34ece660745da894aaf3 Mon Sep 17 00:00:00 2001
-From: Jakub Zelenka <bukka@php.net>
-Date: Sun, 9 Sep 2018 18:53:37 +0100
-Subject: [PATCH] Fix ssl stream reneg limit test to print only after first
- renegotiation
-
-It has been reported that in some setup the test does multiple
-renegotiations which is allowed.
----
- ext/openssl/tests/stream_server_reneg_limit.phpt | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/ext/openssl/tests/stream_server_reneg_limit.phpt b/ext/openssl/tests/stream_server_reneg_limit.phpt
-index f0353351a23a..f033cbabe343 100644
---- a/ext/openssl/tests/stream_server_reneg_limit.phpt
-+++ b/ext/openssl/tests/stream_server_reneg_limit.phpt
-@@ -22,14 +22,18 @@ if(substr(PHP_OS, 0, 3) == 'WIN') {
- */
-
- $serverCode = <<<'CODE'
-+ $printed = false;
- $serverUri = "ssl://127.0.0.1:64321";
- $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
- $serverCtx = stream_context_create(['ssl' => [
- 'local_cert' => __DIR__ . '/bug54992.pem',
- 'reneg_limit' => 0,
- 'reneg_window' => 30,
-- 'reneg_limit_callback' => function($stream) {
-- var_dump($stream);
-+ 'reneg_limit_callback' => function($stream) use (&$printed) {
-+ if (!$printed) {
-+ $printed = true;
-+ var_dump($stream);
-+ }
- }
- ]]);
-
diff --git a/c1729272b17a1fe893d1a54e423d3b71470f3ee8.patch b/c1729272b17a1fe893d1a54e423d3b71470f3ee8.patch
deleted file mode 100644
index d945192..0000000
--- a/c1729272b17a1fe893d1a54e423d3b71470f3ee8.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From c1729272b17a1fe893d1a54e423d3b71470f3ee8 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Wed, 29 Aug 2018 09:10:59 +0200
-Subject: [PATCH] fix double cast to int on 32-bit
-
----
- Zend/zend_operators.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
-index cafb14d4cc25..9a8a40142433 100644
---- a/Zend/zend_operators.c
-+++ b/Zend/zend_operators.c
-@@ -3101,7 +3101,7 @@ ZEND_API zend_long ZEND_FASTCALL zend_dval_to_lval_slow(double d)
- if (dmod < 0) {
- /* we're going to make this number positive; call ceil()
- * to simulate rounding towards 0 of the negative number */
-- dmod = ceil(dmod);// + two_pow_32;
-+ dmod = ceil(dmod) + two_pow_32;
- }
- return (zend_long)(zend_ulong)dmod;
- }
diff --git a/cd0a37994e3cbf1f0aa1174155d3d662cefe2e7a.patch b/cd0a37994e3cbf1f0aa1174155d3d662cefe2e7a.patch
deleted file mode 100644
index 0cb89c8..0000000
--- a/cd0a37994e3cbf1f0aa1174155d3d662cefe2e7a.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From cd0a37994e3cbf1f0aa1174155d3d662cefe2e7a Mon Sep 17 00:00:00 2001
-From: Jakub Zelenka <bukka@php.net>
-Date: Sun, 2 Sep 2018 20:00:08 +0100
-Subject: [PATCH] Fix stream_security_level.phpt with OpenSSL 1.1.1
-
----
- ext/openssl/tests/stream_security_level.phpt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/ext/openssl/tests/stream_security_level.phpt b/ext/openssl/tests/stream_security_level.phpt
-index fb1d36a58624..26fedcf670e9 100644
---- a/ext/openssl/tests/stream_security_level.phpt
-+++ b/ext/openssl/tests/stream_security_level.phpt
-@@ -5,6 +5,7 @@ security_level setting to prohibit cert
- if (!extension_loaded("openssl")) die("skip openssl not loaded");
- if (OPENSSL_VERSION_NUMBER < 0x10100000) die("skip OpenSSL >= v1.1.0 required");
- if (!function_exists("proc_open")) die("skip no proc_open");
-+?>
- --FILE--
- <?php
- $serverCode = <<<'CODE'
-@@ -24,7 +25,7 @@ $clientCode = <<<'CODE'
- $serverUri = "ssl://127.0.0.1:64322";
- $clientFlags = STREAM_CLIENT_CONNECT;
- $clientCtx = stream_context_create(['ssl' => [
-- 'security_level' => 3,
-+ 'security_level' => 2,
- 'verify_peer' => true,
- 'cafile' => __DIR__ . '/bug54992-ca.pem',
- 'verify_peer_name' => false
-@@ -38,6 +39,7 @@ CODE;
-
- include 'ServerClientTestCase.inc';
- ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
-+?>
- --EXPECTF--
- Warning: stream_socket_client(): SSL operation failed with code 1. OpenSSL Error messages:
- error:1416F086:SSL routines:tls_process_server_certificate:certificate verify failed in %s : eval()'d code on line %d
diff --git a/failed.txt b/failed.txt
index 0e64660..5d87580 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 7.2.10 (2018-09-13)
+===== 7.2.11RC1 (2018-09-27)
$ grep -r 'Tests failed' /var/lib/mock/{fc,el}*/build.log
diff --git a/php72.spec b/php72.spec
index 77b93b0..b14af6a 100644
--- a/php72.spec
+++ b/php72.spec
@@ -28,7 +28,7 @@
%ifarch ppc ppc64
%global oraclever 10.2.0.2
%else
-%global oraclever 12.2
+%global oraclever 18.3
%endif
# Build for LiteSpeed Web Server (LSAPI)
@@ -111,8 +111,8 @@
%global db_devel libdb-devel
%endif
-%global upver 7.2.10
-#global rcver RC1
+%global upver 7.2.11
+%global rcver RC1
Summary: PHP scripting language for creating dynamic web sites
Name: php
@@ -175,9 +175,6 @@ Patch48: php-7.2.8-getallheaders.patch
Patch91: php-7.2.0-oci8conf.patch
# Upstream fixes (100+)
-Patch100: https://github.com/php/php-src/commit/cd0a37994e3cbf1f0aa1174155d3d662cefe2e7a.patch
-Patch101: https://github.com/php/php-src/commit/be50a72715c141befe6f34ece660745da894aaf3.patch
-Patch102: https://github.com/php/php-src/commit/c1729272b17a1fe893d1a54e423d3b71470f3ee8.patch
# Security fixes (200+)
@@ -1090,9 +1087,6 @@ low-level PHP extension for the libsodium cryptographic library.
%patch91 -p1 -b .remi-oci8
# upstream patches
-%patch100 -p1 -b .up1
-%patch101 -p1 -b .up2
-%patch102 -p1 -b .up3
# security patches
@@ -2149,6 +2143,10 @@ fi
%changelog
+* Wed Sep 26 2018 Remi Collet <remi@remirepo.net> - 7.2.11~RC1-1
+- update to 7.2.11RC1
+- use oracle client library version 18.3
+
* Tue Sep 11 2018 Remi Collet <remi@remirepo.net> - 7.2.10-1
- Update to 7.2.10 - http://www.php.net/releases/7_2_10.php