r3174 - in glibc-package/branches/glibc-2.8/debian: . patches patches/any testsuite-checking
Author: aurel32
Date: 2008-10-26 10:11:16 +0000 (Sun, 26 Oct 2008)
New Revision: 3174
Added:
glibc-package/branches/glibc-2.8/debian/patches/any/cvs-bug-iconv6_tst-iconv7.diff
Modified:
glibc-package/branches/glibc-2.8/debian/changelog
glibc-package/branches/glibc-2.8/debian/patches/series
glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-hppa-linux-gnu-libc
glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-i486-kfreebsd-gnu-libc
glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-i486-linux-gnu-libc
glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-ia64-linux-gnu-libc
glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-powerpc-linux-gnu-libc
glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-s390-linux-gnu-libc
glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-sparc-linux-gnu-libc
glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-x86_64-kfreebsd-gnu-libc
Log:
* any/cvs-bug-iconv6_tst-iconv7.diff: new patch from upstream to fix
bug-iconv6 and tst-iconv7 when the locales package is not installed.
Update the testsuite results accordingly.
Modified: glibc-package/branches/glibc-2.8/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.8/debian/changelog 2008-10-23 14:49:50 UTC (rev 3173)
+++ glibc-package/branches/glibc-2.8/debian/changelog 2008-10-26 10:11:16 UTC (rev 3174)
@@ -1,4 +1,4 @@
-glibc (2.8+20080809-2) UNRELEASED; urgency=low
+glibc (2.8+20080809-3) UNRELEASED; urgency=low
[ Aurelien Jarno ]
* New upstream release.
@@ -133,6 +133,8 @@
Closes: #498516).
* rules, rules.d/build.mk, debhelper.in/glibc-doc.manpages: install the
generated manpages.
+ * any/cvs-bug-iconv6_tst-iconv7.diff: new patch from upstream to fix
+ bug-iconv6 and tst-iconv7 when the locales package is not installed.
[ Petr Salinger ]
* add any/local-linuxthreads-ptw.diff. Closes: #494908.
Added: glibc-package/branches/glibc-2.8/debian/patches/any/cvs-bug-iconv6_tst-iconv7.diff
===================================================================
--- glibc-package/branches/glibc-2.8/debian/patches/any/cvs-bug-iconv6_tst-iconv7.diff (rev 0)
+++ glibc-package/branches/glibc-2.8/debian/patches/any/cvs-bug-iconv6_tst-iconv7.diff 2008-10-26 10:11:16 UTC (rev 3174)
@@ -0,0 +1,43 @@
+2008-05-21 Ulrich Drepper <drepper@redhat.com>
+
+ * iconvdata/Depend: Add localedata.
+
+2008-05-14 Joseph Myers <joseph@codesourcery.com>
+
+ * iconvdata/Makefile (bug-iconv6-ENV, tst-iconv7-ENV): Define.
+
+2008-05-14 Ulrich Drepper <drepper@redhat.com>
+
+ * iconvdata/bug-iconv6.c (do_test): Use de_DE.UTF-8 locale.
+
+diff a/iconvdata/Depend b/iconvdata/Depend
+--- a/iconvdata/Depend
++++ b/iconvdata/Depend
+@@ -1 +1,2 @@
+ iconv
++localedata
+diff a/iconvdata/Makefile b/iconvdata/Makefile
+--- a/iconvdata/Makefile
++++ b/iconvdata/Makefile
+@@ -73,6 +73,9 @@ tests += bug-iconv3
+ endif
+
+ test-srcs := tst-table-from tst-table-to
++
++bug-iconv6-ENV = LOCPATH=$(common-objpfx)localedata
++tst-iconv7-ENV = LOCPATH=$(common-objpfx)localedata
+ endif
+
+ # No code here is in libc.so.
+diff a/iconvdata/bug-iconv6.c b/iconvdata/bug-iconv6.c
+--- a/iconvdata/bug-iconv6.c
++++ b/iconvdata/bug-iconv6.c
+@@ -13,7 +13,7 @@ static const char testbuf[] = {
+ static int
+ do_test (void)
+ {
+- setlocale (LC_ALL, "en_US.UTF-8");
++ setlocale (LC_ALL, "de_DE.UTF-8");
+ iconv_t ic = iconv_open ("ISO-2022-JP//TRANSLIT", "UTF-8");
+ if (ic == (iconv_t) -1)
+ {
Modified: glibc-package/branches/glibc-2.8/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.8/debian/patches/series 2008-10-23 14:49:50 UTC (rev 3173)
+++ glibc-package/branches/glibc-2.8/debian/patches/series 2008-10-26 10:11:16 UTC (rev 3174)
@@ -126,6 +126,7 @@
all/local-ru_RU.diff
all/submitted-iconv-latin9.diff
+any/cvs-bug-iconv6_tst-iconv7.diff
any/cvs-getaddrinfo.diff
any/cvs-iconv-braces.diff
any/cvs-nscd-getservbyport.diff
Modified: glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-hppa-linux-gnu-libc
===================================================================
--- glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-hppa-linux-gnu-libc 2008-10-23 14:49:50 UTC (rev 3173)
+++ glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-hppa-linux-gnu-libc 2008-10-26 10:11:16 UTC (rev 3174)
@@ -4,7 +4,6 @@
# Format: <Failed test>, Error <Make error code> [(ignored)]
#
annexc.out, Error 1 (ignored)
-bug-iconv6.out, Error 1
check-localplt.out, Error 1
check-textrel.out, Error 1
tst-addr1.out, Error 1
@@ -14,5 +13,4 @@
tst-audit2.out, Error 139
tst-clock1.out, Error 1
tst-getcpu.out, Error 1
-tst-iconv7.out, Error 1
tst-timer.out, Error 139
Modified: glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-i486-kfreebsd-gnu-libc
===================================================================
--- glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-i486-kfreebsd-gnu-libc 2008-10-23 14:49:50 UTC (rev 3173)
+++ glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-i486-kfreebsd-gnu-libc 2008-10-26 10:11:16 UTC (rev 3174)
@@ -4,7 +4,6 @@
# Format: <Failed test>, Error <Make error code> [(ignored)]
#
annexc.out, Error 1 (ignored)
-bug-iconv6.out, Error 1
check-localplt.out, Error 1
tst-aio10.out, Error 1
tst-aio9.out, Error 1
@@ -18,7 +17,6 @@
tst-cputimer2.o, Error 1
tst-cputimer3.o, Error 1
tst-fdopendir.o, Error 1
-tst-iconv7.out, Error 1
tst-lfschk1.out, Error 1
tst-lfschk2.out, Error 1
tst-lfschk3.out, Error 1
Modified: glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-i486-linux-gnu-libc
===================================================================
--- glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-i486-linux-gnu-libc 2008-10-23 14:49:50 UTC (rev 3173)
+++ glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-i486-linux-gnu-libc 2008-10-26 10:11:16 UTC (rev 3174)
@@ -4,9 +4,7 @@
# Format: <Failed test>, Error <Make error code> [(ignored)]
#
annexc.out, Error 1 (ignored)
-bug-iconv6.out, Error 1
check-localplt.out, Error 1
tst-cancelx4.out, Error 1
tst-cancelx5.out, Error 1
-tst-iconv7.out, Error 1
tst-timer.out, Error 139
Modified: glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-ia64-linux-gnu-libc
===================================================================
--- glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-ia64-linux-gnu-libc 2008-10-23 14:49:50 UTC (rev 3173)
+++ glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-ia64-linux-gnu-libc 2008-10-26 10:11:16 UTC (rev 3174)
@@ -4,9 +4,7 @@
# Format: <Failed test>, Error <Make error code> [(ignored)]
#
annexc.out, Error 1 (ignored)
-bug-iconv6.out, Error 1
check-localplt.out, Error 1
-tst-iconv7.out, Error 1
tst-mutexpi4.out, Error 1
tst-mutexpi5a.out, Error 1
tst-mutexpi5.out, Error 1
Modified: glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-powerpc-linux-gnu-libc
===================================================================
--- glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-powerpc-linux-gnu-libc 2008-10-23 14:49:50 UTC (rev 3173)
+++ glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-powerpc-linux-gnu-libc 2008-10-26 10:11:16 UTC (rev 3174)
@@ -4,9 +4,7 @@
# Format: <Failed test>, Error <Make error code> [(ignored)]
#
annexc.out, Error 1 (ignored)
-bug-iconv6.out, Error 1
check-localplt.out, Error 1
tst-cancelx4.out, Error 1
tst-cancelx5.out, Error 1
-tst-iconv7.out, Error 1
tst-timer.out, Error 139
Modified: glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-s390-linux-gnu-libc
===================================================================
--- glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-s390-linux-gnu-libc 2008-10-23 14:49:50 UTC (rev 3173)
+++ glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-s390-linux-gnu-libc 2008-10-26 10:11:16 UTC (rev 3174)
@@ -4,9 +4,7 @@
# Format: <Failed test>, Error <Make error code> [(ignored)]
#
annexc.out, Error 1 (ignored)
-bug-iconv6.out, Error 1
check-localplt.out, Error 1
tst-aio8.out, Error 1
tst-timer.out, Error 139
-tst-iconv7.out, Error 1
tst-robust8.out, Error 1
Modified: glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-sparc-linux-gnu-libc
===================================================================
--- glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-sparc-linux-gnu-libc 2008-10-23 14:49:50 UTC (rev 3173)
+++ glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-sparc-linux-gnu-libc 2008-10-26 10:11:16 UTC (rev 3174)
@@ -4,7 +4,6 @@
# Format: <Failed test>, Error <Make error code> [(ignored)]
#
annexc.out, Error 1 (ignored)
-bug-iconv6.out, Error 1
check-localplt.out, Error 1
tst-cancel20.out, Error 1
tst-cancelx20.out, Error 1
@@ -12,4 +11,3 @@
tst-cancelx5.out, Error 1
tst-eintr1.out, Error 1
tst-timer.out, Error 139
-tst-iconv7.out, Error 1
Modified: glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-x86_64-kfreebsd-gnu-libc
===================================================================
--- glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-x86_64-kfreebsd-gnu-libc 2008-10-23 14:49:50 UTC (rev 3173)
+++ glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-x86_64-kfreebsd-gnu-libc 2008-10-26 10:11:16 UTC (rev 3174)
@@ -4,7 +4,6 @@
# Format: <Failed test>, Error <Make error code> [(ignored)]
#
annexc.out, Error 1 (ignored)
-bug-iconv6.out, Error 1
check-localplt.out, Error 1
tst-aio10.out, Error 1
tst-aio9.out, Error 1
@@ -18,7 +17,6 @@
tst-cputimer2.o, Error 1
tst-cputimer3.o, Error 1
tst-fdopendir.o, Error 1
-tst-iconv7.out, Error 1
tst-lfschk1.out, Error 1
tst-lfschk2.out, Error 1
tst-lfschk3.out, Error 1
Reply to: