From b1e6c483142a56315f782827dd9eac76b06864d2 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 17 Mar 2020 09:34:41 +0100
Subject: standard:   Fix #79329 get_headers() silently truncates after a null
 byte   CVE-2020-7066 exif:   Fix #79282 Use-of-uninitialized-value in exif  
 CVE-2020-7064 use oracle client library version 19.6 (18.5 on EL-6)

---
 php.spec | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index 65d3d94..a34b436 100644
--- a/php.spec
+++ b/php.spec
@@ -63,7 +63,7 @@
 %endif
 %global oraclelib 18.1
 %else
-%global oraclever 19.5
+%global oraclever 19.6
 %global oraclelib 19.1
 %endif
 
@@ -140,7 +140,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 5%{?dist}
+Release: 6%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -212,6 +212,8 @@ Patch208: php-bug79037.patch
 Patch209: php-bug77569.patch
 Patch210: php-bug79221.patch
 Patch211: php-bug79082.patch
+Patch212: php-bug79282.patch
+Patch213: php-bug79329.patch
 
 # Fixes for tests (300+)
 # Factory is droped from system tzdata
@@ -954,6 +956,8 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 %patch209 -p1 -b .bug77569
 %patch210 -p1 -b .bug79221
 %patch211 -p1 -b .bug79082
+%patch212 -p1 -b .bug79282
+%patch213 -p1 -b .bug79329
 
 # Fixes for tests
 %patch300 -p1 -b .datetests
@@ -1912,6 +1916,15 @@ EOF
 
 
 %changelog
+* Tue Mar 17 2020 Remi Collet <remi@remirepo.net> - 7.1.33-6
+- standard:
+  Fix #79329 get_headers() silently truncates after a null byte
+  CVE-2020-7066
+- exif:
+  Fix #79282 Use-of-uninitialized-value in exif
+  CVE-2020-7064
+- use oracle client library version 19.6 (18.5 on EL-6)
+
 * Tue Feb 18 2020 Remi Collet <remi@remirepo.net> - 7.1.33-5
 - dom:
   Fix #77569 Write Access Violation in DomImplementation
-- 
cgit