From owner-svn-ports-head@FreeBSD.ORG Mon Apr 27 16:05:53 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2C6D9B6F; Mon, 27 Apr 2015 16:05:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 00D7E1874; Mon, 27 Apr 2015 16:05:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3RG5q8I041936; Mon, 27 Apr 2015 16:05:52 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3RG5q8g041934; Mon, 27 Apr 2015 16:05:52 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201504271605.t3RG5q8g041934@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Mon, 27 Apr 2015 16:05:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384861 - head/security/suricata X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Apr 2015 16:05:53 -0000 Author: antoine Date: Mon Apr 27 16:05:52 2015 New Revision: 384861 URL: https://svnweb.freebsd.org/changeset/ports/384861 Log: - Add JSON to OPTIONS_DEFAULT to match default configuration where eve-log support is enabled - Package threshold.config configuration file PR: 197937 Approved by: koobs (maintainer) Modified: head/security/suricata/Makefile head/security/suricata/pkg-plist Modified: head/security/suricata/Makefile ============================================================================== --- head/security/suricata/Makefile Mon Apr 27 15:59:45 2015 (r384860) +++ head/security/suricata/Makefile Mon Apr 27 16:05:52 2015 (r384861) @@ -3,6 +3,7 @@ PORTNAME= suricata PORTVERSION= 2.0.6 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://www.openinfosecfoundation.org/download/ \ http://mirrors.rit.edu/zi/ @@ -28,7 +29,7 @@ INSTALL_TARGET= install-strip PATHFIX_MAKEFILEIN= Makefile.am OPTIONS_DEFINE= GEOIP HTP_PORT IPFW JSON NSS PORTS_PCAP PRELUDE SC TESTS -OPTIONS_DEFAULT= HTP_PORT IPFW PRELUDE +OPTIONS_DEFAULT= HTP_PORT IPFW JSON PRELUDE OPTIONS_RADIO= SCRIPTS OPTIONS_RADIO_SCRIPTS= LUA LUAJIT OPTIONS_SUB= yes @@ -108,7 +109,7 @@ CONFIGURE_ARGS+=--enable-gccprotect \ LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config CONFIG_DIR?= ${ETCDIR} -CONFIG_FILES= suricata.yaml classification.config reference.config +CONFIG_FILES= suricata.yaml classification.config reference.config threshold.config RULES_DIR= ${CONFIG_DIR}/rules RULES_FILES= decoder-events.rules dns-events.rules files.rules http-events.rules smtp-events.rules stream-events.rules tls-events.rules LOGS_DIR?= /var/log/${PORTNAME} Modified: head/security/suricata/pkg-plist ============================================================================== --- head/security/suricata/pkg-plist Mon Apr 27 15:59:45 2015 (r384860) +++ head/security/suricata/pkg-plist Mon Apr 27 16:05:52 2015 (r384861) @@ -59,6 +59,7 @@ bin/suricata @sample %%ETCDIR%%/suricata.yaml.sample @sample %%ETCDIR%%/classification.config.sample @sample %%ETCDIR%%/reference.config.sample +@sample %%ETCDIR%%/threshold.config.sample %%ETCDIR%%/rules/decoder-events.rules %%ETCDIR%%/rules/dns-events.rules %%ETCDIR%%/rules/files.rules