Date: Wed, 13 Nov 2013 15:44:54 -0800 (PST) From: Craig Leres <leres@ee.lbl.gov> To: FreeBSD-gnats-submit@freebsd.org Cc: leres@ee.lbl.gov Subject: ports/183939: [PATCH] security/broccoli: update to 2.2 and add stage support Message-ID: <201311132344.rADNisCV050964@fun.ee.lbl.gov> Resent-Message-ID: <201311132350.rADNo0Xx010583@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 183939 >Category: ports >Synopsis: [PATCH] security/broccoli: update to 2.2 and add stage support >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: Wed Nov 13 23:50:00 UTC 2013 >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 #11 r26: Wed Sep 11 10:30:14 PDT 2013 leres@fun.ee.lbl.gov:/sys/amd64/compile/LBL amd64 >Description: This updates broccoli from 2.1 to 2.2. Other changes include: - Add stage support - Update MASTER_SITES - Add LICENSE This PR should processed at the same time the security/bro PR I am submitting; I will follow up with that PR number once one is assigned. >How-To-Repeat: >Fix: Remove/delete all current patch files: files/patch-aux-broccoli-CMakeLists.txt And then apply the attached patch set. --- patch-broccoli.txt begins here --- --- Makefile.orig 2013-10-16 17:11:45.000000000 -0700 +++ Makefile 2013-11-13 15:24:23.000000000 -0800 @@ -2,14 +2,16 @@ # $FreeBSD: head/security/broccoli/Makefile 330536 2013-10-16 20:21:52Z tabthorpe $ PORTNAME= broccoli -PORTVERSION= 2.1 +PORTVERSION= 2.2 CATEGORIES= security -MASTER_SITES= http://www.bro-ids.org/downloads/release/ +MASTER_SITES= http://www.bro.org/downloads/release/ DISTNAME= bro-${PORTVERSION} MAINTAINER= leres@ee.lbl.gov COMMENT= The Bro Client Communications Library +LICENSE= BSD + BUILD_DEPENDS= bison:${PORTSDIR}/devel/bison \ swig:${PORTSDIR}/devel/swig13 LIB_DEPENDS= GeoIP:${PORTSDIR}/net/GeoIP @@ -24,10 +26,12 @@ .if defined(BRO_PREFIX) PREFIX=${BRO_PREFIX} PLIST_SUB+= CLEANUP_PREFIX="" +NEED_ROOT= yes .else PLIST_SUB+= CLEANUP_PREFIX="@comment " .endif CMAKE_ARGS+= -D CMAKE_INSTALL_PREFIX:PATH=${PREFIX} \ + -D BRO_ETC_INSTALL_DIR:PATH=${PREFIX}/etc \ -D PY_MOD_INSTALL_DIR:PATH=${PREFIX} OPTIONS_DEFINE= DEBUG PYTHON RUBY @@ -36,7 +40,6 @@ PYTHON_DESC= Build python bindings for broccoli RUBY_DESC= Build ruby bindings for broccoli -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDEBUG} @@ -59,10 +62,11 @@ PLIST_SUB+= RUBY="@comment " .endif -post-install: - @${MKDIR} ${PREFIX}/etc - @${INSTALL_SCRIPT} ${WRKSRC}/aux/broccoli/broccoli.conf ${PREFIX}/etc/broccoli.conf.sample - @[ -f ${PREFIX}/etc/broccoli.conf ] || \ - ${CP} -p ${PREFIX}/etc/broccoli.conf.sample ${PREFIX}/etc/broccoli.conf +post-stage:: +.if defined(BRO_PREFIX) + @${MKDIR} ${PREFIX} +.endif + @${MKDIR} ${STAGEDIR}${PREFIX}/etc + @${INSTALL_SCRIPT} ${WRKSRC}/aux/broccoli/broccoli.conf ${STAGEDIR}${PREFIX}/etc/broccoli.conf.example .include <bsd.port.mk> --- distinfo.orig 2013-10-16 17:11:45.000000000 -0700 +++ distinfo 2013-11-13 15:24:23.000000000 -0800 @@ -1,2 +1,2 @@ -SHA256 (bro-2.1.tar.gz) = 0d83b7c78d6e247d44b0407649df7fefa6da5c73a572a16c0096c9b7f2a955e0 -SIZE (bro-2.1.tar.gz) = 5627966 +SHA256 (bro-2.2.tar.gz) = 86909361c2d804681f314604a6ce763be663937b2f045c8d25d810528a633dc9 +SIZE (bro-2.2.tar.gz) = 9646602 --- pkg-plist.orig 2013-10-16 17:11:45.000000000 -0700 +++ pkg-plist 2013-11-13 15:24:23.000000000 -0800 @@ -1,8 +1,7 @@ bin/broccoli-config -@exec mkdir -p %B -@unexec cmp -s %D/etc/broccoli.conf.sample %D/etc/broccoli.conf && rm %D/etc/broccoli.conf || true -etc/broccoli.conf.sample -@exec test -f %B/broccoli.conf || cp -p %D/%F %B/broccoli.conf +@unexec cmp -s %D/etc/broccoli.conf.example %D/etc/broccoli.conf && rm %D/etc/broccoli.conf || true +etc/broccoli.conf.example +@exec test -f %D/etc/broccoli.conf || cp -p %D/%F %D/etc/broccoli.conf include/broccoli.h lib/libbroccoli.a lib/libbroccoli.so --- patch-broccoli.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?201311132344.rADNisCV050964>