CVS commit: pkgsrc/net/fping

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Nov  1 14:53:29 UTC 2016

Modified Files:
        pkgsrc/net/fping: Makefile PLIST distinfo
        pkgsrc/net/fping/patches: patch-aa
Added Files:
        pkgsrc/net/fping: options.mk

Log Message:
Changes 3.13:
* Fix ICMP errors sometimes causing crashes with fping >= 3.11


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/fping/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/fping/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/fping/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/fping/options.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/fping/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/fping/Makefile
diff -u pkgsrc/net/fping/Makefile:1.14 pkgsrc/net/fping/Makefile:1.15
--- pkgsrc/net/fping/Makefile:1.14      Fri May  9 15:28:53 2014
+++ pkgsrc/net/fping/Makefile   Tue Nov  1 14:53:29 2016
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2014/05/09 15:28:53 sborrill Exp $
+# $NetBSD: Makefile,v 1.15 2016/11/01 14:53:29 adam Exp $
 
-DISTNAME=      fping-3.10
+DISTNAME=      fping-3.13
 CATEGORIES=    net
 MASTER_SITES=  http://fping.org/dist/
 
@@ -8,8 +8,12 @@ MAINTAINER=    abs%NetBSD.org@localhost
 HOMEPAGE=      http://www.fping.org/
 COMMENT=       Quickly ping many hosts w/o flooding the network
 
-GNU_CONFIGURE= YES
+CONFIGURE_ARGS+=       --enable-ipv4
+GNU_CONFIGURE=         yes
 
 SPECIAL_PERMS+=                sbin/fping ${SETUID_ROOT_PERMS}
+SPECIAL_PERMS+=                sbin/fping6 ${SETUID_ROOT_PERMS}
+
+.include "options.mk"
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/fping/PLIST
diff -u pkgsrc/net/fping/PLIST:1.1 pkgsrc/net/fping/PLIST:1.2
--- pkgsrc/net/fping/PLIST:1.1  Wed Oct 31 22:55:23 2001
+++ pkgsrc/net/fping/PLIST      Tue Nov  1 14:53:29 2016
@@ -1,3 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:55:23 zuntum Exp $
-sbin/fping
+@comment $NetBSD: PLIST,v 1.2 2016/11/01 14:53:29 adam Exp $
 man/man8/fping.8
+${PLIST.ipv6}man/man8/fping6.8
+sbin/fping
+${PLIST.ipv6}sbin/fping6

Index: pkgsrc/net/fping/distinfo
diff -u pkgsrc/net/fping/distinfo:1.9 pkgsrc/net/fping/distinfo:1.10
--- pkgsrc/net/fping/distinfo:1.9       Wed Nov  4 00:35:00 2015
+++ pkgsrc/net/fping/distinfo   Tue Nov  1 14:53:29 2016
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2015/11/04 00:35:00 agc Exp $
+$NetBSD: distinfo,v 1.10 2016/11/01 14:53:29 adam Exp $
 
-SHA1 (fping-3.10.tar.gz) = d8a1fa3ec13289d67d70102c1ef16c461a7eb505
-RMD160 (fping-3.10.tar.gz) = ca957b5f629b6e32ab5592644a4fa75d7f737e07
-SHA512 (fping-3.10.tar.gz) = 64bf93c7dbfa2b8adc3344514b2e6e182f1e5950da08b042b8d4d5e4c94b2b8bdc3aaba804339d0461dd88e0efbdfc0bd914a10d22810da8138c9c45335f7047
-Size (fping-3.10.tar.gz) = 157010 bytes
-SHA1 (patch-aa) = 7a5c2a99abd08797b8567ff23bfe6764ba585cbf
+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

Index: pkgsrc/net/fping/patches/patch-aa
diff -u pkgsrc/net/fping/patches/patch-aa:1.7 pkgsrc/net/fping/patches/patch-aa:1.8
--- pkgsrc/net/fping/patches/patch-aa:1.7       Fri May  9 15:28:53 2014
+++ pkgsrc/net/fping/patches/patch-aa   Tue Nov  1 14:53:29 2016
@@ -1,10 +1,12 @@
-$NetBSD: patch-aa,v 1.7 2014/05/09 15:28:53 sborrill Exp $
+$NetBSD: patch-aa,v 1.8 2016/11/01 14:53:29 adam Exp $
 
---- src/fping.c.orig   2014-05-04 21:33:12.000000000 +0100
-+++ src/fping.c        2014-05-09 16:25:45.000000000 +0100
-@@ -1521,8 +1521,10 @@
- 
+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__ )

Added files:

Index: pkgsrc/net/fping/options.mk
diff -u /dev/null pkgsrc/net/fping/options.mk:1.1
--- /dev/null   Tue Nov  1 14:53:29 2016
+++ pkgsrc/net/fping/options.mk Tue Nov  1 14:53:29 2016
@@ -0,0 +1,19 @@
+# $NetBSD: options.mk,v 1.1 2016/11/01 14:53:29 adam Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.fping
+PKG_SUPPORTED_OPTIONS= inet6
+
+.if empty(MISSING_FEATURES:Minet6)
+PKG_SUGGESTED_OPTIONS= inet6
+.endif
+
+.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