From d32d7c1425cc7358edaa8b078ed97d2fd324ffa2 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 3 Jul 2019 12:49:06 +0200
Subject: add upstream patch for https://bugs.php.net/78230 segfault with
 opcache enabled

---
 php.spec | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index a7aa881..d162c39 100644
--- a/php.spec
+++ b/php.spec
@@ -68,7 +68,7 @@
 
 # Regression tests take a long time, you can skip 'em with this
 %{!?runselftest: %global runselftest 1}
-#global runselftest 0
+%global runselftest 0
 
 # Use the arch-specific mysql_config binary to avoid mismatch with the
 # arch detection heuristic used by bindir/mysql_config.
@@ -137,7 +137,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 1%{?dist}
+Release: 2%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -192,6 +192,7 @@ Patch48: php-7.3.3-pdooci.patch
 Patch91: php-7.2.0-oci8conf.patch
 
 # Upstream fixes (100+)
+Patch100: php-bug78230.patch
 
 # Security fixes (200+)
 
@@ -948,6 +949,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 # upstream patches
 
 # security patches
+%patch100 -p1 -b .bug78230
 
 # Fixes for tests
 %patch300 -p1 -b .datetests
@@ -1885,6 +1887,10 @@ fi
 
 
 %changelog
+* Wed Jul  3 2019 Remi Collet <remi@remirepo.net> - 7.3.7-2
+- add upstream patch for https://bugs.php.net/78230
+  segfault with opcache enabled
+
 * Tue Jul  2 2019 Remi Collet <remi@remirepo.net> - 7.3.7-1
 - Update to 7.3.7 - http://www.php.net/releases/7_3_7.php
 - disable opcache.huge_code_pages in default configuration
-- 
cgit