diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2015-08-20 14:18:18 +0200 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2015-08-20 14:18:18 +0200 |
| commit | 8416ea962b3feb527e8ca0ed4d05c524f3a66b3a (patch) | |
| tree | 3e857011e2d1dab2dde01763561c3b6f57a25f74 /net-misc/iputils/files | |
| parent | dev-util/scala-ide: Version bump. (diff) | |
| download | gentoo-8416ea962b3feb527e8ca0ed4d05c524f3a66b3a.tar.gz gentoo-8416ea962b3feb527e8ca0ed4d05c524f3a66b3a.tar.bz2 gentoo-8416ea962b3feb527e8ca0ed4d05c524f3a66b3a.zip | |
net-misc/iputils: Bump to version 20150815.
Package-Manager: portage-2.2.20.1
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'net-misc/iputils/files')
3 files changed, 105 insertions, 0 deletions
diff --git a/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch b/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch new file mode 100644 index 000000000000..50e108b09e85 --- /dev/null +++ b/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch @@ -0,0 +1,11 @@ +--- iputils-s20150815/ping.h ++++ iputils-s20150815/ping.h +@@ -61,7 +61,7 @@ + + #define MAXWAIT 10 /* max seconds to wait for response */ + #define MININTERVAL 10 /* Minimal interpacket gap */ +-#define MINUSERINTERVAL 200 /* Minimal allowed interval for non-root */ ++#define MINUSERINTERVAL 0 /* Minimal allowed interval for non-root */ + + #define SCHINT(a) (((a) <= MININTERVAL) ? MININTERVAL : (a)) + diff --git a/net-misc/iputils/files/iputils-20150815-ping6_crypto.patch b/net-misc/iputils/files/iputils-20150815-ping6_crypto.patch new file mode 100644 index 000000000000..1e236eed1f1e --- /dev/null +++ b/net-misc/iputils/files/iputils-20150815-ping6_crypto.patch @@ -0,0 +1,29 @@ +From a45b719645960c9bacb430e452192d6ffac5be19 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomial-c@gentoo.org> +Date: Thu, 20 Aug 2015 13:43:47 +0200 +Subject: [PATCH] Let ping6 use crypto if enabled. + +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index e34be5b..d4cb6c0 100644 +--- a/Makefile ++++ b/Makefile +@@ -159,9 +159,9 @@ LIB_clockdiff = $(LIB_CAP) + + # ping / ping6 + DEF_ping_common = $(DEF_CAP) $(DEF_IDN) +-DEF_ping6_common = $(DEF_CAP) $(DEF_IDN) ++DEF_ping6_common = $(DEF_CAP) $(DEF_IDN) $(DEF_CRYPTO) + DEF_ping = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_IPV4) +-LIB_ping = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV) ++LIB_ping = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV) $(LIB_CRYPTO) + + ping: ping_common.o ping6_common.o + ping.o ping_common.o ping6_common.o: ping.h in6_flowlabel.h +-- +2.5.0 + diff --git a/net-misc/iputils/files/iputils-20150815-ping_default_ipv4.patch b/net-misc/iputils/files/iputils-20150815-ping_default_ipv4.patch new file mode 100644 index 000000000000..71d32f0f4aa6 --- /dev/null +++ b/net-misc/iputils/files/iputils-20150815-ping_default_ipv4.patch @@ -0,0 +1,65 @@ +From 8d4d34eea9fbd25d0103975f366799764bbc4a2f Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomial-c@gentoo.org> +Date: Thu, 20 Aug 2015 11:47:22 +0200 +Subject: [PATCH] Add possibility to make ping use IPv4 by default. + +Using ping with a linux kernel without IPv6 capability yields to the +following problem: + +> ping www.google.de +ping: socket: Address family not supported by protocol (raw socket +required by specified options). +> + +because ping is using IPv6 by default when -4 option is omitted. + +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> +--- + Makefile | 7 ++++++- + ping.c | 5 +++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 8b37c42..e34be5b 100644 +--- a/Makefile ++++ b/Makefile +@@ -114,6 +114,11 @@ ifeq ($(ENABLE_PING6_RTHDR),RFC3542) + endif + endif + ++# DEFAULT TO IPV4 ++ifneq ($(IPV4_DEFAULT),no) ++ DEF_IPV4 = -DIPV4_DEFAULT ++endif ++ + # ------------------------------------- + TARGETS=ping tracepath tracepath6 traceroute6 clockdiff rdisc arping tftpd rarpd + +@@ -155,7 +160,7 @@ 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) ++DEF_ping = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_IPV4) + LIB_ping = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV) + + ping: ping_common.o ping6_common.o +diff --git a/ping.c b/ping.c +index ec9708e..a08a03e 100644 +--- a/ping.c ++++ b/ping.c +@@ -439,6 +439,11 @@ main(int argc, char **argv) + + target = argv[argc-1]; + ++#ifdef IPV4_DEFAULT ++ if (hints.ai_family == AF_UNSPEC) ++ hints.ai_family = AF_INET; ++#endif ++ + /* Create sockets */ + enable_capability_raw(); + if (hints.ai_family != AF_INET6) +-- +2.5.0 + |