FreeBSD Bugzilla – Attachment 138091 Details for
Bug 183939
[PATCH] security/broccoli: update to 2.2 and add stage support
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch-broccoli.txt
patch-broccoli.txt (text/plain), 2.65 KB, created by
Craig Leres
on 2013-11-13 23:50:00 UTC
(
hide
)
Description:
patch-broccoli.txt
Filename:
MIME Type:
Creator:
Craig Leres
Created:
2013-11-13 23:50:00 UTC
Size:
2.65 KB
patch
obsolete
>--- 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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 183939
: 138091