From f14531e79e16606aac6d97f26a65ce815a03d569 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 7 Jun 2022 14:33:59 +0200
Subject: use oracle client library version 21.6

mysqlnd: fix #81719: mysqlnd/pdo password buffer overflow. CVE-2022-31626
pgsql: fix #81720: Uninitialized array in pg_query_params(). CVE-2022-31625
---
 php.spec | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index 095e477..b195c01 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.3
+%global oraclever 21.6
 %global oraclelib 21.1
 
 # Build for LiteSpeed Web Server (LSAPI)
@@ -127,7 +127,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 32%{?dist}
+Release: 33%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -248,6 +248,8 @@ Patch251: php-bug76450.patch
 Patch252: php-bug81211.patch
 Patch253: php-bug81026.patch
 Patch254: php-bug79971.patch
+Patch255: php-bug81719.patch
+Patch256: php-bug81720.patch
 
 # Fixes for tests (300+)
 # Factory is droped from system tzdata
@@ -774,12 +776,7 @@ Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 BuildRequires: libjpeg-devel, libpng-devel, freetype-devel
 BuildRequires: libXpm-devel
 %if %{with_libgd}
-BuildRequires: gd-devel >= 2.1.1
-%if 0%{?fedora} <= 19 && 0%{?rhel} <= 7
-Requires: gd-last%{?_isa} >= 2.1.1
-%else
-Requires: gd%{?_isa} >= 2.1.1
-%endif
+BuildRequires: gd-devel >= 2.3.3
 %else
 BuildRequires: libwebp-devel
 %endif
@@ -1048,7 +1045,9 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 %patch252 -p1 -b .bug81211
 %patch253 -p1 -b .bug81026
 %patch254 -p1 -b .bug79971
-: ---------------------------
+%patch255 -p1 -b .bug81719
+%patch256 -p1 -b .bug81720
+ : ---------------------------
 #exit 1
 
 # Fixes for tests
@@ -1821,7 +1820,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 fix, backported from 7.3, the
+  the important security fix, backported from 7.4, the
   UPGRADE to a maintained version is very strongly RECOMMENDED.
 
 =====================================================================
@@ -2005,6 +2004,11 @@ EOF
 
 
 %changelog
+* Tue Jun  7 2022 Remi Collet <remi@remirepo.net> - 7.0.33-33
+- use oracle client library version 21.6
+- mysqlnd: fix #81719: mysqlnd/pdo password buffer overflow. CVE-2022-31626
+- pgsql: fix #81720: Uninitialized array in pg_query_params(). CVE-2022-31625
+
 * Mon Nov 15 2021 Remi Collet <remi@remirepo.net> - 7.0.33-32
 - Fix #79971 special character is breaking the path in xml function
   CVE-2021-21707
-- 
cgit