From 2dc86a7ff14cdcfa9bfaffbde77b72f756ea8e45 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 20 Oct 2021 12:15:10 +0200
Subject: fix PHP-FPM oob R/W in root process leading to priv escalation

  CVE-2021-21703
use libicu version 69
use oracle client library version 21.3
---
 php.spec | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index 9f91fff..9c91f0b 100644
--- a/php.spec
+++ b/php.spec
@@ -55,7 +55,7 @@
 
 %global mysql_sock %(mysql_config --socket  2>/dev/null || echo /var/lib/mysql/mysql.sock)
 
-%global oraclever 21.1
+%global oraclever 21.3
 %global oraclelib 21.1
 
 # Build for LiteSpeed Web Server (LSAPI)
@@ -126,7 +126,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 8%{?dist}
+Release: 9%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -198,6 +198,7 @@ Patch202: php-bug80710.patch
 Patch203: php-bug81122.patch
 Patch204: php-bug76450.patch
 Patch205: php-bug81211.patch
+Patch206: php-bug81026.patch
 
 # Fixes for tests (300+)
 # Factory is droped from system tzdata
@@ -853,7 +854,7 @@ Group: System Environment/Libraries
 License: PHP
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 # Upstream requires 4.0, we require 50 to ensure use of libicu-last / libicu62
-BuildRequires: libicu-devel >= 50
+BuildRequires: libicu-devel >= 69
 
 %description intl
 The %{?scl_prefix}php-intl package contains a dynamic shared object that will add
@@ -967,6 +968,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 %patch203 -p1 -b .bug81122
 %patch204 -p1 -b .bug76450
 %patch205 -p1 -b .bug81211
+%patch206 -p1 -b .bug81026
 
 # Fixes for tests
 %patch300 -p1 -b .datetests
@@ -1378,8 +1380,7 @@ popd
 
 %check
 %if %runselftest
-
-cd build-apache
+cd build-fpm
 
 # Run tests, using the CLI SAPI
 export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
@@ -1938,6 +1939,12 @@ EOF
 
 
 %changelog
+* Wed Oct 20 2021 Remi Collet <remi@remirepo.net> - 7.2.34-9
+- fix PHP-FPM oob R/W in root process leading to priv escalation
+  CVE-2021-21703
+- use libicu version 69
+- use oracle client library version 21.3
+
 * Tue Sep  7 2021 Remi Collet <remi@remirepo.net> - 7.2.34-8
 - fix intl build on F35
 
-- 
cgit