[meta-security] suricata: update to 6.0.3

Submitted by Armin Kuster on July 7, 2021, 5:23 a.m. | Patch ID: 179923

Details

Message ID 20210707052347.844215-1-akuster808@gmail.com
State New
Headers show

Commit Message

Armin Kuster July 7, 2021, 5:23 a.m.
add new crates
minor cleanup

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../{libhtp_0.5.37.bb => libhtp_0.5.38.bb}      |  2 +-
 .../meta-rust/recipes-ids/suricata/suricata.inc |  5 -----
 .../{suricata_6.0.2.bb => suricata_6.0.3.bb}    | 17 +++++++++++++++--
 3 files changed, 16 insertions(+), 8 deletions(-)
 rename dynamic-layers/meta-rust/recipes-ids/suricata/{libhtp_0.5.37.bb => libhtp_0.5.38.bb} (91%)
 rename dynamic-layers/meta-rust/recipes-ids/suricata/{suricata_6.0.2.bb => suricata_6.0.3.bb} (92%)

Patch hide | download patch | download mbox

diff --git a/dynamic-layers/meta-rust/recipes-ids/suricata/libhtp_0.5.37.bb b/dynamic-layers/meta-rust/recipes-ids/suricata/libhtp_0.5.38.bb
similarity index 91%
rename from dynamic-layers/meta-rust/recipes-ids/suricata/libhtp_0.5.37.bb
rename to dynamic-layers/meta-rust/recipes-ids/suricata/libhtp_0.5.38.bb
index 34e72e9..38dece9 100644
--- a/dynamic-layers/meta-rust/recipes-ids/suricata/libhtp_0.5.37.bb
+++ b/dynamic-layers/meta-rust/recipes-ids/suricata/libhtp_0.5.38.bb
@@ -5,7 +5,7 @@  require suricata.inc
 LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=596ab7963a1a0e5198e5a1c4aa621843"
 
 SRC_URI = "git://github.com/OISF/libhtp.git;protocol=https;branch=0.5.x"
-SRCREV = "eaa2db29e65e7f2691c18a9022aeb5fb836ec5f1"
+SRCREV = "fca44158911a1642880ea5c774151a33ad33d906"
 
 DEPENDS = "zlib"
 
diff --git a/dynamic-layers/meta-rust/recipes-ids/suricata/suricata.inc b/dynamic-layers/meta-rust/recipes-ids/suricata/suricata.inc
index 85f419e..7d3509a 100644
--- a/dynamic-layers/meta-rust/recipes-ids/suricata/suricata.inc
+++ b/dynamic-layers/meta-rust/recipes-ids/suricata/suricata.inc
@@ -1,8 +1,3 @@ 
 HOMEPAGE = "http://suricata-ids.org/"
 SECTION = "security Monitor/Admin"
 LICENSE = "GPLv2"
-
-VER = "6.0.2"
-SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-${VER}.tar.gz"
-
-SRC_URI[sha256sum] = "5e4647a07cb31b5d6d0049972a45375c137de908a964a44e2d6d231fa3ad4b52"
diff --git a/dynamic-layers/meta-rust/recipes-ids/suricata/suricata_6.0.2.bb b/dynamic-layers/meta-rust/recipes-ids/suricata/suricata_6.0.3.bb
similarity index 92%
rename from dynamic-layers/meta-rust/recipes-ids/suricata/suricata_6.0.2.bb
rename to dynamic-layers/meta-rust/recipes-ids/suricata/suricata_6.0.3.bb
index a4255d2..632f1d8 100644
--- a/dynamic-layers/meta-rust/recipes-ids/suricata/suricata_6.0.2.bb
+++ b/dynamic-layers/meta-rust/recipes-ids/suricata/suricata_6.0.3.bb
@@ -2,10 +2,13 @@  SUMMARY = "The Suricata Engine is an Open Source Next Generation Intrusion Detec
 
 require suricata.inc
 
-DEPENDS = "lz4 libhtp"
-
 LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=c70d8d3310941dcdfcd1e02800a1f548"
 
+SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-${PV}.tar.gz"
+SRC_URI[sha256sum] = "daf134bb2d7c980035e9ae60f7aaf313323a809340009f26e48110ccde81f602"
+
+DEPENDS = "lz4 libhtp"
+
 SRC_URI += " \
     file://volatiles.03_suricata \
     file://tmpfiles.suricata \
@@ -84,6 +87,16 @@  SRC_URI += " \
     crate://crates.io/log/0.4.0 \
     crate://crates.io/rand_hc/0.2.0 \
     crate://crates.io/wasi/0.9.0+wasi-snapshot-preview1 \
+    crate://crates.io/sawp/0.5.0 \
+    crate://crates.io/sawp-modbus/0.5.0 \
+    crate://crates.io/brotli/3.3.0 \
+    crate://crates.io/flate2/1.0.20 \
+    crate://crates.io/alloc-no-stdlib/2.0.1 \
+    crate://crates.io/alloc-stdlib/0.2.1 \
+    crate://crates.io/brotli-decompressor/2.3.1 \
+    crate://crates.io/crc32fast/1.2.1 \
+    crate://crates.io/miniz_oxide/0.4.4 \
+    crate://crates.io/adler/1.0.2 \
     "
 
 # test case support