From 9298687f80170e93b01098be5b295d281111946b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 5 Jun 2024 08:22:21 +0200
Subject: Fix filter bypass in filter_var FILTER_VALIDATE_URL

  CVE-2024-5458
---
 php.spec | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index 084c212..57dbe2f 100644
--- a/php.spec
+++ b/php.spec
@@ -56,9 +56,9 @@
 %global mysql_sock %(mysql_config --socket  2>/dev/null || echo /var/lib/mysql/mysql.sock)
 
 %ifarch aarch64
-%global oraclever 19.19
+%global oraclever 19.22
 %global oraclelib 19.1
-%global oracledir 19.19
+%global oracledir 19.22
 %else
 %global oraclever 21.13
 %global oraclelib 21.1
@@ -133,7 +133,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 21%{?dist}
+Release: 22%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -221,6 +221,7 @@ Patch218: php-cve-2023-3823.patch
 Patch219: php-cve-2023-3824.patch
 Patch220: php-cve-2024-2756.patch
 Patch221: php-cve-2024-3096.patch
+Patch222: php-cve-2024-5458.patch
 
 # Fixes for tests (300+)
 # Factory is droped from system tzdata
@@ -1003,6 +1004,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 %patch -P219 -p1 -b .cve3824
 %patch -P220 -p1 -b .cve2756
 %patch -P221 -p1 -b .cve3096
+%patch -P222 -p1 -b .cve5458
 
 # Fixes for tests
 %patch -P300 -p1 -b .datetests
@@ -1973,6 +1975,10 @@ EOF
 
 
 %changelog
+* Tue Jun  4 2024 Remi Collet <remi@remirepo.net> - 7.2.34-22
+- Fix filter bypass in filter_var FILTER_VALIDATE_URL
+  CVE-2024-5458
+
 * Wed Apr 10 2024 Remi Collet <remi@remirepo.net> - 7.2.34-21
 - 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
-- 
cgit