Attachment 144959 Details for Bug 192105 – head.diffs

head.diffs

head.diffs (text/plain), 21.76 KB, created by Craig Leres on 2014-07-25 02:46:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Craig Leres

Created: 2014-07-25 02:46:30 UTC

Size: 21.76 KB

patch

obsolete

>Index: GIDs
>===================================================================
>--- GIDs	(revision 362777)
>+++ GIDs	(working copy)
>@@ -285,5 +285,6 @@
> unifi:*:975:
> minetest:*:976:
> ums:*:979:
>+bro:*:980:
> nogroup:*:65533:
> nobody:*:65534:
>Index: UIDs
>===================================================================
>--- UIDs	(revision 362777)
>+++ UIDs	(working copy)
>@@ -291,4 +291,5 @@
> tests:*:977:65534::0:0:Unprivileged user for tests:/nonexistent:/usr/sbin/nologin
> _dnscrypt-proxy:*:978:65534::0:0:dnscrypt-proxy user:/var/empty:/usr/sbin/nologin
> ums:*:979:979::0:0:Universal Media Server:/nonexistent:/usr/sbin/nologin
>+bro:*:980:980::0:0:Bro Network Security Monitor:/nonexistent:/usr/sbin/nologin
> nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin
>Index: security/bro/Makefile
>===================================================================
>--- security/bro/Makefile	(revision 362777)
>+++ security/bro/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	bro
>-PORTVERSION=	2.2
>-PORTREVISION=	1
>+PORTVERSION=	2.3
> CATEGORIES=	security
> MASTER_SITES=	http://www.bro.org/downloads/release/
> 
>@@ -16,6 +15,8 @@
> 		${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13
> LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
> 
>+SUB_LIST+=	PYTHON_CMD="${PYTHON_CMD}"
>+
> USES=		cmake:outsource perl5
> USE_PYTHON=	yes
> 
>@@ -26,9 +27,8 @@
> PREFIX=${BRO_PREFIX}
> PLIST_SUB+=	CLEANUP_PREFIX=""
> .if ! defined(WITH_PKGNG) && ! exists(${BRO_PREFIX})
>-NEED_ROOT=      yes
>+NEED_ROOT=	yes
> .endif
>-NO_MTREE=	yes
> .else
> PLIST_SUB+=	CLEANUP_PREFIX="@comment "
> .endif
>@@ -43,9 +43,16 @@
> 		-D INSTALL_AUX_TOOLS:BOOL=true \
> 		-D BUILD_SHARED_LIBS:BOOL=true
> 
>-OPTIONS_DEFINE=	BROCCOLI BROCTL DEBUG IPSUMDUMP LBL_CF LBL_HF PERFTOOLS
>-OPTIONS_DEFAULT=BROCCOLI BROCTL IPSUMDUMP LBL_CF LBL_HF
>+BROUSER?=	bro
>+BROGROUP?=	bro
>+PLIST_SUB+=	BROUSER="$(BROUSER)" BROGROUP="$(BROGROUP)"
> 
>+USERS=		${BROUSER}
>+GROUPS=		${BROGROUP}
>+
>+OPTIONS_DEFINE=	BROCCOLI BROCTL DEBUG IPSUMDUMP LBL_CF LBL_HF PERFTOOLS PORTS_SSL
>+OPTIONS_DEFAULT=BROCCOLI BROCTL IPSUMDUMP LBL_CF LBL_HF PORTS_SSL
>+
> BROCCOLI_DESC=	Build support for libbroccoli communications
> BROCTL_DESC=	Build BroControl support (requires BROCCOLI)
> DEBUG_DESC=	Compile in debugging mode
>@@ -53,6 +60,7 @@
> LBL_CF_DESC=	Unix time to formated time/date filter support
> LBL_HF_DESC=	Address to hostname filter support
> PERFTOOLS_DESC=	Use Perftools to improve memory & CPU usage
>+PORTS_SSL_DESC=	Build with OpenSSL from ports (instead of base system)
> 
> OPTIONS_EXCLUDE=NLS DOCS
> 
>@@ -109,6 +117,17 @@
> CMAKE_ARGS+=	-D ENABLE_PERFTOOLS:BOOL=false
> .endif
> 
>+.if ${PORT_OPTIONS:MPORTS_SSL}
>+.if !defined(WITH_OPENSSL_PORT)
>+IGNORE=		the PORTS_SSL option is required when WITH_OPENSSL_PORT is set
>+.endif
>+CMAKE_ARGS+=	-D CMAKE_EXE_LINKER_FLAGS="${OPENSSL_LDFLAGS}"
>+.else
>+.if defined(WITH_OPENSSL_PORT)
>+IGNORE=		the PORTS_SSL option not allowed when WITH_OPENSSL_PORT is not set
>+.endif
>+.endif
>+
> .if ${PORT_OPTIONS:MIPSUMDUMP}
> BUILD_DEPENDS+=	ipsumdump:${PORTSDIR}/net/ipsumdump
> RUN_DEPENDS+=	ipsumdump:${PORTSDIR}/net/ipsumdump
>@@ -120,10 +139,14 @@
> 	# pkg_install needs PREFIX in order to make a package from STAGEDIR/PREFIX
> 	@${MKDIR} ${PREFIX}
> .endif
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/logs
>+.if ${PORT_OPTIONS:MBROCTL}
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/spool/tmp
>+.endif
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/spool/installed-scripts-do-not-touch/auto
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/spool/installed-scripts-do-not-touch/site
> .for F in broctl.cfg
>-	@${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/aux/broctl/etc/${F} ${STAGEDIR}${PREFIX}/etc/${F}.example
>+	@${INSTALL_DATA} ${INSTALL_WRKSRC}/aux/broctl/etc/${F} ${STAGEDIR}${PREFIX}/etc/${F}.example
> .endfor
> .for F in networks.cfg node.cfg
> 	@${MV} ${WRKSRC}/aux/broctl/etc/${F} ${STAGEDIR}${PREFIX}/etc/${F}.example
>Index: security/bro/distinfo
>===================================================================
>--- security/bro/distinfo	(revision 362777)
>+++ security/bro/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (bro-2.2.tar.gz) = 86909361c2d804681f314604a6ce763be663937b2f045c8d25d810528a633dc9
>-SIZE (bro-2.2.tar.gz) = 9646602
>+SHA256 (bro-2.3.tar.gz) = 46bb9f46fbe71b22afd12ad12e0eb32033fb991a2a60b3bc2d881750249b85cd
>+SIZE (bro-2.3.tar.gz) = 10283001
>Index: security/bro/files/patch-src-input-readers-Raw.cc
>===================================================================
>--- security/bro/files/patch-src-input-readers-Raw.cc	(revision 362777)
>+++ security/bro/files/patch-src-input-readers-Raw.cc	(working copy)
>@@ -1,11 +0,0 @@
>---- src/input/readers/Raw.cc.orig	2014-01-06 21:04:06.000000000 +0200
>-+++ src/input/readers/Raw.cc	2014-01-06 21:04:13.000000000 +0200
>-@@ -352,7 +352,7 @@
>- 		fname = source.substr(0, fname.length() - 1);
>- 		}
>- 
>--	map<const char*, const char*>::const_iterator it = info.config.find("stdin"); // data that is sent to the child process
>-+	ReaderInfo::config_map::const_iterator it = info.config.find("stdin"); // data that is sent to the child process
>- 	if ( it != info.config.end() )
>- 		{
>- 		stdin_string = it->second;
>Index: security/bro/files/patch-src-input-readers-SQLite.cc
>===================================================================
>--- security/bro/files/patch-src-input-readers-SQLite.cc	(revision 362777)
>+++ security/bro/files/patch-src-input-readers-SQLite.cc	(working copy)
>@@ -1,11 +0,0 @@
>---- src/input/readers/SQLite.cc.orig	2014-01-06 21:07:44.000000000 +0200
>-+++ src/input/readers/SQLite.cc	2014-01-06 21:08:00.000000000 +0200
>-@@ -85,7 +85,7 @@
>- 	fullpath.append(".sqlite");
>- 
>- 	string query;
>--	map<const char*, const char*>::const_iterator it = info.config.find("query");
>-+	ReaderInfo::config_map::const_iterator it = info.config.find("query");
>- 	if ( it == info.config.end() )
>- 		{
>- 		Error(Fmt("No query specified when setting up SQLite data source. Aborting.", info.source));
>Index: security/bro/files/patch-src-logging-writers-SQLite.cc
>===================================================================
>--- security/bro/files/patch-src-logging-writers-SQLite.cc	(revision 362777)
>+++ security/bro/files/patch-src-logging-writers-SQLite.cc	(working copy)
>@@ -1,11 +0,0 @@
>---- src/logging/writers/SQLite.cc.orig	2014-01-06 21:08:34.000000000 +0200
>-+++ src/logging/writers/SQLite.cc	2014-01-06 21:08:45.000000000 +0200
>-@@ -126,7 +126,7 @@
>- 	fullpath.append(".sqlite");
>- 	string tablename;
>- 
>--	map<const char*, const char*>::const_iterator it = info.config.find("tablename");
>-+	WriterInfo::config_map::const_iterator it = info.config.find("tablename");
>- 	if ( it == info.config.end() )
>- 		{
>- 		MsgThread::Info(Fmt("tablename configuration option not found. Defaulting to path %s", info.path));
>Index: security/bro/files/pkg-message.in
>===================================================================
>--- security/bro/files/pkg-message.in	(revision 362777)
>+++ security/bro/files/pkg-message.in	(working copy)
>@@ -5,6 +5,6 @@
> the software will create a .sample file instead and the
> edited files will remain in place when you upgrade.  If you
> want to delete them, you have to delete them and the directory,
>-%%PREFIX%%/etc/bro manually.
>+%%PREFIX%%/etc manually.
> 
> ********************PLEASE NOTE!!!***************************
>Index: security/bro/pkg-descr
>===================================================================
>--- security/bro/pkg-descr	(revision 362777)
>+++ security/bro/pkg-descr	(working copy)
>@@ -1,6 +1,6 @@
> Bro is an open-source, Unix-based Network Intrusion Detection System (NIDS)
> that passively monitors network traffic and looks for suspicious activity.
>-Bro detects intrusions by first parsing network traffic to extract is
>+Bro detects intrusions by first parsing network traffic to extract its
> application-level semantics and then executing event-oriented analyzers that
> compare the activity with patterns deemed troublesome. Its analysis includes
> detection of specific attacks (including those defined by signatures, but
>@@ -10,4 +10,4 @@
> 
> Bro is documented in the USENIX 1998 Security Conference proceedings.
> 
>-WWW: http://bro-ids.org/
>+WWW: http://www.bro.org/
>Index: security/bro/pkg-plist
>===================================================================
>--- security/bro/pkg-plist	(revision 362777)
>+++ security/bro/pkg-plist	(working copy)
>@@ -1,5 +1,9 @@
>+@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/spool
>+%%BROCTL%%@exec chown %%BROUSER%%:%%BROGROUP%% %D/spool/tmp
> bin/bro
> bin/bro-cut
> %%BROCTL%%bin/broctl
>@@ -53,6 +57,7 @@
> %%DATADIR%%/base/bif/analyzer.bif.bro
> %%DATADIR%%/base/bif/bloom-filter.bif.bro
> %%DATADIR%%/base/bif/bro.bif.bro
>+%%DATADIR%%/base/bif/broxygen.bif.bro
> %%DATADIR%%/base/bif/cardinality-counter.bif.bro
> %%DATADIR%%/base/bif/const.bif.bro
> %%DATADIR%%/base/bif/event.bif.bro
>@@ -94,14 +99,16 @@
> %%DATADIR%%/base/bif/plugins/Bro_NetFlow.events.bif.bro
> %%DATADIR%%/base/bif/plugins/Bro_PIA.events.bif.bro
> %%DATADIR%%/base/bif/plugins/Bro_POP3.events.bif.bro
>+%%DATADIR%%/base/bif/plugins/Bro_RADIUS.events.bif.bro
> %%DATADIR%%/base/bif/plugins/Bro_RPC.events.bif.bro
> %%DATADIR%%/base/bif/plugins/Bro_SMB.events.bif.bro
> %%DATADIR%%/base/bif/plugins/Bro_SMTP.events.bif.bro
> %%DATADIR%%/base/bif/plugins/Bro_SMTP.functions.bif.bro
>+%%DATADIR%%/base/bif/plugins/Bro_SNMP.events.bif.bro
>+%%DATADIR%%/base/bif/plugins/Bro_SNMP.types.bif.bro
> %%DATADIR%%/base/bif/plugins/Bro_SOCKS.events.bif.bro
> %%DATADIR%%/base/bif/plugins/Bro_SSH.events.bif.bro
> %%DATADIR%%/base/bif/plugins/Bro_SSL.events.bif.bro
>-%%DATADIR%%/base/bif/plugins/Bro_SSL.functions.bif.bro
> %%DATADIR%%/base/bif/plugins/Bro_SteppingStone.events.bif.bro
> %%DATADIR%%/base/bif/plugins/Bro_Syslog.events.bif.bro
> %%DATADIR%%/base/bif/plugins/Bro_TCP.events.bif.bro
>@@ -110,6 +117,9 @@
> %%DATADIR%%/base/bif/plugins/Bro_UDP.events.bif.bro
> %%DATADIR%%/base/bif/plugins/Bro_Unified2.events.bif.bro
> %%DATADIR%%/base/bif/plugins/Bro_Unified2.types.bif.bro
>+%%DATADIR%%/base/bif/plugins/Bro_X509.events.bif.bro
>+%%DATADIR%%/base/bif/plugins/Bro_X509.functions.bif.bro
>+%%DATADIR%%/base/bif/plugins/Bro_X509.types.bif.bro
> %%DATADIR%%/base/bif/plugins/Bro_ZIP.events.bif.bro
> %%DATADIR%%/base/bif/plugins/__load__.bro
> %%DATADIR%%/base/bif/reporter.bif.bro
>@@ -122,6 +132,8 @@
> %%DATADIR%%/base/files/hash/main.bro
> %%DATADIR%%/base/files/unified2/__load__.bro
> %%DATADIR%%/base/files/unified2/main.bro
>+%%DATADIR%%/base/files/x509/__load__.bro
>+%%DATADIR%%/base/files/x509/main.bro
> %%DATADIR%%/base/frameworks/analyzer/__load__.bro
> %%DATADIR%%/base/frameworks/analyzer/main.bro
> %%DATADIR%%/base/frameworks/cluster/__load__.bro
>@@ -137,6 +149,9 @@
> %%DATADIR%%/base/frameworks/dpd/__load__.bro
> %%DATADIR%%/base/frameworks/dpd/main.bro
> %%DATADIR%%/base/frameworks/files/__load__.bro
>+%%DATADIR%%/base/frameworks/files/magic/__load__.bro
>+%%DATADIR%%/base/frameworks/files/magic/general.sig
>+%%DATADIR%%/base/frameworks/files/magic/libmagic.sig
> %%DATADIR%%/base/frameworks/files/main.bro
> %%DATADIR%%/base/frameworks/input/__load__.bro
> %%DATADIR%%/base/frameworks/input/main.bro
>@@ -202,6 +217,7 @@
> %%DATADIR%%/base/init-bare.bro
> %%DATADIR%%/base/init-default.bro
> %%DATADIR%%/base/misc/find-checksum-offloading.bro
>+%%DATADIR%%/base/misc/find-filtered-trace.bro
> %%DATADIR%%/base/misc/p0f.fp
> %%DATADIR%%/base/protocols/conn/__load__.bro
> %%DATADIR%%/base/protocols/conn/contents.bro
>@@ -244,11 +260,16 @@
> %%DATADIR%%/base/protocols/modbus/main.bro
> %%DATADIR%%/base/protocols/pop3/__load__.bro
> %%DATADIR%%/base/protocols/pop3/dpd.sig
>+%%DATADIR%%/base/protocols/radius/__load__.bro
>+%%DATADIR%%/base/protocols/radius/consts.bro
>+%%DATADIR%%/base/protocols/radius/main.bro
> %%DATADIR%%/base/protocols/smtp/__load__.bro
> %%DATADIR%%/base/protocols/smtp/dpd.sig
> %%DATADIR%%/base/protocols/smtp/entities.bro
> %%DATADIR%%/base/protocols/smtp/files.bro
> %%DATADIR%%/base/protocols/smtp/main.bro
>+%%DATADIR%%/base/protocols/snmp/__load__.bro
>+%%DATADIR%%/base/protocols/snmp/main.bro
> %%DATADIR%%/base/protocols/socks/__load__.bro
> %%DATADIR%%/base/protocols/socks/consts.bro
> %%DATADIR%%/base/protocols/socks/dpd.sig
>@@ -259,6 +280,7 @@
> %%DATADIR%%/base/protocols/ssl/__load__.bro
> %%DATADIR%%/base/protocols/ssl/consts.bro
> %%DATADIR%%/base/protocols/ssl/dpd.sig
>+%%DATADIR%%/base/protocols/ssl/files.bro
> %%DATADIR%%/base/protocols/ssl/main.bro
> %%DATADIR%%/base/protocols/ssl/mozilla-ca-list.bro
> %%DATADIR%%/base/protocols/syslog/__load__.bro
>@@ -288,68 +310,8 @@
> %%BROCTL%%%%DATADIR%%/broctl/main.bro
> %%BROCTL%%%%DATADIR%%/broctl/process-trace.bro
> %%BROCTL%%%%DATADIR%%/broctl/standalone.bro
>-%%DATADIR%%/magic/animation
>-%%DATADIR%%/magic/archive
>-%%DATADIR%%/magic/assembler
>-%%DATADIR%%/magic/audio
>-%%DATADIR%%/magic/c-lang
>-%%DATADIR%%/magic/cafebabe
>-%%DATADIR%%/magic/commands
>-%%DATADIR%%/magic/compress
>-%%DATADIR%%/magic/database
>-%%DATADIR%%/magic/diff
>-%%DATADIR%%/magic/elf
>-%%DATADIR%%/magic/epoc
>-%%DATADIR%%/magic/filesystems
>-%%DATADIR%%/magic/flash
>-%%DATADIR%%/magic/fonts
>-%%DATADIR%%/magic/fortran
>-%%DATADIR%%/magic/frame
>-%%DATADIR%%/magic/gimp
>-%%DATADIR%%/magic/gnu
>-%%DATADIR%%/magic/gnumeric
>-%%DATADIR%%/magic/icc
>-%%DATADIR%%/magic/iff
>-%%DATADIR%%/magic/images
>-%%DATADIR%%/magic/java
>-%%DATADIR%%/magic/javascript
>-%%DATADIR%%/magic/jpeg
>-%%DATADIR%%/magic/kde
>-%%DATADIR%%/magic/kml
>-%%DATADIR%%/magic/linux
>-%%DATADIR%%/magic/lisp
>-%%DATADIR%%/magic/lua
>-%%DATADIR%%/magic/m4
>-%%DATADIR%%/magic/macintosh
>-%%DATADIR%%/magic/mail.news
>-%%DATADIR%%/magic/make
>-%%DATADIR%%/magic/marc21
>-%%DATADIR%%/magic/matroska
>-%%DATADIR%%/magic/misctools
>-%%DATADIR%%/magic/msdos
>-%%DATADIR%%/magic/neko
>-%%DATADIR%%/magic/pascal
>-%%DATADIR%%/magic/pdf
>-%%DATADIR%%/magic/perl
>-%%DATADIR%%/magic/pgp
>-%%DATADIR%%/magic/pkgadd
>-%%DATADIR%%/magic/printer
>-%%DATADIR%%/magic/python
>-%%DATADIR%%/magic/riff
>-%%DATADIR%%/magic/rpm
>-%%DATADIR%%/magic/rtf
>-%%DATADIR%%/magic/ruby
>-%%DATADIR%%/magic/sc
>-%%DATADIR%%/magic/sgml
>-%%DATADIR%%/magic/sniffer
>-%%DATADIR%%/magic/tcl
>-%%DATADIR%%/magic/tex
>-%%DATADIR%%/magic/troff
>-%%DATADIR%%/magic/vorbis
>-%%DATADIR%%/magic/warc
>-%%DATADIR%%/magic/windows
>-%%DATADIR%%/magic/wordprocessors
>-%%DATADIR%%/magic/xwindows
>+%%DATADIR%%/broxygen/__load__.bro
>+%%DATADIR%%/broxygen/example.bro
> %%DATADIR%%/policy/frameworks/communication/listen.bro
> %%DATADIR%%/policy/frameworks/control/controllee.bro
> %%DATADIR%%/policy/frameworks/control/controller.bro
>@@ -369,6 +331,7 @@
> %%DATADIR%%/policy/frameworks/intel/seen/smtp.bro
> %%DATADIR%%/policy/frameworks/intel/seen/ssl.bro
> %%DATADIR%%/policy/frameworks/intel/seen/where-locations.bro
>+%%DATADIR%%/policy/frameworks/intel/seen/x509.bro
> %%DATADIR%%/policy/frameworks/packet-filter/shunt.bro
> %%DATADIR%%/policy/frameworks/signatures/detect-windows-shells.sig
> %%DATADIR%%/policy/frameworks/software/version-changes.bro
>@@ -391,6 +354,7 @@
> %%DATADIR%%/policy/misc/detect-traceroute/__load__.bro
> %%DATADIR%%/policy/misc/detect-traceroute/detect-low-ttls.sig
> %%DATADIR%%/policy/misc/detect-traceroute/main.bro
>+%%DATADIR%%/policy/misc/dump-events.bro
> %%DATADIR%%/policy/misc/known-devices.bro
> %%DATADIR%%/policy/misc/load-balancing.bro
> %%DATADIR%%/policy/misc/loaded-scripts.bro
>@@ -425,17 +389,21 @@
> %%DATADIR%%/policy/protocols/ssh/geo-data.bro
> %%DATADIR%%/policy/protocols/ssh/interesting-hostnames.bro
> %%DATADIR%%/policy/protocols/ssh/software.bro
>-%%DATADIR%%/policy/protocols/ssl/cert-hash.bro
> %%DATADIR%%/policy/protocols/ssl/expiring-certs.bro
> %%DATADIR%%/policy/protocols/ssl/extract-certs-pem.bro
>+%%DATADIR%%/policy/protocols/ssl/heartbleed.bro
> %%DATADIR%%/policy/protocols/ssl/known-certs.bro
>+%%DATADIR%%/policy/protocols/ssl/log-hostcerts-only.bro
> %%DATADIR%%/policy/protocols/ssl/notary.bro
> %%DATADIR%%/policy/protocols/ssl/validate-certs.bro
>+%%DATADIR%%/policy/protocols/ssl/validate-ocsp.bro
>+%%DATADIR%%/policy/protocols/ssl/weak-keys.bro
> %%DATADIR%%/policy/tuning/__load__.bro
> %%DATADIR%%/policy/tuning/defaults/__load__.bro
> %%DATADIR%%/policy/tuning/defaults/extracted_file_limits.bro
> %%DATADIR%%/policy/tuning/defaults/packet-fragments.bro
> %%DATADIR%%/policy/tuning/defaults/warnings.bro
>+%%DATADIR%%/policy/tuning/json-logs.bro
> %%DATADIR%%/policy/tuning/logs-to-elasticsearch.bro
> %%DATADIR%%/policy/tuning/track-all-assets.bro
> %%DATADIR%%/site/local-manager.bro
>@@ -450,7 +418,6 @@
> %%BROCTL%%%%DATADIR%%ctl/scripts/create-link-for-log
> %%BROCTL%%%%DATADIR%%ctl/scripts/delete-log
> %%BROCTL%%%%DATADIR%%ctl/scripts/expire-logs
>-%%BROCTL%%%%DATADIR%%ctl/scripts/get-prof-log
> %%BROCTL%%%%DATADIR%%ctl/scripts/helpers/cat-file
> %%BROCTL%%%%DATADIR%%ctl/scripts/helpers/check-pid
> %%BROCTL%%%%DATADIR%%ctl/scripts/helpers/df
>@@ -464,7 +431,6 @@
> %%BROCTL%%%%DATADIR%%ctl/scripts/helpers/stop
> %%BROCTL%%%%DATADIR%%ctl/scripts/helpers/to-bytes.awk
> %%BROCTL%%%%DATADIR%%ctl/scripts/helpers/top
>-%%BROCTL%%%%DATADIR%%ctl/scripts/is-alive
> %%BROCTL%%%%DATADIR%%ctl/scripts/local-interfaces
> %%BROCTL%%%%DATADIR%%ctl/scripts/make-archive-name
> %%BROCTL%%%%DATADIR%%ctl/scripts/post-terminate
>@@ -476,7 +442,6 @@
> %%BROCTL%%%%DATADIR%%ctl/scripts/set-bro-path
> %%BROCTL%%%%DATADIR%%ctl/scripts/stats-to-csv
> %%BROCTL%%%%DATADIR%%ctl/scripts/update
>-%%BROCTL%%%%DATADIR%%ctl/scripts/update-stats
> %%BROCTL%%@unexec rm -f %D/logs/current
> %%BROCTL%%@unexec rm -f %D/spool/broctl-config.sh
> %%BROCTL%%@unexec rm -f %D/spool/broctl.dat
>@@ -489,8 +454,11 @@
> %%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/site
> %%BROCTL%%@dirrmtry spool/installed-scripts-do-not-touch/auto
>+%%BROCTL%%@dirrmtry spool/installed-scripts-do-not-touch/auto
> %%BROCTL%%@dirrmtry spool/installed-scripts-do-not-touch
>+%%BROCTL%%@dirrmtry spool/installed-scripts-do-not-touch
> %%BROCTL%%@dirrmtry spool
> %%BROCTL%%@dirrm %%DATADIR%%ctl/scripts/postprocessors
> %%BROCTL%%@dirrm %%DATADIR%%ctl/scripts/helpers
>@@ -527,7 +495,7 @@
> @dirrm %%DATADIR%%/policy/frameworks/communication
> @dirrm %%DATADIR%%/policy/frameworks
> @dirrm %%DATADIR%%/policy
>-@dirrm %%DATADIR%%/magic
>+@dirrm %%DATADIR%%/broxygen
> %%BROCTL%%@dirrm %%DATADIR%%/broctl
> @dirrm %%DATADIR%%/base/utils
> @dirrm %%DATADIR%%/base/protocols/tunnels
>@@ -535,7 +503,9 @@
> @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
>@@ -563,6 +533,7 @@
> @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
>@@ -571,6 +542,7 @@
> @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
>@@ -588,4 +560,4 @@
> %%CLEANUP_PREFIX%%@dirrmtry etc
> %%CLEANUP_PREFIX%%@dirrmtry bin
> %%CLEANUP_PREFIX%%@dirrmtry %D
>-%%BROCTL%%@exec %D/bin/broctl install
>+%%BROCTL%%@exec su %%BROUSER%% -c '%D/bin/broctl install'
>Index: security/broccoli/Makefile
>===================================================================
>--- security/broccoli/Makefile	(revision 362777)
>+++ security/broccoli/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	broccoli
>-PORTVERSION=	2.2
>-PORTREVISION=	2
>+PORTVERSION=	2.3
> CATEGORIES=	security
> MASTER_SITES=	http://www.bro.org/downloads/release/
> DISTNAME=	bro-${PORTVERSION}
>Index: security/broccoli/distinfo
>===================================================================
>--- security/broccoli/distinfo	(revision 362777)
>+++ security/broccoli/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (bro-2.2.tar.gz) = 86909361c2d804681f314604a6ce763be663937b2f045c8d25d810528a633dc9
>-SIZE (bro-2.2.tar.gz) = 9646602
>+SHA256 (bro-2.3.tar.gz) = 46bb9f46fbe71b22afd12ad12e0eb32033fb991a2a60b3bc2d881750249b85cd
>+SIZE (bro-2.3.tar.gz) = 10283001
>Index: security/broccoli/pkg-plist
>===================================================================
>--- security/broccoli/pkg-plist	(revision 362777)
>+++ security/broccoli/pkg-plist	(working copy)
>@@ -8,10 +8,6 @@
> lib/libbroccoli.so.5
> lib/libbroccoli.so.5.1.0
> %%PYTHON%%%%PYTHON_SITELIBDIR%%/_broccoli_intern.so
>-%%PYTHON%%@exec ln -f %%PREFIX%%/%%PYTHON_SITELIBDIR%%/_broccoli_intern.so %%LOCALBASE%%/%%PYTHON_SITELIBDIR%%/_broccoli_intern.so
>-%%PYTHON%%@unexec rm -f %%LOCALBASE%%/%%PYTHON_SITELIBDIR%%/_broccoli_intern.so
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/broccoli.py
>-%%PYTHON%%@exec ln -f %%PREFIX%%/%%PYTHON_SITELIBDIR%%/broccoli.py %%LOCALBASE%%/%%PYTHON_SITELIBDIR%%/broccoli.py
> %%PYTHON%%@unexec rm -f %%LOCALBASE%%/%%PYTHON_SITELIBDIR%%/broccoli.py
> %%PYTHON%%@unexec rm -f %%LOCALBASE%%/%%PYTHON_SITELIBDIR%%/broccoli.pyc
> %%RUBY%%%%RUBY_SITELIBDIR%%/Broccoli/connection.rb
>@@ -18,15 +14,9 @@
> %%RUBY%%%%RUBY_SITELIBDIR%%/Broccoli/event.rb
> %%RUBY%%%%RUBY_SITELIBDIR%%/Broccoli/record.rb
> %%RUBY%%%%RUBY_SITELIBDIR%%/broccoli.rb
>+%%RUBY%%@dirrmtry %%RUBY_SITELIBDIR%%/Broccoli
> %%RUBY%%%%RUBY_SITEARCHLIBDIR%%/broccoli_ext.so
>-%%RUBY%%@dirrmtry %%RUBY_SITELIBDIR%%/Broccoli
> %%CLEANUP_PREFIX%%%%PORTDOCS%%@dirrmtry share
>-%%CLEANUP_PREFIX%%%%RUBY%%@dirrmtry lib/ruby/site_ruby/1.9/i386-freebsd9
>-%%CLEANUP_PREFIX%%%%RUBY%%@dirrmtry lib/ruby/site_ruby/1.9
>-%%CLEANUP_PREFIX%%%%RUBY%%@dirrmtry lib/ruby/site_ruby
>-%%CLEANUP_PREFIX%%%%RUBY%%@dirrmtry lib/ruby
>-%%CLEANUP_PREFIX%%%%PYTHON%%@dirrmtry lib/python2.7/site-packages
>-%%CLEANUP_PREFIX%%%%PYTHON%%@dirrmtry lib/python2.7
> %%CLEANUP_PREFIX%%@dirrmtry lib
> %%CLEANUP_PREFIX%%@dirrmtry include
> %%CLEANUP_PREFIX%%@dirrmtry etc
>--- head.diffs ends here ---

Flags:

leres: maintainer-approval+

Actions: View

Attachments on bug 192105: 144959