Mailinglist Archive: opensuse-commit (1059 mails)

< Previous Next >
commit php5
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Sat, 12 Jan 2008 03:18:42 +0100
  • Message-id: <20080112021842.6E01E678335@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package php5
checked in at Sat Jan 12 03:18:42 CET 2008.

--------
--- php5/php5.changes 2008-01-07 07:09:52.000000000 +0100
+++ /mounts/work_src_done/STABLE/php5/php5.changes 2008-01-11
08:10:18.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Jan 11 08:06:38 CET 2008 - crrodriguez@xxxxxxx
+
+- Try patch recently published by Redhat that allows PHP to
+ use the system timezone database instead of the bundled one.
+
+-------------------------------------------------------------------

New:
----
php-5.2.5-system-tzdb.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ php5.spec ++++++
--- /var/tmp/diff_new_pack.r18191/_old 2008-01-12 03:17:12.000000000 +0100
+++ /var/tmp/diff_new_pack.r18191/_new 2008-01-12 03:17:12.000000000 +0100
@@ -67,15 +67,16 @@
%define apache2_includedir %(%{apxs2} -q INCLUDEDIR)
%define apache2_serverroot %(%{apxs2} -q PREFIX)
#unfortunately at this stage we dont have a working PHP binary..
-%define builtin_tz_ver 2007.9
+#define builtin_tz_ver 2007.9
###
###
Version: 5.2.5
-Release: 16
+Release: 18
License: The PHP License, version 3.01
Group: Development/Languages/Other
Provides: php zend php-xml php-spl php-simplexml php-session php-pcre
php-date php-reflection php-filter
-Provides: php-dbx php-dio php-fam php-filepro php-yp php(tzdatabase) =
%{builtin_tz_ver}
+Provides: php-dbx php-dio php-fam php-filepro php-yp
+#Provides: php(tzdatabase) = %{builtin_tz_ver}
AutoReqProv: on
PreReq: update-alternatives
#extensions that are no longer here
@@ -96,6 +97,7 @@
%if %{with_suhosin_patch}
Patch6: suhosin-patch-%{version}-%{suhosin_patch_version}.patch
%endif
+Patch7: php-5.2.5-system-tzdb.patch
#bugs
# compiler warnings
Patch9: php5-warnings.patch
@@ -1117,6 +1119,7 @@
%if %{with_suhosin_patch}
%patch6 -p1
%endif
+%patch7
%patch9
%patch10
# we build three SAPI
@@ -1137,12 +1140,12 @@
build-$sapi/Zend
done
%endif
-vtzdb=`grep timezonedb_builtin ext/date/lib/timezonedb.h | sed -e
's/[^"]*"\([^"]\+\)"*[^"]*/\1\n/g' | head -n1`
-if test "x${vtzdb}" != "x%{builtin_tz_ver}"; then
- : Error: Built-in timezonedb version is now ${vtzdb}, expecting
%{builtin_tz_ver}.
- : Update the builtin_tz_ver macro and rebuild.
- exit 1
-fi
+#vtzdb=`grep timezonedb_builtin ext/date/lib/timezonedb.h | sed -e
's/[^"]*"\([^"]\+\)"*[^"]*/\1\n/g' | head -n1`
+#if test "x${vtzdb}" != "x%{builtin_tz_ver}"; then
+# : Error: Built-in timezonedb version is now ${vtzdb}, expecting
%{builtin_tz_ver}.
+# : Update the builtin_tz_ver macro and rebuild.
+# exit 1
+#fi

%build
#find %{_libdir} -name "*.la" | xargs grep 'dependency_libs='''
@@ -1208,6 +1211,7 @@
--program-suffix=5 \
--with-pic \
--with-gnu-ld \
+ --with-system-tzdata=/usr/share/zoneinfo \
"$@"
# Some modules are builtin, reasons:
# - libxml can not be shared (and is needed by PEAR)
@@ -1812,6 +1816,9 @@
%config(noreplace) %{php_sysconf}/conf.d/zlib.ini

%changelog
+* Fri Jan 11 2008 - crrodriguez@xxxxxxx
+- Try patch recently published by Redhat that allows PHP to
+ use the system timezone database instead of the bundled one.
* Mon Jan 07 2008 - crrodriguez@xxxxxxx
- Do not hard require php5-timezonedb, instead provide a capability
php(tzdatabase) = builtin_tz_ver so it gets installed via rpm

++++++ php-5.2.5-system-tzdb.patch ++++++
Index: ext/date/lib/parse_tz.c
===================================================================
RCS file: /repository/php-src/ext/date/lib/parse_tz.c,v
retrieving revision 1.35
diff -u -r1.35 parse_tz.c
--- ext/date/lib/parse_tz.c 31 Dec 2007 07:12:08 -0000 1.35
+++ ext/date/lib/parse_tz.c 10 Jan 2008 11:42:15 -0000
@@ -20,6 +20,16 @@

#include "timelib.h"

+#ifdef HAVE_SYSTEM_TZDATA
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <limits.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include "php_scandir.h"
+#endif
+
#include <stdio.h>

#ifdef HAVE_STRING_H
@@ -27,7 +37,10 @@
#else
#include <strings.h>
#endif
+
+#ifndef HAVE_SYSTEM_TZDATA
#include "timezonedb.h"
+#endif

#if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__)
|| defined(__LITTLE_ENDIAN__))
# if defined(__LITTLE_ENDIAN__)
@@ -202,6 +215,195 @@
}
}

+#ifdef HAVE_SYSTEM_TZDATA
+
+#ifdef HAVE_SYSTEM_TZDATA_PREFIX
+#define ZONEINFO_PREFIX HAVE_SYSTEM_TZDATA_PREFIX
+#else
+#define ZONEINFO_PREFIX "/usr/share/zoneinfo"
+#endif
+
+static const timelib_tzdb *timezonedb_system = NULL;
+
+/* Filter out some non-tzdata files and the posix/right databases, if
+ * present. */
+static int index_filter(const struct dirent *ent)
+{
+ return strcmp(ent->d_name, ".") != 0
+ && strcmp(ent->d_name, "..") != 0
+ && strcmp(ent->d_name, "posix") != 0
+ && strcmp(ent->d_name, "posixrules") != 0
+ && strcmp(ent->d_name, "right") != 0
+ && strstr(ent->d_name, ".tab") == NULL;
+}
+
+/* Create the zone identifier index by trawling the filesystem. */
+static void create_zone_index(timelib_tzdb *db)
+{
+ size_t dirstack_size, dirstack_top;
+ size_t index_size, index_next;
+ timelib_tzdb_index_entry *db_index;
+ char **dirstack;
+
+ /* LIFO stack to hold directory entres to scan; each slot is a
+ * directory name relative to the zoneinfo prefix. */
+ dirstack_size = 32;
+ dirstack = malloc(dirstack_size * sizeof *dirstack);
+ dirstack_top = 1;
+ dirstack[0] = strdup("");
+
+ /* Index array. */
+ index_size = 64;
+ db_index = malloc(index_size * sizeof *db_index);
+ index_next = 0;
+
+ do {
+ struct dirent **ents;
+ char name[PATH_MAX], *top;
+ int count;
+
+ /* Pop the top stack entry, and iterate through its contents. */
+ top = dirstack[--dirstack_top];
+ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s", top);
+
+ count = php_scandir(name, &ents, index_filter, php_alphasort);
+
+ while (count > 0) {
+ struct stat st;
+ const char *leaf = ents[count - 1]->d_name;
+
+ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s",
+ top, leaf);
+
+ if (strlen(name) && stat(name, &st) == 0) {
+ /* Name, relative to the zoneinfo prefix. */
+ const char *root = top;
+
+ if (root[0] == '/') root++;
+
+ snprintf(name, sizeof name, "%s%s%s", root,
+ *root ? "/": "", leaf);
+
+ if (S_ISDIR(st.st_mode)) {
+ if (dirstack_top == dirstack_size) {
+ dirstack_size *= 2;
+ dirstack = realloc(dirstack,
+
dirstack_size * sizeof *dirstack);
+ }
+ dirstack[dirstack_top++] = strdup(name);
+ }
+ else {
+ if (index_next == index_size) {
+ index_size *= 2;
+ db_index = realloc(db_index,
+ index_size *
sizeof *db_index);
+ }
+
+ db_index[index_next].id = strdup(name);
+ db_index[index_next++].pos = 0;
+ }
+ }
+
+ free(ents[--count]);
+ }
+
+ free(ents);
+ free(top);
+ } while (dirstack_top);
+
+ db->index = db_index;
+ db->index_size = index_next;
+
+ free(dirstack);
+}
+
+/* Return the mmap()ed tzfile if found, else NULL. On success, the
+ * length of the mapped data is placed in *length. */
+static char *map_tzfile(const char *timezone, size_t *length)
+{
+ char fname[PATH_MAX];
+ struct stat st;
+ char *p;
+ int fd;
+
+ if (strstr(timezone, "..") != NULL) {
+ return NULL;
+ }
+
+ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone);
+
+ fd = open(fname, O_RDONLY);
+ if (fd == -1) {
+ return NULL;
+ } else if (fstat(fd, &st) != 0 || st.st_size < 21) {
+ close(fd);
+ return NULL;
+ }
+
+ *length = st.st_size;
+ p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
+ close(fd);
+
+ return p != MAP_FAILED ? p : NULL;
+}
+
+const timelib_tzdb *timelib_builtin_db(void)
+{
+ if (timezonedb_system == NULL) {
+ timelib_tzdb *tmp = malloc(sizeof *tmp);
+
+ tmp->version = "0.system";
+ tmp->data = NULL;
+ create_zone_index(tmp);
+ timezonedb_system = tmp;
+ }
+
+ return timezonedb_system;
+}
+
+const timelib_tzdb_index_entry *timelib_timezone_builtin_identifiers_list(int
*count)
+{
+ *count = timezonedb_system->index_size;
+ return timezonedb_system->index;
+}
+
+int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb)
+{
+ char fname[PATH_MAX];
+
+ if (strstr(timezone, "..") != NULL) {
+ return 0;
+ }
+
+ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone);
+
+ return access(fname, R_OK) == 0 ? 1 : 0;
+}
+
+timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb)
+{
+ char *tzf, *orig;
+ timelib_tzinfo *tmp;
+ size_t len;
+
+ orig = map_tzfile(timezone, &len);
+ if (orig == NULL) {
+ return NULL;
+ }
+
+ tmp = timelib_tzinfo_ctor(timezone);
+
+ tzf = orig + 20;
+ read_header(&tzf, tmp);
+ read_transistions(&tzf, tmp);
+ read_types(&tzf, tmp);
+
+ munmap(orig, len);
+
+ return tmp;
+}
+#else /* !HAVE_SYSTEM_TZDATA */
+
static int seek_to_tz_position(const unsigned char **tzf, char *timezone,
const timelib_tzdb *tzdb)
{
int left = 0, right = tzdb->index_size - 1;
@@ -258,6 +460,7 @@

return tmp;
}
+#endif

static ttinfo* fetch_timezone_offset(timelib_tzinfo *tz, timelib_sll ts,
timelib_sll *transition_time)
{
Index: ext/date/lib/timelib.m4
===================================================================
RCS file: /repository/php-src/ext/date/lib/timelib.m4,v
retrieving revision 1.4
diff -u -r1.4 timelib.m4
--- ext/date/lib/timelib.m4 3 Jul 2005 23:30:52 -0000 1.4
+++ ext/date/lib/timelib.m4 10 Jan 2008 11:42:16 -0000
@@ -78,3 +78,17 @@

dnl Check for strtoll, atoll
AC_CHECK_FUNCS(strtoll atoll strftime)
+
+PHP_ARG_WITH(system-tzdata, for use of system timezone data,
+[ --with-system-tzdata[=DIR] to specify use of system timezone data],
+no, no)
+
+if test "$PHP_SYSTEM_TZDATA" != "no"; then
+ AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used])
+
+ if test "$PHP_SYSTEM_TZDATA" != "yes"; then
+ AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA",
+ [Define for location of system timezone data])
+ fi
+fi
+




++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread