4 files changed, 156 insertions, 28 deletions

diff --git a/security/silktools/Makefile b/security/silktools/Makefile
index 818a66d49eb6..1ca8e5db3996 100644
--- a/security/silktools/Makefile
+++ b/security/silktools/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	silktools
-PORTVERSION=	0.10.5
+PORTVERSION=	0.11.1
 CATEGORIES=	security net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://tools.netsa.cert.org/releases/
+DISTNAME=	silk-${PORTVERSION}
 
 MAINTAINER=	lx@FreeBSD.org
 COMMENT=	Tools for large-scale network capture analysis
@@ -29,16 +29,13 @@ MAN1=	rwip2cc.1 rwpmapbuild.1 mapsid.1 num2dot.1 rwaddrcount.1 rwappend.1 \
 	rwnetmask.1 rwrandomizeip.1 rwset.1 rwsetbuild.1 rwsetcat.1 rwsort.1 \
 	rwsetintersect.1 rwsetunion.1 rwstats.1 rwswapbytes.1 rwtotal.1 \
 	rwtuc.1 rwuniq.1 rwptoflow.1 rwpmatch.1 rwpdedupe.1 rwpcut.1 \
-	rwp2yaf2silk.1
+	rwp2yaf2silk.1 rwgeoip2ccmap.1 rwpmapcat.1 rwresolve.1 rwscan.1 \
+	rwscanquery.1 rwsetmember.1 rwsettool.1 rwsplit.1
 
 MAN3=	libaddrtype.3 libccfilter.3 libpmapfilter.3
 
-MAN5=	sensor.conf.5
+MAN5=	sensor.conf.5 silk.conf.5
 
-MAN8=	rwflowpack.8 flowcap.8
-
-post-install:
-	@${MV} ${PREFIX}/share/silk/rwfpd.conf ${PREFIX}/share/silk/rwfpd.conf.sample
-	@${MV} ${PREFIX}/share/silk/flowcap.conf ${PREFIX}/share/silk/flowcap.conf.sample
+MAN8=	rwflowpack.8 rwpackchecker.8 rwflowappend.8 rwreceiver.8 rwsender.8
 
 .include <bsd.port.mk>
diff --git a/security/silktools/distinfo b/security/silktools/distinfo
index 13c9e51bad9d..8a47df1ce03e 100644
--- a/security/silktools/distinfo
+++ b/security/silktools/distinfo
@@ -1,3 +1,3 @@
-MD5 (silktools-0.10.5.tar.gz) = 572027aa913ee4c83a019098ceda4224
-SHA256 (silktools-0.10.5.tar.gz) = 4d0a6016314251b4d2900da277188d6fdf454b9d8bbeb034a608cc5af1670dd2
-SIZE (silktools-0.10.5.tar.gz) = 1071487
+MD5 (silk-0.11.1.tar.gz) = f8df3214b7e187161a6e20b24f5bd014
+SHA256 (silk-0.11.1.tar.gz) = 4a0312649f35bc9c4e12b4ae2d06baeca7bacf4382723666d8c1aaa02d9f881a
+SIZE (silk-0.11.1.tar.gz) = 1862799
diff --git a/security/silktools/pkg-descr b/security/silktools/pkg-descr
index 1d3c327928e4..5290def87736 100644
--- a/security/silktools/pkg-descr
+++ b/security/silktools/pkg-descr
@@ -5,4 +5,4 @@ Awareness) Team to facilitate security analysis in large networks.
 SiLK consists of a suite of tools which collect and examine netflow
 data, allowing analysts to rapidly query large sets of data. 
 
-WWW: http://silktools.sourceforge.net
+WWW: http://tools.netsa.cert.org/silk/
diff --git a/security/silktools/pkg-plist b/security/silktools/pkg-plist
index 16dcb8b7cce1..172f74f64777 100644
--- a/security/silktools/pkg-plist
+++ b/security/silktools/pkg-plist
@@ -14,6 +14,7 @@ bin/rwcount
 bin/rwcut
 bin/rwip2cc
 bin/rwpmapbuild
+bin/rwpmapcat
 bin/rwallformats
 bin/rwresolve
 bin/rwsetbuild
@@ -22,38 +23,168 @@ bin/rwsetintersect
 bin/rwsetunion
 bin/rwtuc
 bin/rwp2yaf2silk
-bin/flowcap
-bin/rwflowcapd
 bin/rwfglob
 bin/rwfileinfo
 bin/rwfilter
-bin/rwflowpack
-bin/rwfpd
 bin/rwgroup
 bin/rwmatch
 bin/rwnetmask
 bin/rwpcut
 bin/rwpdedupe
+bin/rwgeoip2ccmap
 bin/rwpmatch
 bin/rwptoflow
 bin/rwrandomizeip
 bin/rwrtd2split
+bin/rwscan
+bin/rwscanquery
 bin/rwset
+bin/rwsetmember
+bin/rwsettool
 bin/rwset-union
 bin/rwsort
 bin/rwstats
+bin/rwsplit
 bin/rwswapbytes
 bin/rwtotal
 bin/rwuniq
 bin/setintersect
