diff --git a/glibc-2.16.90-e3c6aa3a5848.tar.xz b/glibc-2.16.90-e3c6aa3a5848.tar.xz deleted file mode 100644 index 447ac69..0000000 --- a/glibc-2.16.90-e3c6aa3a5848.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0bd758d05a8abeb05258a9f5c253969c201ad76e6f6c6bebdc4e8883a3cf2443 -size 11142916 diff --git a/glibc-2.16.90-f638872ab422.tar.xz b/glibc-2.16.90-f638872ab422.tar.xz new file mode 100644 index 0000000..797110e --- /dev/null +++ b/glibc-2.16.90-f638872ab422.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f470c705a84e326a17e07c600897bd7ad9a5a23a7a42c8c640cf7399a35f6390 +size 11157404 diff --git a/glibc-resolv-assert.diff b/glibc-resolv-assert.diff deleted file mode 100644 index fcb478e..0000000 --- a/glibc-resolv-assert.diff +++ /dev/null @@ -1,59 +0,0 @@ -2011-07-21 Aurelien Jarno - - * resolv/res_query.c(__libc_res_nquery): Assign hp and hp2 - depending n and resplen2 to catch cases where answer - equals answerp2. - -diff --git a/resolv/res_query.c b/resolv/res_query.c -index 2f7cfaa..405fa68 100644 ---- a/resolv/res_query.c -+++ b/resolv/res_query.c -@@ -122,6 +122,7 @@ __libc_res_nquery(res_state statp, - int *resplen2) - { - HEADER *hp = (HEADER *) answer; -+ HEADER *hp2; - int n, use_malloc = 0; - u_int oflags = statp->_flags; - -@@ -239,26 +240,25 @@ __libc_res_nquery(res_state statp, - /* __libc_res_nsend might have reallocated the buffer. */ - hp = (HEADER *) *answerp; - -- /* We simplify the following tests by assigning HP to HP2. It -- is easy to verify that this is the same as ignoring all -- tests of HP2. */ -- HEADER *hp2 = answerp2 ? (HEADER *) *answerp2 : hp; -- -- if (n < (int) sizeof (HEADER) && answerp2 != NULL -- && *resplen2 > (int) sizeof (HEADER)) -+ /* We simplify the following tests by assigning HP to HP2 or -+ vice versa. It is easy to verify that this is the same as -+ ignoring all tests of HP or HP2. */ -+ if (answerp2 == NULL || *resplen2 < (int) sizeof (HEADER)) - { -- /* Special case of partial answer. */ -- assert (hp != hp2); -- hp = hp2; -+ hp2 = hp; - } -- else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER) -- && n > (int) sizeof (HEADER)) -+ else - { -- /* Special case of partial answer. */ -- assert (hp != hp2); -- hp2 = hp; -+ hp2 = (HEADER *) *answerp2; -+ if (n < (int) sizeof (HEADER)) -+ { -+ hp = hp2; -+ } - } - -+ /* Make sure both hp and hp2 are defined */ -+ assert((hp != NULL) && (hp2 != NULL)); -+ - if ((hp->rcode != NOERROR || ntohs(hp->ancount) == 0) - && (hp2->rcode != NOERROR || ntohs(hp2->ancount) == 0)) { - #ifdef DEBUG diff --git a/glibc-strict-aliasing.diff b/glibc-strict-aliasing.diff deleted file mode 100644 index 064e0b7..0000000 --- a/glibc-strict-aliasing.diff +++ /dev/null @@ -1,25 +0,0 @@ -Index: glibc-2.15.90/elf/Makefile -=================================================================== ---- glibc-2.15.90.orig/elf/Makefile -+++ glibc-2.15.90/elf/Makefile -@@ -50,6 +50,7 @@ include ../Makeconfig - ifeq ($(unwind-find-fde),yes) - routines += unwind-dw2-fde-glibc - shared-only-routines += unwind-dw2-fde-glibc -+CFLAGS-unwind-dw2-fde-glibc.c = -fno-strict-aliasing - endif - - before-compile = $(objpfx)trusted-dirs.h -Index: glibc-2.15.90/sunrpc/Makefile -=================================================================== ---- glibc-2.15.90.orig/sunrpc/Makefile -+++ glibc-2.15.90/sunrpc/Makefile -@@ -145,6 +145,8 @@ CFLAGS-key_call.c = -fexceptions - CFLAGS-pmap_rmt.c = -fexceptions - CFLAGS-clnt_perr.c = -fexceptions - CFLAGS-openchild.c = -fexceptions -+CFLAGS-clnt_tcp.c = -fno-strict-aliasing -+CFLAGS-clnt_unix.c = -fno-strict-aliasing - - sunrpc-CPPFLAGS = -D_RPC_THREAD_SAFE_ - CPPFLAGS += $(sunrpc-CPPFLAGS) diff --git a/glibc.changes b/glibc.changes index e825d12..d1d64f0 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Sat Dec 1 08:55:05 UTC 2012 - aj@suse.de + +- Update to f638872ab422: + Fix regression introduced with last update in sunrpc code + Fix assertion failure in resolver + Bug fixes +- Remove upstreamed patch glibc-resolv-assert.diff + +------------------------------------------------------------------- +Fri Nov 30 09:15:15 UTC 2012 - aj@suse.de + +- Update to c93ec1f091ec: + Warn about unsupported DT_FLAGS_1 flags + Add Interlingua locale + Bug fixes + +------------------------------------------------------------------- +Thu Nov 29 14:30:11 UTC 2012 - schwab@suse.de + +- Remove obsolete patches: + glibc-strict-aliasing.diff + nscd-avoid-gcc-warning.diff + ------------------------------------------------------------------- Wed Nov 28 15:48:32 UTC 2012 - aj@suse.de diff --git a/glibc.spec b/glibc.spec index d39c49a..3369737 100644 --- a/glibc.spec +++ b/glibc.spec @@ -123,7 +123,7 @@ Provides: ld-linux.so.3(GLIBC_2.4) Version: 2.16.90 Release: 0 %define glibc_major_version 2.16.90 -%define git_id e3c6aa3a5848 +%define git_id f638872ab422 Url: http://www.gnu.org/software/libc/libc.html BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: glibc-%{version}-%{git_id}.tar.xz @@ -232,12 +232,6 @@ Patch305: glibc-nscd-hconf.diff # PATCH-FIX-OPENSUSE disable rewriting ::1 to 127.0.0.1 for /etc/hosts bnc#684534, bnc#706719 Patch306: glibc-fix-double-loopback.diff -### Misc patches -# FIX-OPENSUSE compile some files with -fno-strict-aliasing -Patch401: glibc-strict-aliasing.diff -# PATCH-FIX-OPENSUSE avoid false positive warning that triggers brp postcheck fail -Patch402: nscd-avoid-gcc-warning.diff - ### # Patches from upstream ### @@ -245,8 +239,6 @@ Patch402: nscd-avoid-gcc-warning.diff ### # Patches awaiting upstream approval ### -# PATCH-FIX-UPSTREAM Fix assertion error in res_query.c (bso#13013) -Patch2001: glibc-resolv-assert.diff # PATCH-FIX-OPENSUSE Fix LD_PROFILE (glibc bug#13818) - aj@suse.de Patch2008: glibc-ld-profile.patch @@ -468,14 +460,10 @@ rm nscd/s-stamp %patch305 -p1 %patch306 -p1 -%patch401 -p1 -%patch402 -p1 - %ifarch armv7l armv7hl %patch20 -p1 %endif -%patch2001 -p1 # XXX Disable, it breaks the testsuite, test elf/tst-audit2 # %patch2008 -p1 diff --git a/nscd-avoid-gcc-warning.diff b/nscd-avoid-gcc-warning.diff deleted file mode 100644 index 60f78f1..0000000 --- a/nscd-avoid-gcc-warning.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: glibc-2.15.90/nscd/connections.c -=================================================================== ---- glibc-2.15.90.orig/nscd/connections.c -+++ glibc-2.15.90/nscd/connections.c -@@ -1803,6 +1803,8 @@ handle_request: request received (Versio - ++nready; - } - /* NOTREACHED */ -+ assert(0); -+ return 0; - } - -