From 997d6f80d9b806bcdad4af50a785d271b65004bf Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 10 Apr 2024 14:56:28 +0200
Subject: use oracle client library version 21.13 on x86_64, 19.19 on aarch64

Fix __Host-/__Secure- cookie bypass due to partial CVE-2022-31629 fix
  CVE-2024-2756
Fix password_verify can erroneously return true opening ATO risk
  CVE-2024-3096
---
 php.spec | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index 3dc98d9..4e43e52 100644
--- a/php.spec
+++ b/php.spec
@@ -60,7 +60,7 @@
 %global oraclelib 19.1
 %global oracledir 19.19
 %else
-%global oraclever 21.11
+%global oraclever 21.13
 %global oraclelib 21.1
 %global oracledir 21
 %endif
@@ -134,7 +134,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 40%{?dist}
+Release: 41%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -266,6 +266,8 @@ Patch262: php-cve-2023-0662.patch
 Patch263: php-cve-2023-3247.patch
 Patch264: php-cve-2023-3823.patch
 Patch265: php-cve-2023-3824.patch
+Patch266: php-cve-2024-2756.patch
+Patch267: php-cve-2024-3096.patch
 
 # Fixes for tests (300+)
 # Factory is droped from system tzdata
@@ -1074,8 +1076,8 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 %patch -P263 -p1 -b .cve3247
 %patch -P264 -p1 -b .cve3823
 %patch -P265 -p1 -b .cve3824
-: ---------------------------
-#exit 1
+%patch -P266 -p1 -b .cve2756
+%patch -P267 -p1 -b .cve3096
 
 # Fixes for tests
 %patch -P300 -p1 -b .datetests
@@ -1847,7 +1849,7 @@ cat << EOF
 
   WARNING : PHP 7.0 have reached its "End of Life" in
   December 2018. Even, if this package includes some of
-  the important security fixes, backported from 8.0, the
+  the important security fixes, backported from 8.1, the
   UPGRADE to a maintained version is very strongly RECOMMENDED.
 
 =====================================================================
@@ -2031,6 +2033,13 @@ EOF
 
 
 %changelog
+* Wed Apr 10 2024 Remi Collet <remi@remirepo.net> - 7.0.33-41
+- use oracle client library version 21.13 on x86_64, 19.19 on aarch64
+- Fix __Host-/__Secure- cookie bypass due to partial CVE-2022-31629 fix
+  CVE-2024-2756
+- Fix password_verify can erroneously return true opening ATO risk
+  CVE-2024-3096
+
 * Wed Aug  2 2023 Remi Collet <remi@remirepo.net> - 7.0.33-40
 - Fix Security issue with external entity loading in XML without enabling it
   GHSA-3qrf-m4j2-pcrr CVE-2023-3823
-- 
cgit