svn commit: r553612 - in branches/2020Q4/security/suricata: . files

[Kurt Jaeger]

Author: pi
Date: Thu Oct 29 12:00:58 2020
New Revision: 553612
URL: https://svnweb.freebsd.org/changeset/ports/553612

Log:
  MFH: r553604
  
  security/suricata: update 5.0.2 -> 5.0.4
  
  PR:		246093
  Submitted by:	Franco Fichtner <franco at opnsense.org> (maintainer)
  Relnotes:	https://suricata-ids.org/2020/04/28/suricata-5-0-3-released/
  		https://suricata-ids.org/2020/10/08/suricata-4-1-9-and-5-0-4-released/
  Approved by:	ports-secteam (fluffy)

Added:
  branches/2020Q4/security/suricata/files/patch-src_suricata-common.h
     - copied unchanged from r553604, head/security/suricata/files/patch-src_suricata-common.h
Modified:
  branches/2020Q4/security/suricata/Makefile
  branches/2020Q4/security/suricata/distinfo
  branches/2020Q4/security/suricata/pkg-plist
Directory Properties:
  branches/2020Q4/   (props changed)

Modified: branches/2020Q4/security/suricata/Makefile
==============================================================================
--- branches/2020Q4/security/suricata/Makefile	Thu Oct 29 11:57:16 2020	(r553611)
+++ branches/2020Q4/security/suricata/Makefile	Thu Oct 29 12:00:58 2020	(r553612)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	suricata
-DISTVERSION=	5.0.2
-PORTREVISION=	8
+DISTVERSION=	5.0.4
 CATEGORIES=	security
 MASTER_SITES=	https://www.openinfosecfoundation.org/download/
 
@@ -22,7 +21,7 @@ LIB_DEPENDS=	libpcre.so:devel/pcre \
 
 USES=		autoreconf cpe gmake iconv:translit libtool pathfix pkgconfig
 
-CONFLICTS_INSTALL=	libhtp suricata5
+CONFLICTS_INSTALL=	libhtp
 
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	${PORTNAME}

Modified: branches/2020Q4/security/suricata/distinfo
==============================================================================
--- branches/2020Q4/security/suricata/distinfo	Thu Oct 29 11:57:16 2020	(r553611)
+++ branches/2020Q4/security/suricata/distinfo	Thu Oct 29 12:00:58 2020	(r553612)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581674131
-SHA256 (suricata-5.0.2.tar.gz) = 7f30cac92feeab2a9281b6059b96f9f163dce9aadcc959a6c0b9a2f6d750cee7
-SIZE (suricata-5.0.2.tar.gz) = 23735393
+TIMESTAMP = 1603639476
+SHA256 (suricata-5.0.4.tar.gz) = b4398036fd36086d088668a4d2b0759a1a22ea9b8ce066a542cf9b27278f988b
+SIZE (suricata-5.0.4.tar.gz) = 29091046

Copied: branches/2020Q4/security/suricata/files/patch-src_suricata-common.h (from r553604, head/security/suricata/files/patch-src_suricata-common.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q4/security/suricata/files/patch-src_suricata-common.h	Thu Oct 29 12:00:58 2020	(r553612, copy of r553604, head/security/suricata/files/patch-src_suricata-common.h)
@@ -0,0 +1,11 @@
+--- src/suricata-common.h-orig	2020-10-25 16:56:49.454317000 +0100
++++ src/suricata-common.h	2020-10-25 16:57:06.035153000 +0100
+@@ -36,6 +36,8 @@
+ #define _GNU_SOURCE
+ #define __USE_GNU
+ 
++#include "queue.h"
++
+ #if HAVE_CONFIG_H
+ #include <config.h>
+ #endif

Modified: branches/2020Q4/security/suricata/pkg-plist
==============================================================================
--- branches/2020Q4/security/suricata/pkg-plist	Thu Oct 29 11:57:16 2020	(r553611)
+++ branches/2020Q4/security/suricata/pkg-plist	Thu Oct 29 12:00:58 2020	(r553612)
@@ -128,7 +128,7 @@ man/man1/suricata.1.gz
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/util.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/version.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/version.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata_update-1.1.1-py%%PYTHON_VER%%.egg-info
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata_update-1.1.3-py%%PYTHON_VER%%.egg-info
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricatasc/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricatasc/__init__.pyc
 %%DATADIR%%/rules/app-layer-events.rules