From: Marcin Krol <hawk@tld-linux.org>
Date: Thu, 27 Oct 2016 07:53:43 +0000 (+0000)
Subject: - updated to 7.0.12
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=5ff070d48177f5f3a231401f52318168db8b2ffb;p=packages%2Fphp.git

- updated to 7.0.12
---

diff --git a/php-ini.patch b/php-ini.patch
index 3ad7fe2..2b8f90a 100644
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- php-7.0.9/php.ini	2016-07-20 13:11:36.000000000 +0000
-+++ php-7.0.9/php.ini	2016-07-26 12:51:35.015554000 +0000
+--- php-7.0.12/php.ini	2016-10-13 14:04:17.000000000 +0000
++++ php-7.0.12/php.ini	2016-10-27 07:40:55.773715000 +0000
 @@ -82,6 +82,20 @@
  ; much more verbose when it comes to errors. We recommend using the
  ; development version only in development environments, as errors shown to
@@ -57,7 +57,7 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Resource Limits ;
-@@ -719,7 +733,7 @@
+@@ -718,7 +732,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
@@ -66,7 +66,7 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -733,53 +747,6 @@
+@@ -732,65 +746,6 @@
  ; http://php.net/enable-dl
  enable_dl = Off
  
@@ -97,6 +97,11 @@
 -; http://php.net/cgi.fix-pathinfo
 -;cgi.fix_pathinfo=1
 -
+-; if cgi.discard_path is enabled, the PHP CGI binary can safely be placed outside
+-; of the web tree and people will not be able to circumvent .htaccess security.
+-; http://php.net/cgi.dicard-path
+-;cgi.discard_path=1
+-
 -; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate
 -; security tokens of the calling client.  This allows IIS to define the
 -; security context that the request runs under.  mod_fastcgi under Apache
@@ -116,11 +121,18 @@
 -; Default is zero.
 -; http://php.net/cgi.rfc2616-headers
 -;cgi.rfc2616_headers = 0
+-
+-; cgi.check_shebang_line controls whether CGI PHP checks for line starting with #!
+-; (shebang) at the top of the running script. This line might be needed if the
+-; script support running both as stand-alone script and via PHP CGI<. PHP in CGI
+-; mode skips this line and ignores its content if this directive is turned on.
+-; http://php.net/cgi.check-shebang-line
+-;cgi.check_shebang_line=1
 -
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
  ;;;;;;;;;;;;;;;;
-@@ -857,47 +824,8 @@
+@@ -868,47 +823,8 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -170,7 +182,7 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
-@@ -935,19 +863,19 @@
+@@ -946,19 +862,19 @@
  ; Use of this INI entry is deprecated, use global input_encoding instead.
  ; If empty, default_charset or input_encoding or iconv.input_encoding is used.
  ; The precedence is: default_charset < intput_encoding < iconv.input_encoding
@@ -193,7 +205,7 @@
  
  [intl]
  ;intl.default_locale =
-@@ -1143,6 +1071,9 @@
+@@ -1154,6 +1070,9 @@
  ; http://php.net/mysqli.default-socket
  mysqli.default_socket =
  
@@ -203,7 +215,7 @@
  ; Default host for mysql_connect() (doesn't apply in safe mode).
  ; http://php.net/mysqli.default-host
  mysqli.default_host =
-@@ -1270,7 +1201,7 @@
+@@ -1281,7 +1200,7 @@
  
  [browscap]
  ; http://php.net/browscap
@@ -212,7 +224,7 @@
  
  [Session]
  ; Handler used to store/retrieve data.
-@@ -1697,7 +1628,7 @@
+@@ -1708,7 +1627,7 @@
  
  ; Sets the directory name where SOAP extension will put cache files.
  ; http://php.net/soap.wsdl-cache-dir
diff --git a/php.spec b/php.spec
index 29683a4..c3471e3 100644
--- a/php.spec
+++ b/php.spec
@@ -144,7 +144,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.12
 Release:	1
 Epoch:		4
 # All files licensed under PHP version 3.01, except
@@ -153,7 +153,7 @@ Epoch:		4
 License:	PHP 3.01 and Zend and BSD
 Group:		Libraries
 Source0:	http://www.php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5:	6294813fb3c8158cfde74302f573cac7
+# Source0-md5:	bdcc4dbdac90c2a39422786653059f70
 Source2:	%{orgname}-mod_php.conf
 Source3:	%{orgname}-cgi-fcgi.ini
 Source4:	%{orgname}-apache.ini
@@ -305,7 +305,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}