From 1e0b327cdd97a276a06c81ba22d2308bb003807a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 20 Oct 2021 12:15:22 +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
---
 php72.spec | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'php72.spec')

diff --git a/php72.spec b/php72.spec
index 25b0a8f..492122c 100644
--- a/php72.spec
+++ b/php72.spec
@@ -25,7 +25,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)
@@ -110,7 +110,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 7%{?dist}
+Release: 9%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -147,6 +147,7 @@ Source99: php-fpm.init
 
 # Build fixes
 Patch1: php-7.1.7-httpd.patch
+Patch2: php-7.1.33-intl.patch
 Patch5: php-7.2.0-includedir.patch
 Patch6: php-5.6.3-embed.patch
 Patch7: php-5.3.0-recode.patch
@@ -182,6 +183,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
@@ -987,7 +989,7 @@ Group: System Environment/Libraries
 License: PHP
 Requires: 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
 %if 0%{?rhel}
 Obsoletes: php53-intl, php53u-intl, php54-intl, php54w-intl, php55u-intl, php55w-intl, php56u-intl, php56w-intl
 Obsoletes: php70u-intl, php70w-intl, php71u-intl, php71w-intl, php72u-intl, php72w-intl
@@ -1091,6 +1093,7 @@ low-level PHP extension for the libsodium cryptographic library.
 %setup -q -n php-%{upver}%{?rcver}
 
 %patch1 -p1 -b .mpmcheck
+%patch2 -p1 -b .true
 %patch5 -p1 -b .includedir
 %patch6 -p1 -b .embed
 %patch7 -p1 -b .recode
@@ -1123,6 +1126,7 @@ low-level PHP extension for the libsodium cryptographic library.
 %patch203 -p1 -b .bug81122
 %patch204 -p1 -b .bug76450
 %patch205 -p1 -b .bug81211
+%patch206 -p1 -b .bug81026
 
 # Fixes for tests
 %if 0%{?fedora} >= 25 || 0%{?rhel} >= 6
@@ -1656,7 +1660,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
@@ -2236,6 +2240,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
+
 * Wed Aug 25 2021 Remi Collet <remi@remirepo.net> - 7.2.34-7
 - Fix #81211 Symlinks are followed when creating PHAR archive
 
-- 
cgit