Author: barbier
Date: 2006-03-17 21:06:37 +0000 (Fri, 17 Mar 2006)
New Revision: 1293
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/forward-backward-collation.diff
Log:
* Fix forward-backward-collation.diff: the change in strcoll_l.c has to
be applied at several places. Closes: #357390.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-03-17 19:21:58 UTC (rev
1292)
+++ glibc-package/trunk/debian/changelog 2006-03-17 21:06:37 UTC (rev
1293)
@@ -23,6 +23,8 @@
* Add strfmon.diff: the negative sign is not printed by strfmon when
current locale defines sign_posn == 4 (as in de_CH) and format
argument contains the ! modifier.
+ * Fix forward-backward-collation.diff: the change in strcoll_l.c has to
+ be applied at several places. Closes: #357390.
[ Clint Adams ]
* Add mips-bits-resource.diff: add RLIMIT_NICE and RLIMIT_RTPRIO.
Modified: glibc-package/trunk/debian/patches/forward-backward-collation.diff
===================================================================
--- glibc-package/trunk/debian/patches/forward-backward-collation.diff
2006-03-17 19:21:58 UTC (rev 1292)
+++ glibc-package/trunk/debian/patches/forward-backward-collation.diff
2006-03-17 21:06:37 UTC (rev 1293)
@@ -10,7 +10,7 @@
# DP: Test case: the following command segfaults in en_US.UTF-8 locale
# DP: when BZ645 is fixed:
# DP: echo 2d d194 0a 2d d194 0a | xxd -r -p | sort
-# DP: Date: 2005-11-01
+# DP: Date: 2006-03-17
if [ $# -ne 2 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
@@ -25,8 +25,10 @@
esac
exit 0
---- libc/string/strxfrm_l.c 14 Mar 2004 20:52:47 -0000 1.4
-+++ libc/string/strxfrm_l.c 15 Oct 2005 20:49:18 -0000 1.5
+Index: glibc-2.3.6/string/strxfrm_l.c
+===================================================================
+--- glibc-2.3.6.orig/string/strxfrm_l.c
++++ glibc-2.3.6/string/strxfrm_l.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,96,97,2002, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1995,96,97,2002, 2004, 2005 Free Software Foundation, Inc.
@@ -55,9 +57,35 @@
len = weights[idxarr[backw]++];
if (len != 0)
{
---- libc/string/strcoll_l.c 14 Mar 2004 20:52:47 -0000 1.4
-+++ libc/string/strcoll_l.c 23 May 2005 22:35:59 -0000
-@@ -370,7 +370,10 @@
+Index: glibc-2.3.6/string/strcoll_l.c
+===================================================================
+--- glibc-2.3.6.orig/string/strcoll_l.c
++++ glibc-2.3.6/string/strcoll_l.c
+@@ -186,7 +186,10 @@
+ /* The last pushed character was handled. Continue
+ with forward characters. */
+ if (idx1cnt < idx1max)
+- idx1now = idx1cnt;
++ {
++ idx1now = idx1cnt;
++ backw1_stop = ~0ul;
++ }
+ else
+ /* Nothing anymore. The backward sequence ended with
+ the last sequence in the string. Note that seq1len
+@@ -245,7 +248,10 @@
+ /* The last pushed character was handled. Continue
+ with forward characters. */
+ if (idx2cnt < idx2max)
+- idx2now = idx2cnt;
++ {
++ idx2now = idx2cnt;
++ backw2_stop = ~0ul;
++ }
+ else
+ /* Nothing anymore. The backward sequence ended with
+ the last sequence in the string. Note that seq2len
+@@ -370,7 +376,10 @@
/* The last pushed character was handled. Continue
with forward characters. */
if (idx1cnt < idx1max)
@@ -69,3 +97,15 @@
else
{
/* Nothing anymore. The backward sequence
+@@ -426,7 +435,10 @@
+ /* The last pushed character was handled. Continue
+ with forward characters. */
+ if (idx2cnt < idx2max)
+- idx2now = idx2cnt;
++ {
++ idx2now = idx2cnt;
++ backw2_stop = ~0ul;
++ }
+ else
+ {
+ /* Nothing anymore. The backward sequence
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
