security/bro, security/broccoli: 2.3 -> 2.3.2

This updates bro and broccoli from 2.3 and 2.3.2, which is a security
update.

Changes to the bro port:
- Rework openssl option logic
- Remove obsolete
- pkgng related changes

Changes to the broccoli port:
- Remove unused DOCS option
- Enable PYTHON by default
- pkgng related changes
- Minor portlint changes

Changes in 2.3.2:
- DNP3: fix reachable assertion and buffer over-read/overflow.
  CVE number pending. (Travis Emmert, Jon Siwek)
- Update binpac: Fix potential out-of-bounds memory reads in
  generated code. CVE-2014-9586. (John Villamil and Chris Rohlf
  - Yahoo Paranoids, Jon Siwek)
- BIT-1234: Fix build on systems that already have ntohll/htonll.
  (Jon Siwek)
- BIT-1291: Delete prebuilt python bytecode files from git.  (Jon Siwek)
- Adding call to new binpac::init() function. (Robin Sommer)

Changes in 2.3.1:
- Fix a reference counting bug in ListVal ctor. (Jon Siwek)
- Fix possible buffer over-read in DNS TSIG parsing. (Jon Siwek)
- Change EDNS parsing code to use rdlength more cautiously.  (Jon Siwek)
- Fix null pointer dereference in OCSP verification code in
  case no certificate is sent as part as the ocsp reply. Addresses
  BIT-1212.  (Johanna Amann)
- Fix OCSP reply validation. Addresses BIT-1212 (Johanna Amann)
- Make links in documentation templates protocol relative. (Johanna Amann)

PR:		197107
Submitted by:	Craig Leres <leres@ee.lbl.gov> (maintainer)
Reviewed by:	koobs

3 files changed, 20 insertions, 23 deletions

diff --git a/security/broccoli/Makefile b/security/broccoli/Makefile
index 8864673c475f..14ff6b570dc4 100644
--- a/security/broccoli/Makefile
+++ b/security/broccoli/Makefile
@@ -2,14 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	broccoli
-PORTVERSION=	2.3
-PORTREVISION=	1
+PORTVERSION=	2.3.2
 CATEGORIES=	security
 MASTER_SITES=	http://www.bro.org/downloads/release/
 DISTNAME=	bro-${PORTVERSION}
 
 MAINTAINER=	leres@ee.lbl.gov
-COMMENT=	The Bro Client Communications Library
+COMMENT=	Bro Client Communications Library
 
 LICENSE=	BSD3CLAUSE
 
@@ -33,9 +32,11 @@ PLIST_SUB+=	CLEANUP_PREFIX="@comment "
 CMAKE_ARGS+=	-D CMAKE_INSTALL_PREFIX:PATH=${PREFIX} \
 		-D BRO_ETC_INSTALL_DIR:PATH=${PREFIX}/etc
 
-OPTIONS_DEFINE=	DEBUG PYTHON RUBY DOCS
+OPTIONS_DEFINE=	DEBUG PYTHON RUBY
 OPTIONS_SUB=
 
+OPTIONS_DEFAULT=	PYTHON
+
 DEBUG_DESC=	Compile in debugging mode
 PYTHON_DESC=	Build python bindings for broccoli
 RUBY_DESC=	Build ruby bindings for broccoli
@@ -50,15 +51,13 @@ RUBY_CMAKE_ON=	-D RB_INSTALL_DIR:PATH=${RUBY_SITELIBDIR} \
 RUBY_CMAKE_OFF=		-D DISABLE_RUBY_BINDINGS:BOOL=true
 
 post-install::
+	@${MV} ${STAGEDIR}${PREFIX}/etc/broccoli.conf ${STAGEDIR}${PREFIX}/etc/broccoli.conf.example
 .if defined(BRO_PREFIX) && empty(${PORT_OPTIONS:MPYTHON})
 	# Move lib/pythonX.X tree into BRO_PREFIX
 	${MV} ${STAGEDIR}${PYTHON_LIBDIR} ${STAGEDIR}${PREFIX}/lib
 .endif
-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc
-	@${MV} ${STAGEDIR}${PREFIX}/etc/broccoli.conf ${STAGEDIR}${PREFIX}/etc/broccoli.conf.example
-.if !empty(${PORT_OPTIONS:MPYTHON}) && defined(BRO_PREFIX)
-	# bsd.python.mk isn't PREFIX-safe yet.
-	@${MV} ${STAGEDIR}${PYTHON_LIBDIR} ${STAGEDIR}${PYTHONPREFIX_LIBDIR}
+.if defined(BRO_PREFIX)
+	${FIND} ${STAGEDIR} -type d | ${XARGS} ${CHMOD} g-w
 .endif
 
 .include <bsd.port.mk>
diff --git a/security/broccoli/distinfo b/security/broccoli/distinfo
index c922c60faa5b..ab3a58b6ce98 100644
--- a/security/broccoli/distinfo
+++ b/security/broccoli/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bro-2.3.tar.gz) = 46bb9f46fbe71b22afd12ad12e0eb32033fb991a2a60b3bc2d881750249b85cd
-SIZE (bro-2.3.tar.gz) = 10283001
+SHA256 (bro-2.3.2.tar.gz) = 2fe5fbda0a86b5a594116d567fd9a4c2458d30f1c6670ba8e1fac0bc8848c69b
+SIZE (bro-2.3.2.tar.gz) = 10290134
diff --git a/security/broccoli/pkg-plist b/security/broccoli/pkg-plist
index b0d50e0c4109..6ceed6125b6b 100644
--- a/security/broccoli/pkg-plist
+++ b/security/broccoli/pkg-plist
@@ -1,24 +1,22 @@
 bin/broccoli-config
-@unexec cmp -s %D/etc/broccoli.conf.example %D/etc/broccoli.conf && rm %D/etc/broccoli.conf || true
+@unexec cmp -s %D/etc/broccoli.conf.example %D/etc/broccoli.conf && rm -f %D/etc/broccoli.conf || true
 etc/broccoli.conf.example
-@exec test -f %D/etc/broccoli.conf || cp -p %D/%F %D/etc/broccoli.conf
+@exec test -f %D/etc/broccoli.conf || cp -p %D/etc/broccoli.conf.example %D/etc/broccoli.conf
 include/broccoli.h
 lib/libbroccoli.a
 lib/libbroccoli.so
 lib/libbroccoli.so.5
 lib/libbroccoli.so.5.1.0
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/_broccoli_intern.so
-%%PYTHON%%@unexec rm -f %%LOCALBASE%%/%%PYTHON_SITELIBDIR%%/broccoli.py
-%%PYTHON%%@unexec rm -f %%LOCALBASE%%/%%PYTHON_SITELIBDIR%%/broccoli.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/broccoli.py
+%%PYTHON%%@unexec rm -f %D/%%PYTHON_SITELIBDIR%%/broccoli.pyc
 %%RUBY%%%%RUBY_SITELIBDIR%%/Broccoli/connection.rb
 %%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
-%%CLEANUP_PREFIX%%%%PORTDOCS%%@dirrmtry share
-%%CLEANUP_PREFIX%%@dirrmtry lib
-%%CLEANUP_PREFIX%%@dirrmtry include
-%%CLEANUP_PREFIX%%@dirrmtry etc
-%%CLEANUP_PREFIX%%@dirrmtry bin
-%%CLEANUP_PREFIX%%@unexec rmdir %D || :
+%%RUBY%%%%RUBY_SITELIBDIR%%/broccoli.rb
+%%CLEANUP_PREFIX%%@dir share
+%%CLEANUP_PREFIX%%@dir lib
+%%CLEANUP_PREFIX%%@dir include
+%%CLEANUP_PREFIX%%@dir etc
+%%CLEANUP_PREFIX%%@dir bin