From a817c65b50619aedd807dce0b2c76db33ac4dc86 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 13 Jun 2019 10:21:44 +0200 Subject: add 3 upstream patches --- php.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'php.spec') diff --git a/php.spec b/php.spec index 56f133b..f00d38f 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: 8%{?dist} +Release: 9%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -164,6 +164,9 @@ Patch47: php-5.6.3-phpinfo.patch Patch91: php-7.2.0-oci8conf.patch # Upstream fixes (100+) +Patch100: https://github.com/php/php-src/commit/175c7bf6fe0ceeb4b5dc08e08837b411ab05ff6b.patch +Patch101: https://github.com/php/php-src/commit/b2b0e5246650bc6b63e841614110e471a061d577.patch +Patch102: https://github.com/php/php-src/commit/b64107531b35e9bc2312cd1ed8c030782e7841d8.patch # Security fixes (200+) @@ -938,6 +941,9 @@ in pure PHP. %patch91 -p1 -b .remi-oci8 # upstream patches +%patch100 -p1 +%patch101 -p1 +%patch102 -p1 # security patches @@ -1797,6 +1803,9 @@ fi %changelog +* Wed Jun 12 2019 Remi Collet - 7.4.0~alpha1-9 +- add 3 upstream patches + * Wed Jun 12 2019 Remi Collet - 7.4.0~alpha1-8 - update to 7.4.0alpha1 -- cgit