Update for Suricata to 6.0.2

OK jasper@

security/suricata/Makefile

@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.41 2021/02/23 19:39:39 sthen Exp $
+# $OpenBSD: Makefile,v 1.42 2021/04/26 09:09:01 gonzalo Exp $
 
 COMMENT =	high performance network IDS, IPS and security monitoring
 
-SURICATA_V =	6.0.1
-SUPDATE_V =	1.2.0
-REVISION =	0
+SURICATA_V =	6.0.2
+SUPDATE_V =	1.2.1
 
 DISTNAME =	suricata-${SURICATA_V}
 CATEGORIES =	security

security/suricata/distinfo

@@ -1,2 +1,2 @@
-SHA256 (suricata-6.0.1.tar.gz) = 56F5j+WcHSE/dS/u+/i7VBaPn6ViNc8zgDR8aW7Nsa4=
-SIZE (suricata-6.0.1.tar.gz) = 30460439
+SHA256 (suricata-6.0.2.tar.gz) = XkZHoHyzG11tAEmXKkU3XBN96QipZKROLW0jH6OtS1I=
+SIZE (suricata-6.0.2.tar.gz) = 30514801

security/suricata/patches/patch-configure_ac

@@ -1,11 +1,11 @@
-$OpenBSD: patch-configure_ac,v 1.5 2021/01/31 18:03:49 sthen Exp $
+$OpenBSD: patch-configure_ac,v 1.6 2021/04/26 09:09:01 gonzalo Exp $
 
 To remove the pid file, its directory must be writable by suricata user.
 
 Index: configure.ac
 --- configure.ac.orig
 +++ configure.ac
-@@ -2743,7 +2743,7 @@ if test "$WINDOWS_PATH" = "yes"; then
+@@ -2745,7 +2745,7 @@ if test "$WINDOWS_PATH" = "yes"; then
      fi
  else
      EXPAND_VARIABLE(localstatedir, e_logdir, "/log/suricata/")

security/suricata/patches/patch-src_suricata_c

@@ -1,4 +1,4 @@
-$OpenBSD: patch-src_suricata_c,v 1.7 2021/01/31 18:03:49 sthen Exp $
+$OpenBSD: patch-src_suricata_c,v 1.8 2021/04/26 09:09:01 gonzalo Exp $
 
 Use setresuid/gid() directly to change user and group.  Otherwise
 Suricata uses libcap-ng on Linux and runs as root elsewhere.
@@ -6,7 +6,7 @@ Suricata uses libcap-ng on Linux and runs as root elsewhere.
 Index: src/suricata.c
 --- src/suricata.c.orig
 +++ src/suricata.c
-@@ -2818,6 +2818,7 @@ int SuricataMain(int argc, char **argv)
+@@ -2825,6 +2825,7 @@ int SuricataMain(int argc, char **argv)
  
      PostRunStartedDetectSetup(&suricata);
  

security/suricata/patches/patch-suricata_yaml_in

@@ -1,4 +1,4 @@
-$OpenBSD: patch-suricata_yaml_in,v 1.10 2021/01/31 18:03:49 sthen Exp $
+$OpenBSD: patch-suricata_yaml_in,v 1.11 2021/04/26 09:09:01 gonzalo Exp $
 
 - After reload allow to write log files or use syslog.
 - Switch user and group to avoid running as root.
@@ -98,7 +98,7 @@ Index: suricata.yaml.in
        facility: local5
        format: "[%i] <%d> -- "
        # type: json
-@@ -988,9 +997,9 @@ asn1-max-frames: 256
+@@ -990,9 +999,9 @@ asn1-max-frames: 256
  ##
  
  # Run Suricata with a specific user-id and group-id:
@@ -111,7 +111,7 @@ Index: suricata.yaml.in
  
  # Some logging modules will use that name in event as identifier. The default
  # value is the hostname
-@@ -999,7 +1008,7 @@ asn1-max-frames: 256
+@@ -1001,7 +1010,7 @@ asn1-max-frames: 256
  # Default location of the pid file. The pid file is only used in
  # daemon mode (start Suricata with -D). If not running in daemon mode
  # the --pidfile command line option must be used to create a pid file.
@@ -120,7 +120,7 @@ Index: suricata.yaml.in
  
  # Daemon working directory
  # Suricata will change directory to this one if provided
-@@ -1852,14 +1861,38 @@ napatech:
+@@ -1857,14 +1866,38 @@ napatech:
      #
      hashmode: hash5tuplesorted
  

security/suricata/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.16 2021/02/03 00:33:47 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.17 2021/04/26 09:09:01 gonzalo Exp $
 @conflict suricata-update-*
 @pkgpath security/suricata-update
 @newgroup _suricata:800
@@ -154,6 +154,9 @@ lib/python${MODPY_VERSION}/site-packages/suricatasc/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/suricatasc/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/suricatasc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 @man man/man1/suricata.1
+@man man/man1/suricatactl-filestore.1
+@man man/man1/suricatactl.1
+@man man/man1/suricatasc.1
 share/doc/pkg-readmes/${PKGSTEM}
 share/examples/suricata/
 @sample ${SYSCONFDIR}/suricata/