summaryrefslogtreecommitdiffstats
path: root/php.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-01-28 17:28:15 +0100
committerRemi Collet <remi@remirepo.net>2021-01-28 17:28:15 +0100
commit29ae9d95bc936a7c3d338d05e3b893f11fa4d47c (patch)
tree4be0381d36aa3a74c7ab7282c1cb59e8ade40164 /php.spec
parentf7f1667020e164a07aa4bc954a40991059c2afcd (diff)
add upstream patch for https://bugs.php.net/80682
fix opcache doesn't honour pcre.jit option
Diffstat (limited to 'php.spec')
-rw-r--r--php.spec8
1 files changed, 7 insertions, 1 deletions
diff --git a/php.spec b/php.spec
index c7445e1..564b40a 100644
--- a/php.spec
+++ b/php.spec
@@ -106,7 +106,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: %{upver}%{?rcver:~%{rcver}}%{?gh_date:.%{gh_date}}
-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
@@ -163,6 +163,7 @@ Patch47: php-7.4.8-phpinfo.patch
Patch91: php-7.2.0-oci8conf.patch
# Upstream fixes (100+)
+Patch100: php-bug80682.patch
# Security fixes (200+)
@@ -936,6 +937,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
%patch91 -p1 -b .remi-oci8
# upstream patches
+%patch100 -p1 -b .bug80682
# security patches
@@ -1813,6 +1815,10 @@ fi
%changelog
+* Thu Jan 28 2021 Remi Collet <remi@remirepo.net> - 7.4.15~RC2-2
+- add upstream patch for https://bugs.php.net/80682
+ fix opcache doesn't honour pcre.jit option
+
* Tue Jan 19 2021 Remi Collet <remi@remirepo.net> - 7.4.15~RC2-1
- update to 7.4.15RC2