summaryrefslogtreecommitdiffstats
path: root/php.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-01-04 14:40:02 +0100
committerRemi Collet <remi@remirepo.net>2021-01-04 14:40:02 +0100
commit986f60d859ab5c31fa877c302bbbb2056c20c1ea (patch)
treea3580705993e5c5df908e88d40dd78380132b78e /php.spec
parent7b20869557afb0fb1c1006ea1e614372cefc5310 (diff)
Fix #77423 FILTER_VALIDATE_URL accepts URLs with invalid userinfoHEADmaster
CVE-2020-7071
Diffstat (limited to 'php.spec')
-rw-r--r--php.spec12
1 files changed, 10 insertions, 2 deletions
diff --git a/php.spec b/php.spec
index 5400c19..1770701 100644
--- a/php.spec
+++ b/php.spec
@@ -65,7 +65,7 @@
%else
%ifarch x86_64
-%global oraclever 19.8
+%global oraclever 19.9
%else
%global oraclever 19.6
%endif
@@ -140,7 +140,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: %{upver}%{?rcver:~%{rcver}}
-Release: 1%{?dist}
+Release: 2%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -203,6 +203,7 @@ Patch91: php-7.2.0-oci8conf.patch
# Upstream fixes (100+)
# Security fixes (200+)
+Patch200: php-bug77423.patch
# Fixes for tests (300+)
# Factory is droped from system tzdata
@@ -237,6 +238,7 @@ BuildRequires: bzip2
BuildRequires: perl
BuildRequires: autoconf
BuildRequires: automake
+BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?dtsprefix}gcc-c++
BuildRequires: libtool
@@ -421,6 +423,7 @@ Requires: %{?scl_prefix}php-cli%{?_isa} = %{version}-%{release}
# always needed to build extension
Requires: autoconf
Requires: automake
+Requires: make
Requires: gcc
Requires: gcc-c++
Requires: libtool
@@ -962,6 +965,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
# upstream patches
# security patches
+%patch200 -p1 -b .bug77423
# Fixes for tests
%patch300 -p1 -b .datetests
@@ -1920,6 +1924,10 @@ fi
%changelog
+* Mon Jan 4 2021 Remi Collet <remi@remirepo.net> - 7.2.34-2
+- Fix #77423 FILTER_VALIDATE_URL accepts URLs with invalid userinfo
+ CVE-2020-7071
+
* Wed Sep 30 2020 Remi Collet <remi@remirepo.net> - 7.2.34-1
- Update to 7.2.34 - http://www.php.net/releases/7_2_34.php