UPDATE: suricata to 4.1.5

Hi,

Here's an update of suricata to 4.1.5.
Please test and report regressions if any.

--
jasper

Index: Makefile
===================================================================
RCS file: /cvs/ports/security/suricata/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile 2 Sep 2019 07:03:39 -0000 1.23
+++ Makefile 27 Sep 2019 21:07:01 -0000
@@ -2,7 +2,7 @@

COMMENT = high performance network IDS, IPS and security monitoring

-SURICATA_V = 4.1.4
+SURICATA_V = 4.1.5
SUPDATE_V = 1.0.5

DISTNAME = suricata-${SURICATA_V}
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/suricata/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 3 May 2019 06:22:34 -0000 1.5
+++ distinfo 27 Sep 2019 21:07:01 -0000
@@ -1,2 +1,2 @@
-SHA256 (suricata-4.1.4.tar.gz) = LaUNkfkq34sa+TDziDYfdkJEILiPVT9hDieA5CQPIAk=
-SIZE (suricata-4.1.4.tar.gz) = 15661783
+SHA256 (suricata-4.1.5.tar.gz) = zuX2U1zX/mP93Oq2LrO8ZqY/xGRGbIjsekG3oTMax0s=
+SIZE (suricata-4.1.5.tar.gz) = 15729747
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/security/suricata/patches/patch-configure_ac,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure_ac
--- patches/patch-configure_ac 3 May 2019 06:22:34 -0000 1.2
+++ patches/patch-configure_ac 27 Sep 2019 21:07:01 -0000
@@ -5,7 +5,7 @@ To remove pid file its directory must be
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
-@@ -2411,7 +2411,7 @@ if test "$WINDOWS_PATH" = "yes"; then
+@@ -2439,7 +2439,7 @@ if test "$WINDOWS_PATH" = "yes"; then
e_datarulesdir="$e_winbase\\\\rules\\\\"
else
EXPAND_VARIABLE(localstatedir, e_logdir, "/log/suricata/")
Index: patches/patch-rust_vendor_libc_src_unix_bsd_netbsdlike_openbsd_mod_rs
===================================================================
RCS file: patches/patch-rust_vendor_libc_src_unix_bsd_netbsdlike_openbsd_mod_rs
diff -N patches/patch-rust_vendor_libc_src_unix_bsd_netbsdlike_openbsd_mod_rs
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-rust_vendor_libc_src_unix_bsd_netbsdlike_openbsd_mod_rs 27 Sep 2019 21:07:01 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+add minimal sparc64 support
+could be removed with libc>=0.2.63
+
+Index: rust/vendor/libc/src/unix/bsd/netbsdlike/openbsd/mod.rs
+--- rust/vendor/libc/src/unix/bsd/netbsdlike/openbsd/mod.rs.orig
++++ rust/vendor/libc/src/unix/bsd/netbsdlike/openbsd/mod.rs
+@@ -1437,6 +1437,11 @@ cfg_if! {
+ } else if #[cfg(target_arch = "aarch64")] {
+ mod aarch64;
+ pub use self::aarch64::*;
++ } else if #[cfg(target_arch = "sparc64")] {
++ pub type c_long = i64;
++ pub type c_ulong = u64;
++ pub type c_char = i8;
++ pub const _ALIGNBYTES: usize = 0xf;
+ } else {
+ // Unknown target_arch
+ }
Index: patches/patch-rust_vendor_libc_src_unix_bsd_netbsdlike_openbsdlike_openbsd_mod_rs
===================================================================
RCS file: patches/patch-rust_vendor_libc_src_unix_bsd_netbsdlike_openbsdlike_openbsd_mod_rs
diff -N patches/patch-rust_vendor_libc_src_unix_bsd_netbsdlike_openbsdlike_openbsd_mod_rs
--- patches/patch-rust_vendor_libc_src_unix_bsd_netbsdlike_openbsdlike_openbsd_mod_rs 2 Sep 2019 07:03:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-rust_vendor_libc_src_unix_bsd_netbsdlike_openbsdlike_openbsd_mod_rs,v 1.1 2019/09/02 07:03:39 semarie Exp $
-add minimal sparc64 support
-could be removed with libc>=0.2.63
-Index: vendor/libc/src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs
---- rust/vendor/libc/src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs.orig
-+++ rust/vendor/libc/src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs
-@@ -273,6 +273,11 @@ cfg_if! {
- } else if #[cfg(target_arch = "aarch64")] {
- mod aarch64;
- pub use self::aarch64::*;
-+ } else if #[cfg(target_arch = "sparc64")] {
-+ pub type c_long = i64;
-+ pub type c_ulong = u64;
-+ pub type c_char = i8;
-+ pub const _ALIGNBYTES: usize = 0xf;
- } else {
- // Unknown target_arch
- }
Index: patches/patch-src_suricata_c
===================================================================
RCS file: /cvs/ports/security/suricata/patches/patch-src_suricata_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_suricata_c
--- patches/patch-src_suricata_c 3 May 2019 06:22:34 -0000 1.4
+++ patches/patch-src_suricata_c 27 Sep 2019 21:07:01 -0000
@@ -8,7 +8,7 @@ https://github.com/OISF/suricata/commit/
Index: src/suricata.c
--- src/suricata.c.orig
+++ src/suricata.c
-@@ -3039,6 +3039,8 @@ int main(int argc, char **argv)
+@@ -3041,6 +3041,8 @@ int main(int argc, char **argv)