From 7793a5dcbc72bc773ed50787c2bd1a3bfc11755f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Mon, 19 Sep 2016 23:21:18 +0300
Subject: [PATCH] up to 7.0.10, fixes to: CVE-2016-7124; CVE-2016-7125,
 CVE-2016-7133, CVE-2016-7134, CVE-2016-7128, CVE-2016-7126, CVE-2016-7127,
 CVE-2016-7129, CVE-2016-7130, CVE-2016-7131, CVE-2016-7132

http://php.net/releases/7_0_10.php
---
 php-ini.patch | 7 ++++---
 php.spec      | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/php-ini.patch b/php-ini.patch
index 51709d2..0ce13b8 100644
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- php-7.0.0RC3/php.ini~	2015-09-20 21:20:29.000000000 +0300
-+++ php-7.0.0RC3/php.ini	2015-09-20 21:25:50.349958427 +0300
+--- php-7.0.10/php.ini~	2016-09-19 23:26:55.000000000 +0300
++++ php-7.0.10/php.ini	2016-09-19 23:27:28.521756951 +0300
 @@ -82,6 +82,20 @@
  ; much more verbose when it comes to errors. We recommending using the
  ; development version only in development environments as errors shown to
@@ -111,7 +111,7 @@
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
  ;;;;;;;;;;;;;;;;
-@@ -825,46 +825,8 @@
+@@ -823,47 +823,8 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -124,6 +124,7 @@
 -;extension=php_bz2.dll
 -;extension=php_curl.dll
 -;extension=php_fileinfo.dll
+-;extension=php_ftp.dll
 -;extension=php_gd2.dll
 -;extension=php_gettext.dll
 -;extension=php_gmp.dll
diff --git a/php.spec b/php.spec
index 60a3790..56b886f 100644
--- a/php.spec
+++ b/php.spec
@@ -143,7 +143,7 @@ Summary(pt_BR.UTF-8):	A linguagem de script PHP
 Summary(ru.UTF-8):	PHP Версии 7 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):	PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		%{orgname}%{php_suffix}
-Version:	7.0.9
+Version:	7.0.10
 Release:	1
 Epoch:		4
 # All files licensed under PHP version 3.01, except
@@ -152,7 +152,7 @@ Epoch:		4
 License:	PHP 3.01 and Zend and BSD
 Group:		Libraries
 Source0:	http://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5:	6294813fb3c8158cfde74302f573cac7
+# Source0-md5:	6f087f16514b6c442e8009a5828827b7
 Source2:	%{orgname}-mod_php.conf
 Source3:	%{orgname}-cgi-fcgi.ini
 Source4:	%{orgname}-apache.ini
@@ -312,7 +312,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		jsonver		1.4.0
 %define		pharver		2.0.2
 %define		sqlite3ver	0.7-dev
-%define		zipver		1.13.3
+%define		zipver		1.13.4
 %define		phpdbgver	0.5.0
 
 %define		_zend_zts		%{!?with_zts:0}%{?with_zts:1}
-- 
2.44.0