OISF · victorjulien · Jul 4, 2024 · Jun 18, 2024 · Jun 21, 2024 · Jun 27, 2024
diff --git a/eve-validator/Cargo.toml b/eve-validator/Cargo.toml
@@ -4,6 +4,6 @@ version = "0.1.0"
 edition = "2018"
 
 [dependencies]
-jsonschema = { version = "0.17", default_features = false }
-clap = { version = "3.1.6", default_features = false, features = ["std", "derive"] }
+jsonschema = { version = "0.17", default-features = false }
+clap = { version = "3.1.6", default-features = false, features = ["std", "derive"] }
 serde_json = "1"
diff --git a/tests/bug-2482-01/test.yaml b/tests/bug-2482-01/test.yaml
@@ -1,8 +1,3 @@
-requires:
-  features:
-    - HAVE_LIBJANSSON
-  min-version: 4.1.0
-
 args:
 - -k none
 - --set vars.address-groups.EXTERNAL_NET=any
@@ -14,16 +9,6 @@ checks:
         event_type: alert
         alert.signature_id: 2013933
         http.http_method: "CONNECT"
-  - filter:
-      version: 4.1
-      count: 172
-      match:
-        event_type: tls
-  - filter:
-      version: 5
-      count: 170
-      match:
-        event_type: tls
   - filter:
       version: 6
       count: 172

diff --git a/tests/bug-4953/test.yaml b/tests/bug-4953/test.yaml
@@ -16,16 +16,6 @@ checks:
         fileinfo.gaps: true
         fileinfo.state: TRUNCATED
         fileinfo.size: 137708
-  - filter:
-      requires:
-        lt-version: 6
-      count: 1
-      match:
-        event_type: fileinfo
-        fileinfo.filename: "/IEyF/EN3GUkgHakZ3iVe/YBqssWlF8iWaHTr/"
-        fileinfo.gaps: false
-        fileinfo.state: TRUNCATED
-        fileinfo.size: 1176
   - filter:
       count: 1
       match:

diff --git a/tests/datasets-memcap-01/test.yaml b/tests/datasets-memcap-01/test.yaml
@@ -2,6 +2,8 @@ pcap: ../flowbit-oring/input.pcap
 
 requires:
   lt-version: 8
+  os: linux
+  arch: x86_64
 
 args:
  - -k none

diff --git a/tests/decode-erspan-typeI-03/README.md b/tests/decode-erspan-typeI-03/README.md
diff --git a/tests/decode-erspan-typeI-03/test.yaml b/tests/decode-erspan-typeI-03/test.yaml
diff --git a/tests/dhcp-eve-extended-pre-6/suricata.yaml b/tests/dhcp-eve-extended-pre-6/suricata.yaml
diff --git a/tests/dhcp-eve-extended-pre-6/test.yaml b/tests/dhcp-eve-extended-pre-6/test.yaml
diff --git a/tests/dns-json-log/expected/dns.json b/tests/dns-json-log/expected/dns.json
diff --git a/tests/dns-json-log/suricata.yaml b/tests/dns-json-log/suricata.yaml
diff --git a/tests/dns-json-log/test.yaml b/tests/dns-json-log/test.yaml
diff --git a/tests/filestore-v1-stream-depth/suricata.yaml b/tests/filestore-v1-stream-depth/suricata.yaml
diff --git a/tests/filestore-v1-stream-depth/test.rules b/tests/filestore-v1-stream-depth/test.rules
diff --git a/tests/filestore-v1-stream-depth/test.yaml b/tests/filestore-v1-stream-depth/test.yaml
diff --git a/tests/ikev2-weak-dh/test.yaml b/tests/ikev2-weak-dh/test.yaml
@@ -16,40 +16,6 @@ checks:
         alert.signature_id: 1
         alert.signature: "SURICATA IKEv2 weak cryptographic parameters (Diffie-Hellman)"
 
-  - filter:
-      count: 1
-      version: 4
-      match:
-        event_type: ikev2
-        ikev2.version_major: 2
-        ikev2.exchange_type: 34
-        ikev2.message_id: 0
-        ikev2.init_spi: "61d3693ce12af528"
-        ikev2.resp_spi: "0000000000000000"
-        ikev2.role: initiator
-        ikev2.errors: 0
-        ikev2.payload[0]: Nonce
-        ikev2.payload[1]: KeyExchange
-        ikev2.payload[2]: SecurityAssociation
-        ikev2.payload[3]: NoNextPayload
-
-  - filter:
-      count: 1
-      version: 5
-      match:
-        event_type: ikev2
-        ikev2.version_major: 2
-        ikev2.exchange_type: 34
-        ikev2.message_id: 0
-        ikev2.init_spi: "61d3693ce12af528"
-        ikev2.resp_spi: "0000000000000000"
-        ikev2.role: initiator
-        ikev2.errors: 0
-        ikev2.payload[0]: Nonce
-        ikev2.payload[1]: KeyExchange
-        ikev2.payload[2]: SecurityAssociation
-        ikev2.payload[3]: NoNextPayload
-
   # from suricata version >=7 the event_type for ikev2 is ike
   - filter:
       count: 1

diff --git a/tests/mqtt-connect-rules/test.yaml b/tests/mqtt-connect-rules/test.yaml
@@ -1,6 +1,5 @@
 requires:
-  files:
-    - src/detect-mqtt-connect-protocol-string.c
+  min-version: 8
 
 args:
   - -k none

diff --git a/tests/nfs3-01-pre-6/test.rules b/tests/nfs3-01-pre-6/test.rules