From 9e9d8ae65a96770f3edf6945b8b15f87fd52c9ef Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 16 Sep 2015 09:51:42 +0300 Subject: [PATCH] PHP 5.6.13 (03 Sep 2015) --- php-systzdata.patch | 12 +++++------- php.spec | 6 +++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/php-systzdata.patch b/php-systzdata.patch index aa3277c..a33ef08 100644 --- a/php-systzdata.patch +++ b/php-systzdata.patch @@ -20,9 +20,8 @@ r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert) r2: add filesystem trawl to set up name alias index r1: initial revision -diff -up php-5.6.9RC1/ext/date/lib/parse_tz.c.systzdata php-5.6.9RC1/ext/date/lib/parse_tz.c ---- php-5.6.9RC1/ext/date/lib/parse_tz.c.systzdata 2015-04-30 00:00:18.000000000 +0200 -+++ php-5.6.9RC1/ext/date/lib/parse_tz.c 2015-04-30 06:36:47.019617321 +0200 +--- php-7.0.0RC1/ext/date/lib/parse_tz.c~ 2015-08-27 12:06:04.000000000 +0300 ++++ php-7.0.0RC1/ext/date/lib/parse_tz.c 2015-08-27 12:08:08.706661229 +0300 @@ -20,6 +20,16 @@ #include "timelib.h" @@ -40,11 +39,10 @@ diff -up php-5.6.9RC1/ext/date/lib/parse_tz.c.systzdata php-5.6.9RC1/ext/date/li #include #ifdef HAVE_LOCALE_H -@@ -31,7 +41,12 @@ - #else - #include +@@ -43,7 +43,11 @@ #endif -+ + + #define TIMELIB_SUPPORTS_V2DATA +#ifndef HAVE_SYSTEM_TZDATA #include "timezonedb.h" +#endif diff --git a/php.spec b/php.spec index 4c0594f..7a86ee9 100644 --- a/php.spec +++ b/php.spec @@ -153,7 +153,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules. %undefine with_filter %endif -%define rel 2 +%define rel 1 %define orgname php %define ver_suffix 56 %define php_suffix %{!?with_default_php:%{ver_suffix}} @@ -164,7 +164,7 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP Summary(ru.UTF-8): PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} -Version: 5.6.12 +Version: 5.6.13 Release: %{rel} Epoch: 4 # All files licensed under PHP version 3.01, except @@ -173,7 +173,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: f2cc602602eb2b121779f2c4b8bacaba +# Source0-md5: de4a8ff544986d9e0da90522fa66f195 Source2: %{orgname}-mod_%{orgname}.conf Source3: %{orgname}-cgi-fcgi.ini Source4: %{orgname}-apache.ini -- 2.44.0