From 57d207bca8d001f0ef4c0aab76a520459049203a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 4 Jan 2021 15:08:01 +0100
Subject: Fix #77423 FILTER_VALIDATE_URL accepts URLs with invalid userinfo  
 CVE-2020-7071

---
 php71.spec | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'php71.spec')

diff --git a/php71.spec b/php71.spec
index 059730e..fe94e0f 100644
--- a/php71.spec
+++ b/php71.spec
@@ -36,7 +36,7 @@
 
 %else
 %ifarch x86_64
-%global oraclever 19.8
+%global oraclever 19.9
 %else
 %global oraclever 19.6
 %endif
@@ -123,7 +123,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
@@ -204,6 +204,7 @@ Patch218: php-bug79797.patch
 Patch219: php-bug79877.patch
 Patch220: php-bug79601.patch
 Patch221: php-bug79699.patch
+Patch222: php-bug77423.patch
 
 # Fixes for tests (300+)
 # Factory is droped from system tzdata
@@ -434,7 +435,7 @@ package and the php-cli package.
 %package devel
 Group: Development/Libraries
 Summary: Files needed for building PHP extensions
-Requires: php-cli%{?_isa} = %{version}-%{release}, autoconf, automake
+Requires: php-cli%{?_isa} = %{version}-%{release}, autoconf, automake, make
 # see "php-config --libs"
 Requires: krb5-devel%{?_isa}
 Requires: libedit-devel%{?_isa}
@@ -1081,6 +1082,7 @@ support for JavaScript Object Notation (JSON) to PHP.
 %patch219 -p1 -b .bug79877
 %patch220 -p1 -b .bug79601
 %patch221 -p1 -b .bug79699
+%patch222 -p1 -b .bug77423
 
 # Fixes for tests
 %if 0%{?fedora} >= 25 || 0%{?rhel} >= 6
@@ -1972,7 +1974,7 @@ cat << EOF
 
   WARNING : PHP 7.1 have reached its "End of Life" in
   December 2019. 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.
 
 =====================================================================
@@ -2155,6 +2157,10 @@ EOF
 
 
 %changelog
+* Mon Jan  4 2021 Remi Collet <remi@remirepo.net> - 7.1.33-11
+- Fix #77423 FILTER_VALIDATE_URL accepts URLs with invalid userinfo
+  CVE-2020-7071
+
 * Tue Sep 29 2020 Remi Collet <remi@remirepo.net> - 7.1.33-10
 - Core:
   Fix #79699 PHP parses encoded cookie names so malicious `__Host-` cookies can be sent
-- 
cgit