update to 7.3.0RC1

with oniguruma 6.9.0

4 files changed, 11 insertions, 111 deletions

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 2019b9e..6247ed7 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 7.3.0beta3 (2018-08-30)
+===== 7.3.0RC1 (2018-09-13)
 
 $ grep -r 'Tests failed' /var/lib/mock/scl73*/build.log
 
@@ -16,13 +16,3 @@ $ grep -r 'Tests failed' /var/lib/mock/scl73*/build.log
 (3)	known issue
 (5)	need investigation
 
-
-FAILED TEST SUMMARY
----------------------------------------------------------------------
-security_level setting to prohibit cert [ext/openssl/tests/stream_security_level.phpt]
-=====================================================================
-TEST FAILURE: ../ext/openssl/tests/stream_security_level.diff --
-002+ error:141A90B5:SSL routines:ssl_cipher_list_to_bytes:no ciphers available in /builddir/build/BUILD/php-7.3.0beta3/ext/openssl/tests/ServerClientTestCase.inc(96) : eval()'d code on line 11
-002- error:1416F086:SSL routines:tls_process_server_certificate:certificate verify failed in %s : eval()'d code on line %d
--- ../ext/openssl/tests/stream_security_level.diff result ends.
-
diff --git a/php-upstream.patch b/php-upstream.patch
deleted file mode 100644
index 0a11cbe..0000000
--- a/php-upstream.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 8cc7e2a2df912d86f6b9dc3f3d40e5de1d93214b Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Wed, 29 Aug 2018 14:40:59 +0200
-Subject: [PATCH] Revert "Don't report mmap failure if it is expected"
-
-This reverts commit 446b5b15d324dacd30f58313563a9d625fb54ac8.
----
- Zend/zend_alloc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
-index d81616a87a4b..8eec54c6f703 100644
---- a/Zend/zend_alloc.c
-+++ b/Zend/zend_alloc.c
-@@ -432,7 +432,7 @@ static void *zend_mm_mmap_fixed(void *addr, size_t size)
- 	void *ptr = mmap(addr, size, PROT_READ | PROT_WRITE, flags /*| MAP_POPULATE | MAP_HUGETLB*/, -1, 0);
- 
- 	if (ptr == MAP_FAILED) {
--#if ZEND_MM_ERROR && !defined(MAP_FIXED_NOREPLACE) && !defined(MAP_EXCL)
-+#if ZEND_MM_ERROR
- 		fprintf(stderr, "\nmmap() failed: [%d] %s\n", errno, strerror(errno));
- #endif
- 		return NULL;
-From a55bcaa14ddba2df0c0f9c7f4444fc9d9f6564fd Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Wed, 29 Aug 2018 14:41:04 +0200
-Subject: [PATCH] Revert "Support fixed address mmap without replacement"
-
-This reverts commit 0f68ff5c92924deb9401ce66458e67f250ccde74.
----
- Zend/zend_alloc.c | 9 ++-------
- 1 file changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
-index 8eec54c6f703..11691d837759 100644
---- a/Zend/zend_alloc.c
-+++ b/Zend/zend_alloc.c
-@@ -423,13 +423,8 @@ static void *zend_mm_mmap_fixed(void *addr, size_t size)
- #ifdef _WIN32
- 	return VirtualAlloc(addr, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
- #else
--	int flags = MAP_PRIVATE | MAP_ANON;
--#ifdef MAP_FIXED_NOREPLACE
--	flags |= MAP_FIXED_NOREPLACE;
--#elif defined MAP_EXCL
--	flags |= MAP_FIXED | MAP_EXCL;
--#endif
--	void *ptr = mmap(addr, size, PROT_READ | PROT_WRITE, flags /*| MAP_POPULATE | MAP_HUGETLB*/, -1, 0);
-+	/* MAP_FIXED leads to discarding of the old mapping, so it can't be used. */
-+	void *ptr = mmap(addr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON /*| MAP_POPULATE | MAP_HUGETLB*/, -1, 0);
- 
- 	if (ptr == MAP_FAILED) {
- #if ZEND_MM_ERROR
diff --git a/php.spec b/php.spec
index 18c623b..242e6d1 100644
--- a/php.spec
+++ b/php.spec
@@ -82,7 +82,7 @@
 %else
 %global with_libpcre      0
 %endif
-%if 0%{?fedora} >= 26
+%if 0%{?fedora} >= 28
 %global with_onig         1
 %else
 %global with_onig         0
@@ -125,12 +125,13 @@
 %endif
 
 %global upver        7.3.0
-%global rcver        beta3
+%global rcver        RC1
+%global lower        rc1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{?scl_prefix}php
-Version: %{upver}%{?rcver:~%{rcver}}
-Release: 3%{?dist}
+Version: %{upver}%{?rcver:~%{lower}}
+Release: 1%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -183,8 +184,6 @@ Patch47: php-5.6.3-phpinfo.patch
 Patch91: php-7.2.0-oci8conf.patch
 
 # Upstream fixes (100+)
-Patch100: php-upstream.patch
-Patch101: https://github.com/php/php-src/commit/cd0a37994e3cbf1f0aa1174155d3d662cefe2e7a.patch
 
 # Security fixes (200+)
 
@@ -685,7 +684,7 @@ License: PHP and LGPLv2 and BSD and OpenLDAP
 %if %{with_onig}
 BuildRequires: oniguruma-devel
 %else
-Provides: bundled(oniguruma) = 6.3.0
+Provides: bundled(oniguruma) = 6.9.0
 %endif
 Provides: bundled(libmbfl) = 1.3.2
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
@@ -925,8 +924,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
 
 # security patches
 
@@ -1861,6 +1858,10 @@ fi
 
 
 %changelog
+* Tue Sep 11 2018 Remi Collet <remi@remirepo.net> - 7.3.0~rc1-1
+- update to 7.3.0RC1
+- with oniguruma 6.9.0
+
 * Mon Sep  3 2018 Remi Collet <remi@remirepo.net> - 7.3.0~beta3-3
 - add upstream patch for openssl failing test