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

[Kubilay Kocak]

Author: koobs
Date: Thu Nov 26 11:25:42 2015
New Revision: 402436
URL: https://svnweb.freebsd.org/changeset/ports/402436

Log:
  security/suricata: Update to 3.0 RC1
  
  - Update to 3.0 release candidate 1 (Welcome Netmap support!)
  - Update pkg-plist accordingly
  - Add NETMAP option (Enabled by default for packages)
  - Sort OPTIONS_* alphabetically
  - Enable verbose builds
  - Remove patches (upstreamed)
  - Update test target

Deleted:
  head/security/suricata/files/patch-PR1416
  head/security/suricata/files/patch-scripts_suricatasc_suricatasc.in
Modified:
  head/security/suricata/Makefile
  head/security/suricata/distinfo
  head/security/suricata/pkg-plist

Modified: head/security/suricata/Makefile
==============================================================================
--- head/security/suricata/Makefile	Thu Nov 26 11:25:41 2015	(r402435)
+++ head/security/suricata/Makefile	Thu Nov 26 11:25:42 2015	(r402436)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	suricata
-PORTVERSION=	2.0.9
+DISTVERSION=	3.0RC1
 CATEGORIES=	security
 MASTER_SITES=	http://www.openinfosecfoundation.org/download/
 
@@ -26,10 +26,12 @@ CPE_VENDOR=	openinfosecfoundation
 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 JSON PRELUDE
+OPTIONS_DEFINE=		GEOIP HTP_PORT IPFW JSON NETMAP NSS PORTS_PCAP PRELUDE SC TESTS
+OPTIONS_DEFAULT=	HTP_PORT IPFW JSON NETMAP PRELUDE
+
 OPTIONS_RADIO=		SCRIPTS
 OPTIONS_RADIO_SCRIPTS=	LUA LUAJIT
+
 OPTIONS_SUB=		yes
 
 SCRIPTS_DESC=		Scripting
@@ -40,6 +42,7 @@ IPFW_DESC=		IPFW and IP Divert support f
 JSON_DESC=		JSON output support
 LUA_DESC=		LUA scripting support
 LUAJIT_DESC=		LuaJIT scripting support
+NETMAP_DESC=		Netmap support for inline IDP
 NSS_DESC=		File checksums and SSL/TLS fingerprinting
 PORTS_PCAP_DESC=	Use libpcap from ports
 PRELUDE_DESC=		Prelude support for NIDS alerts
@@ -57,16 +60,6 @@ HTP_PORT_USES_OFF=		iconv:translit
 
 IPFW_CONFIGURE_ON=		--enable-ipfw
 
-PORTS_PCAP_LIB_DEPENDS=		libpcap.so:${PORTSDIR}/net/libpcap
-PORTS_PCAP_CONFIGURE_ON=	--with-libpcap-includes=${LOCALBASE}/include \
-				--with-libpcap-libraries=${LOCALBASE}/lib
-PORTS_PCAP_CONFIGURE_OFF=	--with-libpcap-includes=/usr/include \
-				--with-libpcap-libraries=/usr/lib
-
-PRELUDE_LIB_DEPENDS=		libprelude.so:${PORTSDIR}/security/libprelude
-PRELUDE_CONFIGURE_ENABLE=	prelude
-PRELUDE_CONFIGURE_ON=		--with-libprelude-prefix=${LOCALBASE}
-
 JSON_LIB_DEPENDS=		libjansson.so:${PORTSDIR}/devel/jansson
 JSON_CONFIGURE_ON=		--with-libjansson-includes=${LOCALBASE}/include \
 				--with-libjansson-libraries=${LOCALBASE}/lib
@@ -86,6 +79,18 @@ NSS_CONFIGURE_ON=		--with-libnss-include
 				--with-libnspr-libraries=${LOCALBASE}/lib \
 				--with-libnspr-includes=${LOCALBASE}/include/nspr
 
+NETMAP_CONFIGURE_ENABLE=	netmap
+
+PORTS_PCAP_LIB_DEPENDS=		libpcap.so:${PORTSDIR}/net/libpcap
+PORTS_PCAP_CONFIGURE_ON=	--with-libpcap-includes=${LOCALBASE}/include \
+				--with-libpcap-libraries=${LOCALBASE}/lib
+PORTS_PCAP_CONFIGURE_OFF=	--with-libpcap-includes=/usr/include \
+				--with-libpcap-libraries=/usr/lib
+
+PRELUDE_LIB_DEPENDS=		libprelude.so:${PORTSDIR}/security/libprelude
+PRELUDE_CONFIGURE_ENABLE=	prelude
+PRELUDE_CONFIGURE_ON=		--with-libprelude-prefix=${LOCALBASE}
+
 SC_USES=			python
 SC_CONFIGURE_ENV=		ac_cv_path_HAVE_PYTHON_CONFIG=yes
 SC_CONFIGURE_ENV_OFF=		ac_cv_path_HAVE_PYTHON_CONFIG=no
@@ -95,6 +100,7 @@ TESTS_CONFIGURE_ENABLE=		unittests
 SUB_FILES=	pkg-message
 
 CONFIGURE_ARGS+=--enable-gccprotect \
+		--disable-silent-rules \
 		--with-libpcre-includes=${LOCALBASE}/include \
 		--with-libpcre-libraries=${LOCALBASE}/lib \
 		--with-libyaml-includes=${LOCALBASE}/include \
@@ -137,13 +143,6 @@ post-install:
 	-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
 .endif
 
-TMPDIR?=	/tmp
-TESTDIR=	${TMPDIR}/${PORTNAME}
-
-regression-test: build
-	${RM} -rf ${TESTDIR}
-	${MKDIR} ${TESTDIR}
-	cd ${WRKSRC}/src && ./suricata -u -l ${TESTDIR}
-	${RM} -rf ${TESTDIR}
+TEST_TARGET=	check
 
 .include <bsd.port.post.mk>

Modified: head/security/suricata/distinfo
==============================================================================
--- head/security/suricata/distinfo	Thu Nov 26 11:25:41 2015	(r402435)
+++ head/security/suricata/distinfo	Thu Nov 26 11:25:42 2015	(r402436)
@@ -1,2 +1,2 @@
-SHA256 (suricata-2.0.9.tar.gz) = 4a19214d7673f9c0eba2e4e5ac78152309464186d16df48944b8f5644faa802d
-SIZE (suricata-2.0.9.tar.gz) = 3089593
+SHA256 (suricata-3.0RC1.tar.gz) = 61b22ef3931c6fa37bb84ab9b7b26b6a363bde2444d6dd7b563044e8109ecbff
+SIZE (suricata-3.0RC1.tar.gz) = 3292713

Modified: head/security/suricata/pkg-plist
==============================================================================
--- head/security/suricata/pkg-plist	Thu Nov 26 11:25:41 2015	(r402435)
+++ head/security/suricata/pkg-plist	Thu Nov 26 11:25:42 2015	(r402436)
@@ -45,8 +45,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.16.so.1
-%%NO_HTP_PORT%%lib/libhtp-0.5.16.so.1.0.0
+%%NO_HTP_PORT%%lib/libhtp-0.5.18.so.1
+%%NO_HTP_PORT%%lib/libhtp-0.5.18.so.1.0.0
 %%NO_HTP_PORT%%lib/libhtp.a
 %%NO_HTP_PORT%%lib/libhtp.so
 %%NO_HTP_PORT%%libdata/pkgconfig/htp.pc