commit: a646c7a9114a2dea6c92f877d48249f90d792971 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Thu Jan 19 17:26:34 2017 +0000 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> CommitDate: Sun Jan 22 21:09:17 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a646c7a9
net-misc/iputils: remove unused patches (cherry picked from commit 098227ab3f128470bffb406a43f32c766c9aa9b5) Fixes: https://github.com/gentoo/gentoo/pull/3542 Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> .../files/iputils-20150815-defines_and_libs.patch | 28 --------- ...ls-20150815-handle_single_protocol_system.patch | 70 ---------------------- 2 files changed, 98 deletions(-) diff --git a/net-misc/iputils/files/iputils-20150815-defines_and_libs.patch b/net-misc/iputils/files/iputils-20150815-defines_and_libs.patch deleted file mode 100644 index 4def935..00000000 --- a/net-misc/iputils/files/iputils-20150815-defines_and_libs.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ba739daf98450fe725569724eefc64a2afdeb909 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Pavel=20=C5=A0imerda?= <[email protected]> -Date: Thu, 20 Aug 2015 16:16:14 +0200 -Subject: [PATCH] ping: fix defines and libs in Makefile - ---- - Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 9b0b70f..4eea516 100644 ---- a/Makefile -+++ b/Makefile -@@ -153,10 +153,10 @@ DEF_clockdiff = $(DEF_CAP) - LIB_clockdiff = $(LIB_CAP) - - # ping / ping6 --DEF_ping_common = $(DEF_CAP) $(DEF_IDN) --DEF_ping6_common = $(DEF_CAP) $(DEF_IDN) --DEF_ping = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) --LIB_ping = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV) -+DEF_ping = $(DEF_CAP) $(DEF_IDN) $(DEF_CRYPTO) $(DEF_WITHOUT_IFADDRS) -+DEF_ping_common = $(DEF_ping) -+DEF_ping6_common = $(DEF_ping) -+LIB_ping = $(LIB_CAP) $(LIB_IDN) $(LIB_CRYPTO) $(LIB_RESOLV) - - ping: ping_common.o ping6_common.o - ping.o ping_common.o ping6_common.o: ping.h in6_flowlabel.h diff --git a/net-misc/iputils/files/iputils-20150815-handle_single_protocol_system.patch b/net-misc/iputils/files/iputils-20150815-handle_single_protocol_system.patch deleted file mode 100644 index 1bf98cc..00000000 --- a/net-misc/iputils/files/iputils-20150815-handle_single_protocol_system.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 9fd870a4bac0b8b2070c38452f378ef1eb7d460a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Pavel=20=C5=A0imerda?= <[email protected]> -Date: Fri, 21 Aug 2015 00:55:56 +0200 -Subject: [PATCH] ping: handle single protocol systems - ---- - ping.c | 28 ++++++++++++++++++---------- - 1 file changed, 18 insertions(+), 10 deletions(-) - -diff --git a/ping.c b/ping.c -index ec9708e..95a10a7 100644 ---- a/ping.c -+++ b/ping.c -@@ -110,26 +110,26 @@ static struct sockaddr_in source = { .sin_family = AF_INET }; - static char *device; - static int pmtudisc = -1; - --static void create_socket(socket_st *sock, int family, int socktype, int protocol) -+static void create_socket(socket_st *sock, int family, int socktype, int protocol, int requisite) - { - errno = 0; - - sock->fd = socket(family, socktype, protocol); - -- /* Fallback to raw socket when ping socket failed */ -- if (sock->fd == -1 && socktype == SOCK_DGRAM) { -+ /* Attempt creating a raw socket when ping socket failed */ -+ if (sock->fd == -1 && errno != EAFNOSUPPORT && socktype == SOCK_DGRAM) { - if (options & F_VERBOSE) - fprintf(stderr, "ping: socket: %s, attempting raw socket...\n", strerror(errno)); -- create_socket(sock, family, SOCK_RAW, protocol); -+ create_socket(sock, family, SOCK_RAW, protocol, requisite); - return; - } - - if (sock->fd == -1) { -- if (socktype == SOCK_RAW) -- fprintf(stderr, "ping: socket: %s (raw socket required by specified options).\n", strerror(errno)); -- else -+ if (requisite || errno != EAFNOSUPPORT || options & F_VERBOSE) - fprintf(stderr, "ping: socket: %s\n", strerror(errno)); -- exit(2); -+ if (requisite) -+ exit(2); -+ return; - } - - sock->socktype = socktype; -@@ -442,11 +442,19 @@ main(int argc, char **argv) - /* Create sockets */ - enable_capability_raw(); - if (hints.ai_family != AF_INET6) -- create_socket(&sock4, AF_INET, hints.ai_socktype, IPPROTO_ICMP); -+ create_socket(&sock4, AF_INET, hints.ai_socktype, IPPROTO_ICMP, hints.ai_family == AF_INET); - if (hints.ai_family != AF_INET) -- create_socket(&sock6, AF_INET6, hints.ai_socktype, IPPROTO_ICMPV6); -+ create_socket(&sock6, AF_INET6, hints.ai_socktype, IPPROTO_ICMPV6, sock4.fd == -1); - disable_capability_raw(); - -+ /* Limit address family on single-protocol systems */ -+ if (hints.ai_family == AF_UNSPEC) { -+ if (sock4.fd == -1) -+ hints.ai_family = AF_INET6; -+ else if (sock6.fd == -1) -+ hints.ai_family = AF_INET; -+ } -+ - /* Set socket options */ - if (settos) - set_socket_option(&sock4, IPPROTO_IP, IP_TOS, &settos, sizeof settos);
