summaryrefslogtreecommitdiffstats
path: root/php.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-01-28 17:25:00 +0100
committerRemi Collet <remi@remirepo.net>2021-01-28 17:25:00 +0100
commit697972a4a0e4d0fffd5673f17e1a906b94f2e7d3 (patch)
treed035ff8b21cb035a3a2418575afd0055c48fb1c1 /php.spec
parente3ed190c2b07cc238edb63c58c6871cea14e0538 (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.spec9
1 files changed, 8 insertions, 1 deletions
diff --git a/php.spec b/php.spec
index 00c2400..4098988 100644
--- a/php.spec
+++ b/php.spec
@@ -141,7 +141,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
@@ -203,6 +203,8 @@ Patch49: php-7.3.24-fpm.patch
Patch91: php-7.2.0-oci8conf.patch
# Upstream fixes (100+)
+# Backported from 7.4.16
+Patch100: php-bug80682.patch
# Security fixes (200+)
@@ -972,6 +974,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
@@ -1925,6 +1928,10 @@ fi
%changelog
+* Thu Jan 28 2021 Remi Collet <remi@remirepo.net> - 7.3.26-2
+- add upstream patch for https://bugs.php.net/80682
+ fix opcache doesn't honour pcre.jit option
+
* Tue Jan 5 2021 Remi Collet <remi@remirepo.net> - 7.3.26-1
- Update to 7.3.26 - http://www.php.net/releases/7_3_26.php