From b23b8a0a335d3a3115ae43bfc128e70d633ff80b Mon Sep 17 00:00:00 2001 From: David Thiel Date: Sat, 26 Jul 2008 20:56:33 +0000 Subject: [PATCH] Update to 1.1.0. Many changes since the last release! See changelog: at http://tools.netsa.cert.org/silk/silk_releasenote.html --- security/silktools/Makefile | 25 ++++-- security/silktools/distinfo | 6 +- security/silktools/pkg-plist | 158 +++++++++++++++-------------------- 3 files changed, 92 insertions(+), 97 deletions(-) diff --git a/security/silktools/Makefile b/security/silktools/Makefile index 0a29bdd4ed13..c5383860e9e2 100644 --- a/security/silktools/Makefile +++ b/security/silktools/Makefile @@ -6,7 +6,7 @@ # PORTNAME= silktools -PORTVERSION= 0.11.9 +PORTVERSION= 1.1.0 CATEGORIES= security net MASTER_SITES= http://tools.netsa.cert.org/releases/ \ http://redundancy.redundancy.org/mirror/ @@ -15,6 +15,10 @@ 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 +# chicken/egg issue +OPTIONS= IPFIX "Enable IPFIX support" off + LIB_DEPENDS= lzo:${PORTSDIR}/archivers/lzo GNU_CONFIGURE= yes @@ -31,16 +35,27 @@ MAN1= rwip2cc.1 rwpmapbuild.1 mapsid.1 num2dot.1 rwaddrcount.1 rwappend.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 rwgeoip2ccmap.1 rwpmapcat.1 rwresolve.1 rwscan.1 \ - rwscanquery.1 rwsetmember.1 rwsettool.1 rwsplit.1 rwdedupe.1 + rwscanquery.1 rwsetmember.1 rwsettool.1 rwsplit.1 rwdedupe.1 \ + rwidsquery.1 -MAN3= libaddrtype.3 libccfilter.3 libpmapfilter.3 +MAN3= addrtype.3 ccfilter.3 pmapfilter.3 MAN5= sensor.conf.5 silk.conf.5 +MAN7= silk.7 + MAN8= rwflowpack.8 rwpackchecker.8 rwflowappend.8 rwreceiver.8 rwsender.8 \ - flowcap.8 + flowcap.8 rwguess.8 + +.include + +.if defined(WITH_IPFIX) +LIB_DEPENDS+= fixbuf:${PORTSDIR}/net/libfixbuf +MAN1+= rwipfix2silk.1 rwsilk2ipfix.1 +PLIST_SUB+= IPFIX="" +.endif post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure -.include +.include diff --git a/security/silktools/distinfo b/security/silktools/distinfo index aa2d725e88d5..3e030dc30fd2 100644 --- a/security/silktools/distinfo +++ b/security/silktools/distinfo @@ -1,3 +1,3 @@ -MD5 (silk-0.11.9.tar.gz) = 50ff21f2704955c50ac0348fa8c428c3 -SHA256 (silk-0.11.9.tar.gz) = 6be598d65057efe51cec3cd3fdca01d0d854bedab9fddc8d5ce5c4317250d8e6 -SIZE (silk-0.11.9.tar.gz) = 1921765 +MD5 (silk-1.1.0.tar.gz) = 287912494f4908511cb57b45dd8c73e5 +SHA256 (silk-1.1.0.tar.gz) = a6367a8c25a709527279819c4ec474da194eccd5bb306d9b195f22e9f7ad640c +SIZE (silk-1.1.0.tar.gz) = 2187847 diff --git a/security/silktools/pkg-plist b/security/silktools/pkg-plist index e1b6fc43907b..43edb133d81f 100644 --- a/security/silktools/pkg-plist +++ b/security/silktools/pkg-plist @@ -1,9 +1,7 @@ @comment $FreeBSD$ bin/rwdedupe -bin/buildset bin/mapsid bin/num2dot -bin/readset bin/rwaddrcount bin/rwappend bin/rwbag @@ -13,6 +11,8 @@ bin/rwbagtool bin/rwcat bin/rwcount bin/rwcut +bin/rwidsquery +bin/rwsetintersect bin/rwip2cc bin/rwpmapbuild bin/rwpmapcat @@ -20,7 +20,6 @@ bin/rwallformats bin/rwresolve bin/rwsetbuild bin/rwsetcat -bin/rwsetintersect bin/rwsetunion bin/rwtuc bin/rwp2yaf2silk @@ -42,90 +41,73 @@ 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/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/libippair.so.0 -lib/silk/libippair.so -lib/silk/libippair.la -lib/silk/libippair.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 +%%IPFIX%%bin/rwipfix2silk +%%IPFIX%%bin/rwsilk2ipfix +sbin/rwguess 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/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/libsilk-thrd.a +lib/libsilk-thrd.la +lib/libsilk-thrd.so +lib/libsilk-thrd.so.1 +lib/libsilk.a +lib/libsilk.la +lib/libsilk.so +lib/libsilk.so.1 lib/libskmsg.a -lib/libsktransfer.so.0 -lib/libsktransfer.so -lib/libsktransfer.la -lib/libsktransfer.a +lib/libskmsg.la +lib/libskmsg.so +lib/libskmsg.so.1 +lib/silk/addrtype.a +lib/silk/addrtype.la +lib/silk/addrtype.so +lib/silk/ccfilter.a +lib/silk/ccfilter.la +lib/silk/ccfilter.so +lib/silk/cutmatch.a +lib/silk/cutmatch.la +lib/silk/cutmatch.so +lib/silk/packlogic-generic.so +lib/silk/packlogic-generic.la +lib/silk/packlogic-generic.a +lib/silk/packlogic-twoway.so +lib/silk/packlogic-twoway.la +lib/silk/packlogic-twoway.a +lib/silk/pmapfilter.a +lib/silk/pmapfilter.la +lib/silk/pmapfilter.so +lib/silk/rwp2f_minbytes.a +lib/silk/rwp2f_minbytes.la +lib/silk/rwp2f_minbytes.so +lib/silk/rwslammer.a +lib/silk/rwslammer.la +lib/silk/rwslammer.so +lib/silk/rwsynackfin.a +lib/silk/rwsynackfin.la +lib/silk/rwsynackfin.so +lib/silk/tuple.a +lib/silk/tuple.la +lib/silk/tuple.so +%%IPFIX%%lib/libskipfix.so.1 +%%IPFIX%%lib/libskipfix.so +%%IPFIX%%lib/libskipfix.la +%%IPFIX%%lib/libskipfix.a sbin/flowcap sbin/rwflowpack sbin/rwpackchecker @@ -142,34 +124,33 @@ 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 +share/silk/addrtype-templ.txt +share/silk/update-sensor-conf +share/silk/generic-silk.conf +share/silk/twoway-silk.conf 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/rwflowpack.h include/silk/rwpack.h +include/silk/rwrec.h +include/silk/skheader.h include/silk/silk.h +include/silk/silk_config.h include/silk/silk_files.h -include/silk/silk_site.h include/silk/skdaemon.h include/silk/skdeque.h include/silk/skdllist.h @@ -190,7 +171,6 @@ 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