From e31fb3122983dfe20d0fc9e9dd33aeb80aa4166e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 29 Sep 2020 10:09:59 +0200
Subject: Core:   Fix #79699 PHP parses encoded cookie names so malicious
 `__Host-` cookies can be sent   CVE-2020-7070 OpenSSL:   Fix #79601 Wrong
 ciphertext/tag in AES-CCM encryption for a 12 bytes IV   CVE-2020-7069   Fix
 bug #78079 openssl_encrypt_ccm.phpt fails with OpenSSL 1.1.1c

---
 php71.spec | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'php71.spec')

diff --git a/php71.spec b/php71.spec
index b8375d8..402b9f4 100644
--- a/php71.spec
+++ b/php71.spec
@@ -33,8 +33,13 @@
 %global oraclever 18.3
 %endif
 %global oraclelib 18.1
+
+%else
+%ifarch x86_64
+%global oraclever 19.8
 %else
 %global oraclever 19.6
+%endif
 %global oraclelib 19.1
 %endif
 
@@ -118,7 +123,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 9%{?dist}
+Release: 10%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -197,6 +202,8 @@ Patch216: php-bug78875.patch
 Patch217: php-bug78876.patch
 Patch218: php-bug79797.patch
 Patch219: php-bug79877.patch
+Patch220: php-bug79601.patch
+Patch221: php-bug79699.patch
 
 # Fixes for tests (300+)
 # Factory is droped from system tzdata
@@ -1072,6 +1079,8 @@ support for JavaScript Object Notation (JSON) to PHP.
 %patch217 -p1 -b .bug78876
 %patch218 -p1 -b .bug79797
 %patch219 -p1 -b .bug79877
+%patch220 -p1 -b .bug79601
+%patch221 -p1 -b .bug79699
 
 # Fixes for tests
 %if 0%{?fedora} >= 25 || 0%{?rhel} >= 6
@@ -2146,6 +2155,15 @@ EOF
 
 
 %changelog
+* Tue Sep 29 2020 Remi Collet <remi@remirepo.net> - 7.1.33-10
+- Core:
+  Fix #79699 PHP parses encoded cookie names so malicious `__Host-` cookies can be sent
+  CVE-2020-7070
+- OpenSSL:
+  Fix #79601 Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV
+  CVE-2020-7069
+  Fix bug #78079 openssl_encrypt_ccm.phpt fails with OpenSSL 1.1.1c
+
 * Tue Aug  4 2020 Remi Collet <remi@remirepo.net> - 7.1.33-9
 - Core:
   Fix #79877 getimagesize function silently truncates after a null byte
-- 
cgit