Hello,
Update for Suricata to 5.0.0:
https://github.com/OISF/suricata/releases
Most of our patches are now in.
OK? Comments?
Cheers.-
--
- gonzalo
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/suricata/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile 2 Oct 2019 17:42:24 -0000 1.24
+++ Makefile 21 Oct 2019 10:13:50 -0000
@@ -2,7 +2,7 @@
COMMENT = high performance network IDS, IPS and security monitoring
-SURICATA_V = 4.1.5
+SURICATA_V = 5.0.0
SUPDATE_V = 1.0.5
DISTNAME = suricata-${SURICATA_V}
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/suricata/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 2 Oct 2019 17:42:24 -0000 1.6
+++ distinfo 21 Oct 2019 10:13:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (suricata-4.1.5.tar.gz) = zuX2U1zX/mP93Oq2LrO8ZqY/xGRGbIjsekG3oTMax0s=
-SIZE (suricata-4.1.5.tar.gz) = 15729747
+SHA256 (suricata-5.0.0.tar.gz) = aj3MQnGWknpc3v0ywpD6NS1kBem7bT/hLHH0fTHZimM=
+SIZE (suricata-5.0.0.tar.gz) = 23689051
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- patches/patch-configure_ac 2 Oct 2019 17:42:24 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.3 2019/10/02 17:42:24 jasper Exp $
-
-To remove pid file its directory must be writable by suricata user.
-
-Index: configure.ac
---- configure.ac.orig
-+++ configure.ac
-@@ -2439,7 +2439,7 @@ if test "$WINDOWS_PATH" = "yes"; then
- e_datarulesdir="$e_winbase\\\\rules\\\\"
- else
- EXPAND_VARIABLE(localstatedir, e_logdir, "/log/suricata/")
-- EXPAND_VARIABLE(localstatedir, e_rundir, "/run/")
-+ EXPAND_VARIABLE(localstatedir, e_rundir, "/suricata/run/")
- EXPAND_VARIABLE(localstatedir, e_logfilesdir, "/log/suricata/files")
- EXPAND_VARIABLE(localstatedir, e_logcertsdir, "/log/suricata/certs")
- EXPAND_VARIABLE(sysconfdir, e_sysconfdir, "/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
--- patches/patch-rust_vendor_libc_src_unix_bsd_netbsdlike_openbsd_mod_rs
2 Oct 2019 17:42:24 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-rust_vendor_libc_src_unix_bsd_netbsdlike_openbsd_mod_rs,v 1.1
2019/10/02 17:42:24 jasper Exp $
-
-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-src_suricata_c
===================================================================
RCS file: patches/patch-src_suricata_c
diff -N patches/patch-src_suricata_c
--- patches/patch-src_suricata_c 2 Oct 2019 17:42:24 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-src_suricata_c,v 1.5 2019/10/02 17:42:24 jasper Exp $
-
-https://github.com/OISF/suricata/commit/0ea3fa92a8955b065f052fb378aab253622f1a4e
-Use setresuid/gid() directly to change user and group. Otherwise
-Suricata uses libcap-ng on Linux and runs as root elsewhere.
-https://github.com/OISF/suricata/commit/00917a0415629abbf675fd14d8752a0a27ab1ff5
-
-Index: src/suricata.c
---- src/suricata.c.orig
-+++ src/suricata.c
-@@ -3041,6 +3041,8 @@ int main(int argc, char **argv)
- #endif
- #endif
-
-+ SCSetUserID(suricata.userid, suricata.groupid);
-+ SCPledge();
- SuricataMainLoop(&suricata);
-
- /* Update the engine stage/status flag */
Index: patches/patch-src_util-error_c
===================================================================
RCS file: patches/patch-src_util-error_c
diff -N patches/patch-src_util-error_c
--- patches/patch-src_util-error_c 19 Apr 2019 12:22:27 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_util-error_c,v 1.1 2019/04/19 12:22:27 bluhm Exp $
-
-https://github.com/OISF/suricata/commit/00917a0415629abbf675fd14d8752a0a27ab1ff5
-
-Index: src/util-error.c
---- src/util-error.c.orig
-+++ src/util-error.c
-@@ -198,6 +198,7 @@ const char * SCErrorToString(SCError err)
- CASE_CODE (SC_ERR_CHANGING_CAPS_FAILED);
- CASE_CODE (SC_ERR_LIBCAP_NG_REQUIRED);
- CASE_CODE (SC_ERR_LIBNET11_INCOMPATIBLE_WITH_LIBCAP_NG);
-+ CASE_CODE (SC_ERR_PLEDGE_FAILED);
- CASE_CODE (SC_WARN_FLOW_EMERGENCY);
- CASE_CODE (SC_ERR_SVC);
- CASE_CODE (SC_ERR_ERF_DAG_OPEN_FAILED);
Index: patches/patch-src_util-error_h
===================================================================
RCS file: patches/patch-src_util-error_h
diff -N patches/patch-src_util-error_h
--- patches/patch-src_util-error_h 19 Apr 2019 12:22:27 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_util-error_h,v 1.1 2019/04/19 12:22:27 bluhm Exp $
-
-https://github.com/OISF/suricata/commit/00917a0415629abbf675fd14d8752a0a27ab1ff5
-
-Index: src/util-error.h
---- src/util-error.h.orig
-+++ src/util-error.h
-@@ -349,6 +349,7 @@ typedef enum {
- SC_WARN_RUST_NOT_AVAILABLE,
- SC_WARN_DEFAULT_WILL_CHANGE,
- SC_WARN_EVE_MISSING_EVENTS,
-+ SC_ERR_PLEDGE_FAILED,
-
- SC_ERR_MAX,
- } SCError;
Index: patches/patch-src_util-logopenfile_c
===================================================================
RCS file: patches/patch-src_util-logopenfile_c
diff -N patches/patch-src_util-logopenfile_c
--- patches/patch-src_util-logopenfile_c 19 Apr 2019 12:22:27 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-src_util-logopenfile_c,v 1.2 2019/04/19 12:22:27 bluhm Exp $
-
-https://github.com/OISF/suricata/commit/4b4bb31c30339caa2c6020a7ec14bea848ba5a5d
-
-Index: src/util-logopenfile.c
---- src/util-logopenfile.c.orig
-+++ src/util-logopenfile.c
-@@ -523,7 +523,9 @@ int SCConfLogReopen(LogFileCtx *log_ctx)
- return -1;
- }
-
-- fclose(log_ctx->fp);
-+ if (log_ctx->fp != NULL) {
-+ fclose(log_ctx->fp);
-+ }
-
- /* Reopen the file. Append is forced in case the file was not
- * moved as part of a rotation process. */
Index: patches/patch-src_util-privs_c
===================================================================
RCS file: patches/patch-src_util-privs_c
diff -N patches/patch-src_util-privs_c
--- patches/patch-src_util-privs_c 19 Apr 2019 12:22:27 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,51 +0,0 @@
-$OpenBSD: patch-src_util-privs_c,v 1.2 2019/04/19 12:22:27 bluhm Exp $
-
-Use setresuid/gid() directly to change user and group. Otherwise
-Suricata uses libcap-ng on Linux and runs as root elsewhere.
-https://github.com/OISF/suricata/commit/00917a0415629abbf675fd14d8752a0a27ab1ff5
-
-Index: src/util-privs.c
---- src/util-privs.c.orig
-+++ src/util-privs.c
-@@ -235,4 +235,41 @@ int SCGetGroupID(const char *group_name, uint32_t *gid
-
- return 0;
- }
-+
-+int SCSetUserID(const uint32_t uid, const uint32_t gid)
-+{
-+ int ret = setresgid(gid, gid, gid);
-+
-+ if (ret != 0) {
-+ SCLogError(SC_ERR_GID_FAILED, "unable to set the group ID,"
-+ " check permissions!! gid=%u ret=%i errno=%i", gid, ret,
errno);
-+ exit(EXIT_FAILURE);
-+ }
-+
-+ ret = setresuid(uid, uid, uid);
-+
-+ if (ret != 0) {
-+ SCLogError(SC_ERR_UID_FAILED, "unable to set the user ID,"
-+ " check permissions!! uid=%u ret=%i errno=%i", uid, ret,
errno);
-+ exit(EXIT_FAILURE);
-+ }
-+
-+ return 0;
-+}
-+
-+#ifdef __OpenBSD__
-+int SCPledge(void)
-+{
-+ int ret = pledge("stdio rpath wpath cpath fattr unix dns bpf", NULL);
-+
-+ if (ret != 0) {
-+ SCLogError(SC_ERR_PLEDGE_FAILED, "unable to pledge,"
-+ " check permissions!! ret=%i errno=%i", ret, errno);
-+ exit(EXIT_FAILURE);
-+ }
-+
-+ return 0;
-+}
-+#endif /* __OpenBSD__ */
-+
- #endif /* OS_WIN32 */
Index: patches/patch-src_util-privs_h
===================================================================
RCS file: patches/patch-src_util-privs_h
diff -N patches/patch-src_util-privs_h
--- patches/patch-src_util-privs_h 19 Apr 2019 12:22:27 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-src_util-privs_h,v 1.2 2019/04/19 12:22:27 bluhm Exp $
-
-Use setresuid/gid() directly to change user and group. Otherwise
-Suricata uses libcap-ng on Linux and runs as root elsewhere.
-https://github.com/OISF/suricata/commit/00917a0415629abbf675fd14d8752a0a27ab1ff5
-
-Index: src/util-privs.h
---- src/util-privs.h.orig
-+++ src/util-privs.h
-@@ -93,6 +93,13 @@ void SCDropMainThreadCaps(uint32_t , uint32_t );
-
- int SCGetUserID(const char *, const char *, uint32_t *, uint32_t *);
- int SCGetGroupID(const char *, uint32_t *);
-+int SCSetUserID(const uint32_t uid, const uint32_t gid);
-+
-+#ifdef __OpenBSD__
-+int SCPledge(void);
-+#else /* __OpenBSD__ */
-+#define SCPledge(...)
-+#endif /* __OpenBSD__ */
-
- #endif /* _UTIL_PRIVS_H */
-
Index: patches/patch-suricata-update_suricata_update_config_py
===================================================================
RCS file: patches/patch-suricata-update_suricata_update_config_py
diff -N patches/patch-suricata-update_suricata_update_config_py
--- patches/patch-suricata-update_suricata_update_config_py 12 Feb 2019
09:27:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-suricata-update_suricata_update_config_py,v 1.1 2019/02/12
09:27:16 gonzalo Exp $
-
-Index: suricata-update/suricata/update/config.py
---- suricata-update/suricata/update/config.py.orig
-+++ suricata-update/suricata/update/config.py
-@@ -215,8 +215,7 @@ def init(args):
- # Set the data-directory prefix to that of the --localstatedir
- # found in the build-info.
- if not DATA_DIRECTORY_KEY in _config and "localstatedir" in
build_info:
-- data_directory = os.path.join(
-- build_info["localstatedir"], "lib/suricata")
-+ data_directory = "/var/suricata"
- logger.info("Using data-directory %s.", data_directory)
- _config[DATA_DIRECTORY_KEY] = data_directory
-
Index: patches/patch-suricata_yaml_in
===================================================================
RCS file: /cvs/ports/security/suricata/patches/patch-suricata_yaml_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-suricata_yaml_in
--- patches/patch-suricata_yaml_in 2 Oct 2019 17:42:24 -0000 1.6
+++ patches/patch-suricata_yaml_in 21 Oct 2019 10:13:50 -0000
@@ -24,15 +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"
-@@ -253,6 +255,7 @@ outputs:
- - unified2-alert:
- enabled: no
- filename: unified2.alert
-+ filemode: 664
-
- # File size limit. Can be specified in kb, mb, gb. Just a number
- # is parsed as bytes.
-@@ -295,6 +298,7 @@ outputs:
+@@ -297,6 +299,7 @@ outputs:
- http-log:
enabled: no
filename: http.log
@@ -40,7 +32,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)
-@@ -305,6 +309,7 @@ outputs:
+@@ -307,6 +310,7 @@ outputs:
- tls-log:
enabled: no # Log TLS connections.
filename: tls.log # File to store TLS logs.
@@ -48,15 +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)
-@@ -324,6 +329,7 @@ outputs:
- - dns-log:
- enabled: no
- filename: dns.log
-+ filemode: 664
- append: yes
- #filetype: regular # 'regular', 'unix_stream' or 'unix_dgram'
-
-@@ -360,6 +366,7 @@ outputs:
+@@ -354,6 +358,7 @@ outputs:
- pcap-log:
enabled: no
filename: log.pcap
@@ -64,7 +48,7 @@ Index: suricata.yaml.in
# File size limit. Can be specified in kb, mb, gb. Just a number
# is parsed as bytes.
-@@ -394,6 +401,7 @@ outputs:
+@@ -388,6 +393,7 @@ outputs:
- alert-debug:
enabled: no
filename: alert-debug.log
@@ -72,7 +56,7 @@ Index: suricata.yaml.in
append: yes
#filetype: regular # 'regular', 'unix_stream' or 'unix_dgram'
-@@ -409,6 +417,7 @@ outputs:
+@@ -403,6 +409,7 @@ outputs:
- stats:
enabled: yes
filename: stats.log
@@ -80,23 +64,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
-@@ -428,6 +437,7 @@ outputs:
- - drop:
- enabled: no
- filename: drop.log
-+ filemode: 664
- append: yes
- #filetype: regular # 'regular', 'unix_stream' or 'unix_dgram'
-
-@@ -534,6 +544,7 @@ outputs:
- - file-log:
- enabled: no
- filename: files-json.log
-+ filemode: 664
- append: yes
- #filetype: regular # 'regular', 'unix_stream' or 'unix_dgram'
-
-@@ -552,6 +563,7 @@ outputs:
+@@ -505,6 +512,7 @@ outputs:
enabled: no
type: file
filename: tcp-data.log
@@ -104,7 +72,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
-@@ -563,6 +575,7 @@ outputs:
+@@ -516,6 +524,7 @@ outputs:
enabled: no
type: file
filename: http-data.log
@@ -112,14 +80,14 @@ Index: suricata.yaml.in
# Lua Output Support - execute lua script to generate alert and event
# output.
-@@ -604,12 +617,12 @@ logging:
+@@ -557,12 +566,12 @@ logging:
enabled: yes
# type: json
- file:
- enabled: yes
+ enabled: no
level: info
- filename: @e_log...@suricata.log
+ filename: suricata.log
# type: json
- syslog:
- enabled: no
@@ -127,7 +95,7 @@ Index: suricata.yaml.in
facility: local5
format: "[%i] <%d> -- "
# type: json
-@@ -1047,9 +1060,9 @@ asn1-max-frames: 256
+@@ -978,9 +987,9 @@ asn1-max-frames: 256
##
# Run suricata as user and group.
@@ -140,7 +108,7 @@ Index: suricata.yaml.in
# Some logging module will use that name in event as identifier. The default
# value is the hostname
-@@ -1058,7 +1071,7 @@ asn1-max-frames: 256
+@@ -989,7 +998,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,15 +117,11 @@ Index: suricata.yaml.in
# Daemon working directory
# Suricata will change directory to this one if provided
-@@ -1862,9 +1875,21 @@ mpipe:
- ## file configuration".
- ##
+@@ -1815,7 +1824,19 @@ napatech:
+ default-rule-path: @e_defaultruledir@
--@no_suricata_update_comment@default-rule-path: @e_defaultruledir@
--@no_suricata_update_comment@rule-files:
--@no_suricata_update_comment@ - suricata.rules
-+default-rule-path: @e_sysconfdir@rules
-+rule-files:
+ rule-files:
+- - suricata.rules
+
+ - app-layer-events.rules
+ - decoder-events.rules
@@ -173,4 +137,4 @@ Index: suricata.yaml.in
+ - tls-events.rules
##
- ## Advanced rule file configuration.
+ ## Auxiliary configuration files.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/suricata/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 2 Oct 2019 17:42:24 -0000 1.9
+++ pkg/PLIST 21 Oct 2019 10:13:50 -0000
@@ -5,7 +5,6 @@
@newuser _suricata:800:_suricata:daemon:Suricata
Account:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/suricata
@bin bin/suricata
-bin/suricata-update
bin/suricatactl
bin/suricatasc
include/htp/
@@ -32,107 +31,43 @@ lib/libhtp.a
lib/libhtp.la
@lib lib/libhtp.so.${LIBhtp_VERSION}
lib/pkgconfig/htp.pc
-lib/python${MODPY_VERSION}/site-packages/suricata/
-lib/python${MODPY_VERSION}/site-packages/suricata-${SURICATA_V}-py${MODPY_VERSION}.egg-info
-lib/python${MODPY_VERSION}/site-packages/suricata/__init__.py
-lib/python${MODPY_VERSION}/site-packages/suricata/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/config/
-lib/python${MODPY_VERSION}/site-packages/suricata/config/__init__.py
-lib/python${MODPY_VERSION}/site-packages/suricata/config/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/config/defaults.py
-lib/python${MODPY_VERSION}/site-packages/suricata/config/defaults.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/ctl/
-lib/python${MODPY_VERSION}/site-packages/suricata/ctl/__init__.py
-lib/python${MODPY_VERSION}/site-packages/suricata/ctl/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/ctl/filestore.py
-lib/python${MODPY_VERSION}/site-packages/suricata/ctl/filestore.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/ctl/loghandler.py
-lib/python${MODPY_VERSION}/site-packages/suricata/ctl/loghandler.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/ctl/main.py
-lib/python${MODPY_VERSION}/site-packages/suricata/ctl/main.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/ctl/test_filestore.py
-lib/python${MODPY_VERSION}/site-packages/suricata/ctl/test_filestore.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/sc/
-lib/python${MODPY_VERSION}/site-packages/suricata/sc/__init__.py
-lib/python${MODPY_VERSION}/site-packages/suricata/sc/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/sc/suricatasc.py
-lib/python${MODPY_VERSION}/site-packages/suricata/sc/suricatasc.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/
-lib/python${MODPY_VERSION}/site-packages/suricata/update/__init__.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/
-lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/__init__.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/addsource.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/addsource.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/disablesource.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/disablesource.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/enablesource.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/enablesource.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/listenabledsources.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/listenabledsources.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/listsources.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/listsources.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/removesource.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/removesource.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/updatesources.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/commands/updatesources.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/compat/
-lib/python${MODPY_VERSION}/site-packages/suricata/update/compat/__init__.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/compat/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/compat/argparse/
-lib/python${MODPY_VERSION}/site-packages/suricata/update/compat/argparse/__init__.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/compat/argparse/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/compat/argparse/argparse.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/compat/argparse/argparse.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/compat/ordereddict.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/compat/ordereddict.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/config.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/config.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/configs/
-lib/python${MODPY_VERSION}/site-packages/suricata/update/configs/__init__.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/configs/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/configs/disable.conf
-lib/python${MODPY_VERSION}/site-packages/suricata/update/configs/drop.conf
-lib/python${MODPY_VERSION}/site-packages/suricata/update/configs/enable.conf
-lib/python${MODPY_VERSION}/site-packages/suricata/update/configs/modify.conf
-lib/python${MODPY_VERSION}/site-packages/suricata/update/configs/threshold.in
-lib/python${MODPY_VERSION}/site-packages/suricata/update/configs/update.yaml
-lib/python${MODPY_VERSION}/site-packages/suricata/update/data/
-lib/python${MODPY_VERSION}/site-packages/suricata/update/data/__init__.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/data/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/data/index.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/data/index.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/data/update.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/data/update.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/engine.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/engine.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/exceptions.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/exceptions.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/extract.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/extract.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/loghandler.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/loghandler.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/main.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/main.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/maps.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/maps.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/net.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/net.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/notes.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/notes.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/rule.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/rule.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/sources.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/sources.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/util.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/util.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata/update/version.py
-lib/python${MODPY_VERSION}/site-packages/suricata/update/version.pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg-info
-lib/python${MODPY_VERSION}/site-packages/suricatasc/
-lib/python${MODPY_VERSION}/site-packages/suricatasc/__init__.py
-lib/python${MODPY_VERSION}/site-packages/suricatasc/__init__.pyc
+lib/python3.7/
+lib/python3.7/site-packages/
+lib/python3.7/site-packages/suricata/
+lib/python3.7/site-packages/suricata-${SURICATA_V}-py3.7.egg-info
+lib/python3.7/site-packages/suricata/__init__.py
+lib/python3.7/site-packages/suricata/__pycache__/
+lib/python3.7/site-packages/suricata/__pycache__/__init__.cpython-37.pyc
+lib/python3.7/site-packages/suricata/config/
+lib/python3.7/site-packages/suricata/config/__init__.py
+lib/python3.7/site-packages/suricata/config/__pycache__/
+lib/python3.7/site-packages/suricata/config/__pycache__/__init__.cpython-37.pyc
+lib/python3.7/site-packages/suricata/config/__pycache__/defaults.cpython-37.pyc
+lib/python3.7/site-packages/suricata/config/defaults.py
+lib/python3.7/site-packages/suricata/ctl/
+lib/python3.7/site-packages/suricata/ctl/__init__.py
+lib/python3.7/site-packages/suricata/ctl/__pycache__/
+lib/python3.7/site-packages/suricata/ctl/__pycache__/__init__.cpython-37.pyc
+lib/python3.7/site-packages/suricata/ctl/__pycache__/filestore.cpython-37.pyc
+lib/python3.7/site-packages/suricata/ctl/__pycache__/loghandler.cpython-37.pyc
+lib/python3.7/site-packages/suricata/ctl/__pycache__/main.cpython-37.pyc
+lib/python3.7/site-packages/suricata/ctl/__pycache__/test_filestore.cpython-37.pyc
+lib/python3.7/site-packages/suricata/ctl/filestore.py
+lib/python3.7/site-packages/suricata/ctl/loghandler.py
+lib/python3.7/site-packages/suricata/ctl/main.py
+lib/python3.7/site-packages/suricata/ctl/test_filestore.py
+lib/python3.7/site-packages/suricata/sc/
+lib/python3.7/site-packages/suricata/sc/__init__.py
+lib/python3.7/site-packages/suricata/sc/__pycache__/
+lib/python3.7/site-packages/suricata/sc/__pycache__/__init__.cpython-37.pyc
+lib/python3.7/site-packages/suricata/sc/__pycache__/specs.cpython-37.pyc
+lib/python3.7/site-packages/suricata/sc/__pycache__/suricatasc.cpython-37.pyc
+lib/python3.7/site-packages/suricata/sc/specs.py
+lib/python3.7/site-packages/suricata/sc/suricatasc.py
+lib/python3.7/site-packages/suricatasc/
+lib/python3.7/site-packages/suricatasc/__init__.py
+lib/python3.7/site-packages/suricatasc/__pycache__/
+lib/python3.7/site-packages/suricatasc/__pycache__/__init__.cpython-37.pyc
@man man/man1/suricata.1
share/doc/pkg-readmes/${PKGSTEM}
share/doc/suricata/
@@ -143,15 +78,12 @@ share/doc/suricata/TODO
@sample ${SYSCONFDIR}/suricata/
@sample ${SYSCONFDIR}/suricata/rules/
share/examples/suricata/
-share/examples/suricata/classification.config
-@sample ${SYSCONFDIR}/suricata/classification.config
-share/examples/suricata/reference.config
-@sample ${SYSCONFDIR}/suricata/reference.config
share/examples/suricata/rules/
share/examples/suricata/rules/app-layer-events.rules
@sample ${SYSCONFDIR}/suricata/rules/app-layer-events.rules
share/examples/suricata/rules/decoder-events.rules
@sample ${SYSCONFDIR}/suricata/rules/decoder-events.rules
+share/examples/suricata/rules/dhcp-events.rules
share/examples/suricata/rules/dnp3-events.rules
@sample ${SYSCONFDIR}/suricata/rules/dnp3-events.rules
share/examples/suricata/rules/dns-events.rules
@@ -188,9 +120,12 @@ share/examples/suricata/threshold.config
@owner
@group
share/suricata/
+share/suricata/classification.config
+share/suricata/reference.config
share/suricata/rules/
share/suricata/rules/app-layer-events.rules
share/suricata/rules/decoder-events.rules
+share/suricata/rules/dhcp-events.rules
share/suricata/rules/dnp3-events.rules
share/suricata/rules/dns-events.rules
share/suricata/rules/files.rules
