summaryrefslogtreecommitdiffstats
path: root/php.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php.spec')
-rw-r--r--php.spec15
1 files changed, 13 insertions, 2 deletions
diff --git a/php.spec b/php.spec
index df70e44..2964063 100644
--- a/php.spec
+++ b/php.spec
@@ -108,7 +108,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}}
-Release: 29%{?dist}
+Release: 30%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -175,6 +175,10 @@ Patch300: php-7.0.10-datetests.patch
# WIP
Patch100: https://github.com/php/php-src/commit/05c5e5dfde91955263469daa2dd5afcbb5199d17.patch
+Patch101: https://github.com/php/php-src/commit/1c9bfcb6a766d4062f2dd1e594b30831d59cc36c.patch
+Patch102: https://github.com/php/php-src/commit/1417352dda354c22db43a8d4dbaa967575e2720c.patch
+Patch103: https://github.com/php/php-src/commit/598bf7f5d5f9c76fd003590083c98736eb7702ab.patch
+Patch104: https://github.com/php/php-src/commit/dcd772325d0f7702a525f03c7d5dd04bf96d8e18.patch
BuildRequires: gnupg2
BuildRequires: bzip2-devel
@@ -947,6 +951,10 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
# WIP patch
%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
# Prevent %%doc confusion over LICENSE files
cp Zend/LICENSE Zend/ZEND_LICENSE
@@ -1806,8 +1814,11 @@ fi
%changelog
+* Wed Oct 23 2019 Remi Collet <remi@remirepo.net> - 7.4.0~rc4-30
+- fix preload, add more upstream patches for #78713 #78716
+
* Mon Oct 21 2019 Remi Collet <remi@remirepo.net> - 7.4.0~rc4-29
-- fix preload, add upstream patch for https://bugs.php.net/78512
+- fix preload, add upstream patch for #78512
* Tue Oct 15 2019 Remi Collet <remi@remirepo.net> - 7.4.0~rc4-28
- update to 7.4.0RC4