From 696a742badfcc181fdea421702524a2176d44b20 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 4 Aug 2020 09:38:47 +0200
Subject: Core:   Fix #79877 getimagesize function silently truncates after a
 null byte Phar:   Fix #79797 use of freed hash key in the phar_parse_zipfile
 function   CVE-2020-7068

---
 php.spec | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index 83ededc..4f6a77d 100644
--- a/php.spec
+++ b/php.spec
@@ -140,7 +140,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}
-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
@@ -218,6 +218,8 @@ Patch214: php-bug79330.patch
 Patch215: php-bug79465.patch
 Patch216: php-bug78875.patch
 Patch217: php-bug78876.patch
+Patch218: php-bug79797.patch
+Patch219: php-bug79877.patch
 
 # Fixes for tests (300+)
 # Factory is droped from system tzdata
@@ -966,6 +968,8 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 %patch215 -p1 -b .bug79465
 %patch216 -p1 -b .bug78875
 %patch217 -p1 -b .bug78876
+%patch218 -p1 -b .bug79797
+%patch219 -p1 -b .bug79877
 
 # Fixes for tests
 %patch300 -p1 -b .datetests
@@ -1924,6 +1928,13 @@ EOF
 
 
 %changelog
+* Tue Aug  4 2020 Remi Collet <remi@remirepo.net> - 7.1.33-9
+- Core:
+  Fix #79877 getimagesize function silently truncates after a null byte
+- Phar:
+  Fix #79797 use of freed hash key in the phar_parse_zipfile function
+  CVE-2020-7068
+
 * Tue May 12 2020 Remi Collet <remi@remirepo.net> - 7.1.33-8
 - Core:
   Fix #78875 Long filenames cause OOM and temp files are not cleaned
-- 
cgit