3 files changed, 39 insertions, 39 deletions

diff --git a/security/silktools/Makefile b/security/silktools/Makefile
index 3bc0c903671e..7e640d2d7a57 100644
--- a/security/silktools/Makefile
+++ b/security/silktools/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	silktools
-PORTVERSION=	1.1.9
+PORTVERSION=	2.2.0
 CATEGORIES=	security net
 MASTER_SITES=	http://tools.netsa.cert.org/releases/ \
 		http://redundancy.redundancy.org/mirror/
@@ -15,12 +15,12 @@ DISTNAME=	silk-${PORTVERSION}
 MAINTAINER=	lx@FreeBSD.org
 COMMENT=	Tools for large-scale network capture analysis
 
-# Optional PySiLK support awaiting a fix for the USE_PYTHON
+LIB_DEPENDS=	lzo:${PORTSDIR}/archivers/lzo
+
+# Optional PySiLK support is awaiting a fix for the USE_PYTHON
 # chicken/egg issue
 OPTIONS=	IPFIX "Enable IPFIX support" off
 
-LIB_DEPENDS=	lzo:${PORTSDIR}/archivers/lzo
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-lzo=${LOCALBASE} --enable-packing-tools
 USE_GMAKE=	yes
@@ -33,13 +33,13 @@ MAN1=	mapsid.1 num2dot.1 rwaddrcount.1 rwappend.1 \
 	rwcat.1 rwcount.1 rwcut.1 rwdedupe.1 rwfglob.1 \
 	rwfileinfo.1 rwfilter.1 rwgeoip2ccmap.1 rwgroup.1 \
 	rwidsquery.1 rwip2cc.1 rwmatch.1 \
-	rwnetmask.1 rwp2yaf2silk.1 rwpcut.1 rwpdedupe.1 \
-	rwpmapbuild.1 rwpmapcat.1 rwpmatch.1 rwptoflow.1 \
+	rwnetmask.1 rwpcut.1 rwpdedupe.1 rwpmapbuild.1 \
+	rwpmapcat.1 rwpmatch.1 rwptoflow.1 \
 	rwrandomizeip.1 rwresolve.1 rwscan.1 rwscanquery.1 \
 	rwset.1 rwsetbuild.1 rwsetcat.1 rwsetintersect.1 \
 	rwsetmember.1 rwsettool.1 rwsetunion.1 \
 	rwsort.1 rwsplit.1 rwstats.1 rwswapbytes.1 \
-	rwtotal.1 rwtuc.1 rwuniq.1
+	rwtotal.1 rwtuc.1 rwuniq.1 rwcompare.1 silk_config.1
 
 MAN3=	addrtype.3 ccfilter.3 flowrate.3 pmapfilter.3
 
@@ -54,7 +54,7 @@ MAN8=	flowcap.8 rwflowappend.8 rwflowpack.8 rwguess.8 \
 
 .if defined(WITH_IPFIX)
 LIB_DEPENDS+=	fixbuf:${PORTSDIR}/net/libfixbuf
-MAN1+=	rwipfix2silk.1 rwsilk2ipfix.1
+MAN1+=	rwipfix2silk.1 rwsilk2ipfix.1 rwp2yaf2silk.1
 PLIST_SUB=	IPFIX=""
 .else
 PLIST_SUB=	IPFIX="@comment "
diff --git a/security/silktools/distinfo b/security/silktools/distinfo
index 880000f92a22..240b3c642eb4 100644
--- a/security/silktools/distinfo
+++ b/security/silktools/distinfo
@@ -1,3 +1,3 @@
-MD5 (silk-1.1.9.tar.gz) = f8d5ae45474026292e0fdcfd7b1432b5
-SHA256 (silk-1.1.9.tar.gz) = 069bf7b1b23e80575a18f06fb689734eb25c41f1ea815498639b8d0fda5a266f
-SIZE (silk-1.1.9.tar.gz) = 2181147
+MD5 (silk-2.2.0.tar.gz) = b9bd4b6a3de56d8bd3947ec89b20594f
+SHA256 (silk-2.2.0.tar.gz) = bb953f51b2dad6d864751d997731c444ac18b1c9ed56a2ac0823b7e1a3321b11
+SIZE (silk-2.2.0.tar.gz) = 2714525
diff --git a/security/silktools/pkg-plist b/security/silktools/pkg-plist
index fa26d8427735..0fd12395dd8a 100644
--- a/security/silktools/pkg-plist
+++ b/security/silktools/pkg-plist
@@ -8,6 +8,7 @@ bin/rwbagbuild
 bin/rwbagcat
 bin/rwbagtool
 bin/rwcat
