Author: aurel32
Date: 2008-06-02 14:18:07 +0000 (Mon, 02 Jun 2008)
New Revision: 2967
Added:
glibc-package/trunk/debian/patches/any/cvs-iconv-braces.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* patches/any/cvs-iconv-braces.diff: new patch from upstream to fix various
iconv bugs.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-06-01 23:23:29 UTC (rev
2966)
+++ glibc-package/trunk/debian/changelog 2008-06-02 14:18:07 UTC (rev
2967)
@@ -11,6 +11,8 @@
* sysdeps/amd64.mk, sysdeps/i386.mk, control.in/main: bump g++-4.3
build-depends
to (>= 4.3.0-2) to make sure the cld fix is applied. Use gcc-4.3 on amd64
and i386.
+ * patches/any/cvs-iconv-braces.diff: new patch from upstream to fix various
+ iconv bugs.
[ Clint Adams ]
* Add any/cvs-regex_anchor.diff to fix performance anomaly with ^$.
@@ -24,7 +26,7 @@
* patches/hurd-i386/local-unlockpt-chroot.diff: new patch to fix ptys in
chroots.
- -- Aurelien Jarno <[EMAIL PROTECTED]> Sat, 31 May 2008 10:10:13 +0200
+ -- Aurelien Jarno <[EMAIL PROTECTED]> Mon, 02 Jun 2008 16:17:23 +0200
glibc (2.7-11) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/any/cvs-iconv-braces.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-iconv-braces.diff
(rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-iconv-braces.diff
2008-06-02 14:18:07 UTC (rev 2967)
@@ -0,0 +1,48 @@
+commit eeb930172c353b4649f88a35feaaeb0fc354e47b
+Author: Ulrich Drepper <[EMAIL PROTECTED]>
+Date: Wed May 14 22:52:44 2008 +0000
+
+ (BODY for __gconv_transform_ascii_internal): Add missing braces.
+ (BODY for __gconv_transform_internal_ascii): Likewise.
+
+diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c
+index ec8f38a..5cf3237 100644
+--- a/iconv/gconv_simple.c
++++ b/iconv/gconv_simple.c
+@@ -1,5 +1,5 @@
+ /* Simple transformations functions.
+- Copyright (C) 1997-2003, 2004, 2005, 2007 Free Software Foundation, Inc.
++ Copyright (C) 1997-2005, 2007, 2008 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <[EMAIL PROTECTED]>, 1997.
+
+@@ -820,9 +820,11 @@ ucs4le_internal_loop_single (struct __gconv_step *step,
+ STANDARD_FROM_LOOP_ERR_HANDLER (1); \
+ }
\
+ else \
+- /* It's an one byte sequence. */
\
+- *((uint32_t *) outptr) = *inptr++; \
+- outptr += sizeof (uint32_t); \
++ {
\
++ /* It's an one byte sequence. */ \
++ *((uint32_t *) outptr) = *inptr++; \
++ outptr += sizeof (uint32_t); \
++ }
\
+ }
+ #define LOOP_NEED_FLAGS
+ #include <iconv/loop.c>
+@@ -851,9 +853,11 @@ ucs4le_internal_loop_single (struct __gconv_step *step,
+ STANDARD_TO_LOOP_ERR_HANDLER (4); \
+ }
\
+ else \
+- /* It's an one byte sequence. */
\
+- *outptr++ = *((const uint32_t *) inptr);
\
+- inptr += sizeof (uint32_t); \
++ {
\
++ /* It's an one byte sequence. */ \
++ *outptr++ = *((const uint32_t *) inptr); \
++ inptr += sizeof (uint32_t); \
++ }
\
+ }
+ #define LOOP_NEED_FLAGS
+ #include <iconv/loop.c>
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2008-06-01 23:23:29 UTC (rev
2966)
+++ glibc-package/trunk/debian/patches/series 2008-06-02 14:18:07 UTC (rev
2967)
@@ -145,6 +145,7 @@
any/cvs-ether_line.diff -p0
any/cvs-fchmodat.diff -p1
any/cvs-gcc-4.3.diff -p1
+any/cvs-iconv-braces.diff
any/cvs-iconv-iso2022jp-loop-bug.diff
any/cvs-rfc3484.diff -p1
any/cvs-sched_h.diff -p0
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
