Date: Wed, 19 Feb 2014 02:00:52 +0000 (UTC) From: David Thiel <lx@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344984 - head/security/silktools Message-ID: <201402190200.s1J20qkS064615@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lx Date: Wed Feb 19 02:00:52 2014 New Revision: 344984 URL: http://svnweb.freebsd.org/changeset/ports/344984 QAT: https://qat.redports.org/buildarchive/r344984/ Log: Update to 3.8.1, STAGE-ify, add option for localtime. Submitted by: localtime patch by Chad Gross Modified: head/security/silktools/Makefile head/security/silktools/distinfo head/security/silktools/pkg-plist Modified: head/security/silktools/Makefile ============================================================================== --- head/security/silktools/Makefile Wed Feb 19 01:32:51 2014 (r344983) +++ head/security/silktools/Makefile Wed Feb 19 02:00:52 2014 (r344984) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= silktools -PORTVERSION= 3.7.2 +PORTVERSION= 3.8.1 CATEGORIES= security net MASTER_SITES= http://tools.netsa.cert.org/releases/ \ http://redundancy.redundancy.org/mirror/ @@ -11,11 +11,12 @@ DISTNAME= silk-${PORTVERSION} MAINTAINER= lx@FreeBSD.org COMMENT= Tools for large-scale network capture analysis -LIB_DEPENDS= lzo2:${PORTSDIR}/archivers/lzo2 \ - fixbuf:${PORTSDIR}/net/libfixbuf +LIB_DEPENDS= liblzo2.so:${PORTSDIR}/archivers/lzo3 \ + libfixbuf.so:${PORTSDIR}/net/libfixbuf GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-lzo=${LOCALBASE} --enable-packing-tools --with-python +CONFIGURE_ARGS= --with-lzo=${LOCALBASE} --enable-packing-tools --with-python \ + --prefix=${STAGEDIR}/${PREFIX} USE_PYTHON= yes USE_GMAKE= yes MAKE_ARGS= CC="${CC}" GCC_FLAGS="" CFLAGS_RELEASE="" @@ -23,34 +24,15 @@ USE_LDCONFIG= yes USES= perl5 USE_PERL5= build -MAN1= mapsid.1 num2dot.1 rwaddrcount.1 rwappend.1 \ - rwbag.1 rwbagbuild.1 rwbagcat.1 rwbagtool.1 \ - rwcat.1 rwcount.1 rwcut.1 rwdedupe.1 rwfglob.1 \ - rwfileinfo.1 rwfilter.1 rwgeoip2ccmap.1 rwgroup.1 \ - rwip2cc.1 rwmatch.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 rwcompare.1 silk_config.1 \ - rwidsquery.1 rwipfix2silk.1 rwp2yaf2silk.1 rwsilk2ipfix.1 \ - rwpmaplookup.1 rwrecgenerator.1 rwsiteinfo.1 rwdpu2silk.1 \ - rwpdu2silk.1 - -MAN3= addrtype.3 ccfilter.3 flowrate.3 pmapfilter.3 pysilk.3 \ - silk-plugin.3 silkpython.3 int-ext-fields.3 \ - packlogic-generic.3 packlogic-twoway.3 - -MAN5= sensor.conf.5 silk.conf.5 - -MAN7= silk.7 - -MAN8= flowcap.8 rwflowappend.8 rwflowpack.8 rwguess.8 \ - rwpackchecker.8 rwpollexec.8 rwreceiver.8 \ - rwsender.8 +OPTIONS_DEFINE= LOCALTIME +LOCALTIME_DESC= Use localtime instead of UTC + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MLOCALTIME} +CONFIGURE_ARGS+=--enable-localtime +.endif -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure Modified: head/security/silktools/distinfo ============================================================================== --- head/security/silktools/distinfo Wed Feb 19 01:32:51 2014 (r344983) +++ head/security/silktools/distinfo Wed Feb 19 02:00:52 2014 (r344984) @@ -1,2 +1,2 @@ -SHA256 (silk-3.7.2.tar.gz) = ec10b4d274d6d2b1205b4db92138e06bc6cf42a0421837e0efdce917760d88d8 -SIZE (silk-3.7.2.tar.gz) = 5035334 +SHA256 (silk-3.8.1.tar.gz) = 3a66912bfef82a5fdb37fa3ed87307f5ab152cae889594885538ec8b8ffb97f1 +SIZE (silk-3.8.1.tar.gz) = 5075843 Modified: head/security/silktools/pkg-plist ============================================================================== --- head/security/silktools/pkg-plist Wed Feb 19 01:32:51 2014 (r344983) +++ head/security/silktools/pkg-plist Wed Feb 19 02:00:52 2014 (r344984) @@ -40,10 +40,8 @@ bin/rwscanquery bin/rwset bin/rwsetbuild bin/rwsetcat -bin/rwsetintersect bin/rwsetmember bin/rwsettool -bin/rwsetunion bin/rwsilk2ipfix bin/rwsiteinfo bin/rwsort @@ -55,13 +53,9 @@ bin/rwtuc bin/rwuniq bin/silk_config include/silk/bagtree.h -include/silk/dynlib.h -include/silk/gnu_getopt.h include/silk/hashlib.h -include/silk/iochecks.h include/silk/iptree.h include/silk/libflowsource.h -include/silk/multiqueue.h include/silk/probeconf.h include/silk/redblack.h include/silk/rwascii.h @@ -80,13 +74,11 @@ 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/skipset.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 @@ -104,27 +96,15 @@ include/silk/utils.h lib/libflowsource.a lib/libflowsource.la lib/libflowsource.so -lib/libflowsource.so.4 -lib/libflowsource.so.7 +lib/libflowsource.so.8 lib/libsilk-thrd.a lib/libsilk-thrd.la lib/libsilk-thrd.so -lib/libsilk-thrd.so.4 -lib/libsilk-thrd.so.5 +lib/libsilk-thrd.so.6 lib/libsilk.a lib/libsilk.la lib/libsilk.so -lib/libsilk.so.13 -lib/libsilk.so.7 -lib/libskipfix.a -lib/libskipfix.la -lib/libskipfix.so -lib/libskipfix.so.2 -lib/libskipfix.so.7 -lib/libskmsg.a -lib/libskmsg.la -lib/libskmsg.so -lib/libskmsg.so.2 +lib/libsilk.so.15 lib/silk/app-mismatch.a lib/silk/app-mismatch.la lib/silk/app-mismatch.so @@ -152,6 +132,79 @@ lib/silk/silkpython.so lib/silk/uniq-distproto.a lib/silk/uniq-distproto.la lib/silk/uniq-distproto.so +man/man1/mapsid.1.gz +man/man1/num2dot.1.gz +man/man1/rwaddrcount.1.gz +man/man1/rwappend.1.gz +man/man1/rwbag.1.gz +man/man1/rwbagbuild.1.gz +man/man1/rwbagcat.1.gz +man/man1/rwbagtool.1.gz +man/man1/rwcat.1.gz +man/man1/rwcompare.1.gz +man/man1/rwcount.1.gz +man/man1/rwcut.1.gz +man/man1/rwdedupe.1.gz +man/man1/rwfglob.1.gz +man/man1/rwfileinfo.1.gz +man/man1/rwfilter.1.gz +man/man1/rwgeoip2ccmap.1.gz +man/man1/rwgroup.1.gz +man/man1/rwidsquery.1.gz +man/man1/rwip2cc.1.gz +man/man1/rwipfix2silk.1.gz +man/man1/rwmatch.1.gz +man/man1/rwnetmask.1.gz +man/man1/rwp2yaf2silk.1.gz +man/man1/rwpcut.1.gz +man/man1/rwpdedupe.1.gz +man/man1/rwpdu2silk.1.gz +man/man1/rwpmapbuild.1.gz +man/man1/rwpmapcat.1.gz +man/man1/rwpmaplookup.1.gz +man/man1/rwpmatch.1.gz +man/man1/rwptoflow.1.gz +man/man1/rwrandomizeip.1.gz +man/man1/rwrecgenerator.1.gz +man/man1/rwresolve.1.gz +man/man1/rwscan.1.gz +man/man1/rwscanquery.1.gz +man/man1/rwset.1.gz +man/man1/rwsetbuild.1.gz +man/man1/rwsetcat.1.gz +man/man1/rwsetmember.1.gz +man/man1/rwsettool.1.gz +man/man1/rwsilk2ipfix.1.gz +man/man1/rwsiteinfo.1.gz +man/man1/rwsort.1.gz +man/man1/rwsplit.1.gz +man/man1/rwstats.1.gz +man/man1/rwswapbytes.1.gz +man/man1/rwtotal.1.gz +man/man1/rwtuc.1.gz +man/man1/rwuniq.1.gz +man/man1/silk_config.1.gz +man/man3/addrtype.3.gz +man/man3/ccfilter.3.gz +man/man3/flowrate.3.gz +man/man3/int-ext-fields.3.gz +man/man3/packlogic-generic.3.gz +man/man3/packlogic-twoway.3.gz +man/man3/pmapfilter.3.gz +man/man3/pysilk.3.gz +man/man3/silk-plugin.3.gz +man/man3/silkpython.3.gz +man/man5/sensor.conf.5.gz +man/man5/silk.conf.5.gz +man/man7/silk.7.gz +man/man8/flowcap.8.gz +man/man8/rwflowappend.8.gz +man/man8/rwflowpack.8.gz +man/man8/rwguess.8.gz +man/man8/rwpackchecker.8.gz +man/man8/rwpollexec.8.gz +man/man8/rwreceiver.8.gz +man/man8/rwsender.8.gz sbin/flowcap sbin/rwflowappend sbin/rwflowpack @@ -176,27 +229,34 @@ share/silk/etc/rwsender.conf share/silk/generic-silk.conf share/silk/silk.magic share/silk/twoway-silk.conf +%%PYTHON_SITELIBDIR%%/netsa_silk.py +%%PYTHON_SITELIBDIR%%/netsa_silk.pyc +%%PYTHON_SITELIBDIR%%/netsa_silk.pyo %%PYTHON_SITELIBDIR%%/silk/__init__.py -%%PYTHON_SITELIBDIR%%/silk/fglob.py -%%PYTHON_SITELIBDIR%%/silk/plugin.py -%%PYTHON_SITELIBDIR%%/silk/site.py %%PYTHON_SITELIBDIR%%/silk/__init__.pyc -%%PYTHON_SITELIBDIR%%/silk/fglob.pyc -%%PYTHON_SITELIBDIR%%/silk/plugin.pyc -%%PYTHON_SITELIBDIR%%/silk/site.pyc %%PYTHON_SITELIBDIR%%/silk/__init__.pyo +%%PYTHON_SITELIBDIR%%/silk/_netsa_silk.py +%%PYTHON_SITELIBDIR%%/silk/_netsa_silk.pyc +%%PYTHON_SITELIBDIR%%/silk/_netsa_silk.pyo +%%PYTHON_SITELIBDIR%%/silk/fglob.py +%%PYTHON_SITELIBDIR%%/silk/fglob.pyc %%PYTHON_SITELIBDIR%%/silk/fglob.pyo +%%PYTHON_SITELIBDIR%%/silk/plugin.py +%%PYTHON_SITELIBDIR%%/silk/plugin.pyc %%PYTHON_SITELIBDIR%%/silk/plugin.pyo -%%PYTHON_SITELIBDIR%%/silk/site.pyo -%%PYTHON_SITELIBDIR%%/silk/pysilk.so -%%PYTHON_SITELIBDIR%%/silk/pysilk.la -%%PYTHON_SITELIBDIR%%/silk/pysilk_nl.so -%%PYTHON_SITELIBDIR%%/silk/pysilk_nl.la %%PYTHON_SITELIBDIR%%/silk/pysilk.a +%%PYTHON_SITELIBDIR%%/silk/pysilk.la +%%PYTHON_SITELIBDIR%%/silk/pysilk.so %%PYTHON_SITELIBDIR%%/silk/pysilk_nl.a +%%PYTHON_SITELIBDIR%%/silk/pysilk_nl.la +%%PYTHON_SITELIBDIR%%/silk/pysilk_nl.so +%%PYTHON_SITELIBDIR%%/silk/site.py +%%PYTHON_SITELIBDIR%%/silk/site.pyc +%%PYTHON_SITELIBDIR%%/silk/site.pyo @dirrmtry share/silk/etc/init.d @dirrmtry share/silk/etc @dirrmtry share/silk @dirrmtry lib/silk @dirrmtry include/silk @dirrmtry %%PYTHON_SITELIBDIR%%/silk +@dirrmtry %%PYTHON_SITELIBDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402190200.s1J20qkS064615>