[php] systzdata fix from Michael Heimpold
jorton
jorton at fedoraproject.org
Mon Aug 6 09:01:31 UTC 2012
commit f0bec845ffce17022690b6d60febe573714096a3
Author: Joe Orton <jorton at redhat.com>
Date: Mon Aug 6 10:01:08 2012 +0100
systzdata fix from Michael Heimpold
...tzdata-v8.patch => php-5.3.1-systzdata-v9.patch | 25 +++++++++++--------
php.spec | 2 +-
2 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/php-5.3.1-systzdata-v8.patch b/php-5.3.1-systzdata-v9.patch
similarity index 97%
rename from php-5.3.1-systzdata-v8.patch
rename to php-5.3.1-systzdata-v9.patch
index 6caf9e0..e6a3ccc 100644
--- a/php-5.3.1-systzdata-v8.patch
+++ b/php-5.3.1-systzdata-v9.patch
@@ -1,8 +1,8 @@
-
Add support for use of the system timezone database, rather
than embedding a copy. Discussed upstream but was not desired.
History:
+r9: fix another compile error without --with-system-tzdata configured (Michael Heimpold)
r8: fix compile error without --with-system-tzdata configured
r7: improve check for valid timezone id to exclude directories
r6: fix fd leak in r5, fix country code/BC flag use in
@@ -16,9 +16,9 @@ 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
---- php-5.3.1/ext/date/lib/parse_tz.c.systzdata
-+++ php-5.3.1/ext/date/lib/parse_tz.c
-@@ -20,6 +20,16 @@
+--- a/ext/date/lib/parse_tz.c
++++ b/ext/date/lib/parse_tz.c
+@@ -24,6 +24,16 @@
#include "timelib.h"
@@ -35,7 +35,7 @@ r1: initial revision
#include <stdio.h>
#ifdef HAVE_LOCALE_H
-@@ -31,7 +41,12 @@
+@@ -35,7 +45,12 @@
#else
#include <strings.h>
#endif
@@ -48,7 +48,7 @@ r1: initial revision
#if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
# if defined(__LITTLE_ENDIAN__)
-@@ -51,9 +66,14 @@
+@@ -55,9 +70,14 @@
static void read_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
{
@@ -66,7 +66,7 @@ r1: initial revision
/* read BC flag */
tz->bc = (**tzf == '\1');
*tzf += 1;
-@@ -253,7 +273,397 @@ void timelib_dump_tzinfo(timelib_tzinfo
+@@ -260,7 +280,397 @@ void timelib_dump_tzinfo(timelib_tzinfo
}
}
@@ -465,7 +465,7 @@ r1: initial revision
{
int left = 0, right = tzdb->index_size - 1;
#ifdef HAVE_SETLOCALE
-@@ -292,36 +702,125 @@ static int seek_to_tz_position(const uns
+@@ -299,36 +709,125 @@ static int seek_to_tz_position(const uns
return 0;
}
@@ -473,6 +473,7 @@ r1: initial revision
+ char **map, size_t *maplen,
+ const timelib_tzdb *tzdb)
+{
++#ifdef HAVE_SYSTEM_TZDATA
+ if (tzdb == timezonedb_system) {
+ char *orig;
+
@@ -486,7 +487,9 @@ r1: initial revision
+
+ return 1;
+ }
-+ else {
++ else
++#endif
++ {
+ return inmem_seek_to_tz_position(tzf, timezone, tzdb);
+ }
+}
@@ -594,8 +597,8 @@ r1: initial revision
} else {
tmp = NULL;
}
---- php-5.3.1/ext/date/lib/timelib.m4.systzdata
-+++ php-5.3.1/ext/date/lib/timelib.m4
+--- a/ext/date/lib/timelib.m4
++++ b/ext/date/lib/timelib.m4
@@ -78,3 +78,17 @@ stdlib.h
dnl Check for strtoll, atoll
diff --git a/php.spec b/php.spec
index fc04684..c3a58a2 100644
--- a/php.spec
+++ b/php.spec
@@ -82,7 +82,7 @@ Patch7: php-5.3.0-recode.patch
# Functional changes
Patch40: php-5.4.0-dlopen.patch
Patch41: php-5.4.0-easter.patch
-Patch42: php-5.3.1-systzdata-v8.patch
+Patch42: php-5.3.1-systzdata-v9.patch
# See http://bugs.php.net/53436
Patch43: php-5.4.0-phpize.patch
# Use system libzip instead of bundled one
More information about the scm-commits
mailing list