v7.2.5RC1

3 files changed, 7 insertions, 37 deletions

diff --git a/failed.txt b/failed.txt
index 1f58d1e..cb435d1 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 7.2.4 (2018-03-29)
+===== 7.2.5RC1 (2018-04-12)
 
 $ grep -r 'Tests failed' /var/lib/mock/scl72*/build.log
 
diff --git a/php-upstream.patch b/php-upstream.patch
deleted file mode 100644
index 20d4814..0000000
--- a/php-upstream.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4072b2787074ee8e247a6639585b49e10c5a55fe Mon Sep 17 00:00:00 2001
-From: "Christoph M. Becker" <cmbecker69@gmx.de>
-Date: Tue, 20 Mar 2018 16:35:39 +0100
-Subject: [PATCH] Fix #76113: mbstring does not build with Oniguruma 6.8.1
-
-As of Oniguruma 6.8.1, the regex structure has been moved from the
-public `oniguruma.h` to the private `regint.h`.  Thus, it is no longer
-possible to directly access the struct's members, and actually, there
-is no need to, since there are respective accessor functions available
-at least of 2.3.1.
----
- NEWS                       | 2 ++
- ext/mbstring/php_mbregex.c | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c
-index a5a6cd0..7a70c63 100644
---- a/ext/mbstring/php_mbregex.c
-+++ b/ext/mbstring/php_mbregex.c
-@@ -452,7 +452,7 @@ static php_mb_regex_t *php_mbregex_compile_pattern(const char *pattern, int patl
- 	OnigUChar err_str[ONIG_MAX_ERROR_MESSAGE_LEN];
- 
- 	rc = zend_hash_str_find_ptr(&MBREX(ht_rc), (char *)pattern, patlen);
--	if (!rc || rc->options != options || rc->enc != enc || rc->syntax != syntax) {
-+	if (!rc || onig_get_options(rc) != options || onig_get_encoding(rc) != enc || onig_get_syntax(rc) != syntax) {
- 		if ((err_code = onig_new(&retval, (OnigUChar *)pattern, (OnigUChar *)(pattern + patlen), options, enc, syntax, &err_info)) != ONIG_NORMAL) {
- 			onig_error_code_to_str(err_str, err_code, &err_info);
- 			php_error_docref(NULL, E_WARNING, "mbregex compile err: %s", err_str);
--- 
-2.1.4
-
diff --git a/php.spec b/php.spec
index cbf0d5d..9d821a7 100644
--- a/php.spec
+++ b/php.spec
@@ -124,13 +124,13 @@
 %global db_devel  libdb-devel
 %endif
 
-%global upver        7.2.4
-#global rcver        RC1
+%global upver        7.2.5
+%global rcver        RC1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 2%{?dist}
+Release: 1%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -182,7 +182,6 @@ Patch47: php-5.6.3-phpinfo.patch
 Patch91: php-7.2.0-oci8conf.patch
 
 # Upstream fixes (100+)
-Patch100: php-upstream.patch
 
 # Security fixes (200+)
 
@@ -923,7 +922,6 @@ low-level PHP extension for the libsodium cryptographic library.
 %patch91 -p1 -b .remi-oci8
 
 # upstream patches
-%patch100 -p1 -b .upstream
 
 # security patches
 
@@ -1864,6 +1862,9 @@ fi
 
 
 %changelog
+* Wed Apr 11 2018 Remi Collet <remi@remirepo.net> - 7.2.5~RC1-1
+- update to 7.2.5RC1
+
 * Tue Apr  3 2018 Remi Collet <remi@remirepo.net> - 7.2.4-2
 - add upstream patch for oniguruma 6.8.1, FTBFS #1562583