From df79e9327223857efd2dbe8505dc3c32f6c36df0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 29 Sep 2020 10:26:56 +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

---
 php.spec | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index bcf2495..37f49bc 100644
--- a/php.spec
+++ b/php.spec
@@ -86,12 +86,7 @@
 # Optional components; pass "--with mssql" etc to rpmbuild.
 %global with_oci8      %{?_with_oci8:1}%{!?_with_oci8:0}
 %global with_imap      1
-# until firebird available in EPEL
-%if 0%{?rhel} == 8
-%global with_interbase 0
-%else
 %global with_interbase 1
-%endif
 %global with_mcrypt    1
 %global with_freetds   1
 %global with_tidy      1
@@ -145,7 +140,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{?scl_prefix}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
@@ -225,6 +220,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
@@ -975,6 +972,8 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 %patch217 -p1 -b .bug78876
 %patch218 -p1 -b .bug79797
 %patch219 -p1 -b .bug79877
+%patch220 -p1 -b .bug79601
+%patch221 -p1 -b .bug79699
 
 # Fixes for tests
 %patch300 -p1 -b .datetests
@@ -1939,6 +1938,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