gentoo resync : 05.02.2020

2 files changed, 32 insertions, 0 deletions

diff --git a/net-analyzer/fping/files/fping-4.2-fno-common.patch b/net-analyzer/fping/files/fping-4.2-fno-common.patch
new file mode 100644
index 000000000000..d18af66b0637
--- /dev/null
+++ b/net-analyzer/fping/files/fping-4.2-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/fping.h
++++ b/src/fping.h
+@@ -11,7 +11,7 @@
+ void crash_and_burn( char *message );
+ void errno_crash_and_burn( char *message );
+ int in_cksum( unsigned short *p, int n );
+-int random_data_flag;
++extern int random_data_flag;
+ 
+ /* socket.c */
+ int  open_ping_socket_ipv4();
diff --git a/net-analyzer/fping/files/fping-4.2-fping6-6.patch b/net-analyzer/fping/files/fping-4.2-fping6-6.patch
new file mode 100644
index 000000000000..63138d3e2d2c
--- /dev/null
+++ b/net-analyzer/fping/files/fping-4.2-fping6-6.patch
@@ -0,0 +1,21 @@
+From 6fd4f8bd91abc43f80078bdd0084cb6d2b1de7f1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Johan=20Str=C3=B6m?= <johan@stromnet.se>
+Date: Tue, 25 Jun 2019 14:03:14 +0200
+Subject: [PATCH] Do not fail if using fping6 with -6 flag
+
+Mostly for backwards compatability
+---
+ src/fping.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/fping.c
++++ b/src/fping.c
+@@ -435,7 +435,7 @@
+             break;
+         case '6':
+ #ifdef IPV6
+-            if (hints_ai_family != AF_UNSPEC) {
++            if (hints_ai_family != AF_UNSPEC && hints_ai_family != AF_INET6) {
+                 fprintf(stderr, "%s: can't specify both -4 and -6\n", prog);
+                 exit(1);
+             }