3 files changed, 18 insertions, 24 deletions

diff --git a/security/silktools/Makefile b/security/silktools/Makefile
index 5334476f2f33..d3ba4d0818b5 100644
--- a/security/silktools/Makefile
+++ b/security/silktools/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	silktools
-PORTVERSION=	2.3.1
-PORTREVISION=	1
+PORTVERSION=	2.4.5
 CATEGORIES=	security net
 MASTER_SITES=	http://tools.netsa.cert.org/releases/ \
 		http://redundancy.redundancy.org/mirror/
@@ -16,7 +15,7 @@ DISTNAME=	silk-${PORTVERSION}
 MAINTAINER=	lx@FreeBSD.org
 COMMENT=	Tools for large-scale network capture analysis
 
-LIB_DEPENDS=	lzo:${PORTSDIR}/archivers/lzo \
+LIB_DEPENDS=	lzo2:${PORTSDIR}/archivers/lzo2 \
 		fixbuf:${PORTSDIR}/net/libfixbuf
 
 GNU_CONFIGURE=	yes
@@ -41,14 +40,15 @@ MAN1=	mapsid.1 num2dot.1 rwaddrcount.1 rwappend.1 \
 	rwidsquery.1 rwipfix2silk.1 rwp2yaf2silk.1 rwsilk2ipfix.1
 
 MAN3=	addrtype.3 ccfilter.3 flowrate.3 pmapfilter.3 pysilk.3 \
-		silkpython.3
+		silk-plugin.3 silkpython.3
 
 MAN5=	sensor.conf.5 silk.conf.5
 
 MAN7=	silk.7
 
 MAN8=	flowcap.8 rwflowappend.8 rwflowpack.8 rwguess.8 \
-		rwpackchecker.8 rwreceiver.8 rwsender.8
+		rwpackchecker.8 rwpollexec.8 rwreceiver.8 \
+		rwsender.8
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
diff --git a/security/silktools/distinfo b/security/silktools/distinfo
index 6be16ecec69a..8b0f1f9960d4 100644
--- a/security/silktools/distinfo
+++ b/security/silktools/distinfo
@@ -1,3 +1,2 @@
-MD5 (silk-2.3.1.tar.gz) = f49ca6da333e5d579347af858e6a1b83
-SHA256 (silk-2.3.1.tar.gz) = 8c1968dd7ba1b4aaf424a6de19d4d4dec9d1f84d968b1dc41e78d9b957433c44
-SIZE (silk-2.3.1.tar.gz) = 2727352
+SHA256 (silk-2.4.5.tar.gz) = 9d65fd1f61cd842072f1eda6fb213779133ceff85a0576da1da52b9781f09b6a
+SIZE (silk-2.4.5.tar.gz) = 4475166
diff --git a/security/silktools/pkg-plist b/security/silktools/pkg-plist
index 47eef88c577d..e48dc74519af 100644
--- a/security/silktools/pkg-plist
+++ b/security/silktools/pkg-plist
@@ -66,6 +66,7 @@ include/silk/rwpack.h
 include/silk/rwrec.h
 include/silk/silk.h
 include/silk/silk_config.h
+include/silk/silk_config2.h
 include/silk/silk_files.h
 include/silk/skcountry.h
 include/silk/skdaemon.h
@@ -77,16 +78,17 @@ include/silk/skiobuf.h
 include/silk/skipaddr.h
 include/silk/skipfix.h
 include/silk/skipset.h
-include/silk/skplugin.h
 include/silk/sklog.h
 include/silk/skmempool.h
 include/silk/skmsg.h
+include/silk/skplugin.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/sktempfile.h
 include/silk/skthread.h
 include/silk/sktimer.h
 include/silk/sktracemsg.h
@@ -95,15 +97,15 @@ include/silk/utils.h
 lib/libflowsource.a
 lib/libflowsource.la
 lib/libflowsource.so
-lib/libflowsource.so.3
+lib/libflowsource.so.4
 lib/libsilk-thrd.a
 lib/libsilk-thrd.la
 lib/libsilk-thrd.so
-lib/libsilk-thrd.so.3
+lib/libsilk-thrd.so.4
 lib/libsilk.a
 lib/libsilk.la
 lib/libsilk.so
-lib/libsilk.so.5
+lib/libsilk.so.7
 lib/libskipfix.a
 lib/libskipfix.la
 lib/libskipfix.so
@@ -112,15 +114,9 @@ lib/libskmsg.a
 lib/libskmsg.la
 lib/libskmsg.so
 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
@@ -136,12 +132,9 @@ lib/silk/packlogic-generic.so
 lib/silk/packlogic-twoway.a
 lib/silk/packlogic-twoway.la
 lib/silk/packlogic-twoway.so
-lib/silk/pmapfilter.a
-lib/silk/pmapfilter.la
-lib/silk/pmapfilter.so
-lib/silk/silkpython.so
-lib/silk/silkpython.la
 lib/silk/silkpython.a
+lib/silk/silkpython.la
+lib/silk/silkpython.so
 lib/silk/uniq-distproto.a
 lib/silk/uniq-distproto.la
 lib/silk/uniq-distproto.so
@@ -150,6 +143,7 @@ sbin/rwflowappend
 sbin/rwflowpack
 sbin/rwguess
 sbin/rwpackchecker
+sbin/rwpollexec
 sbin/rwreceiver
 sbin/rwsender
 share/silk/addrtype-templ.txt
@@ -157,15 +151,16 @@ share/silk/etc/flowcap.conf
 share/silk/etc/init.d/flowcap
 share/silk/etc/init.d/rwflowappend
 share/silk/etc/init.d/rwflowpack
+share/silk/etc/init.d/rwpollexec
 share/silk/etc/init.d/rwreceiver
 share/silk/etc/init.d/rwsender
 share/silk/etc/rwflowappend.conf
 share/silk/etc/rwflowpack.conf
+share/silk/etc/rwpollexec.conf
 share/silk/etc/rwreceiver.conf
 share/silk/etc/rwsender.conf
 share/silk/generic-silk.conf
 share/silk/twoway-silk.conf
-share/silk/update-sensor-conf
 %%PYTHON_SITELIBDIR%%/silk/__init__.py
 %%PYTHON_SITELIBDIR%%/silk/fglob.py
 %%PYTHON_SITELIBDIR%%/silk/plugin.py