Date: Fri, 3 Jan 2014 17:06:49 -0800 (PST) From: Craig Leres <leres@ee.lbl.gov> To: FreeBSD-gnats-submit@freebsd.org Cc: leres@ee.lbl.gov Subject: ports/185455: [PATCH] security/bro: Fix pkg-fallout issue, Message-ID: <201401040106.s0416nhs078222@fun.ee.lbl.gov> Resent-Message-ID: <201401040110.s041A05p081366@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185455 >Category: ports >Synopsis: [PATCH] security/bro: Fix pkg-fallout issue, >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Jan 04 01:10:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Craig Leres >Release: FreeBSD 9.1-RELEASE amd64 >Organization: Lawrence Berkeley National Laboratory >Environment: System: FreeBSD fun.ee.lbl.gov 9.1-RELEASE FreeBSD 9.1-RELEASE #12 r27: Wed Oct 30 16:07:54 PDT 2013 leres@fun.ee.lbl.gov:/sys/amd64/compile/LBL amd64 >Description: This updates the Makefile to match recent changes to the security/broccoli port: - Convert to new-new OPTIONS framework - Use new *_DEPENDS formats Also included is a patch that attempts to solve recent current and 10 pkg-fallout issues. I wasn't able to reproduce the error using either the lang/clang33 or lang/clang-devel compilers but the Bro developement team provide the patch and claim it should work. >How-To-Repeat: pkg-fallout reports: [REL - head-amd64-default][security/bro] Failed for bro-2.2 in build [REL - head-i386-default][security/bro] Failed for bro-2.2 in build [REL - 10amd64-default][security/bro] Failed for bro-2.2 in build [REL - 10amd64-default][security/bro] Failed for bro-2.2 in build >Fix: --- patch.txt begins here --- --- 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)); --- patch.txt ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401040106.s0416nhs078222>