Changes 4.0:

Incompatible Changes
- fping and fping6 unification
- Option -n, not the same as -d anymore
- Discarding of late packets
- No restrictions by default
- Default interval (-i) changed from 25ms to 10ms

New features
- Unified 'fping' and 'fping6' into one binary
- Long option names for all options
- IPv6 enabled by default
- New option -4 to force IPv4
- New option -6 to force IPv6
- Keep original name if a hostname is given with -n/--name
- Option -d/--rdns now always does a rdns-lookup, even for names, as '-n' was doing until now
- Enforce -t timeout on reply packets, by discarding late packets
- Auto-adjust timeout for -c/-C/-l mode to value of -p

Bugfixes and other changes
- -i/-p restrictions disabled by default (enable with --enable-safe-limits)
- Default interval -i changed from 25ms to 10ms
- Fix compatibility issue with GNU Hurd
- A C99 compiler is now required
- Option parsing with optparse (https://github.com/skeeto/optparse)
- New changelog file format

8 files changed, 40 insertions, 52 deletions

diff --git a/net/fping/Makefile b/net/fping/Makefile
index d5039cda9b5..7a946a83154 100644
--- a/net/fping/Makefile
+++ b/net/fping/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2016/12/10 23:18:54 wiedi Exp $
+# $NetBSD: Makefile,v 1.17 2017/05/20 11:25:50 adam Exp $
 
-DISTNAME=	fping-3.13
+DISTNAME=	fping-4.0
 CATEGORIES=	net
 MASTER_SITES=	http://fping.org/dist/
 
@@ -8,11 +8,9 @@ MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://www.fping.org/
 COMMENT=	Quickly ping many hosts w/o flooding the network
 
-CONFIGURE_ARGS+=	--enable-ipv4
 GNU_CONFIGURE=		yes
 
 SPECIAL_PERMS+=		sbin/fping ${SETUID_ROOT_PERMS}
-SPECIAL_PERMS+=		sbin/fping6 ${SETUID_ROOT_PERMS}
 
 CPPFLAGS.SunOS+=	-Dn_time=uint32_t
 
diff --git a/net/fping/PLIST b/net/fping/PLIST
index baae5e61ab2..2ddde5942c6 100644
--- a/net/fping/PLIST
+++ b/net/fping/PLIST
@@ -1,5 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2016/11/01 14:53:29 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/05/20 11:25:50 adam Exp $
 man/man8/fping.8
-${PLIST.ipv6}man/man8/fping6.8
 sbin/fping
-${PLIST.ipv6}sbin/fping6
diff --git a/net/fping/distinfo b/net/fping/distinfo
index e6be440eb75..ec0fc956c38 100644
--- a/net/fping/distinfo
+++ b/net/fping/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2016/12/29 15:04:29 he Exp $
+$NetBSD: distinfo,v 1.12 2017/05/20 11:25:50 adam Exp $
 
-SHA1 (fping-3.13.tar.gz) = cf38041613a5afaf614130dd79ebbcc5a121d196
-RMD160 (fping-3.13.tar.gz) = 8014495b2665d44dcd942e6b772d2bcdc94dc104
-SHA512 (fping-3.13.tar.gz) = d6c1c5b9edb97ef59cfb6d22f74f6a055e52465d3ba0f93be35b6fc9615ee08490ee927f3cf9efd087e18279519292f353abe6152061985ee166ba5f7e95e29d
-Size (fping-3.13.tar.gz) = 155976 bytes
-SHA1 (patch-aa) = b6f1470e21efe9adaa9dee1e870b2887c506ec08
-SHA1 (patch-src_socket4.c) = fc7ea74b7aee1e468318b9385c90a4d5b465d778
+SHA1 (fping-4.0.tar.gz) = a8f636d08bd3356b79e9cae14ce3f10a3fc5907d
+RMD160 (fping-4.0.tar.gz) = 313e61d4a57669ceeb5544ae62a63972d7dbde22
+SHA512 (fping-4.0.tar.gz) = 5dca650e9c34dd2e1bdbb981df61cf092230f07a15c4ccef105b9f58aaaa43e0d85dc9665db89631feded503ecc6f6be86446719de18e59349adb7c2f3e9757e
+Size (fping-4.0.tar.gz) = 170060 bytes
+SHA1 (patch-configure) = 636ad756f815bcab7e5817a3e339d196cd4c3e8d
+SHA1 (patch-src_fping.c) = c8047e60ed9693c2ad9d7f016854ca76933ea4c7
diff --git a/net/fping/options.mk b/net/fping/options.mk
index acf020ceead..f9b483020a3 100644
--- a/net/fping/options.mk
+++ b/net/fping/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2016/11/01 14:53:29 adam Exp $
+# $NetBSD: options.mk,v 1.2 2017/05/20 11:25:50 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.fping
 PKG_SUPPORTED_OPTIONS=	inet6
@@ -9,11 +9,8 @@ PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=	ipv6
-
 .if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=	--enable-ipv6
-PLIST.ipv6=		yes
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
diff --git a/net/fping/patches/patch-aa b/net/fping/patches/patch-aa
deleted file mode 100644
index 53a8df55305..00000000000
--- a/net/fping/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2016/11/01 14:53:29 adam Exp $
-
-Fix for NetBSD-alpha.
-
---- src/fping.c.orig	2015-10-21 19:02:56.000000000 +0000
-+++ src/fping.c
-@@ -1493,8 +1493,10 @@ int wait_for_reply(long wait_time)
-     ip = ( struct ip* )buffer;
- 
- #ifndef IPV6
--#if defined( __alpha__ ) && __STDC__ && !defined( __GLIBC__ )
-+#if defined( __alpha__ ) && __STDC__ && !defined( __GLIBC__ ) && !defined( __NetBSD__ )
-     /* The alpha headers are decidedly broken.
-+     * XXX _WHAT_ 'alpha'? OSF? True64? Linux?... Certainly not NetBSD
-+     * XXX If defining for a particular broken OS then _include the OS_.
-      * Using an ANSI compiler, it provides ip_vhl instead of ip_hl and
-      * ip_v.  So, to get ip_hl, we mask off the bottom four bits.
-      */
diff --git a/net/fping/patches/patch-configure b/net/fping/patches/patch-configure
new file mode 100644
index 00000000000..1cd78831242
--- /dev/null
+++ b/net/fping/patches/patch-configure
@@ -0,0 +1,14 @@
+$NetBSD: patch-configure,v 1.1 2017/05/20 11:25:50 adam Exp $
+
+Include missing header.
+
+--- configure.orig	2017-05-20 10:15:54.000000000 +0000
++++ configure
+@@ -3098,6 +3098,7 @@ if test "x$enable_ipv6" != "xno"; then :
+            for ac_header in netinet/icmp6.h
+ do :
+   ac_fn_c_check_header_compile "$LINENO" "netinet/icmp6.h" "ac_cv_header_netinet_icmp6_h" "
++      #include <sys/types.h>
+       #include <netinet/in.h>
+ 
+ "
diff --git a/net/fping/patches/patch-src_fping.c b/net/fping/patches/patch-src_fping.c
new file mode 100644
index 00000000000..0f5f2a5d4f9
--- /dev/null
+++ b/net/fping/patches/patch-src_fping.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_fping.c,v 1.1 2017/05/20 11:25:50 adam Exp $
+
+Fix for NetBSD-alpha.
+
+--- src/fping.c.orig	2017-04-23 16:03:08.000000000 +0000
++++ src/fping.c
+@@ -1787,7 +1787,7 @@ int decode_icmp_ipv4(
+     struct icmp* icp;
+     int hlen = 0;
+ 
+-#if defined(__alpha__) && __STDC__ && !defined(__GLIBC__)
++#if defined(__alpha__) && __STDC__ && !defined(__GLIBC__) && !defined(__NetBSD__)
+     /* The alpha headers are decidedly broken.
+      * Using an ANSI compiler, it provides ip_vhl instead of ip_hl and
+      * ip_v.  So, to get ip_hl, we mask off the bottom four bits.
diff --git a/net/fping/patches/patch-src_socket4.c b/net/fping/patches/patch-src_socket4.c
deleted file mode 100644
index c5dda90c918..00000000000
--- a/net/fping/patches/patch-src_socket4.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_socket4.c,v 1.1 2016/12/29 15:04:29 he Exp $
-
-Fix for building on NetBSD 6.0, also works on 7.0.
-
---- src/socket4.c.orig	2015-10-21 19:02:56.000000000 +0000
-+++ src/socket4.c
-@@ -35,6 +35,9 @@
- 
- #include <sys/socket.h>
- #include <netinet/in.h>
-+#ifdef __NetBSD__
-+#include <netinet/in_systm.h>	/* for n_time */
-+#endif /* __NetBSD__ */
- #include <netinet/ip.h>
- #include <netinet/ip_icmp.h>
- #include <netdb.h>