diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2022-04-16 13:50:36 +0200 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2022-04-16 13:53:55 +0200 |
| commit | 2fb6951cd42da96efd9af438404bc48c1b015f4e (patch) | |
| tree | c649a08e739de94e37602ca2444eb164fe2257a6 | |
| parent | Rebase all (diff) | |
| download | glibc-patches-2fb6951cd42da96efd9af438404bc48c1b015f4e.tar.gz glibc-patches-2fb6951cd42da96efd9af438404bc48c1b015f4e.tar.bz2 glibc-patches-2fb6951cd42da96efd9af438404bc48c1b015f4e.zip | |
Drop getaddrinfo patch, let's see what breaks
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
| -rw-r--r-- | 9999/0002-Revert-sysdeps-posix-getaddrinfo.c-gaih_inet-Only-us.patch | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/9999/0002-Revert-sysdeps-posix-getaddrinfo.c-gaih_inet-Only-us.patch b/9999/0002-Revert-sysdeps-posix-getaddrinfo.c-gaih_inet-Only-us.patch deleted file mode 100644 index 59c2b86..0000000 --- a/9999/0002-Revert-sysdeps-posix-getaddrinfo.c-gaih_inet-Only-us.patch +++ /dev/null @@ -1,52 +0,0 @@ -From afd71f4f5c995d68a00f0d34210d80eaf08dbed8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org> -Date: Tue, 29 Aug 2017 22:58:50 +0200 -Subject: [PATCH 02/14] Revert " * sysdeps/posix/getaddrinfo.c (gaih_inet): - Only use gethostbyname4_r" - -This reverts commit 8479f23aa1d5e5477a37f46823856bdafaedfa46. - -See for the background - https://sourceware.org/bugzilla/show_bug.cgi?id=16826 - https://bugs.gentoo.org/show_bug.cgi?id=600632 - -This makes tst-nss-files-hosts-multi fail. Disable it. ---- - nss/Makefile | 1 - - sysdeps/posix/getaddrinfo.c | 8 ++------ - 2 files changed, 2 insertions(+), 7 deletions(-) - -diff --git a/nss/Makefile b/nss/Makefile -index d8b06b44fb..e3639f78ec 100644 ---- a/nss/Makefile -+++ b/nss/Makefile -@@ -85,7 +85,6 @@ tests-container := \ - # Tests which need libdl - ifeq (yes,$(build-shared)) - tests += tst-nss-files-hosts-erange --tests += tst-nss-files-hosts-multi - tests += tst-nss-files-hosts-getent - tests += tst-nss-files-alias-leak - tests += tst-nss-files-alias-truncated -diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c -index bcff909b2f..09954dee22 100644 ---- a/sysdeps/posix/getaddrinfo.c -+++ b/sysdeps/posix/getaddrinfo.c -@@ -623,12 +623,8 @@ get_nss_addresses (const char *name, const struct addrinfo *req, - } - - no_data = 0; -- nss_gethostbyname4_r *fct4 = NULL; -- -- /* gethostbyname4_r sends out parallel A and AAAA queries and -- is thus only suitable for PF_UNSPEC. */ -- if (req->ai_family == PF_UNSPEC) -- fct4 = __nss_lookup_function (nip, "gethostbyname4_r"); -+ nss_gethostbyname4_r *fct4 -+ = __nss_lookup_function (nip, "gethostbyname4_r"); - - if (fct4 != NULL) - { --- -2.35.1 - |