-lib/libccfilter.so
-lib/libipfilter.so
-lib/librwslammer.so
-lib/librwsynackfin.so
-lib/libaddrtype.so
-lib/libpmapfilter.so
-lib/libipport.so
-lib/librwp2f_minbytes.so
-share/silk/rwfpd.conf.sample
-share/silk/flowcap.conf.sample
+lib/libsilk.so.0
+lib/libsilk.so
+lib/libsilk.la
+lib/libsilk.a
+lib/libthreadutils.so.0
+lib/libthreadutils.so
+lib/libthreadutils.la
+lib/libthreadutils.a
+lib/libredblack.so.0
+lib/libredblack.so
+lib/libredblack.la
+lib/libredblack.a
+lib/libsksetbag.so.0
+lib/libsksetbag.so
+lib/libsksetbag.la
+lib/libsksetbag.a
+lib/silk/libaddrtype.so.0
+lib/silk/libaddrtype.so
+lib/silk/libaddrtype.la
+lib/silk/libaddrtype.a
+lib/silk/libccfilter.so.0
+lib/silk/libccfilter.so
+lib/silk/libccfilter.la
+lib/silk/libccfilter.a
+lib/silk/libpmapfilter.so.0
+lib/silk/libpmapfilter.so
+lib/silk/libpmapfilter.la
+lib/silk/libpmapfilter.a
+lib/silk/libipport.so.0
+lib/silk/libipport.so
+lib/silk/libipport.la
+lib/silk/libipport.a
+lib/silk/librwslammer.so.0
+lib/silk/librwslammer.so
+lib/silk/librwslammer.la
+lib/silk/librwslammer.a
+lib/silk/librwsynackfin.so.0
+lib/silk/librwsynackfin.so
+lib/silk/librwsynackfin.la
+lib/silk/librwsynackfin.a
+lib/silk/librwp2f_minbytes.so.0
+lib/silk/librwp2f_minbytes.so
+lib/silk/librwp2f_minbytes.la
+lib/silk/librwp2f_minbytes.a
+lib/libhash.so.0
+lib/libhash.so
+lib/libhash.la
+lib/libhash.a
+lib/libheap.so.0
+lib/libheap.so
+lib/libheap.la
+lib/libheap.a
+lib/libflowsource.so.0
+lib/libflowsource.so
+lib/libflowsource.la
+lib/libflowsource.a
+lib/libskdeque.so.0
+lib/libskdeque.so
+lib/libskdeque.la
+lib/libskdeque.a
+lib/libskpolldir.so.0
+lib/libskpolldir.so
+lib/libskpolldir.la
+lib/libskpolldir.a
+lib/libskmsg.so.0
+lib/libskmsg.so
+lib/libskmsg.la
+lib/libskmsg.a
+lib/libsktransfer.so.0
+lib/libsktransfer.so
+lib/libsktransfer.la
+lib/libsktransfer.a
+sbin/rwflowpack
+sbin/rwpackchecker
+sbin/rwflowappend
+sbin/rwreceiver
+sbin/rwsender
+share/silk/etc/rwflowpack.conf
+share/silk/etc/init.d/rwflowpack
+share/silk/etc/init.d/rwflowappend
+share/silk/etc/init.d/rwreceiver
+share/silk/etc/init.d/rwsender
+share/silk/etc/rwflowappend.conf
+share/silk/etc/rwreceiver.conf
+share/silk/etc/rwsender.conf
+share/silk/silk.conf.template
+include/silk/bagtree.h
+include/silk/convert-cflowd.h
+include/silk/convert-flowcap.h
+include/silk/dynlib.h
+include/silk/flowcap-source.h
+include/silk/flowcap-stats.h
+include/silk/flowcap.h
+include/silk/gnu_getopt.h
+include/silk/hashlib.h
+include/silk/hashlib_conf.h
+include/silk/hashlib_utils.h
+include/silk/hashwrap.h
+include/silk/heaplib.h
+include/silk/iochecks.h
+include/silk/ipfixsource.h
+include/silk/iptree.h
+include/silk/libflowsource.h
+include/silk/libsksetbag.h
+include/silk/lzo-file.h
+include/silk/multiqueue.h
+include/silk/pdusource.h
+include/silk/probeconf.h
+include/silk/redblack.h
+include/silk/rwpack.h
+include/silk/silk.h
+include/silk/silk_files.h
+include/silk/silk_site.h
+include/silk/skdaemon.h
+include/silk/skdeque.h
+include/silk/skdllist.h
+include/silk/skiobuf.h
+include/silk/skipfix.h
+include/silk/sklinkedlist.h
+include/silk/sklog.h
+include/silk/skmsg.h
+include/silk/skpolldir.h
+include/silk/skprefixmap.h
+include/silk/skprintnets.h
+include/silk/sksite.h
+include/silk/skstream.h
+include/silk/skstringmap.h
+include/silk/skthread.h
+include/silk/sktimer.h
+include/silk/sktransfer.h
+include/silk/skvector.h
+include/silk/utils.h
+include/silk/v5pdu.h
+include/silk/silk_site_twoway.h
+@dirrmtry share/silk/etc/init.d
+@dirrmtry share/silk/etc
 @dirrmtry share/silk
+@dirrmtry lib/silk
+@dirrmtry include/silk