Hola,
Update for Suricata to 6.0.0:
https://github.com/OISF/suricata/releases/tag/suricata-6.0.0
OK? Comments?
Cheers.-
--
- gonzalo
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/suricata/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile 3 Jul 2020 21:13:08 -0000 1.32
+++ Makefile 9 Oct 2020 09:19:42 -0000
@@ -2,13 +2,12 @@
COMMENT = high performance network IDS, IPS and security monitoring
-SURICATA_V = 5.0.3
-SUPDATE_V = 1.1.2
+SURICATA_V = 6.0.0
+SUPDATE_V = 1.2.0
DISTNAME = suricata-${SURICATA_V}
CATEGORIES = security
SHARED_LIBS += htp 0.0 # 2.0
-REVISION = 0
HOMEPAGE = https://suricata-ids.org/
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/suricata/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo 15 May 2020 09:17:39 -0000 1.10
+++ distinfo 9 Oct 2020 09:19:42 -0000
@@ -1,2 +1,2 @@
-SHA256 (suricata-5.0.3.tar.gz) = NEE+za0v8kUlJtvNIvEnmv0JNRUZFsD/nPrOSwtWZds=
-SIZE (suricata-5.0.3.tar.gz) = 23744731
+SHA256 (suricata-6.0.0.tar.gz) = PBdabe6QcRQTkfZIKFAs+25I3Boggz4UEftFvlNokjs=
+SIZE (suricata-6.0.0.tar.gz) = 30832555
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/security/suricata/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- patches/patch-configure 16 Dec 2019 15:33:27 -0000 1.2
+++ patches/patch-configure 9 Oct 2020 09:19:42 -0000
@@ -5,7 +5,7 @@ Fix path to sphinx-build
Index: configure
--- configure.orig
+++ configure
-@@ -26794,7 +26794,7 @@ $as_echo "#define CLS 64" >>confdefs.h
+@@ -28599,7 +28599,7 @@ $as_echo "#define CLS 64" >>confdefs.h
# sphinx for documentation
# Extract the first word of "sphinx-build", so it can be a program name
with args.
Index: patches/patch-doc_userguide_Makefile_in
===================================================================
RCS file: /cvs/ports/security/suricata/patches/patch-doc_userguide_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-doc_userguide_Makefile_in
--- patches/patch-doc_userguide_Makefile_in 26 Nov 2019 10:44:34 -0000
1.1
+++ patches/patch-doc_userguide_Makefile_in 9 Oct 2020 09:19:42 -0000
@@ -5,10 +5,10 @@ Fix path to sphinx-build
Index: doc/userguide/Makefile.in
--- doc/userguide/Makefile.in.orig
+++ doc/userguide/Makefile.in
-@@ -364,7 +364,7 @@ EXTRA_DIST = _static 3rd-party-integration acknowledge
+@@ -373,7 +373,7 @@ EXTRA_DIST = _static 3rd-party-integration acknowledge
what-is-suricata.rst $(am__append_1)
- @HAVE_SPHINXBUILD_TRUE@man1_MANS = suricata.1
- @HAVE_SURICATA_MAN_TRUE@man1_MANS = suricata.1
+ @HAVE_SPHINXBUILD_TRUE@dist_man1_MANS = suricata.1
+ @HAVE_SURICATA_MAN_TRUE@dist_man1_MANS = suricata.1
-@HAVE_SPHINXBUILD_TRUE@SPHINX_BUILD = sphinx-build -q
+@HAVE_SPHINXBUILD_TRUE@SPHINX_BUILD = sphinx-build${MODPY_BIN_SUFFIX} -q
all: all-am
Index: patches/patch-suricata_yaml_in
===================================================================
RCS file: /cvs/ports/security/suricata/patches/patch-suricata_yaml_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-suricata_yaml_in
--- patches/patch-suricata_yaml_in 30 Oct 2019 12:41:46 -0000 1.7
+++ patches/patch-suricata_yaml_in 9 Oct 2020 09:19:42 -0000
@@ -8,7 +8,7 @@ Remove rules files not present by defaul
Index: suricata.yaml.in
--- suricata.yaml.in.orig
+++ suricata.yaml.in
-@@ -75,6 +75,7 @@ outputs:
+@@ -77,6 +77,7 @@ outputs:
- fast:
enabled: yes
filename: fast.log
@@ -16,23 +16,23 @@ Index: suricata.yaml.in
append: yes
#filetype: regular # 'regular', 'unix_stream' or 'unix_dgram'
-@@ -83,6 +84,7 @@ outputs:
+@@ -85,6 +86,7 @@ outputs:
enabled: @e_enable_evelog@
filetype: regular #regular|syslog|unix_dgram|unix_stream|redis
filename: eve.json
+ filemode: 664
- #prefix: "@cee: " # prefix to prepend to each log entry
- # the following are valid when type: syslog above
- #identity: "suricata"
-@@ -297,6 +299,7 @@ outputs:
+ # Enable for multi-threaded eve.json output; output files are amended
with
+ # with an identifier, e.g., eve.9.json
+ #threaded: false
+@@ -304,6 +306,7 @@ outputs:
- http-log:
enabled: no
filename: http.log
+ filemode: 664
append: yes
#extended: yes # enable this for extended logging information
- #custom: yes # enabled the custom logging format (defined by
customformat)
-@@ -307,6 +310,7 @@ outputs:
+ #custom: yes # enable the custom logging format (defined by
customformat)
+@@ -314,6 +317,7 @@ outputs:
- tls-log:
enabled: no # Log TLS connections.
filename: tls.log # File to store TLS logs.
@@ -40,7 +40,7 @@ Index: suricata.yaml.in
append: yes
#extended: yes # Log extended information like fingerprint
#custom: yes # enabled the custom logging format (defined by
customformat)
-@@ -354,6 +358,7 @@ outputs:
+@@ -361,6 +365,7 @@ outputs:
- pcap-log:
enabled: no
filename: log.pcap
@@ -48,7 +48,7 @@ Index: suricata.yaml.in
# File size limit. Can be specified in kb, mb, gb. Just a number
# is parsed as bytes.
-@@ -388,6 +393,7 @@ outputs:
+@@ -396,6 +401,7 @@ outputs:
- alert-debug:
enabled: no
filename: alert-debug.log
@@ -56,7 +56,7 @@ Index: suricata.yaml.in
append: yes
#filetype: regular # 'regular', 'unix_stream' or 'unix_dgram'
-@@ -403,6 +409,7 @@ outputs:
+@@ -411,6 +417,7 @@ outputs:
- stats:
enabled: yes
filename: stats.log
@@ -64,15 +64,15 @@ 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
-@@ -505,6 +512,7 @@ outputs:
+@@ -504,6 +511,7 @@ outputs:
enabled: no
type: file
filename: tcp-data.log
+ filemode: 664
- # Log HTTP body data after normalization, dechunking and unzipping.
- # 2 types: file or dir. File logs into a single logfile. Dir creates
-@@ -516,6 +524,7 @@ outputs:
+ # Log HTTP body data after normalization, de-chunking and unzipping.
+ # Two types: file or dir.
+@@ -517,6 +525,7 @@ outputs:
enabled: no
type: file
filename: http-data.log
@@ -80,7 +80,7 @@ Index: suricata.yaml.in
# Lua Output Support - execute lua script to generate alert and event
# output.
-@@ -557,12 +566,12 @@ logging:
+@@ -558,13 +567,13 @@ logging:
enabled: yes
# type: json
- file:
@@ -91,24 +91,23 @@ Index: suricata.yaml.in
# type: json
- syslog:
- enabled: no
+- facility: local5
+ enabled: yes
- facility: local5
++ facility:ulocal5
format: "[%i] <%d> -- "
# type: json
-@@ -978,9 +987,9 @@ asn1-max-frames: 256
- ##
- # Run suricata as user and group.
--#run-as:
--# user: suri
--# group: suri
+@@ -991,6 +1000,9 @@ asn1-max-frames: 256
+ #run-as:
+ # user: suri
+ # group: suri
+run-as:
+ user: _suricata
+ group: _suricata
- # Some logging module will use that name in event as identifier. The default
+ # Some logging modules will use that name in event as identifier. The default
# value is the hostname
-@@ -989,7 +998,7 @@ asn1-max-frames: 256
+@@ -999,7 +1011,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.
@@ -117,7 +116,7 @@ Index: suricata.yaml.in
# Daemon working directory
# Suricata will change directory to this one if provided
-@@ -1815,7 +1824,19 @@ napatech:
+@@ -1865,7 +1877,19 @@ napatech:
default-rule-path: @e_defaultruledir@
rule-files:
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/suricata/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST 22 Jan 2020 10:21:47 -0000 1.12
+++ pkg/PLIST 9 Oct 2020 09:19:42 -0000
@@ -28,6 +28,7 @@ include/htp/htp_version.h
include/htp/lzma/
include/htp/lzma/7zTypes.h
include/htp/lzma/LzmaDec.h
+include/suricata-plugin.h
@static-lib lib/libhtp.a
lib/libhtp.la
@lib lib/libhtp.so.${LIBhtp_VERSION}
@@ -74,8 +75,12 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/suricata/update/${MODPY_PYCACHE}loghandler.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/suricata/update/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/suricata/update/${MODPY_PYCACHE}maps.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/suricata/update/${MODPY_PYCACHE}matchers.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/suricata/update/${MODPY_PYCACHE}net.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/suricata/update/${MODPY_PYCACHE}notes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/suricata/update/${MODPY_PYCACHE}osinfo.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/suricata/update/${MODPY_PYCACHE}parsers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/suricata/update/${MODPY_PYCACHE}revision.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/suricata/update/${MODPY_PYCACHE}rule.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/suricata/update/${MODPY_PYCACHE}sources.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/suricata/update/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
@@ -88,7 +93,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/${MODPY_PYCACHE}checkversions.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/${MODPY_PYCACHE}disablesource.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/${MODPY_PYCACHE}enablesource.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/${MODPY_PYCACHE}listenabledsources.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/${MODPY_PYCACHE}listsources.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/${MODPY_PYCACHE}removesource.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/${MODPY_PYCACHE}updatesources.${MODPY_PYC_MAGIC_TAG}pyc
@@ -96,7 +100,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/checkversions.py
lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/disablesource.py
lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/enablesource.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/listenabledsources.py
lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/listsources.py
lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/removesource.py
lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/updatesources.py
@@ -137,8 +140,12 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/suricata/update/loghandler.py
lib/python${MODPY_VERSION}/site-packages/suricata/update/main.py
lib/python${MODPY_VERSION}/site-packages/suricata/update/maps.py
+lib/python${MODPY_VERSION}/site-packages/suricata/update/matchers.py
lib/python${MODPY_VERSION}/site-packages/suricata/update/net.py
lib/python${MODPY_VERSION}/site-packages/suricata/update/notes.py
+lib/python${MODPY_VERSION}/site-packages/suricata/update/osinfo.py
+lib/python${MODPY_VERSION}/site-packages/suricata/update/parsers.py
+lib/python${MODPY_VERSION}/site-packages/suricata/update/revision.py
lib/python${MODPY_VERSION}/site-packages/suricata/update/rule.py
lib/python${MODPY_VERSION}/site-packages/suricata/update/sources.py
lib/python${MODPY_VERSION}/site-packages/suricata/update/util.py
