From: Bartosz Świątek <shadzik@tld-linux.org>
Date: Fri, 27 Aug 2021 12:30:00 +0000 (+0200)
Subject: - up to 8.0.10
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=10921c9c40face7049840694288b81ba19f72436;p=packages%2Fphp.git

- up to 8.0.10
---

diff --git a/php-systzdata.patch b/php-systzdata.patch
index 902d3ce..4bf7be9 100644
--- a/php-systzdata.patch
+++ b/php-systzdata.patch
@@ -602,22 +602,6 @@ diff -up php-8.0.0beta3/ext/date/lib/parse_tz.c.systzdata php-8.0.0beta3/ext/dat
  }
  
  static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
-@@ -500,12 +1002,14 @@ static timelib_tzinfo* timelib_tzinfo_ct
- timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *tzdb, int *error_code)
- {
- 	const unsigned char *tzf;
-+	char *memmap = NULL;
-+	size_t maplen;
- 	timelib_tzinfo *tmp;
- 	int version;
- 	int transitions_result, types_result;
- 	unsigned int type; /* TIMELIB_TZINFO_PHP or TIMELIB_TZINFO_ZONEINFO */
- 
--	if (seek_to_tz_position(&tzf, timezone, tzdb)) {
-+	if (seek_to_tz_position(&tzf, timezone, &memmap, &maplen, tzdb)) {
- 		tmp = timelib_tzinfo_ctor(timezone);
- 
- 		version = read_preamble(&tzf, tmp, &type);
 @@ -540,11 +1044,36 @@ timelib_tzinfo *timelib_parse_tzfile(con
  		}
  		skip_posix_string(&tzf, tmp);
@@ -655,3 +639,23 @@ diff -up php-8.0.0beta3/ext/date/lib/parse_tz.c.systzdata php-8.0.0beta3/ext/dat
  	} else {
  		*error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE;
  		tmp = NULL;
+--- php-8.0.10/ext/date/lib/parse_tz.c.orig	2021-08-27 14:25:14.033549324 +0200
++++ php-8.0.10/ext/date/lib/parse_tz.c	2021-08-27 14:24:27.173547016 +0200
+@@ -1019,6 +1019,8 @@
+ timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *tzdb, int *error_code)
+ {
+ 	const unsigned char *tzf;
++	char *memmap = NULL;
++	size_t maplen;
+ 	timelib_tzinfo *tmp;
+ 	int version;
+ 	int transitions_result, types_result;
+@@ -1026,7 +1028,7 @@
+ 
+ 	*error_code = TIMELIB_ERROR_NO_ERROR;
+ 
+-	if (seek_to_tz_position(&tzf, timezone, tzdb)) {
++	if (seek_to_tz_position(&tzf, timezone, &memmap, &maplen, tzdb)) {
+ 		tmp = timelib_tzinfo_ctor(timezone);
+ 
+ 		version = read_preamble(&tzf, tmp, &type);
diff --git a/php.spec b/php.spec
index 40e4986..f476285 100644
--- a/php.spec
+++ b/php.spec
@@ -123,7 +123,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:	8.0.8
+Version:	8.0.10
 Release:	1
 Epoch:		4
 # All files licensed under PHP version 3.01, except
@@ -132,7 +132,7 @@ Epoch:		4
 License:	PHP 3.01 and Zend and BSD
 Group:		Libraries
 Source0:	http://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5:	ff8897b914cb8de9d218bbae877decc7
+# Source0-md5:	349ee590787ab46e62dae517d90b5101
 Source1:	opcache.ini
 Source2:	%{orgname}-mod_php.conf
 Source3:	%{orgname}-cgi-fcgi.ini