r6630 - glibc-package/branches/glibc-branch-jessie/debian/patches
Author: aurel32
Date: 2015-10-08 18:13:31 +0000 (Thu, 08 Oct 2015)
New Revision: 6630
Modified:
glibc-package/branches/glibc-branch-jessie/debian/patches/git-updates.diff
Log:
Update from upstream to not introduce #800682
Modified: glibc-package/branches/glibc-branch-jessie/debian/patches/git-updates.diff
===================================================================
--- glibc-package/branches/glibc-branch-jessie/debian/patches/git-updates.diff 2015-10-08 18:00:54 UTC (rev 6629)
+++ glibc-package/branches/glibc-branch-jessie/debian/patches/git-updates.diff 2015-10-08 18:13:31 UTC (rev 6630)
@@ -1,10 +1,21 @@
GIT update of git://sourceware.org/git/glibc.git/release/2.19/master from glibc-2.19
diff --git a/ChangeLog b/ChangeLog
-index 81c393a..3964305 100644
+index 81c393a..6aff2a2 100644
--- a/ChangeLog
+++ b/ChangeLog
-@@ -1,3 +1,347 @@
+@@ -1,3 +1,358 @@
++2015-10-02 Andreas Schwab <schwab@suse.de>
++
++ * sysdeps/posix/getaddrinfo.c (gaih_inet): Advance address pointer
++ when skipping over non-matching result from nscd.
++
++2015-09-11 Alan Modra <amodra@gmail.com>
++
++ [BZ #17153]
++ * elf/elf.h (DT_PPC64_NUM): Correct value.
++ * NEWS: Add to fixed bug list.
++
+2014-03-20 Andreas Schwab <schwab@suse.de>
+
+ [BZ #16743]
@@ -353,7 +364,7 @@
[BZ #16529]
diff --git a/NEWS b/NEWS
-index 98b479e..be59ead 100644
+index 98b479e..fb0fa3c 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,59 @@ See the end for copying conditions.
@@ -365,8 +376,8 @@
+* The following bugs are resolved with this release:
+
+ 15946, 16545, 16574, 16623, 16657, 16695, 16743, 16878, 16882, 16885,
-+ 16916, 16932, 16943, 16958, 17048, 17069, 17137, 17213, 17263, 17325,
-+ 17555, 18287.
++ 16916, 16932, 16943, 16958, 17048, 17069, 17137, 17153, 17213, 17263,
++ 17325, 17555, 18287.
+
+* A buffer overflow in gethostbyname_r and related functions performing DNS
+ requests has been fixed. If the NSS functions were called with a
@@ -429,6 +440,19 @@
ifeq (yes,$(build-shared))
tests-static += tst-tls9-static
tst-tls9-static-ENV = \
+diff --git a/elf/elf.h b/elf/elf.h
+index 40e87b2..78815e8 100644
+--- a/elf/elf.h
++++ b/elf/elf.h
+@@ -2283,7 +2283,7 @@ typedef Elf32_Addr Elf32_Conflict;
+ #define DT_PPC64_OPD (DT_LOPROC + 1)
+ #define DT_PPC64_OPDSZ (DT_LOPROC + 2)
+ #define DT_PPC64_OPT (DT_LOPROC + 3)
+-#define DT_PPC64_NUM 3
++#define DT_PPC64_NUM 4
+
+ /* PowerPC64 specific values for the DT_PPC64_OPT Dyn entry. */
+ #define PPC64_OPT_TLS 1
diff --git a/elf/tst-dl-iter-static.c b/elf/tst-dl-iter-static.c
new file mode 100644
index 0000000..7303d7c
@@ -2708,24 +2732,28 @@
cor = (cor > 0) ? 1.035 * cor + eps : 1.035 * cor - eps;
retval = ((res == res + cor) ? ((m) ? res : -res)
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
-index 8218237..b3cc124 100644
+index 8218237..d2283bc 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
-@@ -710,6 +710,14 @@ gaih_inet (const char *name, const struct gaih_service *service,
- struct gaih_addrtuple *addrfree = addrmem;
- for (int i = 0; i < air->naddrs; ++i)
+@@ -712,6 +712,18 @@ gaih_inet (const char *name, const struct gaih_service *service,
{
+ socklen_t size = (air->family[i] == AF_INET
+ ? INADDRSZ : IN6ADDRSZ);
++
+ if (!((air->family[i] == AF_INET
+ && req->ai_family == AF_INET6
+ && (req->ai_flags & AI_V4MAPPED) != 0)
+ || req->ai_family == AF_UNSPEC
+ || air->family[i] == req->ai_family))
-+ /* Skip over non-matching result. */
-+ continue;
++ {
++ /* Skip over non-matching result. */
++ addrs += size;
++ continue;
++ }
+
- socklen_t size = (air->family[i] == AF_INET
- ? INADDRSZ : IN6ADDRSZ);
if (*pat == NULL)
+ {
+ *pat = addrfree++;
diff --git a/sysdeps/powerpc/powerpc64/entry.h b/sysdeps/powerpc/powerpc64/entry.h
index 76ead1d..30553c1 100644
--- a/sysdeps/powerpc/powerpc64/entry.h
Reply to: