svn commit: r491993 - head/security/bro

[Craig Leres]

Author: leres
Date: Sat Feb  2 21:32:35 2019
New Revision: 491993
URL: https://svnweb.freebsd.org/changeset/ports/491993

Log:
  Restore GeoIP support via net/libmaxminddb and a new GEOIP2 option
  which defaults to enabled, mimicking pre-geoip-deprecation.
  
  PR:		235138
  Submitted by:	bofh
  Approved by:	ler (mentor, implicit)

Modified:
  head/security/bro/Makefile

Modified: head/security/bro/Makefile
==============================================================================
--- head/security/bro/Makefile	Sat Feb  2 21:30:48 2019	(r491992)
+++ head/security/bro/Makefile	Sat Feb  2 21:32:35 2019	(r491993)
@@ -3,9 +3,9 @@
 
 PORTNAME=	bro
 PORTVERSION=	2.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
-MASTER_SITES=	https://www.bro.org/downloads/
+MASTER_SITES=	https://www.zeek.org/downloads/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	leres at FreeBSD.org
@@ -50,14 +50,15 @@ PLIST_SUB+=	ARCH=${ARCH} \
 USERS=		${BROUSER}
 GROUPS=		${BROGROUP}
 
-OPTIONS_DEFINE=	BROCCOLI BROCTL BROKER DEBUG IPSUMDUMP LBL_CF LBL_HF \
-		NETMAP PERFTOOLS
-OPTIONS_DEFAULT=BROCCOLI BROCTL IPSUMDUMP LBL_CF LBL_HF NETMAP
+OPTIONS_DEFINE=	BROCCOLI BROCTL BROKER DEBUG GEOIP2 IPSUMDUMP LBL_CF \
+		LBL_HF NETMAP PERFTOOLS
+OPTIONS_DEFAULT=BROCCOLI BROCTL GEOIP2 IPSUMDUMP LBL_CF LBL_HF NETMAP
 OPTIONS_SUB=	yes
 
 BROCCOLI_DESC=	Build support for libbroccoli communications
 BROCTL_DESC=	BroControl support (implies BROCCOLI and IPSUMDUMP)
 BROKER_DESC=	Enable the Broker communication library
+GEOIP2_DESC=	Build with GeoIP2 (MaxMindDB) support
 IPSUMDUMP_DESC=	Enables traffic summaries
 LBL_CF_DESC=	Unix time to formated time/date filter support
 LBL_HF_DESC=	Address to hostname filter support
@@ -73,6 +74,7 @@ BROCTL_BUILD_DEPENDS=	${LOCALBASE}/bin/bash:shells/bas
 BROCTL_RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash \
 			${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 BROCTL_CMAKE_BOOL=	INSTALL_BROCTL
+GEOIP2_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 IPSUMDUMP_BUILD_DEPENDS=ipsumdump:net/ipsumdump
 IPSUMDUMP_RUN_DEPENDS=	ipsumdump:net/ipsumdump
 BROKER_BUILD_DEPENDS=	swig3.0:devel/swig30