From eb855c9f47558a4511ef09864858aa3d5a6c6244 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 7 Jun 2022 12:50:49 +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
---
 php72.spec | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'php72.spec')

diff --git a/php72.spec b/php72.spec
index dd4075a..1b2e3a8 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.3
+%global oraclever 21.6
 %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: 10%{?dist}
+Release: 11%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -185,6 +185,8 @@ Patch204: php-bug76450.patch
 Patch205: php-bug81211.patch
 Patch206: php-bug81026.patch
 Patch207: php-bug79971.patch
+Patch208: php-bug81719.patch
+Patch209: php-bug81720.patch
 
 # Fixes for tests (300+)
 # Factory is droped from system tzdata
@@ -825,12 +827,7 @@ License: PHP and BSD
 %endif
 Requires: php-common%{?_isa} = %{version}-%{release}
 %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
 # Required to build the bundled GD library
 BuildRequires: libjpeg-devel
@@ -1129,6 +1126,8 @@ low-level PHP extension for the libsodium cryptographic library.
 %patch205 -p1 -b .bug81211
 %patch206 -p1 -b .bug81026
 %patch207 -p1 -b .bug79971
+%patch208 -p1 -b .bug81719
+%patch209 -p1 -b .bug81720
 
 # Fixes for tests
 %if 0%{?fedora} >= 25 || 0%{?rhel} >= 6
@@ -1955,7 +1954,7 @@ sed -e "s/@PHP_APIVER@/%{apiver}%{isasuffix}/" \
 %endif
     < %{SOURCE3} > macros.php
 %if 0%{?fedora} >= 24 || 0%{?rhel} >= 8
-echo '%pecl_xmldir   %{_localstatedir}/lib/php/peclxml' >>macros.php
+echo '%%pecl_xmldir   %{_localstatedir}/lib/php/peclxml' >>macros.php
 %endif
 install -m 644 -D macros.php \
            $RPM_BUILD_ROOT%{macrosdir}/macros.php
@@ -2057,7 +2056,7 @@ cat << EOF
 
   WARNING : PHP 7.2 have reached its "End of Life" in
   November 2020. 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.
 
 =====================================================================
@@ -2242,6 +2241,11 @@ EOF
 
 
 %changelog
+* Tue Jun  7 2022 Remi Collet <remi@remirepo.net> - 7.2.34-11
+- 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.2.34-10
 - Fix #79971 special character is breaking the path in xml function
   CVE-2021-21707
-- 
cgit