Author: aurel32
Date: 2007-01-09 00:03:02 +0100 (Tue, 09 Jan 2007)
New Revision: 1902
Added:
glibc-package/branches/glibc-2.5/debian/patches/any/cvs-zdump-64-bit.diff
glibc-package/trunk/debian/patches/any/cvs-zdump-64-bit.diff
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/patches/series
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* debian/patches/any/cvs-zdump-64-bit.diff: new patch from CVS to fix zdump
on 64-bit architectures. Closes: #402776.
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2007-01-08 22:28:45 UTC
(rev 1901)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2007-01-08 23:03:02 UTC
(rev 1902)
@@ -261,6 +261,8 @@
* debian/patches/hppa/cvs-clone.diff: new patch by Helge Deller
<[EMAIL PROTECTED]> inspired from upstream CVS code (fix LTP clone04 and
clone06 test). Closes: #405411.
+ * debian/patches/any/cvs-zdump-64-bit.diff: new patch from CVS to fix zdump
+ on 64-bit architectures. Closes: #402776.
-- Aurelien Jarno <[EMAIL PROTECTED]> Tue, 2 Jan 2007 03:13:54 +0100
Added: glibc-package/branches/glibc-2.5/debian/patches/any/cvs-zdump-64-bit.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/any/cvs-zdump-64-bit.diff
2007-01-08 22:28:45 UTC (rev 1901)
+++ glibc-package/branches/glibc-2.5/debian/patches/any/cvs-zdump-64-bit.diff
2007-01-08 23:03:02 UTC (rev 1902)
@@ -0,0 +1,37 @@
+Fix for 64-bit architectures.
+
+===================================================================
+RCS file: /cvs/glibc/libc/timezone/zdump.c,v
+retrieving revision 1.14
+retrieving revision 1.15
+diff -u -r1.14 -r1.15
+--- libc/timezone/zdump.c 2006/09/21 03:57:30 1.14
++++ libc/timezone/zdump.c 2006/11/11 02:04:43 1.15
+@@ -418,14 +414,21 @@
+ }
+ } else if (0 > (time_t) -1) {
+ /*
+- ** time_t is signed.
++ ** time_t is signed. Assume overflow wraps around.
+ */
+- register time_t hibit;
++ time_t t = 0;
++ time_t t1 = 1;
+
+- for (hibit = 1; (hibit * 2) != 0; hibit *= 2)
+- continue;
+- absolute_min_time = hibit;
+- absolute_max_time = -(hibit + 1);
++ while (t < t1) {
++ t = t1;
++ t1 = 2 * t1 + 1;
++ }
++
++ absolute_max_time = t;
++ t = -t;
++ absolute_min_time = t - 1;
++ if (t < absolute_min_time)
++ absolute_min_time = t;
+ } else {
+ /*
+ ** time_t is unsigned.
Modified: glibc-package/branches/glibc-2.5/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/series 2007-01-08
22:28:45 UTC (rev 1901)
+++ glibc-package/branches/glibc-2.5/debian/patches/series 2007-01-08
23:03:02 UTC (rev 1902)
@@ -88,6 +88,7 @@
all/local-pt_BR.diff -p1
all/submitted-new-brf-encoding.diff -p0
+any/cvs-zdump-64-bit.diff -p1
any/local-__thread.diff -p0
any/local-asserth-decls.diff -p0
#any/local-base.diff -p0 # g: suspended
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-01-08 22:28:45 UTC (rev
1901)
+++ glibc-package/trunk/debian/changelog 2007-01-08 23:03:02 UTC (rev
1902)
@@ -14,6 +14,8 @@
* debian/patches/hppa/cvs-clone.diff: new patch by Helge Deller
<[EMAIL PROTECTED]> inspired from upstream CVS code (fix LTP clone04 and
clone06 test). Closes: #405411.
+ * debian/patches/any/cvs-zdump-64-bit.diff: new patch from CVS to fix zdump
+ on 64-bit architectures. Closes: #402776.
-- Aurelien Jarno <[EMAIL PROTECTED]> Mon, 8 Jan 2007 22:29:37 +0100
Added: glibc-package/trunk/debian/patches/any/cvs-zdump-64-bit.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-zdump-64-bit.diff
2007-01-08 22:28:45 UTC (rev 1901)
+++ glibc-package/trunk/debian/patches/any/cvs-zdump-64-bit.diff
2007-01-08 23:03:02 UTC (rev 1902)
@@ -0,0 +1,37 @@
+Fix for 64-bit architectures.
+
+===================================================================
+RCS file: /cvs/glibc/libc/timezone/zdump.c,v
+retrieving revision 1.14
+retrieving revision 1.15
+diff -u -r1.14 -r1.15
+--- libc/timezone/zdump.c 2006/09/21 03:57:30 1.14
++++ libc/timezone/zdump.c 2006/11/11 02:04:43 1.15
+@@ -418,14 +414,21 @@
+ }
+ } else if (0 > (time_t) -1) {
+ /*
+- ** time_t is signed.
++ ** time_t is signed. Assume overflow wraps around.
+ */
+- register time_t hibit;
++ time_t t = 0;
++ time_t t1 = 1;
+
+- for (hibit = 1; (hibit * 2) != 0; hibit *= 2)
+- continue;
+- absolute_min_time = hibit;
+- absolute_max_time = -(hibit + 1);
++ while (t < t1) {
++ t = t1;
++ t1 = 2 * t1 + 1;
++ }
++
++ absolute_max_time = t;
++ t = -t;
++ absolute_min_time = t - 1;
++ if (t < absolute_min_time)
++ absolute_min_time = t;
+ } else {
+ /*
+ ** time_t is unsigned.
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2007-01-08 22:28:45 UTC (rev
1901)
+++ glibc-package/trunk/debian/patches/series 2007-01-08 23:03:02 UTC (rev
1902)
@@ -149,6 +149,7 @@
any/cvs-tls-crashfix.diff -p1
any/cvs-tst-setcontext_c.diff -p1
any/cvs-resource_h.diff -p1
+any/cvs-zdump-64-bit.diff -p1
any/local-asserth-decls.diff -p0
#any/local-base.diff -p0 # g: suspended
any/local-bashisms.diff -p1
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
