Hello community, here is the log from the commit of package glibc for openSUSE:Factory checked in at 2014-07-30 07:34:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glibc (Old) and /work/SRC/openSUSE:Factory/.glibc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glibc" Changes: -------- --- /work/SRC/openSUSE:Factory/glibc/glibc-testsuite.changes 2014-07-25 09:08:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.glibc.new/glibc-testsuite.changes 2014-07-30 07:34:18.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Jul 28 10:18:46 UTC 2014 - schwab@suse.de + +- ibm93x-redundant-shift-si.patch: Avoid redundant shift character in + iconv output at block boundary (bnc#886416, BZ #17197) + +------------------------------------------------------------------- +Thu Jul 24 15:35:50 UTC 2014 - schwab@suse.de + +- s390-revert-abi-change.patch: revert back to pre-2.19 layout of jmp_buf + and ucontext_t on s390 (bnc#887228) + +------------------------------------------------------------------- glibc-utils.changes: same change glibc.changes: same change New: ---- ibm93x-redundant-shift-si.patch s390-revert-abi-change.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glibc-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.wfUyPc/_old 2014-07-30 07:34:20.000000000 +0200 +++ /var/tmp/diff_new_pack.wfUyPc/_new 2014-07-30 07:34:20.000000000 +0200 @@ -205,6 +205,8 @@ Patch18: glibc-cpusetsize.diff # PATCH-FEATURE-SLE Use nscd user for nscd Patch19: nscd-server-user.patch +# PATCH-FIX-OPENSUSE Revert "S/390: Make jmp_buf extendible" and "S/390: Make ucontext_t extendible" (bnc#887228) +Patch20: s390-revert-abi-change.patch ### Locale related patches # PATCH-FIX-OPENSUSE Add additional locales @@ -282,6 +284,8 @@ Patch2004: pthread-mutex-trylock-elision.patch # PATCH-FIX-UPSTREAM Speedup memset on x86-64 for large block sizes (BZ #16830) Patch2005: glibc-memset-nontemporal.diff +# PATCH-FIX-UPSTREAM Avoid redundant shift character in iconv output at block boundary (BZ #17197) +Patch2006: ibm93x-redundant-shift-si.patch # Non-glibc patches # PATCH-FIX-OPENSUSE Remove debianisms from manpages @@ -471,6 +475,7 @@ %patch15 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 %patch100 -p1 %patch102 -p1 @@ -506,6 +511,7 @@ %patch2003 -p1 %patch2004 -p1 %patch2005 -p1 +%patch2006 -p1 %patch3000 glibc-utils.spec: same change ++++++ glibc.spec ++++++ --- /var/tmp/diff_new_pack.wfUyPc/_old 2014-07-30 07:34:20.000000000 +0200 +++ /var/tmp/diff_new_pack.wfUyPc/_new 2014-07-30 07:34:20.000000000 +0200 @@ -205,6 +205,8 @@ Patch18: glibc-cpusetsize.diff # PATCH-FEATURE-SLE Use nscd user for nscd Patch19: nscd-server-user.patch +# PATCH-FIX-OPENSUSE Revert "S/390: Make jmp_buf extendible" and "S/390: Make ucontext_t extendible" (bnc#887228) +Patch20: s390-revert-abi-change.patch ### Locale related patches # PATCH-FIX-OPENSUSE Add additional locales @@ -282,6 +284,8 @@ Patch2004: pthread-mutex-trylock-elision.patch # PATCH-FIX-UPSTREAM Speedup memset on x86-64 for large block sizes (BZ #16830) Patch2005: glibc-memset-nontemporal.diff +# PATCH-FIX-UPSTREAM Avoid redundant shift character in iconv output at block boundary (BZ #17197) +Patch2006: ibm93x-redundant-shift-si.patch # Non-glibc patches # PATCH-FIX-OPENSUSE Remove debianisms from manpages @@ -471,6 +475,7 @@ %patch15 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 %patch100 -p1 %patch102 -p1 @@ -506,6 +511,7 @@ %patch2003 -p1 %patch2004 -p1 %patch2005 -p1 +%patch2006 -p1 %patch3000 ++++++ ibm93x-redundant-shift-si.patch ++++++ Avoid redundant shift character in iconv output at block boundary (bug #17197) [BZ #17197] * iconvdata/ibm930.c (BODY for TO_LOOP): Record current DBCS state immediately after emitting SI. * iconvdata/ibm933.c (BODY for TO_LOOP): Likewise. * iconvdata/ibm935.c (BODY for TO_LOOP): Likewise. * iconvdata/ibm937.c (BODY for TO_LOOP): Likewise. * iconvdata/ibm939.c (BODY for TO_LOOP): Likewise. * iconvdata/bug-iconv10.c: New file. * iconvdata/Makefile (tests): Add bug-iconv10. ($(objpfx)bug-iconv10.out): New rule. Index: glibc-2.19/iconvdata/Makefile =================================================================== --- glibc-2.19.orig/iconvdata/Makefile +++ glibc-2.19/iconvdata/Makefile @@ -67,7 +67,8 @@ include ../Makeconfig ifeq (yes,$(build-shared)) tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \ - tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 bug-iconv9 + tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 bug-iconv9 \ + bug-iconv10 ifeq ($(have-thread-library),yes) tests += bug-iconv3 endif @@ -295,6 +296,8 @@ $(objpfx)tst-iconv4.out: $(objpfx)gconv- $(addprefix $(objpfx),$(modules.so)) $(objpfx)tst-iconv7.out: $(objpfx)gconv-modules \ $(addprefix $(objpfx),$(modules.so)) +$(objpfx)bug-iconv10.out: $(objpfx)gconv-modules \ + $(addprefix $(objpfx),$(modules.so)) $(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \ $(addprefix $(objpfx),$(modules.so)) \ Index: glibc-2.19/iconvdata/bug-iconv10.c =================================================================== --- /dev/null +++ glibc-2.19/iconvdata/bug-iconv10.c @@ -0,0 +1,60 @@ +/* bug 17197: check for redundant shift character at block boundary. */ +#include <iconv.h> +#include <locale.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <errno.h> + +static int +do_test (void) +{ + iconv_t cd = iconv_open ("IBM930", "UTF-8"); + if (cd == (iconv_t) -1) + { + puts ("iconv_open failed"); + return 1; + } + + char instr1[] = "\xc2\xa6."; + const char expstr1[4] = "\016Bj\017"; + const char expstr2[] = "K"; + char outstr[4]; + size_t inlen = sizeof (instr1); + size_t outlen = sizeof (outstr); + char *inptr = instr1; + char *outptr = outstr; + size_t r = iconv (cd, &inptr, &inlen, &outptr, &outlen); + if (r != -1 + || errno != E2BIG + || inlen != sizeof (instr1) - 2 + || inptr != instr1 + 2 + || outlen != 0 + || memcmp (outstr, expstr1, sizeof (expstr1)) != 0) + { + puts ("wrong first conversion"); + return 1; + } + + outlen = sizeof (outstr); + outptr = outstr; + r = iconv (cd, &inptr, &inlen, &outptr, &outlen); + if (r != 0 + || inlen != 0 + || outlen != sizeof (outstr) - sizeof (expstr2) + || memcmp (outstr, expstr2, sizeof (expstr2)) != 0) + { + puts ("wrong second conversion"); + return 1; + } + + if (iconv_close (cd) != 0) + { + puts ("iconv_close failed"); + return 1; + } + return 0; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" Index: glibc-2.19/iconvdata/ibm930.c =================================================================== --- glibc-2.19.orig/iconvdata/ibm930.c +++ glibc-2.19/iconvdata/ibm930.c @@ -255,6 +255,7 @@ enum break; \ } \ *outptr++ = SI; \ + curcs = sb; \ } \ \ if (__builtin_expect (outptr + 1 > outend, 0)) \ @@ -268,7 +269,6 @@ enum *outptr++ = 0x5b; \ else \ *outptr++ = cp[0]; \ - curcs = sb; \ } \ \ /* Now that we wrote the output increment the input pointer. */ \ Index: glibc-2.19/iconvdata/ibm933.c =================================================================== --- glibc-2.19.orig/iconvdata/ibm933.c +++ glibc-2.19/iconvdata/ibm933.c @@ -254,6 +254,7 @@ enum break; \ } \ *outptr++ = SI; \ + curcs = sb; \ } \ \ if (__builtin_expect (outptr + 1 > outend, 0)) \ @@ -262,7 +263,6 @@ enum break; \ } \ *outptr++ = cp[0]; \ - curcs = sb; \ } \ \ /* Now that we wrote the output increment the input pointer. */ \ Index: glibc-2.19/iconvdata/ibm935.c =================================================================== --- glibc-2.19.orig/iconvdata/ibm935.c +++ glibc-2.19/iconvdata/ibm935.c @@ -254,6 +254,7 @@ enum break; \ } \ *outptr++ = SI; \ + curcs = sb; \ } \ \ if (__builtin_expect (outptr + 1 > outend, 0)) \ @@ -262,7 +263,6 @@ enum break; \ } \ *outptr++ = cp[0]; \ - curcs = sb; \ } \ \ /* Now that we wrote the output increment the input pointer. */ \ Index: glibc-2.19/iconvdata/ibm937.c =================================================================== --- glibc-2.19.orig/iconvdata/ibm937.c +++ glibc-2.19/iconvdata/ibm937.c @@ -254,6 +254,7 @@ enum break; \ } \ *outptr++ = SI; \ + curcs = sb; \ } \ \ if (__builtin_expect (outptr + 1 > outend, 0)) \ @@ -262,7 +263,6 @@ enum break; \ } \ *outptr++ = cp[0]; \ - curcs = sb; \ } \ \ /* Now that we wrote the output increment the input pointer. */ \ Index: glibc-2.19/iconvdata/ibm939.c =================================================================== --- glibc-2.19.orig/iconvdata/ibm939.c +++ glibc-2.19/iconvdata/ibm939.c @@ -254,6 +254,7 @@ enum break; \ } \ *outptr++ = SI; \ + curcs = sb; \ } \ \ if (__builtin_expect (outptr + 1 > outend, 0)) \ @@ -267,7 +268,6 @@ enum *outptr++ = 0xb2; \ else \ *outptr++ = cp[0]; \ - curcs = sb; \ } \ \ /* Now that we wrote the output increment the input pointer. */ \ ++++++ s390-revert-abi-change.patch ++++++ ++++ 897 lines (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org