+bin/rwcompare
 bin/rwcount
 bin/rwcut
 bin/rwdedupe
@@ -18,10 +19,10 @@ bin/rwgeoip2ccmap
 bin/rwgroup
 bin/rwidsquery
 bin/rwip2cc
-%%IPFIX%%/bin/rwipfix2silk
+%%IPFIX%%bin/rwipfix2silk
 bin/rwmatch
 bin/rwnetmask
-bin/rwp2yaf2silk
+%%IPFIX%%bin/rwp2yaf2silk
 bin/rwpcut
 bin/rwpdedupe
 bin/rwpmapbuild
@@ -40,7 +41,7 @@ bin/rwsetintersect
 bin/rwsetmember
 bin/rwsettool
 bin/rwsetunion
-%%IPFIX%%/bin/rwsilk2ipfix
+%%IPFIX%%bin/rwsilk2ipfix
 bin/rwsort
 bin/rwsplit
 bin/rwstats
@@ -48,20 +49,15 @@ bin/rwswapbytes
 bin/rwtotal
 bin/rwtuc
 bin/rwuniq
+bin/silk_config
 include/silk/bagtree.h
-include/silk/convert-cflowd.h
 include/silk/dynlib.h
-include/silk/flowcap-source.h
 include/silk/gnu_getopt.h
 include/silk/hashlib.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/multiqueue.h
-include/silk/pdusource.h
 include/silk/probeconf.h
 include/silk/redblack.h
 include/silk/rwflowpack.h
@@ -70,14 +66,19 @@ include/silk/rwrec.h
 include/silk/silk.h
 include/silk/silk_config.h
 include/silk/silk_files.h
+include/silk/skcountry.h
 include/silk/skdaemon.h
 include/silk/skdeque.h
 include/silk/skdllist.h
 include/silk/skheader.h
+include/silk/skheap.h
 include/silk/skiobuf.h
+include/silk/skipaddr.h
 include/silk/skipfix.h
-include/silk/sklinkedlist.h
+include/silk/skipset.h
+include/silk/skplugin.h
 include/silk/sklog.h
+include/silk/skmempool.h
 include/silk/skmsg.h
 include/silk/skpolldir.h
 include/silk/skprefixmap.h
@@ -87,44 +88,40 @@ 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
 lib/libflowsource.a
 lib/libflowsource.la
 lib/libflowsource.so
-lib/libflowsource.so.1
-lib/libhash.a
-lib/libhash.la
-lib/libhash.so
-lib/libhash.so.1
-lib/libheap.a
-lib/libheap.la
-lib/libheap.so
-lib/libheap.so.1
+lib/libflowsource.so.3
 lib/libsilk-thrd.a
 lib/libsilk-thrd.la
 lib/libsilk-thrd.so
-lib/libsilk-thrd.so.1
+lib/libsilk-thrd.so.2
 lib/libsilk.a
 lib/libsilk.la
 lib/libsilk.so
-lib/libsilk.so.1
-%%IPFIX%%/lib/libskipfix.a
-%%IPFIX%%/lib/libskipfix.la
-%%IPFIX%%/lib/libskipfix.so
-%%IPFIX%%/lib/libskipfix.so.1
+lib/libsilk.so.4
+%%IPFIX%%lib/libskipfix.a
+%%IPFIX%%lib/libskipfix.la
+%%IPFIX%%lib/libskipfix.so
+%%IPFIX%%lib/libskipfix.so.2
 lib/libskmsg.a
 lib/libskmsg.la
 lib/libskmsg.so
-lib/libskmsg.so.1
+lib/libskmsg.so.2
 lib/silk/addrtype.a
 lib/silk/addrtype.la
 lib/silk/addrtype.so
+lib/silk/app-mismatch.a
+lib/silk/app-mismatch.la
+lib/silk/app-mismatch.so
 lib/silk/ccfilter.a
 lib/silk/ccfilter.la
 lib/silk/ccfilter.so
+lib/silk/conficker-c.a
+lib/silk/conficker-c.la
+lib/silk/conficker-c.so
 lib/silk/cutmatch.a
 lib/silk/cutmatch.la
 lib/silk/cutmatch.so
@@ -140,6 +137,9 @@ lib/silk/packlogic-twoway.so
 lib/silk/pmapfilter.a
 lib/silk/pmapfilter.la
 lib/silk/pmapfilter.so
+lib/silk/uniq-distproto.a
+lib/silk/uniq-distproto.la
+lib/silk/uniq-distproto.so
 sbin/flowcap
 sbin/rwflowappend
 sbin/rwflowpack