Auto-sync with upstream branch release/2.27/master

Upstream commit: 7602b9e48c30c146d52df91dd83e518b8d0d343b

- math: Fix parameter type in C++ version of iseqsig (swbz#23171)
- Use _STRUCT_TIMESPEC as guard in <bits/types/struct_timespec.h> (swbz#23349)
- getifaddrs: Don't return ifa entries with NULL names (swbz#21812)
- libio: Disable vtable validation in case of interposition (swbz#23313)
- stdio-common/tst-printf.c: Remove part under a non-free license (swbz#23363)
This commit is contained in:
Florian Weimer 2018-07-03 20:20:32 +02:00
parent 3a772d0fd4
commit 3fb5edda8e
2 changed files with 12 additions and 16 deletions

View File

@ -8,7 +8,7 @@ Date: Wed May 23 15:26:19 2018 +0200
CVE-2016-6261, CVE-2016-6263, CVE-2017-14062.
diff --git a/LICENSES b/LICENSES
index 80f7f1487947f578..b29efe01084af28c 100644
index 858076d9d3b8f8fb..0e3a9fe39b26e970 100644
--- a/LICENSES
+++ b/LICENSES
@@ -248,75 +248,6 @@ Public License, version 2.1 or later - see the file COPYING.LIB for details.
@ -20644,19 +20644,6 @@ index 0000000000000000..df8203b14a156f2e
+}
+
+#include <support/test-driver.c>
diff --git a/support/support_format_addrinfo.c b/support/support_format_addrinfo.c
index c5e00e516a8279f7..56dc7a9e0cbe92f3 100644
--- a/support/support_format_addrinfo.c
+++ b/support/support_format_addrinfo.c
@@ -67,8 +67,6 @@ format_ai_flags (FILE *out, struct addrinfo *ai)
FLAG (AI_ADDRCONFIG);
FLAG (AI_IDN);
FLAG (AI_CANONIDN);
- FLAG (AI_IDN_ALLOW_UNASSIGNED);
- FLAG (AI_IDN_USE_STD3_ASCII_RULES);
FLAG (AI_NUMERICSERV);
#undef FLAG
int remaining = ai->ai_flags & ~flags_printed;
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index c15f76e547e29533..e21e0f5f33dd422c 100644
--- a/sysdeps/posix/getaddrinfo.c

View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.27-63-g80c83e9114
%define glibcsrcdir glibc-2.27-70-g7602b9e48c
%define glibcversion 2.27
%define glibcrelease 19%{?dist}
%define glibcrelease 20%{?dist}
# Pre-release tarballs are pulled in from git using a command that is
# effectively:
#
@ -1976,6 +1976,15 @@ fi
%endif
%changelog
* Tue Jul 03 2018 Florian Weimer <fweimer@redhat.com> - 2.27-20
- Auto-sync with upstream branch release/2.27/master,
commit 7602b9e48c30c146d52df91dd83e518b8d0d343b:
- math: Fix parameter type in C++ version of iseqsig (swbz#23171)
- Use _STRUCT_TIMESPEC as guard in <bits/types/struct_timespec.h> (swbz#23349)
- getifaddrs: Don't return ifa entries with NULL names (swbz#21812)
- libio: Disable vtable validation in case of interposition (swbz#23313)
- stdio-common/tst-printf.c: Remove part under a non-free license (swbz#23363)
* Wed Jun 20 2018 Florian Weimer <fweimer@redhat.com> - 2.27-19
- Modernise nsswitch.conf defaults (#1581809)