[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r2701 - in glibc-package/trunk/debian: . patches patches/any



Author: aurel32
Date: 2007-11-26 17:24:38 +0000 (Mon, 26 Nov 2007)
New Revision: 2701

Added:
   glibc-package/trunk/debian/patches/any/cvs-tzfile.diff
Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/patches/series
Log:
  * any/cvs-tzfile.diff: new patch from CVS to fix reading version 0 timezone
    data files.  Closes: #451892.



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2007-11-26 11:02:55 UTC (rev 2700)
+++ glibc-package/trunk/debian/changelog	2007-11-26 17:24:38 UTC (rev 2701)
@@ -7,8 +7,10 @@
     Closes: #452081.
   * debian/script.in/nohwcap.sh: add libc6-alphaev67 to the list of optimized
     packages.
+  * any/cvs-tzfile.diff: new patch from CVS to fix reading version 0 timezone
+    data files.  Closes: #451892.
 
- -- Aurelien Jarno <aurel32@debian.org>  Mon, 26 Nov 2007 12:02:25 +0100
+ -- Aurelien Jarno <aurel32@debian.org>  Mon, 26 Nov 2007 16:20:36 +0100
 
 glibc (2.7-1) unstable; urgency=low
 

Added: glibc-package/trunk/debian/patches/any/cvs-tzfile.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-tzfile.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-tzfile.diff	2007-11-26 17:24:38 UTC (rev 2701)
@@ -0,0 +1,21 @@
+2007-11-05  Ulrich Drepper  <drepper@redhat.com>
+
+	* time/tzfile.c (__tzfile_read): Fix check for version 0 data files.
+	Patch by Szymon Siwek <sls@poczta.wp.pl>.
+
+===================================================================
+RCS file: /cvs/glibc/libc/time/tzfile.c,v
+retrieving revision 1.69
+retrieving revision 1.70
+diff -u -r1.69 -r1.70
+--- libc/time/tzfile.c	2007/10/17 14:44:26	1.69
++++ libc/time/tzfile.c	2007/11/06 01:03:43	1.70
+@@ -381,7 +381,7 @@
+       else
+ 	tzspec[tzspec_len - 1] = '\0';
+     }
+-  else if (sizeof (time_t) == 4 && tzhead.tzh_version != '\0')
++  else if (sizeof (time_t) == 4 && tzhead.tzh_version[0] != '\0')
+     {
+       /* Get the TZ string.  */
+       if (__builtin_expect (fread_unlocked ((void *) &tzhead, sizeof (tzhead),

Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series	2007-11-26 11:02:55 UTC (rev 2700)
+++ glibc-package/trunk/debian/patches/series	2007-11-26 17:24:38 UTC (rev 2701)
@@ -126,6 +126,7 @@
 all/local-remove-manual.diff
 all/local-ru_RU.diff 
 
+any/cvs-tzfile.diff -p1
 any/local-notls.diff -p0
 any/local-asserth-decls.diff -p0
 any/local-bashisms.diff -p0



Reply to: