git: 68b4bcafa95a - main - security/suricata: update to 6.0.2

[Neel Chauhan]

The branch main has been updated by nc:

URL: https://cgit.FreeBSD.org/ports/commit/?id=68b4bcafa95adb0ccd29554bc0d5e5191ceda653

commit 68b4bcafa95adb0ccd29554bc0d5e5191ceda653
Author:     Neel Chauhan <nc at FreeBSD.org>
AuthorDate: 2021-04-23 19:53:32 +0000
Commit:     Neel Chauhan <nc at FreeBSD.org>
CommitDate: 2021-04-23 19:53:32 +0000

    security/suricata: update to 6.0.2
    
    Changes: https://redmine.openinfosecfoundation.org/versions/162
    
    PR:             255342
    Submitted by:   Franco Fichtner <franco AT opnsense DOT org> (maintainer)
---
 security/suricata/Makefile                          | 4 +---
 security/suricata/distinfo                          | 6 +++---
 security/suricata/files/patch-configure.ac          | 6 +++---
 security/suricata/files/patch-src_suricata-common.h | 4 ++--
 security/suricata/pkg-plist                         | 4 +---
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/security/suricata/Makefile b/security/suricata/Makefile
index b86c12effc57..6307744e3fed 100644
--- a/security/suricata/Makefile
+++ b/security/suricata/Makefile
@@ -1,7 +1,5 @@
-# Created by: Patrick Tracanelli <eksffa at freebsdbrasil.com.br>
-
 PORTNAME=	suricata
-DISTVERSION=	5.0.6
+DISTVERSION=	6.0.2
 CATEGORIES=	security
 MASTER_SITES=	https://www.openinfosecfoundation.org/download/
 
diff --git a/security/suricata/distinfo b/security/suricata/distinfo
index cc976d6c1299..2e96b779479a 100644
--- a/security/suricata/distinfo
+++ b/security/suricata/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1616749948
-SHA256 (suricata-5.0.6.tar.gz) = d2045c7fbdbd56d1bed15aa8d48a2b3a46e4052599ac7ab89bf2fc3d6a08b491
-SIZE (suricata-5.0.6.tar.gz) = 29136659
+TIMESTAMP = 1616753087
+SHA256 (suricata-6.0.2.tar.gz) = 5e4647a07cb31b5d6d0049972a45375c137de908a964a44e2d6d231fa3ad4b52
+SIZE (suricata-6.0.2.tar.gz) = 30514801
diff --git a/security/suricata/files/patch-configure.ac b/security/suricata/files/patch-configure.ac
index 6469c5417da0..50f478ea39f3 100644
--- a/security/suricata/files/patch-configure.ac
+++ b/security/suricata/files/patch-configure.ac
@@ -1,7 +1,7 @@
---- configure.ac.orig	2017-02-15 07:54:17 UTC
+--- configure.ac.orig	2021-03-01 16:13:22 UTC
 +++ configure.ac
-@@ -935,8 +935,10 @@
-             AS_HELP_STRING([--enable-prelude], [Enable Prelude support for alerts]),,[enable_prelude=no])
+@@ -1186,8 +1186,10 @@
+             AS_HELP_STRING([--enable-prelude], [Enable Prelude support for alerts]),[enable_prelude=$enableval],[enable_prelude=no])
      # Prelude doesn't work with -Werror
      STORECFLAGS="${CFLAGS}"
 -    CFLAGS="${CFLAGS} -Wno-error=unused-result"
diff --git a/security/suricata/files/patch-src_suricata-common.h b/security/suricata/files/patch-src_suricata-common.h
index c65fd8d928e1..e1c8eea63855 100644
--- a/security/suricata/files/patch-src_suricata-common.h
+++ b/security/suricata/files/patch-src_suricata-common.h
@@ -1,4 +1,4 @@
---- src/suricata-common.h.orig	2020-12-04 07:11:05 UTC
+--- src/suricata-common.h.orig	2021-03-01 16:13:22 UTC
 +++ src/suricata-common.h
 @@ -36,6 +36,8 @@
  #define _GNU_SOURCE
@@ -7,5 +7,5 @@
 +#include "queue.h"
 +
  #if HAVE_CONFIG_H
- #include <config.h>
+ #include <autoconf.h>
  #endif
diff --git a/security/suricata/pkg-plist b/security/suricata/pkg-plist
index efc1173f5dcf..889a0baefc09 100644
--- a/security/suricata/pkg-plist
+++ b/security/suricata/pkg-plist
@@ -75,8 +75,6 @@ man/man1/suricata.1.gz
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/disablesource.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/enablesource.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/enablesource.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/listenabledsources.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/listenabledsources.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/listsources.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/listsources.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/removesource.py
@@ -131,7 +129,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.3-py%%PYTHON_VER%%.egg-info
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata_update-1.2.1-py%%PYTHON_VER%%.egg-info
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricatasc/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricatasc/__init__.pyc
 %%DATADIR%%/rules/app-layer-events.rules