From 6db3cf2aa850b172b557a56d59a3dae78eead5f0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 23 Oct 2019 09:35:32 +0200 Subject: fix preload, add more upstream patches for #78713 #78716 --- php74.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'php74.spec') diff --git a/php74.spec b/php74.spec index da00c5f..14dc5fe 100644 --- a/php74.spec +++ b/php74.spec @@ -103,7 +103,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: php Version: %{upver}%{?rcver:~%{lower}} -Release: 10%{?dist} +Release: 11%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -169,6 +169,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 @@ -1166,6 +1170,10 @@ in pure PHP. # WIP patch %patch100 -p1 +%patch101 -p1 +%patch102 -p1 +%patch103 -p1 +%patch104 -p1 # Prevent %%doc confusion over LICENSE files cp Zend/LICENSE Zend/ZEND_LICENSE @@ -2154,8 +2162,11 @@ fi %changelog +* Wed Oct 23 2019 Remi Collet - 7.4.0~RC4-11 +- fix preload, add more upstream patches for #78713 #78716 + * Mon Oct 21 2019 Remi Collet - 7.4.0~RC4-10 -- fix preload, add upstream patch for https://bugs.php.net/78512 +- fix preload, add upstream patch for #78512 - change dependency on nginx-filesystem to weak * Tue Oct 15 2019 Remi Collet - 7.4.0~RC4-9 -- cgit