Update scamper to 20130824. Scamper's homepage (and code) has shifted.

PR pkg/48156

* add a sc_warts2json utility program that prints out JSON renderings
  of trace, ping, and dealias objects in scamper warts files.  this is
  useful when developing simple analysis programs in perl.  the
  initial implementation of JSON output for ping and trace was
  supplied by Internap.  Thanks a lot Internap!

* add a sc_speedtrap utility program that resolves a set of IPv6
  interfaces for aliases (which interfaces belong to the same router).
  documented in sc_speedtrap(1) man page.
  http://www.caida.org/~mjl/pubs/speedtrap.pdf

* add a sc_ipiddump utility program that prints out all IPIDs received
  in ping and dealias objects.  documented in sc_ipiddump(1) man page.
  in ping and dealias objects.  documented in sc_ipiddump(1) man page.

in scamper:
* output json objects with -O json
* add -O debugfileappend, causing the debugfile to be appended to
  rather than truncated
* do not output debugging information to stderr if NDEBUG was
  specified
* drain fds that are not used by any measurement but have not been
  closed yet
* improve the use of poll()
* allow a control socket client to specify its mixing priority
* correctly interpret the neighbour discovery cache sysctl on MacOS.
* fix build on MacOS systems without IPFW.
* fixes prompted by clang static analysis.
* fixes prompted by clang static analysis.

in sc_analysis_dump:
* improvements to the comment header printed automatically at the start
* add -M option to print out MPLS headers in ICMP extensions.
* add -Q option to print out Quoted IP TTL
* add -T option to print out the IP TTL of the response packet

in scamper-ping
* implement stats function so that the stats printed are not junk
* add an -M <mtu> option which causes scamper to send a PTB in
  response to a packet larger than the given size.
* add a -P icmp-time option which causes ping to send ICMP timestamp
  requests.
  requests.

in scamper-sting:
* various improvements in the hole filling phase.
* add -U <userid>

in scamper-dealias:
* implement IPv6 support for Ally and RadarGun which is induced by
  sending ICMP echo packets larger than a given pseudo MTU size
  (causing a responses to be fragmented and thus an ID field revealed.
* implement IPv6 support for Mercator
* be more strict in declaring two interfaces to be aliases: infer
  the byte ordering by determining if the shortest distance in a
  sequence of ID values is in byte-swapped or not, and then using
  that byte ordering mode.

4 files changed, 18 insertions, 18 deletions

diff --git a/net/scamper/DESCR b/net/scamper/DESCR
index 36b16fc3408..6e11ce7d4fe 100644
--- a/net/scamper/DESCR
+++ b/net/scamper/DESCR
@@ -1,9 +1,3 @@
-scamper is a program that conducts traceroute to large numbers of IPv4
-and IPv6 addresses in parallel to fill a specified packets-per-second rate.
-
-scamper can do ICMP based Path MTU discovery. scamper starts with the
-outgoing interface's MTU and discovers the location of PMTU bottlenecks.
-Recent revision of scamper do a PMTU search when an ICMP fragmentation
-required message is not returned to establish the PMTU to the next point
-in the network, followed by a TTL limited search to infer the hop
-where failure appears to occur.
+Scamper is a program that conducts Internet measurement techniques such
+as ping and traceroute to large numbers of IPv4 and IPv6 addresses in
+parallel to fill a specified packets-per-second rate.
diff --git a/net/scamper/Makefile b/net/scamper/Makefile
index ba0f5b4e97e..05b8ac06095 100644
--- a/net/scamper/Makefile
+++ b/net/scamper/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.13 2012/10/23 17:19:07 asau Exp $
+# $NetBSD: Makefile,v 1.14 2013/08/26 20:46:02 markd Exp $
 #
 
-DISTNAME=	scamper-cvs-20111202b
+DISTNAME=	scamper-cvs-20130824
 PKGNAME=	${DISTNAME:S/-cvs//}
 CATEGORIES=	net
-MASTER_SITES=	http://www.wand.net.nz/scamper/
+MASTER_SITES=	http://www.caida.org/tools/measurement/scamper/code/
 
 MAINTAINER=	mjl@luckie.org.nz
-HOMEPAGE=	http://www.wand.net.nz/scamper/
+HOMEPAGE=	http://www.caida.org/tools/measurement/scamper/
 COMMENT=	Tool for parallelised IPv4 and IPv6 measurement
 LICENSE=	gnu-gpl-v2
 
diff --git a/net/scamper/PLIST b/net/scamper/PLIST
index 4e1ef22231b..25a84b74711 100644
--- a/net/scamper/PLIST
+++ b/net/scamper/PLIST
@@ -1,8 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2012/04/16 06:09:47 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/08/26 20:46:02 markd Exp $
 bin/sc_ally
 bin/sc_analysis_dump
 bin/sc_attach
+bin/sc_ipiddump
+bin/sc_speedtrap
 bin/sc_tracediff
+bin/sc_warts2json
 bin/sc_warts2pcap
 bin/sc_warts2text
 bin/sc_wartscat
@@ -25,7 +28,10 @@ lib/libscamperfile.la
 man/man1/sc_ally.1
 man/man1/sc_analysis_dump.1
 man/man1/sc_attach.1
+man/man1/sc_ipiddump.1
+man/man1/sc_speedtrap.1
 man/man1/sc_tracediff.1
+man/man1/sc_warts2json.1
 man/man1/sc_warts2pcap.1
 man/man1/sc_warts2text.1
 man/man1/sc_wartscat.1
diff --git a/net/scamper/distinfo b/net/scamper/distinfo
index e1689ebb5bb..0257f88e275 100644
--- a/net/scamper/distinfo
+++ b/net/scamper/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2012/04/16 06:09:47 markd Exp $
+$NetBSD: distinfo,v 1.9 2013/08/26 20:46:02 markd Exp $
 
-SHA1 (scamper-cvs-20111202b.tar.gz) = cb4a2aff46afd05618e7134b7edf3bc2e0f84300
-RMD160 (scamper-cvs-20111202b.tar.gz) = cf1e43c4f50d03a44df2b32b3127ffe90f4b1723
-Size (scamper-cvs-20111202b.tar.gz) = 1118438 bytes
+SHA1 (scamper-cvs-20130824.tar.gz) = c3d5c5bb28fd39020a13d9d7be25e4e5ac0cb05e
+RMD160 (scamper-cvs-20130824.tar.gz) = f4caeae59f93d3b33e1773c00579f6ee5cce69a9
+Size (scamper-cvs-20130824.tar.gz) = 1209926 bytes