Attachment 139242 Details for Bug 185455 – patch.txt

patch.txt

patch.txt (text/plain), 3.77 KB, created by Craig Leres on 2014-01-04 01:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Craig Leres

Created: 2014-01-04 01:10:00 UTC

Size: 3.77 KB

patch

obsolete

>--- Makefile.orig	2013-12-03 04:25:17.000000000 -0800
>+++ Makefile	2014-01-03 15:33:26.000000000 -0800
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	bro
> PORTVERSION=	2.2
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES=	http://www.bro.org/downloads/release/
> 
>@@ -11,9 +12,9 @@
> 
> LICENSE=	BSD
> 
>-BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison \
>-		swig:${PORTSDIR}/devel/swig13
>-LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
>+BUILD_DEPENDS=	${LOCALBASE}/bin/bison:${PORTSDIR}/devel/bison \
>+		${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13
>+LIB_DEPENDS=	${LOCALBASE}/lib/libGeoIP.so:${PORTSDIR}/net/GeoIP
> 
> USES=		cmake:outsource perl5
> USE_PYTHON=	yes
>@@ -24,7 +25,10 @@
> .if defined(BRO_PREFIX)
> PREFIX=${BRO_PREFIX}
> PLIST_SUB+=	CLEANUP_PREFIX=""
>-NEED_ROOT=	yes
>+.if ! defined(WITH_PKGNG) && ! exists(${BRO_PREFIX})
>+NEED_ROOT=      yes
>+.endif
>+NO_MTREE=	yes
> .else
> PLIST_SUB+=	CLEANUP_PREFIX="@comment "
> .endif
>@@ -74,35 +78,35 @@
> .if empty(PORT_OPTIONS:MIPSUMDUMP)
> IGNORE=		the BROCTL option requires IPSUMDUMP
> .endif
>-BUILD_DEPENDS+=		bash:${PORTSDIR}/shells/bash
>-RUN_DEPENDS+=		bash:${PORTSDIR}/shells/bash
>-PLIST_SUB+=		BROCTL=""
>-USE_LDCONFIG=		yes
>-CMAKE_ARGS+=		-D INSTALL_BROCTL:BOOL=true
>+BUILD_DEPENDS+=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
>+RUN_DEPENDS+=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
>+PLIST_SUB+=	BROCTL=""
>+USE_LDCONFIG=	yes
>+CMAKE_ARGS+=	-D INSTALL_BROCTL:BOOL=true
> .else
>-CMAKE_ARGS+=		-D INSTALL_BROCTL:BOOL=false
>-PLIST_SUB+=		BROCTL="@comment "
>+CMAKE_ARGS+=	-D INSTALL_BROCTL:BOOL=false
>+PLIST_SUB+=	BROCTL="@comment "
> .endif
> 
> .if ${PORT_OPTIONS:MDEBUG}
>-CMAKE_ARGS+=		-D ENABLE_DEBUG:BOOL=true
>+CMAKE_ARGS+=	-D ENABLE_DEBUG:BOOL=true
> .else
>-CMAKE_ARGS+=		-D ENABLE_DEBUG:BOOL=false
>+CMAKE_ARGS+=	-D ENABLE_DEBUG:BOOL=false
> .endif
> 
> .if ${PORT_OPTIONS:MLBL_HF}
>-RUN_DEPENDS+=	hf:${PORTSDIR}/sysutils/lbl-hf
>+RUN_DEPENDS+=	${LOCALBASE}/bin/hf:${PORTSDIR}/sysutils/lbl-hf
> .endif
> 
> .if ${PORT_OPTIONS:MLBL_CF}
>-RUN_DEPENDS+=	cf:${PORTSDIR}/sysutils/lbl-cf
>+RUN_DEPENDS+=	${LOCALBASE}/bin/cf:${PORTSDIR}/sysutils/lbl-cf
> .endif
> 
> .if ${PORT_OPTIONS:MPERFTOOLS}
>-CMAKE_ARGS+=		-D ENABLE_PERFTOOLS:BOOL=true
>-RUN_DEPENDS+=	pprof:${PORTSDIR}/devel/google-perftools
>+CMAKE_ARGS+=	-D ENABLE_PERFTOOLS:BOOL=true
>+RUN_DEPENDS+=	${LOCALBASE}/bin/pprof:${PORTSDIR}/devel/google-perftools
> .else
>-CMAKE_ARGS+=		-D ENABLE_PERFTOOLS:BOOL=false
>+CMAKE_ARGS+=	-D ENABLE_PERFTOOLS:BOOL=false
> .endif
> 
> .if ${PORT_OPTIONS:MIPSUMDUMP}
>@@ -111,8 +115,9 @@
> .endif
> 
> .if ${PORT_OPTIONS:MBROCTL}
>-post-stage::
>-.if defined(BRO_PREFIX)
>+post-install:
>+.if defined(BRO_PREFIX) && !defined(WITH_PKGNG) && !exists(${BRO_PREFIX})
>+	# pkg_install needs PREFIX in order to make a package from STAGEDIR/PREFIX
> 	@${MKDIR} ${PREFIX}
> .endif
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/spool/installed-scripts-do-not-touch/auto
>@@ -121,7 +126,7 @@
> 	@${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/aux/broctl/etc/${F} ${STAGEDIR}${PREFIX}/etc/${F}.example
> .endfor
> .for F in networks.cfg node.cfg
>-	@${INSTALL_SCRIPT} ${WRKSRC}/aux/broctl/etc/${F} ${STAGEDIR}${PREFIX}/etc/${F}.example
>+	@${MV} ${WRKSRC}/aux/broctl/etc/${F} ${STAGEDIR}${PREFIX}/etc/${F}.example
> .endfor
> .endif
> 
>--- /dev/null	2014-01-03 16:07:09.000000000 -0800
>+++ files/patch-logging-writers-SQLite.cc	2014-01-03 15:32:34.000000000 -0800
>@@ -0,0 +1,11 @@
>+--- src/logging/writers/SQLite.cc.orig	2013-11-07 10:27:11.000000000 -0800
>++++ src/logging/writers/SQLite.cc	2013-12-13 15:35:05.000000000 -0800
>+@@ -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));

Actions: View

Attachments on bug 185455: 139242