From 9ffb683ecab59cdf28571bb35c2c1519e189fe61 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 4 Jan 2021 16:14:22 +0100
Subject: Fix #77423 FILTER_VALIDATE_URL accepts URLs with invalid userinfo  
 CVE-2020-7071

---
 php.spec | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index da48921..853f8f4 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
@@ -141,7 +141,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 23%{?dist}
+Release: 24%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -252,6 +252,7 @@ Patch243: php-bug78876.patch
 Patch244: php-bug79797.patch
 Patch245: php-bug79877.patch
 Patch246: php-bug79699.patch
+Patch247: php-bug77423.patch
 
 # Fixes for tests (300+)
 # Factory is droped from system tzdata
@@ -286,6 +287,7 @@ BuildRequires: bzip2
 BuildRequires: perl
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: make
 BuildRequires: gcc
 BuildRequires: gcc-c++
 BuildRequires: libtool
@@ -469,6 +471,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
@@ -1041,6 +1044,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 %patch244 -p1 -b .bug79797
 %patch245 -p1 -b .bug79877
 %patch246 -p1 -b .bug79699
+%patch247 -p1 -b .bug77423
 : ---------------------------
 #exit 1
 
@@ -1815,7 +1819,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.2, the
+  the important security fix, backported from 7.3, the
   UPGRADE to a maintained version is very strongly RECOMMENDED.
 
 =====================================================================
@@ -1999,6 +2003,10 @@ EOF
 
 
 %changelog
+* Mon Jan  4 2021 Remi Collet <remi@remirepo.net> - 7.0.33-24
+- Fix #77423 FILTER_VALIDATE_URL accepts URLs with invalid userinfo
+  CVE-2020-7071
+
 * Tue Sep 29 2020 Remi Collet <remi@remirepo.net> - 7.0.33-23
 - Core:
   Fix #79699 PHP parses encoded cookie names so malicious `__Host-` cookies can be sent
-- 
cgit