Update to 20111202b (PR pkg/46330)

* provide documentation for libscamperfile
* fix ping -O spoof
* fix tracelb and sniff bugs that cause scamper to crash
* fix sc_analysis_dump, sc_warts2pcap, and sc_wartscat man pages
* fix sc_warts2text to read from stdin if no files specified
* add -a (all) -m (pair method) and -n (use dns) options to sc_tracediff

* initial draft of a man page for the warts file format.
   man 5 warts.
* provide -O copyout option to scamper itself, which allows all
   data written over the control socket in "attach" mode to also
   be sent to a named file.  useful for debugging.  documented
   in the scamper man page.
* provide ability to specify the source address of a PTB in tbit.
* in attach mode, each command now returns a command ID as part
   of the OK response.  a command may be halted before it completes
   by issuing a halt command over the same control socket.
* when sanity checking the probe size requested in ping, take
   account of the timestamp IP option correctly.  noticed by
   Alistair.

* fix scamper man page to say -d can be used to set the ICMP checksum
   value in Paris traceroute.  noticed by Alistair.
* add scamper_addr_netaddr, a routine to mask the network portion of
   an IP address in a scamper_addr_t.
* fix scamper's ping to actually set the tos byte that is passed in.
   noticed by Alistair.
* fix scamper's ping to record ICMPv6 PTB messages.
* fix the result code set on sniff tasks when a sniff task is halted.
* fix compiler warnings

* correct copyright notices to reflect that, until 2006,
   I have copyright.  No change to GPLv2 license.
* Switch from select(2) to poll(2) by default, which is useful
   when more than a thousand fds are monitored for events.
   Force the use of select instead of poll by invoking scamper
   with -O select.
* Add support for kqueue (BSD) and epoll (Linux).  To use,
   specify -O kqueue or -O epoll when scamper is invoked.
* Fix a bug that could allow scamper to enter an infinite
   loop if a packet with malformed IP options is received.
* Add support for raw IP sockets, and use these to send
   TCP probes in traceroute if the datalink socket can't be
   used to transmit.
* Set SO_REUSEADDR on TCP sockets.
* Add a new traceroute method: IPv6 fragment traceroute.
   specify the offset to encode in the fragment offset with -o
* Fix file support so that if '-' is specified as the source of
   addresses to probe stdin is read, rather than stdout.  ensure
   the file is closed if an error is encountered when opening a
   file.
* Fix bug in MDA traceroute where some TCP responses from the
   target were ignored.
* Fix a potential memory leak in the neighbour discovery code
* Implement code to calculate statistics (min/mean/max/stddev)
   on ping results.
* Detach the writebuf before closing an attached control socket
* Silence all clang static analysis warnings.

* do not output scamper_debug to stderr if NDEBUG has been specified
* fix logic when -O rawtcp is used with tcptraceroute
* fix scamper event loop to drain sockets that are currently
   unreferenced
* fix scamper event loop to handle POLLHUP
* fix double-frees in scamper_sources.c
* fix small memory leak in scamper_sources.c, noticed by Stephen
* fix uname_wrap on 64bit systems, noticed by Stephen

* do not print "cat" when the -e option is used with sc_analysis_dump.
* fix mixing of sources according to their priority.
* when building the scamper binary, do not use the libscamperfile
   library.  instead, build all code into scamper to ensure scamper
   itself will always work.

3 files changed, 9 insertions, 7 deletions

diff --git a/net/scamper/Makefile b/net/scamper/Makefile
index 810a1e9d94e..70b30e34de8 100644
--- a/net/scamper/Makefile
+++ b/net/scamper/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2011/05/03 11:51:12 obache Exp $
+# $NetBSD: Makefile,v 1.12 2012/04/16 06:09:47 markd Exp $
 #
 
-DISTNAME=	scamper-cvs-20110503
+DISTNAME=	scamper-cvs-20111202b
 PKGNAME=	${DISTNAME:S/-cvs//}
 CATEGORIES=	net
 MASTER_SITES=	http://www.wand.net.nz/scamper/
diff --git a/net/scamper/PLIST b/net/scamper/PLIST
index a2201301580..4e1ef22231b 100644
--- a/net/scamper/PLIST
+++ b/net/scamper/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2011/04/30 11:35:26 obache Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/04/16 06:09:47 markd Exp $
 bin/sc_ally
 bin/sc_analysis_dump
 bin/sc_attach
@@ -31,3 +31,5 @@ man/man1/sc_warts2text.1
 man/man1/sc_wartscat.1
 man/man1/sc_wartsdump.1
 man/man1/scamper.1
+man/man3/libscamperfile.3
+man/man5/warts.5
diff --git a/net/scamper/distinfo b/net/scamper/distinfo
index 43291f2afcf..e1689ebb5bb 100644
--- a/net/scamper/distinfo
+++ b/net/scamper/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2011/05/03 11:51:12 obache Exp $
+$NetBSD: distinfo,v 1.8 2012/04/16 06:09:47 markd Exp $
 
-SHA1 (scamper-cvs-20110503.tar.gz) = 65eb854a359a4f084f0d9616adfca617d5e6cb48
-RMD160 (scamper-cvs-20110503.tar.gz) = 2f3e1d25f1b5f36527f532078900a15d2f36aadc
-Size (scamper-cvs-20110503.tar.gz) = 1087267 bytes
+SHA1 (scamper-cvs-20111202b.tar.gz) = cb4a2aff46afd05618e7134b7edf3bc2e0f84300
+RMD160 (scamper-cvs-20111202b.tar.gz) = cf1e43c4f50d03a44df2b32b3127ffe90f4b1723
+Size (scamper-cvs-20111202b.tar.gz) = 1118438 bytes