From owner-svn-ports-all@freebsd.org Sat Feb 2 21:32:36 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8ACF914D0829; Sat, 2 Feb 2019 21:32:36 +0000 (UTC) (envelope-from leres@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 266BC6AC02; Sat, 2 Feb 2019 21:32:36 +0000 (UTC) (envelope-from leres@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 16635CBE7; Sat, 2 Feb 2019 21:32:36 +0000 (UTC) (envelope-from leres@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x12LWZhb069948; Sat, 2 Feb 2019 21:32:35 GMT (envelope-from leres@FreeBSD.org) Received: (from leres@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x12LWZPv069947; Sat, 2 Feb 2019 21:32:35 GMT (envelope-from leres@FreeBSD.org) Message-Id: <201902022132.x12LWZPv069947@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: leres set sender to leres@FreeBSD.org using -f From: Craig Leres Date: Sat, 2 Feb 2019 21:32:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r491993 - head/security/bro X-SVN-Group: ports-head X-SVN-Commit-Author: leres X-SVN-Commit-Paths: head/security/bro X-SVN-Commit-Revision: 491993 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 266BC6AC02 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.94)[-0.941,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2019 21:32:36 -0000 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@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