From 887080ee792f16157feca5f70b5870aadd215f07 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 29 Mar 2016 13:04:25 +0200 Subject: [PATCH] Auto-sync with upstream master --- glibc-rh1252570.patch | 40 ++++++++++++++-------------------------- glibc.spec | 13 +++++++------ sources | 2 +- 3 files changed, 22 insertions(+), 33 deletions(-) diff --git a/glibc-rh1252570.patch b/glibc-rh1252570.patch index 228bb96..5960653 100644 --- a/glibc-rh1252570.patch +++ b/glibc-rh1252570.patch @@ -12,10 +12,10 @@ Date: Thu Feb 19 15:52:08 2015 +0100 setting nsaddr_list[].sin_family to zero. reverted: -Index: glibc-2.23-39-g314f6de/resolv/res_init.c +Index: glibc-2.23-131-ga603305/resolv/res_init.c =================================================================== ---- glibc-2.23-39-g314f6de.orig/resolv/res_init.c -+++ glibc-2.23-39-g314f6de/resolv/res_init.c +--- glibc-2.23-131-ga603305.orig/resolv/res_init.c ++++ glibc-2.23-131-ga603305/resolv/res_init.c @@ -139,8 +139,10 @@ __res_vinit(res_state statp, int preinit char *cp, **pp; int n; @@ -105,19 +105,7 @@ Index: glibc-2.23-39-g314f6de/resolv/res_init.c /* We try IPv6 servers again. */ statp->ipv6_unavail = false; } -@@ -580,7 +593,11 @@ __res_iclose(res_state statp, bool free_ - statp->_vcsock = -1; - statp->_flags &= ~(RES_F_VC | RES_F_CONN); - } -+#ifdef _LIBC -+ for (ns = 0; ns < MAXNS; ns++) -+#else - for (ns = 0; ns < statp->_u._ext.nscount; ns++) -+#endif - if (statp->_u._ext.nsaddrs[ns]) { - if (statp->_u._ext.nssocks[ns] != -1) { - close_not_cancel_no_status(statp->_u._ext.nssocks[ns]); -@@ -591,6 +608,8 @@ __res_iclose(res_state statp, bool free_ +@@ -591,6 +604,8 @@ __res_iclose(res_state statp, bool free_ statp->_u._ext.nsaddrs[ns] = NULL; } } @@ -126,10 +114,10 @@ Index: glibc-2.23-39-g314f6de/resolv/res_init.c } libc_hidden_def (__res_iclose) -Index: glibc-2.23-39-g314f6de/resolv/res_send.c +Index: glibc-2.23-131-ga603305/resolv/res_send.c =================================================================== ---- glibc-2.23-39-g314f6de.orig/resolv/res_send.c -+++ glibc-2.23-39-g314f6de/resolv/res_send.c +--- glibc-2.23-131-ga603305.orig/resolv/res_send.c ++++ glibc-2.23-131-ga603305/resolv/res_send.c @@ -193,7 +193,6 @@ evNowTime(struct timespec *res) { /* Forward. */ @@ -348,10 +336,10 @@ Index: glibc-2.23-39-g314f6de/resolv/res_send.c - return (struct sockaddr *) (void *) &statp->nsaddr_list[n]; -} - - /* The send_vc function is responsible for sending a DNS query over TCP - to the nameserver numbered NS from the res_state STATP i.e. - EXT(statp).nssocks[ns]. The function supports sending both IPv4 and -@@ -730,7 +752,7 @@ send_vc(res_state statp, + /* Close the resolver structure, assign zero to *RESPLEN2 if RESPLEN2 + is not NULL, and return zero. */ + static int +@@ -742,7 +764,7 @@ send_vc(res_state statp, const HEADER *hp = (HEADER *) buf; const HEADER *hp2 = (HEADER *) buf2; HEADER *anhp = (HEADER *) *ansp; @@ -360,7 +348,7 @@ Index: glibc-2.23-39-g314f6de/resolv/res_send.c int truncating, connreset, n; /* On some architectures compiler might emit a warning indicating 'resplen' may be used uninitialized. However if buf2 == NULL -@@ -763,8 +785,8 @@ send_vc(res_state statp, +@@ -775,8 +797,8 @@ send_vc(res_state statp, if (getpeername(statp->_vcsock, (struct sockaddr *)&peer, &size) < 0 || @@ -371,7 +359,7 @@ Index: glibc-2.23-39-g314f6de/resolv/res_send.c statp->_flags &= ~RES_F_VC; } } -@@ -773,19 +795,20 @@ send_vc(res_state statp, +@@ -785,19 +807,20 @@ send_vc(res_state statp, if (statp->_vcsock >= 0) __res_iclose(statp, false); @@ -396,7 +384,7 @@ Index: glibc-2.23-39-g314f6de/resolv/res_send.c __res_iclose(statp, false); return (0); } -@@ -979,7 +1002,8 @@ static int +@@ -991,7 +1014,8 @@ static int reopen (res_state statp, int *terrno, int ns) { if (EXT(statp).nssocks[ns] == -1) { diff --git a/glibc.spec b/glibc.spec index 84398bd..e36fc5f 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ -%define glibcsrcdir glibc-2.23-69-gf5e753c8 +%define glibcsrcdir glibc-2.23-131-ga603305 %define glibcversion 2.23.90 -%define glibcrelease 6%{?dist} +%define glibcrelease 7%{?dist} # Pre-release tarballs are pulled in from git using a command that is # effectively: # @@ -258,9 +258,6 @@ Patch0058: glibc-bug-regex-gcc5.patch # Add C.UTF-8 locale into /usr/lib/locale/ Patch0059: glibc-c-utf8-locale.patch -# Use "an" as language code. -Patch0060: glibc-fix-an_ES.patch - ############################################################################## # # Patches from upstream @@ -796,7 +793,6 @@ cat /proc/meminfo %patch2036 -p1 %patch2037 -p1 %patch2099 -p1 -%patch0060 -p1 ############################################################################## # %%prep - Additional prep required... @@ -2096,6 +2092,11 @@ rm -f *.filelist* %endif %changelog +* Tue Mar 29 2016 Florian Weimer - 2.23.90-7 +- Auto-sync with upstream master. +- Adjust glibc-rh1252570.patch to partial upstream fix. +- Drop glibc-fix-an_ES.patch, now included upstream. + * Wed Mar 16 2016 Carlos O'Donell - 2.23.90-6 - Use 'an' as language abbreviation for an_ES. diff --git a/sources b/sources index a80a833..a27b541 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b01f358459ba0816cfa7adb2a3ae2426 glibc-2.23-69-gf5e753c8.tar.gz +83d61f05d5fc8b33db80862860318214 glibc-2.23-131-ga603305.tar.gz