summaryrefslogtreecommitdiffstats
path: root/php.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php.spec')
-rw-r--r--php.spec32
1 files changed, 15 insertions, 17 deletions
diff --git a/php.spec b/php.spec
index c925d4b..5097586 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
@@ -141,7 +127,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: %{upver}%{?rcver:~%{rcver}}
-Release: 25%{?dist}
+Release: 27%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -183,6 +169,8 @@ Patch7: php-5.3.0-recode.patch
Patch8: php-7.0.2-libdb.patch
Patch9: php-7.0.7-curl.patch
Patch10: php-7.0.31-icu62.patch
+# backported from 8.0
+Patch11: php-net-snmp.patch
# Functional changes
Patch40: php-7.0.17-dlopen.patch
@@ -254,6 +242,7 @@ Patch245: php-bug79877.patch
Patch246: php-bug79699.patch
Patch247: php-bug77423.patch
Patch248: php-bug80672.patch
+Patch249: php-bug80710.patch
# Fixes for tests (300+)
# Factory is droped from system tzdata
@@ -977,6 +966,7 @@ support for JavaScript Object Notation (JSON) to PHP.
%if 0%{?fedora} >= 29 || 0%{?rhel} >= 7
%patch10 -p1 -b .icu62
%endif
+%patch11 -p1 -b .nodes
%patch40 -p1 -b .dlopen
%if 0%{?fedora} >= 28 || 0%{?rhel} >= 6
@@ -1047,6 +1037,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
%patch246 -p1 -b .bug79699
%patch247 -p1 -b .bug77423
%patch248 -p1 -b .bug80672
+%patch249 -p1 -b .bug80710
: ---------------------------
#exit 1
@@ -2005,6 +1996,13 @@ EOF
%changelog
+* Thu May 27 2021 Remi Collet <remi@remirepo.net> - 7.0.33-27
+- fix snmp extension build with net-snmp without DES
+
+* Wed Apr 28 2021 Remi Collet <remi@remirepo.net> - 7.0.33-26
+- Fix #80710 imap_mail_compose() header injection
+- use oracle client library version 21.1
+
* Wed Feb 3 2021 Remi Collet <remi@remirepo.net> - 7.0.33-25
- Fix #80672 Null Dereference in SoapClient
CVE-2021-21702