From owner-svn-ports-all@freebsd.org Wed Oct 16 01:24:22 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3526F158DAE; Wed, 16 Oct 2019 01:24:22 +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 46tF2G0cztz44XD; Wed, 16 Oct 2019 01:24:22 +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 EE0E227626; Wed, 16 Oct 2019 01:24:21 +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 x9G1OLOg001119; Wed, 16 Oct 2019 01:24:21 GMT (envelope-from leres@FreeBSD.org) Received: (from leres@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9G1OL5V001117; Wed, 16 Oct 2019 01:24:21 GMT (envelope-from leres@FreeBSD.org) Message-Id: <201910160124.x9G1OL5V001117@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: leres set sender to leres@FreeBSD.org using -f From: Craig Leres Date: Wed, 16 Oct 2019 01:24:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r514568 - head/security/bro X-SVN-Group: ports-head X-SVN-Commit-Author: leres X-SVN-Commit-Paths: head/security/bro X-SVN-Commit-Revision: 514568 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Wed, 16 Oct 2019 01:24:22 -0000 Author: leres Date: Wed Oct 16 01:24:21 2019 New Revision: 514568 URL: https://svnweb.freebsd.org/changeset/ports/514568 Log: security/bro: Deprecate BROCCOLI Broccoli is deprecated in favor of broker; flag this in the BROCCOLI option description and change the BROCTL option to imply BROKER. PR: 240909 Submitted by: Jeremy Baggs Approved by: ler (mentor, implicit) Modified: head/security/bro/Makefile Modified: head/security/bro/Makefile ============================================================================== --- head/security/bro/Makefile Tue Oct 15 22:16:55 2019 (r514567) +++ head/security/bro/Makefile Wed Oct 16 01:24:21 2019 (r514568) @@ -3,6 +3,7 @@ PORTNAME= bro PORTVERSION= 2.6.4 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://www.zeek.org/downloads/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -51,11 +52,11 @@ GROUPS= ${BROGROUP} 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_DEFAULT=BROCTL BROKER 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) +BROCCOLI_DESC= Build support for libbroccoli communications (DEPRECATED) +BROCTL_DESC= BroControl support (implies BROKER and IPSUMDUMP) BROKER_DESC= Enable the Broker communication library GEOIP2_DESC= Build with GeoIP2 (MaxMindDB) support IPSUMDUMP_DESC= Enables traffic summaries @@ -64,7 +65,7 @@ LBL_HF_DESC= Address to hostname filter support NETMAP_DESC= Native Netmap Packet IOSource for Bro PERFTOOLS_DESC= Use Perftools to improve memory & CPU usage -BROCTL_IMPLIES= BROCCOLI IPSUMDUMP +BROCTL_IMPLIES= BROKER IPSUMDUMP BROCCOLI_LIB_DEPENDS= libbroccoli.so:security/broccoli BROCTL_BUILD_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash \