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

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

(limited to 'php70.spec')

diff --git a/php70.spec b/php70.spec
index 533ab92..58a1e1d 100644
--- a/php70.spec
+++ b/php70.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: 23%{?dist}
+Release: 24%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -229,6 +229,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
@@ -459,7 +460,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}
@@ -1134,6 +1135,7 @@ echo CIBLE = %{name}-%{version}-%{release} oci8=%{with_oci8} libzip=%{with_libzi
 %patch244 -p1 -b .bug79797
 %patch245 -p1 -b .bug79877
 %patch246 -p1 -b .bug79699
+%patch247 -p1 -b .bug77423
 
 # Fixes for tests
 %if 0%{?fedora} >= 21 || 0%{?rhel} >= 5
@@ -1931,7 +1933,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.
 
 =====================================================================
@@ -2171,6 +2173,10 @@ fi
 
 
 %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