From owner-svn-ports-all@freebsd.org Thu Jan 7 10:27:47 2021 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 8CB5E4CBC96; Thu, 7 Jan 2021 10:27:47 +0000 (UTC) (envelope-from kai@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4DBMr33dVdz4rHR; Thu, 7 Jan 2021 10:27:47 +0000 (UTC) (envelope-from kai@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 6F4D97618; Thu, 7 Jan 2021 10:27:47 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 107ARlS9046766; Thu, 7 Jan 2021 10:27:47 GMT (envelope-from kai@FreeBSD.org) Received: (from kai@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 107ARlUt046764; Thu, 7 Jan 2021 10:27:47 GMT (envelope-from kai@FreeBSD.org) Message-Id: <202101071027.107ARlUt046764@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kai set sender to kai@FreeBSD.org using -f From: Kai Knoblich Date: Thu, 7 Jan 2021 10:27:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r560701 - branches/2021Q1/security/suricata X-SVN-Group: ports-branches X-SVN-Commit-Author: kai X-SVN-Commit-Paths: branches/2021Q1/security/suricata X-SVN-Commit-Revision: 560701 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.34 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: Thu, 07 Jan 2021 10:27:47 -0000 Author: kai Date: Thu Jan 7 10:27:46 2021 New Revision: 560701 URL: https://svnweb.freebsd.org/changeset/ports/560701 Log: MFH: r560700 security/suricata: Update to 5.0.5 [1] * Remove the JSON option and convert the relevant parts into fixed components because devel/jansson has become a mandatory dependency since the 5.0.0 release. [2] Changelog: https://github.com/OISF/suricata/blob/suricata-5.0.5/ChangeLog PR: 251887 Submitted by: Franco Fichtner (maintainer) [1] Reviewed by: fernape, daniel.engberg.lists@pyret.net Approved by: maintainer [2] Approved by: ports-secteam (implicit, bugfix blanket) Modified: branches/2021Q1/security/suricata/Makefile branches/2021Q1/security/suricata/distinfo Directory Properties: branches/2021Q1/ (props changed) Modified: branches/2021Q1/security/suricata/Makefile ============================================================================== --- branches/2021Q1/security/suricata/Makefile Thu Jan 7 10:24:04 2021 (r560700) +++ branches/2021Q1/security/suricata/Makefile Thu Jan 7 10:27:46 2021 (r560701) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= suricata -DISTVERSION= 5.0.4 -PORTREVISION= 1 +DISTVERSION= 5.0.5 CATEGORIES= security MASTER_SITES= https://www.openinfosecfoundation.org/download/ @@ -14,8 +13,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= rustc:lang/${RUST_DEFAULT} - -LIB_DEPENDS= libpcre.so:devel/pcre \ +LIB_DEPENDS= libjansson.so:devel/jansson \ + libpcre.so:devel/pcre \ libnet.so:net/libnet \ liblz4.so:archivers/liblz4 \ libyaml.so:textproc/libyaml @@ -35,10 +34,10 @@ CPE_VENDOR= openinfosecfoundation INSTALL_TARGET= install-strip TEST_TARGET= check -OPTIONS_DEFINE= GEOIP IPFW JSON NETMAP NSS PORTS_PCAP PRELUDE \ +OPTIONS_DEFINE= GEOIP IPFW NETMAP NSS PORTS_PCAP PRELUDE \ PYTHON REDIS TESTS OPTIONS_DEFINE_amd64= HYPERSCAN -OPTIONS_DEFAULT= IPFW JSON NETMAP PYTHON +OPTIONS_DEFAULT= IPFW NETMAP PYTHON OPTIONS_SUB= yes OPTIONS_RADIO= SCRIPTS @@ -47,7 +46,6 @@ OPTIONS_RADIO_SCRIPTS= LUA LUAJIT GEOIP_DESC= GeoIP support HYPERSCAN_DESC= Hyperscan support IPFW_DESC= IPFW and IP Divert support for inline IDP -JSON_DESC= JSON output support LUAJIT_DESC= LuaJIT scripting support LUA_DESC= LUA scripting support NETMAP_DESC= Netmap support for inline IDP @@ -68,10 +66,6 @@ HYPERSCAN_CONFIGURE_ON= --with-libhs-includes=${LOCAL IPFW_CONFIGURE_ON= --enable-ipfw -JSON_LIB_DEPENDS= libjansson.so:devel/jansson -JSON_CONFIGURE_ON= --with-libjansson-includes=${LOCALBASE}/include \ - --with-libjansson-libraries=${LOCALBASE}/lib - LUA_USES= lua:51 LUA_CONFIGURE_ON= --enable-lua \ --with-liblua-includes=${LUA_INCDIR} \ @@ -121,6 +115,8 @@ SUB_FILES= pkg-message CONFIGURE_ARGS+=--enable-gccprotect \ --enable-bundled-htp \ + --with-libjansson-includes=${LOCALBASE}/include \ + --with-libjansson-libraries=${LOCALBASE}/lib \ --with-libpcre-includes=${LOCALBASE}/include \ --with-libpcre-libraries=${LOCALBASE}/lib \ --with-libyaml-includes=${LOCALBASE}/include \ Modified: branches/2021Q1/security/suricata/distinfo ============================================================================== --- branches/2021Q1/security/suricata/distinfo Thu Jan 7 10:24:04 2021 (r560700) +++ branches/2021Q1/security/suricata/distinfo Thu Jan 7 10:27:46 2021 (r560701) @@ -1,3 +1,3 @@ -TIMESTAMP = 1603639476 -SHA256 (suricata-5.0.4.tar.gz) = b4398036fd36086d088668a4d2b0759a1a22ea9b8ce066a542cf9b27278f988b -SIZE (suricata-5.0.4.tar.gz) = 29091046 +TIMESTAMP = 1607096841 +SHA256 (suricata-5.0.5.tar.gz) = 3c46192ec0faa5deb704ee258c9c2d30e34e0eed357b00223c5415352231f065 +SIZE (suricata-5.0.5.tar.gz) = 29094537