rpm/glibc
SHA256
1
0
Fork 0
forked from pool/glibc
Code Pull Requests Activity

Accepting request 143761 from home:a_jaeger:my-factory-packages

Browse Source 
Update to current git head.

OBS-URL: https://build.opensuse.org/request/show/143761
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=242
This commit is contained in:
Andreas Jaeger 2012-12-01 16:20:30 +00:00 committed by Git OBS Bridge
parent 7e8d0bcd19
commit 2471d4494b
5 changed files with 13 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glibc-2.16.90-c93ec1f091ec.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:630233a14364603dbb659dde60d6be097f3b3fd23a0fb2c0d71aaaf53b806b31
size 11125132

3
glibc-2.16.90-f638872ab422.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f470c705a84e326a17e07c600897bd7ad9a5a23a7a42c8c640cf7399a35f6390
size 11157404

59
glibc-resolv-assert.diff
View File

@ -1,59 +0,0 @@
2011-07-21 Aurelien Jarno <aurel32@debian.org>
* 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

9
glibc.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
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

5
glibc.spec
View File

@ -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 c93ec1f091ec
%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
@ -239,8 +239,6 @@ Patch306: glibc-fix-double-loopback.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
@ -466,7 +464,6 @@ rm nscd/s-stamp
%patch20 -p1
%endif
%patch2001 -p1
# XXX Disable, it breaks the testsuite, test elf/tst-audit2
# %patch2008 -p1