svn commit: r560700 - head/security/suricata

[Kai Knoblich]

Author: kai
Date: Thu Jan  7 10:24:04 2021
New Revision: 560700
URL: https://svnweb.freebsd.org/changeset/ports/560700

Log:
  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 <franco at opnsense.org> (maintainer) [1]
  Reviewed by:	fernape, daniel.engberg.lists at pyret.net
  Approved by:	maintainer [2]

Modified:
  head/security/suricata/Makefile
  head/security/suricata/distinfo

Modified: head/security/suricata/Makefile
==============================================================================
--- head/security/suricata/Makefile	Thu Jan  7 10:20:36 2021	(r560699)
+++ head/security/suricata/Makefile	Thu Jan  7 10:24:04 2021	(r560700)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	suricata
-DISTVERSION=	5.0.4
-PORTREVISION=	2
+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: head/security/suricata/distinfo
==============================================================================
--- head/security/suricata/distinfo	Thu Jan  7 10:20:36 2021	(r560699)
+++ head/security/suricata/distinfo	Thu Jan  7 10:24:04 2021	(r560700)
@@ -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