From 08dfa9d5483404da4693663deddd0bd2666fb5f5 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Tue, 26 Jul 2016 13:06:01 +0000 Subject: [PATCH] - updated to 7.0.9 --- php-ini.patch | 19 ++++++++++--------- php.spec | 15 ++++----------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/php-ini.patch b/php-ini.patch index 796cddd..3ad7fe2 100644 --- a/php-ini.patch +++ b/php-ini.patch @@ -1,5 +1,5 @@ ---- php-7.0.1/php.ini 2015-12-16 10:41:54.000000000 +0000 -+++ php-7.0.1/php.ini 2015-12-18 12:13:28.614443158 +0000 +--- 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 @@ -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 ; -@@ -720,7 +734,7 @@ +@@ -719,7 +733,7 @@ ; Directory in which the loadable extensions (modules) reside. ; http://php.net/extension-dir @@ -66,7 +66,7 @@ ; On windows: ; extension_dir = "ext" -@@ -734,53 +748,6 @@ +@@ -733,53 +747,6 @@ ; http://php.net/enable-dl enable_dl = Off @@ -120,7 +120,7 @@ ;;;;;;;;;;;;;;;; ; File Uploads ; ;;;;;;;;;;;;;;;; -@@ -858,46 +825,8 @@ +@@ -857,47 +824,8 @@ ; If you only provide the name of the extension, PHP will look for it in its ; default extension directory. ; @@ -133,6 +133,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 @@ -169,7 +170,7 @@ ;;;;;;;;;;;;;;;;;;; ; Module Settings ; -@@ -935,19 +864,19 @@ +@@ -935,19 +863,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 @@ -192,7 +193,7 @@ [intl] ;intl.default_locale = -@@ -1146,6 +1075,9 @@ +@@ -1143,6 +1071,9 @@ ; http://php.net/mysqli.default-socket mysqli.default_socket = @@ -202,7 +203,7 @@ ; Default host for mysql_connect() (doesn't apply in safe mode). ; http://php.net/mysqli.default-host mysqli.default_host = -@@ -1273,7 +1205,7 @@ +@@ -1270,7 +1201,7 @@ [browscap] ; http://php.net/browscap @@ -211,7 +212,7 @@ [Session] ; Handler used to store/retrieve data. -@@ -1696,7 +1628,7 @@ +@@ -1697,7 +1628,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 5865b27..29683a4 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.6 +Version: 7.0.9 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: 5f0c5d999a6b5c700b31fd9618d5651d +# Source0-md5: 6294813fb3c8158cfde74302f573cac7 Source2: %{orgname}-mod_php.conf Source3: %{orgname}-cgi-fcgi.ini Source4: %{orgname}-apache.ini @@ -303,10 +303,9 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define hashver 1.0 %define intlver 1.1.0 %define jsonver 1.4.0 -%define opcachever 7.0.6-dev %define pharver 2.0.2 %define sqlite3ver 0.7-dev -%define zipver 1.13.2 +%define zipver 1.13.3 %define phpdbgver 0.5.0 %define _zend_zts %{!?with_zts:0}%{?with_zts:1} @@ -1186,7 +1185,7 @@ Group: Libraries URL: https://wiki.php.net/rfc/optimizerplus Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: %{name}-pcre = %{epoch}:%{version}-%{release} -Provides: php(opcache) = %{opcachever} +Provides: php(opcache) = %{version} %description opcache The Zend OPcache provides faster PHP execution through opcode caching @@ -2125,12 +2124,6 @@ if test "$ver" != "%{jsonver}"; then : Update the jsonver macro and rebuild. exit 1 fi -ver=$(awk '/#define PHP_ZENDOPCACHE_VERSION/ {print $3}' ext/opcache/ZendAccelerator.h | xargs) -if test "$ver" != "%{opcachever}"; then - : Error: Upstream Zend Opcache version is now ${ver}, expecting %{opcachever}. - : Update the opcachever macro and rebuild. - exit 1 -fi ver=$(sed -n '/#define PHPDBG_VERSION /{s/.* "//;s/".*$//;p}' sapi/phpdbg/phpdbg.h) if test "$ver" != "%{phpdbgver}"; then : Error: Upstream phpdbg version is now ${ver}, expecting %{phpdbgver}. -- 2.37.3