svn commit: r435393 - in head/security/suricata: . files

[Mathieu Arnold]

Author: mat
Date: Sat Mar  4 13:33:25 2017
New Revision: 435393
URL: https://svnweb.freebsd.org/changeset/ports/435393

Log:
  Update to 3.2.1.
  
  Pass maintainership to submitter.
  
  PR:		217143
  Submitted by:	Franco Fichtner
  Approved by:	maintainer timeout
  Sponsored by:	Absolight

Modified:
  head/security/suricata/Makefile   (contents, props changed)
  head/security/suricata/distinfo   (contents, props changed)
  head/security/suricata/files/patch-configure.ac   (contents, props changed)
  head/security/suricata/pkg-plist   (contents, props changed)

Modified: head/security/suricata/Makefile
==============================================================================
--- head/security/suricata/Makefile	Sat Mar  4 13:33:21 2017	(r435392)
+++ head/security/suricata/Makefile	Sat Mar  4 13:33:25 2017	(r435393)
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	suricata
-PORTVERSION=	3.1.2
+PORTVERSION=	3.2.1
 CATEGORIES=	security
 MASTER_SITES=	http://www.openinfosecfoundation.org/download/
 
-MAINTAINER=	koobs at FreeBSD.org
+MAINTAINER=	franco at opnsense.org
 COMMENT=	High Performance Network IDS, IPS and Security Monitoring engine
 
 LICENSE=	GPLv2
@@ -14,6 +14,10 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libnet.so:net/libnet \
+		libgnutls.so:security/gnutls \
+		libgcrypt.so:security/libgcrypt \
+		libgpg-error.so:security/libgpg-error \
+		libltdl.so:devel/libltdl \
 		libyaml.so:textproc/libyaml
 
 USES=		autoreconf cpe gmake libtool pathfix pkgconfig
@@ -28,6 +32,7 @@ INSTALL_TARGET=		install-strip
 TEST_TARGET=		check
 
 OPTIONS_DEFINE=		GEOIP HTP_PORT IPFW JSON NETMAP NSS PORTS_PCAP PRELUDE SC TESTS
+OPTIONS_DEFINE_amd64=	HYPERSCAN
 OPTIONS_DEFAULT=	HTP_PORT IPFW JSON NETMAP PRELUDE
 OPTIONS_SUB=		yes
 
@@ -37,6 +42,7 @@ OPTIONS_RADIO_SCRIPTS=	LUA LUAJIT
 SCRIPTS_DESC=		Scripting
 
 GEOIP_DESC=		GeoIP support
+HYPERSCAN_DESC=		Hyperscan support
 HTP_PORT_DESC=		Use libhtp from ports
 IPFW_DESC=		IPFW and IP Divert support for inline IDP
 JSON_DESC=		JSON output support
@@ -59,6 +65,10 @@ HTP_PORT_CONFIGURE_OFF=		--enable-bundle
 HTP_PORT_CONFLICTS_INSTALL_OFF=	libhtp-[0-9]* libhtp-suricata
 HTP_PORT_USES_OFF=		iconv:translit
 
+HYPERSCAN_LIB_DEPENDS=		libhs.so:devel/hyperscan
+HYPERSCAN_CONFIGURE_ON=		--with-libhs-includes=${LOCALBASE}/include \
+				--with-libhs-libraries=${LOCALBASE}/lib
+
 IPFW_CONFIGURE_ON=		--enable-ipfw
 
 JSON_LIB_DEPENDS=		libjansson.so:devel/jansson

Modified: head/security/suricata/distinfo
==============================================================================
--- head/security/suricata/distinfo	Sat Mar  4 13:33:21 2017	(r435392)
+++ head/security/suricata/distinfo	Sat Mar  4 13:33:25 2017	(r435393)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1474254433
-SHA256 (suricata-3.1.2.tar.gz) = f9e7742580849f202254e75d9fc245ba53f4d7490f47a6d30f02a7b10aacc512
-SIZE (suricata-3.1.2.tar.gz) = 3338099
+TIMESTAMP = 1487168316
+SHA256 (suricata-3.2.1.tar.gz) = 0e0b0cf49016804bb2fb1fc4327341617e76a67902f4e03e0ef6d16c1d7d3994
+SIZE (suricata-3.2.1.tar.gz) = 11754332

Modified: head/security/suricata/files/patch-configure.ac
==============================================================================
--- head/security/suricata/files/patch-configure.ac	Sat Mar  4 13:33:21 2017	(r435392)
+++ head/security/suricata/files/patch-configure.ac	Sat Mar  4 13:33:25 2017	(r435393)
@@ -1,6 +1,6 @@
---- configure.ac.orig	2015-12-08 13:09:16 UTC
+--- configure.ac.orig	2017-02-15 07:54:17 UTC
 +++ configure.ac
-@@ -853,8 +853,10 @@
+@@ -935,8 +935,10 @@
              AS_HELP_STRING([--enable-prelude], [Enable Prelude support for alerts]),,[enable_prelude=no])
      # Prelude doesn't work with -Werror
      STORECFLAGS="${CFLAGS}"

Modified: head/security/suricata/pkg-plist
==============================================================================
--- head/security/suricata/pkg-plist	Sat Mar  4 13:33:21 2017	(r435392)
+++ head/security/suricata/pkg-plist	Sat Mar  4 13:33:25 2017	(r435393)
@@ -1,4 +1,5 @@
 bin/suricata
+man/man1/suricata.1.gz
 %%SC%%bin/suricatasc
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/Basic_Setup.txt
@@ -45,8 +46,8 @@ bin/suricata
 %%NO_HTP_PORT%%include/htp/htp_urlencoded.h
 %%NO_HTP_PORT%%include/htp/htp_utf8_decoder.h
 %%NO_HTP_PORT%%include/htp/htp_version.h
-%%NO_HTP_PORT%%lib/libhtp-0.5.22.so.1
-%%NO_HTP_PORT%%lib/libhtp-0.5.22.so.1.0.0
+%%NO_HTP_PORT%%lib/libhtp-0.5.23.so.1
+%%NO_HTP_PORT%%lib/libhtp-0.5.23.so.1.0.0
 %%NO_HTP_PORT%%lib/libhtp.a
 %%NO_HTP_PORT%%lib/libhtp.so
 %%NO_HTP_PORT%%libdata/pkgconfig/htp.pc