From 912a14cec72d394e150312bc746618005109a4f6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 1 Dec 2017 14:22:07 +0100 Subject: add upstream patch for https://bugs.php.net/75573 --- php71.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'php71.spec') diff --git a/php71.spec b/php71.spec index 3413ff1..e2d1106 100644 --- a/php71.spec +++ b/php71.spec @@ -113,7 +113,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: php Version: %{upver}%{?rcver:~%{rcver}} -Release: 3%{?dist} +Release: 4%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -170,6 +170,8 @@ Patch48: php-7.1.9-openssl-load-config.patch Patch91: php-5.6.3-oci8conf.patch # Upstream fixes (100+) +Patch100: php-bug75573.patch +Patch101: php-bug75514.patch # Security fixes (200+) @@ -180,7 +182,6 @@ Patch300: php-7.0.10-datetests.patch Patch301: php-7.0.0-oldpcre.patch # WIP -Patch400: 0001-Fixed-bug-75514-mt_rand-returns-value-outside-min-ma.patch BuildRequires: bzip2-devel, curl-devel >= 7.9 BuildRequires: httpd-devel >= 2.0.46-1, pam-devel @@ -1019,6 +1020,8 @@ support for JavaScript Object Notation (JSON) to PHP. %patch91 -p1 -b .remi-oci8 # upstream patches +%patch100 -p1 -b .bug75573 +%patch101 -p1 -b .bug75514 # security patches @@ -1034,7 +1037,6 @@ fi %endif # WIP patch -%patch400 -p1 -bug75514 # Prevent %%doc confusion over LICENSE files cp Zend/LICENSE Zend/ZEND_LICENSE @@ -2057,6 +2059,9 @@ fi %changelog +* Fri Dec 1 2017 Remi Collet - 7.1.12-4 +- add upstream patch for https://bugs.php.net/75573 + * Tue Nov 28 2017 Remi Collet - 7.1.12-3 - refresh patch for https://bugs.php.net/75514 -- cgit