From 61237ab76efb8967c10932820da1a19ef21f20c4 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 29 Sep 2020 10:53:09 +0200
Subject: Core:   Fix #79699 PHP parses encoded cookie names so malicious
 `__Host-` cookies can be sent   CVE-2020-7070

---
 php70.spec | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'php70.spec')

diff --git a/php70.spec b/php70.spec
index 4c86b72..7a6cefc 100644
--- a/php70.spec
+++ b/php70.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: 22%{?dist}
+Release: 23%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -223,6 +228,7 @@ Patch242: php-bug78875.patch
 Patch243: php-bug78876.patch
 Patch244: php-bug79797.patch
 Patch245: php-bug79877.patch
+Patch246: php-bug79699.patch
 
 # Fixes for tests (300+)
 # Factory is droped from system tzdata
@@ -1127,6 +1133,7 @@ echo CIBLE = %{name}-%{version}-%{release} oci8=%{with_oci8} libzip=%{with_libzi
 %patch243 -p1 -b .bug78876
 %patch244 -p1 -b .bug79797
 %patch245 -p1 -b .bug79877
+%patch246 -p1 -b .bug79699
 
 # Fixes for tests
 %if 0%{?fedora} >= 21 || 0%{?rhel} >= 5
@@ -2164,6 +2171,11 @@ fi
 
 
 %changelog
+* Tue Sep 29 2020 Remi Collet <remi@remirepo.net> - 7.0.33-23
+- Core:
+  Fix #79699 PHP parses encoded cookie names so malicious `__Host-` cookies can be sent
+  CVE-2020-7070
+
 * Tue Aug  4 2020 Remi Collet <remi@remirepo.net> - 7.0.33-22
 - Core:
   Fix #79877 getimagesize function silently truncates after a null byte
-- 
cgit