summaryrefslogtreecommitdiffstats
path: root/php.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-04-28 07:51:51 +0200
committerRemi Collet <remi@remirepo.net>2021-04-28 07:51:51 +0200
commite1665732d762383155349ff324a0d361019b741c (patch)
treeb35d7d8290a25982868ce43d04b38a26d2fc9416 /php.spec
parent9777b6f7c823fb6c868d004abe85655fa91831d1 (diff)
Fix #80710 imap_mail_compose() header injection
use oracle client library version 21.1
Diffstat (limited to 'php.spec')
-rw-r--r--php.spec26
1 files changed, 9 insertions, 17 deletions
diff --git a/php.spec b/php.spec
index 68d8e79..609d89a 100644
--- a/php.spec
+++ b/php.spec
@@ -55,22 +55,8 @@
%global mysql_sock %(mysql_config --socket 2>/dev/null || echo /var/lib/mysql/mysql.sock)
-%if 0%{?rhel} == 6
-%ifarch x86_64
-%global oraclever 18.5
-%else
-%global oraclever 18.3
-%endif
-%global oraclelib 18.1
-
-%else
-%ifarch x86_64
-%global oraclever 19.9
-%else
-%global oraclever 19.6
-%endif
-%global oraclelib 19.1
-%endif
+%global oraclever 21.1
+%global oraclelib 21.1
# Build for LiteSpeed Web Server (LSAPI)
%global with_lsws 1
@@ -140,7 +126,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: %{upver}%{?rcver:~%{rcver}}
-Release: 3%{?dist}
+Release: 4%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -205,6 +191,7 @@ Patch91: php-7.2.0-oci8conf.patch
# Security fixes (200+)
Patch200: php-bug77423.patch
Patch201: php-bug80672.patch
+Patch202: php-bug80710.patch
# Fixes for tests (300+)
# Factory is droped from system tzdata
@@ -968,6 +955,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
# security patches
%patch200 -p1 -b .bug77423
%patch201 -p1 -b .bug80672
+%patch202 -p1 -b .bug80710
# Fixes for tests
%patch300 -p1 -b .datetests
@@ -1939,6 +1927,10 @@ EOF
%changelog
+* Wed Apr 28 2021 Remi Collet <remi@remirepo.net> - 7.2.34-4
+- Fix #80710 imap_mail_compose() header injection
+- use oracle client library version 21.1
+
* Wed Feb 3 2021 Remi Collet <remi@remirepo.net> - 7.2.34-3
- Fix #80672 Null Dereference in SoapClient
CVE-2021-21702