Index: security/bro/Makefile =================================================================== --- security/bro/Makefile (revision 377902) +++ security/bro/Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= bro -PORTVERSION= 2.3 -PORTREVISION= 2 +PORTVERSION= 2.3.2 CATEGORIES= security MASTER_SITES= http://www.bro.org/downloads/release/ @@ -16,10 +15,10 @@ ${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13 LIB_DEPENDS= libGeoIP.so:${PORTSDIR}/net/GeoIP -SUB_LIST+= PYTHON_CMD="${PYTHON_CMD}" - USES= cmake:outsource perl5 python +CMAKE_ARGS+= -D PYTHON_EXECUTABLE:PATH=${PYTHON_CMD} + SUB_FILES= pkg-message NO_MTREE= yes @@ -47,6 +46,8 @@ USERS= ${BROUSER} GROUPS= ${BROGROUP} +USE_OPENSSL= yes + OPTIONS_DEFINE= BROCCOLI BROCTL DEBUG IPSUMDUMP LBL_CF LBL_HF PERFTOOLS PORTS_SSL OPTIONS_DEFAULT=BROCCOLI BROCTL IPSUMDUMP LBL_CF LBL_HF PORTS_SSL @@ -115,9 +116,14 @@ .endif .if ${PORT_OPTIONS:MPORTS_SSL} -WITH_OPENSSL_PORT=yes CMAKE_ARGS+= -D CMAKE_EXE_LINKER_FLAGS="${OPENSSL_LDFLAGS}" +BUILD_DEPENDS+= ${LOCALBASE}/lib/libcrypto.so:${PORTSDIR}/security/openssl +RUN_DEPENDS+= ${LOCALBASE}/lib/libcrypto.so:${PORTSDIR}/security/openssl +.else +.if defined(WITH_OPENSSL_PORT) +IGNORE= the SSL option is requred when WITH_OPENSSL_PORT is enabled .endif +.endif .if ${PORT_OPTIONS:MIPSUMDUMP} BUILD_DEPENDS+= ipsumdump:${PORTSDIR}/net/ipsumdump Index: security/bro/distinfo =================================================================== --- security/bro/distinfo (revision 377902) +++ security/bro/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (bro-2.3.tar.gz) = 46bb9f46fbe71b22afd12ad12e0eb32033fb991a2a60b3bc2d881750249b85cd -SIZE (bro-2.3.tar.gz) = 10283001 +SHA256 (bro-2.3.2.tar.gz) = 2fe5fbda0a86b5a594116d567fd9a4c2458d30f1c6670ba8e1fac0bc8848c69b +SIZE (bro-2.3.2.tar.gz) = 10290134 Index: security/bro/pkg-plist =================================================================== --- security/bro/pkg-plist (revision 377902) +++ security/bro/pkg-plist (working copy) @@ -1,7 +1,5 @@ -@comment Note: pkg_install needs the mkdir's, pkgng ignores them -@exec mkdir -p %D/logs @exec chown %%BROUSER%%:%%BROGROUP%% %D/logs -%%BROCTL%%@exec mkdir -p %D/spool/tmp +%%BROCTL%%@exec chown %%BROUSER%%:%%BROGROUP%% %D/share/broctl/scripts %%BROCTL%%@exec chown %%BROUSER%%:%%BROGROUP%% %D/spool %%BROCTL%%@exec chown %%BROUSER%%:%%BROGROUP%% %D/spool/tmp %%BROCTL%%@exec chown -R %%BROUSER%%:%%BROGROUP%% %D/spool/installed-scripts-do-not-touch @@ -453,109 +451,108 @@ %%BROCTL%%@unexec rm -f %D/spool/installed-scripts-do-not-touch/site/local-proxy.bro %%BROCTL%%@unexec rm -f %D/spool/installed-scripts-do-not-touch/site/local-worker.bro %%BROCTL%%@unexec rm -f %D/spool/installed-scripts-do-not-touch/site/local.bro -%%BROCTL%%@dirrmtry spool/tmp -%%BROCTL%%@dirrmtry spool/installed-scripts-do-not-touch/site -%%BROCTL%%@dirrmtry spool/installed-scripts-do-not-touch/auto -%%BROCTL%%@dirrmtry spool/installed-scripts-do-not-touch -%%BROCTL%%@dirrmtry spool -%%BROCTL%%@dirrm %%DATADIR%%ctl/scripts/postprocessors -%%BROCTL%%@dirrm %%DATADIR%%ctl/scripts/helpers -%%BROCTL%%@dirrm %%DATADIR%%ctl/scripts -%%BROCTL%%@dirrm %%DATADIR%%ctl -@dirrm %%DATADIR%%/site -@dirrm %%DATADIR%%/policy/tuning/defaults -@dirrm %%DATADIR%%/policy/tuning -@dirrm %%DATADIR%%/policy/protocols/ssl -@dirrm %%DATADIR%%/policy/protocols/ssh -@dirrm %%DATADIR%%/policy/protocols/smtp -@dirrm %%DATADIR%%/policy/protocols/modbus -@dirrm %%DATADIR%%/policy/protocols/http -@dirrm %%DATADIR%%/policy/protocols/ftp -@dirrm %%DATADIR%%/policy/protocols/dns -@dirrm %%DATADIR%%/policy/protocols/dhcp -@dirrm %%DATADIR%%/policy/protocols/conn -@dirrm %%DATADIR%%/policy/protocols -@dirrm %%DATADIR%%/policy/misc/detect-traceroute -@dirrm %%DATADIR%%/policy/misc/app-stats/plugins -@dirrm %%DATADIR%%/policy/misc/app-stats -@dirrm %%DATADIR%%/policy/misc -@dirrm %%DATADIR%%/policy/integration/collective-intel -@dirrm %%DATADIR%%/policy/integration/barnyard2 -@dirrm %%DATADIR%%/policy/integration -@dirrm %%DATADIR%%/policy/frameworks/software -@dirrm %%DATADIR%%/policy/frameworks/signatures -@dirrm %%DATADIR%%/policy/frameworks/packet-filter -@dirrm %%DATADIR%%/policy/frameworks/intel/seen -@dirrm %%DATADIR%%/policy/frameworks/intel -@dirrm %%DATADIR%%/policy/frameworks/files -@dirrm %%DATADIR%%/policy/frameworks/dpd -@dirrm %%DATADIR%%/policy/frameworks/control -@dirrm %%DATADIR%%/policy/frameworks/communication -@dirrm %%DATADIR%%/policy/frameworks -@dirrm %%DATADIR%%/policy -@dirrm %%DATADIR%%/broxygen -%%BROCTL%%@dirrm %%DATADIR%%/broctl -@dirrm %%DATADIR%%/base/utils -@dirrm %%DATADIR%%/base/protocols/tunnels -@dirrm %%DATADIR%%/base/protocols/syslog -@dirrm %%DATADIR%%/base/protocols/ssl -@dirrm %%DATADIR%%/base/protocols/ssh -@dirrm %%DATADIR%%/base/protocols/socks -@dirrm %%DATADIR%%/base/protocols/snmp -@dirrm %%DATADIR%%/base/protocols/smtp -@dirrm %%DATADIR%%/base/protocols/radius -@dirrm %%DATADIR%%/base/protocols/pop3 -@dirrm %%DATADIR%%/base/protocols/modbus -@dirrm %%DATADIR%%/base/protocols/irc -@dirrm %%DATADIR%%/base/protocols/http -@dirrm %%DATADIR%%/base/protocols/ftp -@dirrm %%DATADIR%%/base/protocols/dns -@dirrm %%DATADIR%%/base/protocols/dnp3 -@dirrm %%DATADIR%%/base/protocols/dhcp -@dirrm %%DATADIR%%/base/protocols/conn -@dirrm %%DATADIR%%/base/protocols -@dirrm %%DATADIR%%/base/misc -@dirrm %%DATADIR%%/base/frameworks/tunnels -@dirrm %%DATADIR%%/base/frameworks/sumstats/plugins -@dirrm %%DATADIR%%/base/frameworks/sumstats -@dirrm %%DATADIR%%/base/frameworks/software -@dirrm %%DATADIR%%/base/frameworks/signatures -@dirrm %%DATADIR%%/base/frameworks/reporter -@dirrm %%DATADIR%%/base/frameworks/packet-filter -@dirrm %%DATADIR%%/base/frameworks/notice/extend-email -@dirrm %%DATADIR%%/base/frameworks/notice/actions -@dirrm %%DATADIR%%/base/frameworks/notice -@dirrm %%DATADIR%%/base/frameworks/logging/writers -@dirrm %%DATADIR%%/base/frameworks/logging/postprocessors -@dirrm %%DATADIR%%/base/frameworks/logging -@dirrm %%DATADIR%%/base/frameworks/intel -@dirrm %%DATADIR%%/base/frameworks/input/readers -@dirrm %%DATADIR%%/base/frameworks/input -@dirrm %%DATADIR%%/base/frameworks/files/magic -@dirrm %%DATADIR%%/base/frameworks/files -@dirrm %%DATADIR%%/base/frameworks/dpd -@dirrm %%DATADIR%%/base/frameworks/control -@dirrm %%DATADIR%%/base/frameworks/communication -@dirrm %%DATADIR%%/base/frameworks/cluster/nodes -@dirrm %%DATADIR%%/base/frameworks/cluster -@dirrm %%DATADIR%%/base/frameworks/analyzer -@dirrm %%DATADIR%%/base/frameworks -@dirrm %%DATADIR%%/base/files/x509 -@dirrm %%DATADIR%%/base/files/unified2 -@dirrm %%DATADIR%%/base/files/hash -@dirrm %%DATADIR%%/base/files/extract -@dirrm %%DATADIR%%/base/files -@dirrm %%DATADIR%%/base/bif/plugins -@dirrm %%DATADIR%%/base/bif -@dirrm %%DATADIR%%/base -@dirrm %%DATADIR%% -%%CLEANUP_PREFIX%%@dirrmtry share -@dirrmtry logs -%%BROCTL%%@dirrmtry lib/broctl/plugins -%%BROCTL%%@dirrmtry lib/broctl/BroControl -%%BROCTL%%@dirrmtry lib/broctl -%%CLEANUP_PREFIX%%@dirrmtry lib -%%CLEANUP_PREFIX%%@dirrmtry etc -%%CLEANUP_PREFIX%%@dirrmtry bin -%%CLEANUP_PREFIX%%@dirrmtry %D +%%BROCTL%%@dir spool/tmp +%%BROCTL%%@dir spool/installed-scripts-do-not-touch/site +%%BROCTL%%@dir spool/installed-scripts-do-not-touch/auto +%%BROCTL%%@dir spool/installed-scripts-do-not-touch +%%BROCTL%%@dir spool +%%BROCTL%%@dir %%DATADIR%%ctl/scripts/postprocessors +%%BROCTL%%@dir %%DATADIR%%ctl/scripts/helpers +%%BROCTL%%@dir %%DATADIR%%ctl/scripts +%%BROCTL%%@dir %%DATADIR%%ctl +@dir %%DATADIR%%/site +@dir %%DATADIR%%/policy/tuning/defaults +@dir %%DATADIR%%/policy/tuning +@dir %%DATADIR%%/policy/protocols/ssl +@dir %%DATADIR%%/policy/protocols/ssh +@dir %%DATADIR%%/policy/protocols/smtp +@dir %%DATADIR%%/policy/protocols/modbus +@dir %%DATADIR%%/policy/protocols/http +@dir %%DATADIR%%/policy/protocols/ftp +@dir %%DATADIR%%/policy/protocols/dns +@dir %%DATADIR%%/policy/protocols/dhcp +@dir %%DATADIR%%/policy/protocols/conn +@dir %%DATADIR%%/policy/protocols +@dir %%DATADIR%%/policy/misc/detect-traceroute +@dir %%DATADIR%%/policy/misc/app-stats/plugins +@dir %%DATADIR%%/policy/misc/app-stats +@dir %%DATADIR%%/policy/misc +@dir %%DATADIR%%/policy/integration/collective-intel +@dir %%DATADIR%%/policy/integration/barnyard2 +@dir %%DATADIR%%/policy/integration +@dir %%DATADIR%%/policy/frameworks/software +@dir %%DATADIR%%/policy/frameworks/signatures +@dir %%DATADIR%%/policy/frameworks/packet-filter +@dir %%DATADIR%%/policy/frameworks/intel/seen +@dir %%DATADIR%%/policy/frameworks/intel +@dir %%DATADIR%%/policy/frameworks/files +@dir %%DATADIR%%/policy/frameworks/dpd +@dir %%DATADIR%%/policy/frameworks/control +@dir %%DATADIR%%/policy/frameworks/communication +@dir %%DATADIR%%/policy/frameworks +@dir %%DATADIR%%/policy +@dir %%DATADIR%%/broxygen +%%BROCTL%%@dir %%DATADIR%%/broctl +@dir %%DATADIR%%/base/utils +@dir %%DATADIR%%/base/protocols/tunnels +@dir %%DATADIR%%/base/protocols/syslog +@dir %%DATADIR%%/base/protocols/ssl +@dir %%DATADIR%%/base/protocols/ssh +@dir %%DATADIR%%/base/protocols/socks +@dir %%DATADIR%%/base/protocols/snmp +@dir %%DATADIR%%/base/protocols/smtp +@dir %%DATADIR%%/base/protocols/radius +@dir %%DATADIR%%/base/protocols/pop3 +@dir %%DATADIR%%/base/protocols/modbus +@dir %%DATADIR%%/base/protocols/irc +@dir %%DATADIR%%/base/protocols/http +@dir %%DATADIR%%/base/protocols/ftp +@dir %%DATADIR%%/base/protocols/dns +@dir %%DATADIR%%/base/protocols/dnp3 +@dir %%DATADIR%%/base/protocols/dhcp +@dir %%DATADIR%%/base/protocols/conn +@dir %%DATADIR%%/base/protocols +@dir %%DATADIR%%/base/misc +@dir %%DATADIR%%/base/frameworks/tunnels +@dir %%DATADIR%%/base/frameworks/sumstats/plugins +@dir %%DATADIR%%/base/frameworks/sumstats +@dir %%DATADIR%%/base/frameworks/software +@dir %%DATADIR%%/base/frameworks/signatures +@dir %%DATADIR%%/base/frameworks/reporter +@dir %%DATADIR%%/base/frameworks/packet-filter +@dir %%DATADIR%%/base/frameworks/notice/extend-email +@dir %%DATADIR%%/base/frameworks/notice/actions +@dir %%DATADIR%%/base/frameworks/notice +@dir %%DATADIR%%/base/frameworks/logging/writers +@dir %%DATADIR%%/base/frameworks/logging/postprocessors +@dir %%DATADIR%%/base/frameworks/logging +@dir %%DATADIR%%/base/frameworks/intel +@dir %%DATADIR%%/base/frameworks/input/readers +@dir %%DATADIR%%/base/frameworks/input +@dir %%DATADIR%%/base/frameworks/files/magic +@dir %%DATADIR%%/base/frameworks/files +@dir %%DATADIR%%/base/frameworks/dpd +@dir %%DATADIR%%/base/frameworks/control +@dir %%DATADIR%%/base/frameworks/communication +@dir %%DATADIR%%/base/frameworks/cluster/nodes +@dir %%DATADIR%%/base/frameworks/cluster +@dir %%DATADIR%%/base/frameworks/analyzer +@dir %%DATADIR%%/base/frameworks +@dir %%DATADIR%%/base/files/x509 +@dir %%DATADIR%%/base/files/unified2 +@dir %%DATADIR%%/base/files/hash +@dir %%DATADIR%%/base/files/extract +@dir %%DATADIR%%/base/files +@dir %%DATADIR%%/base/bif/plugins +@dir %%DATADIR%%/base/bif +@dir %%DATADIR%%/base +@dir %%DATADIR%% +%%CLEANUP_PREFIX%%@dir share +@dir logs +%%BROCTL%%@dir lib/broctl/plugins +%%BROCTL%%@dir lib/broctl/BroControl +%%BROCTL%%@dir lib/broctl +%%CLEANUP_PREFIX%%@dir lib +%%CLEANUP_PREFIX%%@dir etc +%%CLEANUP_PREFIX%%@dir bin %%BROCTL%%@exec su -fm %%BROUSER%% -c '%D/bin/broctl install' Index: security/broccoli/Makefile =================================================================== --- security/broccoli/Makefile (revision 377902) +++ security/broccoli/Makefile (working copy) @@ -2,14 +2,13 @@ # $FreeBSD$ PORTNAME= broccoli -PORTVERSION= 2.3 -PORTREVISION= 1 +PORTVERSION= 2.3.2 CATEGORIES= security MASTER_SITES= http://www.bro.org/downloads/release/ DISTNAME= bro-${PORTVERSION} MAINTAINER= leres@ee.lbl.gov -COMMENT= The Bro Client Communications Library +COMMENT= Bro Client Communications Library LICENSE= BSD3CLAUSE @@ -33,9 +32,11 @@ CMAKE_ARGS+= -D CMAKE_INSTALL_PREFIX:PATH=${PREFIX} \ -D BRO_ETC_INSTALL_DIR:PATH=${PREFIX}/etc -OPTIONS_DEFINE= DEBUG PYTHON RUBY DOCS +OPTIONS_DEFINE= DEBUG PYTHON RUBY OPTIONS_SUB= +OPTIONS_DEFAULT= PYTHON + DEBUG_DESC= Compile in debugging mode PYTHON_DESC= Build python bindings for broccoli RUBY_DESC= Build ruby bindings for broccoli @@ -50,15 +51,13 @@ RUBY_CMAKE_OFF= -D DISABLE_RUBY_BINDINGS:BOOL=true post-install:: + @${MV} ${STAGEDIR}${PREFIX}/etc/broccoli.conf ${STAGEDIR}${PREFIX}/etc/broccoli.conf.example .if defined(BRO_PREFIX) && empty(${PORT_OPTIONS:MPYTHON}) # Move lib/pythonX.X tree into BRO_PREFIX ${MV} ${STAGEDIR}${PYTHON_LIBDIR} ${STAGEDIR}${PREFIX}/lib .endif - @${MKDIR} ${STAGEDIR}${PREFIX}/etc - @${MV} ${STAGEDIR}${PREFIX}/etc/broccoli.conf ${STAGEDIR}${PREFIX}/etc/broccoli.conf.example -.if !empty(${PORT_OPTIONS:MPYTHON}) && defined(BRO_PREFIX) - # bsd.python.mk isn't PREFIX-safe yet. - @${MV} ${STAGEDIR}${PYTHON_LIBDIR} ${STAGEDIR}${PYTHONPREFIX_LIBDIR} +.if defined(BRO_PREFIX) + ${FIND} ${STAGEDIR} -type d | ${XARGS} ${CHMOD} g-w .endif .include Index: security/broccoli/distinfo =================================================================== --- security/broccoli/distinfo (revision 377902) +++ security/broccoli/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (bro-2.3.tar.gz) = 46bb9f46fbe71b22afd12ad12e0eb32033fb991a2a60b3bc2d881750249b85cd -SIZE (bro-2.3.tar.gz) = 10283001 +SHA256 (bro-2.3.2.tar.gz) = 2fe5fbda0a86b5a594116d567fd9a4c2458d30f1c6670ba8e1fac0bc8848c69b +SIZE (bro-2.3.2.tar.gz) = 10290134 Index: security/broccoli/pkg-plist =================================================================== --- security/broccoli/pkg-plist (revision 377902) +++ security/broccoli/pkg-plist (working copy) @@ -1,7 +1,7 @@ bin/broccoli-config -@unexec cmp -s %D/etc/broccoli.conf.example %D/etc/broccoli.conf && rm %D/etc/broccoli.conf || true +@unexec cmp -s %D/etc/broccoli.conf.example %D/etc/broccoli.conf && rm -f %D/etc/broccoli.conf || true etc/broccoli.conf.example -@exec test -f %D/etc/broccoli.conf || cp -p %D/%F %D/etc/broccoli.conf +@exec test -f %D/etc/broccoli.conf || cp -p %D/etc/broccoli.conf.example %D/etc/broccoli.conf include/broccoli.h lib/libbroccoli.a lib/libbroccoli.so @@ -8,17 +8,15 @@ lib/libbroccoli.so.5 lib/libbroccoli.so.5.1.0 %%PYTHON%%%%PYTHON_SITELIBDIR%%/_broccoli_intern.so -%%PYTHON%%@unexec rm -f %%LOCALBASE%%/%%PYTHON_SITELIBDIR%%/broccoli.py -%%PYTHON%%@unexec rm -f %%LOCALBASE%%/%%PYTHON_SITELIBDIR%%/broccoli.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/broccoli.py +%%PYTHON%%@unexec rm -f %D/%%PYTHON_SITELIBDIR%%/broccoli.pyc %%RUBY%%%%RUBY_SITELIBDIR%%/Broccoli/connection.rb %%RUBY%%%%RUBY_SITELIBDIR%%/Broccoli/event.rb %%RUBY%%%%RUBY_SITELIBDIR%%/Broccoli/record.rb +%%RUBY%%%%RUBY_SITEARCHLIBDIR%%/broccoli_ext.so %%RUBY%%%%RUBY_SITELIBDIR%%/broccoli.rb -%%RUBY%%@dirrmtry %%RUBY_SITELIBDIR%%/Broccoli -%%RUBY%%%%RUBY_SITEARCHLIBDIR%%/broccoli_ext.so -%%CLEANUP_PREFIX%%%%PORTDOCS%%@dirrmtry share -%%CLEANUP_PREFIX%%@dirrmtry lib -%%CLEANUP_PREFIX%%@dirrmtry include -%%CLEANUP_PREFIX%%@dirrmtry etc -%%CLEANUP_PREFIX%%@dirrmtry bin -%%CLEANUP_PREFIX%%@unexec rmdir %D || : +%%CLEANUP_PREFIX%%@dir share +%%CLEANUP_PREFIX%%@dir lib +%%CLEANUP_PREFIX%%@dir include +%%CLEANUP_PREFIX%%@dir etc +%%CLEANUP_PREFIX%%@dir bin