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)
#endif
#endif
Index: patches/patch-suricata_yaml_in
===================================================================
RCS file: /cvs/ports/security/suricata/patches/patch-suricata_yaml_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-suricata_yaml_in
--- patches/patch-suricata_yaml_in 5 Apr 2019 12:24:00 -0000 1.5
+++ patches/patch-suricata_yaml_in 27 Sep 2019 21:07:01 -0000
@@ -8,7 +8,7 @@ Remove rules files not present by defaul
Index: suricata.yaml.in
--- suricata.yaml.in.orig
+++ suricata.yaml.in
-@@ -74,6 +74,7 @@ outputs:
+@@ -75,6 +75,7 @@ outputs:
- fast:
enabled: yes
filename: fast.log
@@ -16,7 +16,7 @@ Index: suricata.yaml.in
append: yes
#filetype: regular # 'regular', 'unix_stream' or 'unix_dgram'
-@@ -82,6 +83,7 @@ outputs:
+@@ -83,6 +84,7 @@ outputs:
enabled: @e_enable_evelog@
filetype: regular #regular|syslog|unix_dgram|unix_stream|redis
filename: eve.json
@@ -24,7 +24,7 @@ Index: suricata.yaml.in
#prefix: "@cee: " # prefix to prepend to each log entry
# the following are valid when type: syslog above
#identity: "suricata"
-@@ -252,6 +254,7 @@ outputs:
+@@ -253,6 +255,7 @@ outputs:
- unified2-alert:
enabled: no
filename: unified2.alert
@@ -32,7 +32,7 @@ Index: suricata.yaml.in
# File size limit. Can be specified in kb, mb, gb. Just a number
# is parsed as bytes.
-@@ -294,6 +297,7 @@ outputs:
+@@ -295,6 +298,7 @@ outputs:
- http-log:
enabled: no
filename: http.log
@@ -40,7 +40,7 @@ Index: suricata.yaml.in
append: yes
#extended: yes # enable this for extended logging information
#custom: yes # enabled the custom logging format (defined by
customformat)
-@@ -304,6 +308,7 @@ outputs:
+@@ -305,6 +309,7 @@ outputs:
- tls-log:
enabled: no # Log TLS connections.
filename: tls.log # File to store TLS logs.
@@ -48,7 +48,7 @@ Index: suricata.yaml.in
append: yes
#extended: yes # Log extended information like fingerprint
#custom: yes # enabled the custom logging format (defined by
customformat)
-@@ -323,6 +328,7 @@ outputs:
+@@ -324,6 +329,7 @@ outputs:
- dns-log:
enabled: no
filename: dns.log
@@ -56,7 +56,7 @@ Index: suricata.yaml.in
append: yes
#filetype: regular # 'regular', 'unix_stream' or 'unix_dgram'
-@@ -359,6 +365,7 @@ outputs:
+@@ -360,6 +366,7 @@ outputs:
- pcap-log:
enabled: no
filename: log.pcap
@@ -64,7 +64,7 @@ Index: suricata.yaml.in
# File size limit. Can be specified in kb, mb, gb. Just a number
# is parsed as bytes.
-@@ -393,6 +400,7 @@ outputs:
+@@ -394,6 +401,7 @@ outputs:
- alert-debug:
enabled: no
filename: alert-debug.log
@@ -72,7 +72,7 @@ Index: suricata.yaml.in
append: yes
#filetype: regular # 'regular', 'unix_stream' or 'unix_dgram'
-@@ -408,6 +416,7 @@ outputs:
+@@ -409,6 +417,7 @@ outputs:
- stats:
enabled: yes
filename: stats.log
@@ -80,7 +80,7 @@ Index: suricata.yaml.in
append: yes # append to file (yes) or overwrite it (no)
totals: yes # stats for all threads merged together
threads: no # per thread stats
-@@ -427,6 +436,7 @@ outputs:
+@@ -428,6 +437,7 @@ outputs:
- drop:
enabled: no
filename: drop.log
@@ -88,7 +88,7 @@ Index: suricata.yaml.in
append: yes
#filetype: regular # 'regular', 'unix_stream' or 'unix_dgram'
-@@ -533,6 +543,7 @@ outputs:
+@@ -534,6 +544,7 @@ outputs:
- file-log:
enabled: no
filename: files-json.log
@@ -96,7 +96,7 @@ Index: suricata.yaml.in
append: yes
#filetype: regular # 'regular', 'unix_stream' or 'unix_dgram'
-@@ -551,6 +562,7 @@ outputs:
+@@ -552,6 +563,7 @@ outputs:
enabled: no
type: file
filename: tcp-data.log
@@ -104,7 +104,7 @@ Index: suricata.yaml.in
# Log HTTP body data after normalization, dechunking and unzipping.
# 2 types: file or dir. File logs into a single logfile. Dir creates
-@@ -562,6 +574,7 @@ outputs:
+@@ -563,6 +575,7 @@ outputs:
enabled: no
type: file
filename: http-data.log
@@ -112,7 +112,7 @@ Index: suricata.yaml.in
# Lua Output Support - execute lua script to generate alert and event
# output.
-@@ -603,12 +616,12 @@ logging:
+@@ -604,12 +617,12 @@ logging:
enabled: yes
# type: json
- file:
@@ -127,7 +127,7 @@ Index: suricata.yaml.in
facility: local5
format: "[%i] <%d> -- "
# type: json
-@@ -1042,9 +1055,9 @@ asn1-max-frames: 256
+@@ -1047,9 +1060,9 @@ asn1-max-frames: 256
##
# Run suricata as user and group.
@@ -140,7 +140,7 @@ Index: suricata.yaml.in
# Some logging module will use that name in event as identifier. The default
# value is the hostname
-@@ -1053,7 +1066,7 @@ asn1-max-frames: 256
+@@ -1058,7 +1071,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.
@@ -149,7 +149,7 @@ Index: suricata.yaml.in
# Daemon working directory
# Suricata will change directory to this one if provided
-@@ -1848,9 +1861,21 @@ mpipe:
+@@ -1862,9 +1875,21 @@ mpipe:
## file configuration".
##
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/suricata/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 18 Mar 2019 17:54:33 -0000 1.8
+++ pkg/PLIST 27 Sep 2019 21:07:01 -0000
@@ -25,6 +25,9 @@ include/htp/htp_transaction.h
include/htp/htp_urlencoded.h
include/htp/htp_utf8_decoder.h
include/htp/htp_version.h
+include/htp/lzma/
+include/htp/lzma/7zTypes.h
+include/htp/lzma/LzmaDec.h
lib/libhtp.a
lib/libhtp.la
@lib lib/libhtp.so.${LIBhtp_VERSION}
