[meta-security][PATCH 0/8] Assorted updates 12/22

All of lore.kernel.org
 help / color / mirror / Atom feed

* [meta-security][PATCH 0/8] Assorted updates 12/22
@ 2025-12-22 16:51 Scott Murray
  2025-12-22 16:51 ` [meta-security][PATCH 1/8] suricata: update to 7.0.13 Scott Murray
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: Scott Murray @ 2025-12-22 16:51 UTC (permalink / raw)
  To: yocto-patches; +Cc: Marta Rybczynska

This patch series rolls up the contributed patches from the past few weeks,
a bump of suricata to 7.0.13 that I worked up, and after a bit of rework
to get it passing CI the contributed update of clamav to 1.4.3.  Note that
I had to disable building clamav on all 32-bit platforms due to what appears
to be an upstream limitation/bug.  If you need it on a 32-bit platform,
I'm open to carrying a patch, but a fix would ideally come via working with
upstream.

These changes are queued on the master-next branch if you would like to
check them out to test yourself.  I intend to merge these to master branch
at end of day tomorrow (Eastern Time, Dec. 23rd) unless there are objections.
I also plan to create the whinlatter branch at the same time to get that
going.  For scarthgap branch, I plan to look into backports of newer suricata
and clamav in the next week, but we'll have to see how that goes with older
Rust.

Scott


Changes:

Clayton Casciato (1):
  suricata: drop deprecated nss, nspr PACKAGECONFIGs

Hemant Jadhav (1):
  clamav: Add recipe for version 1.4.3

Scott Murray (2):
  suricata: update to 7.0.13
  scap-security-guide: update branch

Yi Zhao (3):
  libmhash: add UPSTREAM_CHECK_URI
  sssd: inherit github-releases class
  scap-security-guide: add UPSTREAM_CHECK_GITTAGREGEX

hongxu (1):
  openscap: switch to libpcre2

 .../recipes-security/sssd/sssd_2.10.2.bb      |    4 +-
 recipes-compliance/openscap/openscap_1.4.2.bb |    4 +-
 .../scap-security-guide_0.1.78.bb             |    3 +-
 .../packagegroup-core-security.bb             |    6 +-
 recipes-ids/suricata/suricata-crates.inc      | 1437 +++++++++--------
 ...{suricata_7.0.12.bb => suricata_7.0.13.bb} |    6 +-
 recipes-scanners/clamav/clamav-crates.inc     |  286 ++++
 recipes-scanners/clamav/clamav-git-crates.inc |    9 +
 recipes-scanners/clamav/clamav_0.104.4.bb     |  156 --
 recipes-scanners/clamav/clamav_1.4.3.bb       |  236 +++
 .../clamav/files/headers_fixup.patch          |   58 -
 .../clamav/files/oe_cmake_fixup.patch         |   39 -
 recipes-scanners/clamav/files/tmpfiles.clamav |    1 +
 .../clamav/files/volatiles.03_clamav          |    1 +
 recipes-security/libmhash/libmhash_0.9.9.9.bb |    2 +
 15 files changed, 1279 insertions(+), 969 deletions(-)
 rename recipes-ids/suricata/{suricata_7.0.12.bb => suricata_7.0.13.bb} (94%)
 create mode 100644 recipes-scanners/clamav/clamav-crates.inc
 create mode 100644 recipes-scanners/clamav/clamav-git-crates.inc
 delete mode 100644 recipes-scanners/clamav/clamav_0.104.4.bb
 create mode 100644 recipes-scanners/clamav/clamav_1.4.3.bb
 delete mode 100644 recipes-scanners/clamav/files/headers_fixup.patch
 delete mode 100644 recipes-scanners/clamav/files/oe_cmake_fixup.patch

-- 
2.51.0



^ permalink raw reply	[flat|nested] 9+ messages in thread

* [meta-security][PATCH 1/8] suricata: update to 7.0.13
  2025-12-22 16:51 [meta-security][PATCH 0/8] Assorted updates 12/22 Scott Murray
@ 2025-12-22 16:51 ` Scott Murray
  2025-12-22 16:51 ` [meta-security][PATCH 2/8] clamav: Add recipe for version 1.4.3 Scott Murray
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: Scott Murray @ 2025-12-22 16:51 UTC (permalink / raw)
  To: yocto-patches; +Cc: Marta Rybczynska

Release notes:
https://suricata.io/2025/11/06/suricata-8-0-2-and-7-0-13-released/

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
 recipes-ids/suricata/suricata-crates.inc      | 1437 +++++++++--------
 ...{suricata_7.0.12.bb => suricata_7.0.13.bb} |    2 +-
 2 files changed, 734 insertions(+), 705 deletions(-)
 rename recipes-ids/suricata/{suricata_7.0.12.bb => suricata_7.0.13.bb} (98%)

diff --git a/recipes-ids/suricata/suricata-crates.inc b/recipes-ids/suricata/suricata-crates.inc
index 0755302..9c65acf 100644
--- a/recipes-ids/suricata/suricata-crates.inc
+++ b/recipes-ids/suricata/suricata-crates.inc
@@ -1,547 +1,125 @@
 # Autogenerated with 'bitbake -c update_crates suricata'
 
 # from rust/Cargo.lock
-SRC_URI += "crate://crates.io/adler/1.0.2 \
-           crate://crates.io/aead/0.4.3 \
-           crate://crates.io/aes/0.7.5 \
-           crate://crates.io/aes-gcm/0.9.4 \
-           crate://crates.io/aho-corasick/0.7.20 \
-           crate://crates.io/alloc-no-stdlib/2.0.4 \
-           crate://crates.io/alloc-stdlib/0.2.2 \
-           crate://crates.io/asn1-rs/0.5.2 \
-           crate://crates.io/asn1-rs-derive/0.4.0 \
-           crate://crates.io/asn1-rs-impl/0.1.0 \
-           crate://crates.io/autocfg/1.1.0 \
-           crate://crates.io/base64/0.13.1 \
-           crate://crates.io/bendy/0.3.3 \
-           crate://crates.io/bitflags/1.2.1 \
-           crate://crates.io/block-buffer/0.10.4 \
-           crate://crates.io/brotli/8.0.1 \
-           crate://crates.io/brotli-decompressor/5.0.0 \
-           crate://crates.io/build_const/0.2.2 \
-           crate://crates.io/byteorder/1.4.3 \
-           crate://crates.io/cfg-if/1.0.0 \
-           crate://crates.io/cipher/0.3.0 \
-           crate://crates.io/cpufeatures/0.2.11 \
-           crate://crates.io/crc/1.8.1 \
-           crate://crates.io/crc32fast/1.3.2 \
-           crate://crates.io/crypto-common/0.1.6 \
-           crate://crates.io/ctr/0.8.0 \
-           crate://crates.io/data-encoding/2.4.0 \
-           crate://crates.io/der-oid-macro/0.5.0 \
-           crate://crates.io/der-parser/6.0.1 \
-           crate://crates.io/der-parser/8.2.0 \
-           crate://crates.io/digest/0.10.7 \
-           crate://crates.io/displaydoc/0.2.4 \
-           crate://crates.io/enum_primitive/0.1.1 \
-           crate://crates.io/failure/0.1.8 \
-           crate://crates.io/failure_derive/0.1.8 \
-           crate://crates.io/flate2/1.0.28 \
-           crate://crates.io/generic-array/0.14.7 \
-           crate://crates.io/getrandom/0.2.11 \
-           crate://crates.io/ghash/0.4.4 \
-           crate://crates.io/hex/0.4.3 \
-           crate://crates.io/hkdf/0.12.3 \
-           crate://crates.io/hmac/0.12.1 \
-           crate://crates.io/ipsec-parser/0.7.0 \
-           crate://crates.io/itoa/1.0.9 \
-           crate://crates.io/kerberos-parser/0.7.1 \
-           crate://crates.io/lazy_static/1.4.0 \
-           crate://crates.io/libc/0.2.150 \
-           crate://crates.io/lzma-rs/0.2.0 \
-           crate://crates.io/md-5/0.10.6 \
-           crate://crates.io/memchr/2.4.1 \
-           crate://crates.io/minimal-lexical/0.2.1 \
-           crate://crates.io/miniz_oxide/0.7.1 \
-           crate://crates.io/nom/7.1.3 \
-           crate://crates.io/nom-derive/0.10.1 \
-           crate://crates.io/nom-derive-impl/0.10.1 \
-           crate://crates.io/ntp-parser/0.6.0 \
-           crate://crates.io/num/0.2.1 \
-           crate://crates.io/num-bigint/0.2.6 \
-           crate://crates.io/num-bigint/0.4.4 \
-           crate://crates.io/num-complex/0.2.4 \
-           crate://crates.io/num-derive/0.4.2 \
-           crate://crates.io/num-integer/0.1.45 \
-           crate://crates.io/num-iter/0.1.43 \
-           crate://crates.io/num-rational/0.2.4 \
-           crate://crates.io/num-traits/0.1.43 \
-           crate://crates.io/num-traits/0.2.17 \
-           crate://crates.io/num_enum/0.5.11 \
-           crate://crates.io/num_enum_derive/0.5.11 \
-           crate://crates.io/num_threads/0.1.6 \
-           crate://crates.io/oid-registry/0.6.1 \
-           crate://crates.io/opaque-debug/0.3.0 \
-           crate://crates.io/phf/0.10.1 \
-           crate://crates.io/phf_codegen/0.10.0 \
-           crate://crates.io/phf_generator/0.10.0 \
-           crate://crates.io/phf_shared/0.10.0 \
-           crate://crates.io/polyval/0.5.3 \
-           crate://crates.io/ppv-lite86/0.2.17 \
-           crate://crates.io/proc-macro-crate/1.1.0 \
-           crate://crates.io/proc-macro2/1.0.69 \
-           crate://crates.io/quote/1.0.33 \
-           crate://crates.io/rand/0.8.5 \
-           crate://crates.io/rand_chacha/0.3.1 \
-           crate://crates.io/rand_core/0.6.4 \
-           crate://crates.io/regex/1.5.6 \
-           crate://crates.io/regex-syntax/0.6.29 \
-           crate://crates.io/rusticata-macros/4.1.0 \
-           crate://crates.io/rustversion/1.0.14 \
-           crate://crates.io/sawp/0.12.1 \
-           crate://crates.io/sawp-flags/0.12.1 \
-           crate://crates.io/sawp-flags-derive/0.12.1 \
-           crate://crates.io/sawp-modbus/0.12.1 \
-           crate://crates.io/serde/1.0.192 \
-           crate://crates.io/serde_derive/1.0.192 \
-           crate://crates.io/sha1/0.10.6 \
-           crate://crates.io/sha2/0.10.8 \
-           crate://crates.io/siphasher/0.3.11 \
-           crate://crates.io/snmp-parser/0.9.0 \
-           crate://crates.io/subtle/2.4.1 \
-           crate://crates.io/syn/1.0.109 \
-           crate://crates.io/syn/2.0.39 \
-           crate://crates.io/synstructure/0.12.6 \
-           crate://crates.io/test-case/1.1.0 \
-           crate://crates.io/thiserror/1.0.50 \
-           crate://crates.io/thiserror-impl/1.0.50 \
-           crate://crates.io/time/0.3.13 \
-           crate://crates.io/time-macros/0.2.4 \
-           crate://crates.io/tls-parser/0.11.0 \
-           crate://crates.io/toml/0.5.11 \
-           crate://crates.io/typenum/1.17.0 \
-           crate://crates.io/unicode-ident/1.0.12 \
-           crate://crates.io/unicode-xid/0.2.4 \
-           crate://crates.io/universal-hash/0.4.1 \
-           crate://crates.io/uuid/0.8.2 \
-           crate://crates.io/version_check/0.9.4 \
-           crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \
-           crate://crates.io/widestring/0.4.3 \
-           crate://crates.io/x509-parser/0.15.1 \
-           crate://crates.io/ansi_term/0.12.1 \
-           crate://crates.io/atty/0.2.14 \
-           crate://crates.io/autocfg/0.1.8 \
-           crate://crates.io/autocfg/1.1.0 \
-           crate://crates.io/bitflags/1.3.2 \
-           crate://crates.io/bstr/0.2.17 \
-           crate://crates.io/bumpalo/3.11.1 \
-           crate://crates.io/cast/0.2.7 \
-           crate://crates.io/cast/0.3.0 \
-           crate://crates.io/cfg-if/1.0.0 \
-           crate://crates.io/clap/2.34.0 \
-           crate://crates.io/cloudabi/0.0.3 \
-           crate://crates.io/criterion/0.3.2 \
-           crate://crates.io/criterion-plot/0.4.5 \
-           crate://crates.io/crossbeam-channel/0.5.6 \
-           crate://crates.io/crossbeam-deque/0.8.2 \
-           crate://crates.io/crossbeam-epoch/0.9.11 \
-           crate://crates.io/crossbeam-utils/0.8.12 \
-           crate://crates.io/csv/1.1.6 \
-           crate://crates.io/csv-core/0.1.10 \
-           crate://crates.io/either/1.8.0 \
-           crate://crates.io/fuchsia-cprng/0.1.1 \
-           crate://crates.io/heck/0.3.3 \
-           crate://crates.io/hermit-abi/0.1.19 \
-           crate://crates.io/itertools/0.9.0 \
-           crate://crates.io/itertools/0.10.5 \
-           crate://crates.io/itoa/0.4.8 \
-           crate://crates.io/itoa/1.0.4 \
-           crate://crates.io/js-sys/0.3.60 \
-           crate://crates.io/lazy_static/1.4.0 \
-           crate://crates.io/libc/0.2.135 \
-           crate://crates.io/log/0.4.17 \
-           crate://crates.io/memchr/2.5.0 \
-           crate://crates.io/memoffset/0.6.5 \
-           crate://crates.io/num-traits/0.2.15 \
-           crate://crates.io/num_cpus/1.13.1 \
-           crate://crates.io/once_cell/1.15.0 \
-           crate://crates.io/oorandom/11.1.3 \
-           crate://crates.io/plotters/0.2.15 \
-           crate://crates.io/proc-macro-error/1.0.4 \
-           crate://crates.io/proc-macro-error-attr/1.0.4 \
-           crate://crates.io/proc-macro2/1.0.47 \
-           crate://crates.io/quote/1.0.21 \
-           crate://crates.io/rand/0.6.5 \
-           crate://crates.io/rand_chacha/0.1.1 \
-           crate://crates.io/rand_core/0.3.1 \
-           crate://crates.io/rand_core/0.4.2 \
-           crate://crates.io/rand_hc/0.1.0 \
-           crate://crates.io/rand_isaac/0.1.1 \
-           crate://crates.io/rand_jitter/0.1.4 \
-           crate://crates.io/rand_os/0.1.3 \
-           crate://crates.io/rand_pcg/0.1.2 \
-           crate://crates.io/rand_xorshift/0.1.1 \
-           crate://crates.io/rayon/1.5.3 \
-           crate://crates.io/rayon-core/1.9.3 \
-           crate://crates.io/rdrand/0.4.0 \
-           crate://crates.io/regex/1.6.0 \
-           crate://crates.io/regex-automata/0.1.10 \
-           crate://crates.io/regex-syntax/0.6.27 \
-           crate://crates.io/rustc_version/0.4.0 \
-           crate://crates.io/ryu/1.0.11 \
-           crate://crates.io/same-file/1.0.6 \
-           crate://crates.io/scopeguard/1.1.0 \
-           crate://crates.io/semver/1.0.14 \
-           crate://crates.io/serde/1.0.146 \
-           crate://crates.io/serde_derive/1.0.146 \
-           crate://crates.io/serde_json/1.0.87 \
-           crate://crates.io/strsim/0.8.0 \
-           crate://crates.io/structopt/0.3.26 \
-           crate://crates.io/structopt-derive/0.4.18 \
-           crate://crates.io/syn/1.0.103 \
-           crate://crates.io/textwrap/0.11.0 \
-           crate://crates.io/tinytemplate/1.2.1 \
-           crate://crates.io/unicode-ident/1.0.5 \
-           crate://crates.io/unicode-segmentation/1.10.0 \
-           crate://crates.io/unicode-width/0.1.10 \
-           crate://crates.io/vec_map/0.8.2 \
-           crate://crates.io/version_check/0.9.4 \
-           crate://crates.io/walkdir/2.3.2 \
-           crate://crates.io/wasm-bindgen/0.2.83 \
-           crate://crates.io/wasm-bindgen-backend/0.2.83 \
-           crate://crates.io/wasm-bindgen-macro/0.2.83 \
-           crate://crates.io/wasm-bindgen-macro-support/0.2.83 \
-           crate://crates.io/wasm-bindgen-shared/0.2.83 \
-           crate://crates.io/web-sys/0.3.60 \
-           crate://crates.io/winapi/0.3.9 \
-           crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
-           crate://crates.io/winapi-util/0.1.5 \
-           crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
-           crate://crates.io/backtrace/0.3.46 \
-           crate://crates.io/backtrace-sys/0.1.37 \
-           crate://crates.io/cc/1.0.52 \
-           crate://crates.io/cfg-if/0.1.10 \
-           crate://crates.io/failure_derive/0.1.7 \
-           crate://crates.io/libc/0.2.69 \
-           crate://crates.io/proc-macro2/1.0.12 \
-           crate://crates.io/quote/1.0.4 \
-           crate://crates.io/rustc-demangle/0.1.16 \
-           crate://crates.io/syn/1.0.18 \
-           crate://crates.io/synstructure/0.12.3 \
-           crate://crates.io/unicode-xid/0.2.0 \
-           crate://crates.io/autocfg/1.1.0 \
-           crate://crates.io/hashbrown/0.12.3 \
-           crate://crates.io/indexmap/1.9.2 \
-           crate://crates.io/itoa/1.0.5 \
-           crate://crates.io/proc-macro2/1.0.50 \
-           crate://crates.io/quote/1.0.23 \
-           crate://crates.io/ryu/1.0.12 \
-           crate://crates.io/serde/1.0.152 \
-           crate://crates.io/serde_derive/1.0.152 \
-           crate://crates.io/serde_json/1.0.91 \
-           crate://crates.io/syn/1.0.107 \
-           crate://crates.io/unicode-ident/1.0.6 \
-           crate://crates.io/autocfg/1.0.1 \
-           crate://crates.io/bit-set/0.5.2 \
-           crate://crates.io/bit-vec/0.6.3 \
-           crate://crates.io/bitflags/1.3.2 \
-           crate://crates.io/byteorder/1.4.3 \
-           crate://crates.io/cfg-if/1.0.0 \
-           crate://crates.io/doc-comment/0.3.3 \
-           crate://crates.io/fnv/1.0.7 \
-           crate://crates.io/getrandom/0.2.3 \
-           crate://crates.io/lazy_static/1.4.0 \
-           crate://crates.io/libc/0.2.106 \
-           crate://crates.io/memchr/2.4.1 \
-           crate://crates.io/minimal-lexical/0.2.1 \
-           crate://crates.io/num-traits/0.2.14 \
-           crate://crates.io/ppv-lite86/0.2.15 \
-           crate://crates.io/proptest/1.0.0 \
-           crate://crates.io/quick-error/1.2.3 \
-           crate://crates.io/quick-error/2.0.1 \
-           crate://crates.io/rand/0.8.4 \
-           crate://crates.io/rand_chacha/0.3.1 \
-           crate://crates.io/rand_core/0.6.3 \
-           crate://crates.io/rand_hc/0.3.1 \
-           crate://crates.io/rand_xorshift/0.3.0 \
-           crate://crates.io/redox_syscall/0.2.10 \
-           crate://crates.io/regex-syntax/0.6.25 \
-           crate://crates.io/remove_dir_all/0.5.3 \
-           crate://crates.io/rusty-fork/0.3.0 \
-           crate://crates.io/tempfile/3.2.0 \
-           crate://crates.io/wait-timeout/0.2.0 \
-           crate://crates.io/wasi/0.10.2+wasi-snapshot-preview1 \
-           crate://crates.io/winapi/0.3.9 \
-           crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
-           crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
-           crate://crates.io/alloc-no-stdlib/2.0.4 \
-           crate://crates.io/alloc-stdlib/0.2.2 \
-           crate://crates.io/ansi_term/0.11.0 \
-           crate://crates.io/basic-toml/0.1.2 \
-           crate://crates.io/ctor/0.1.26 \
-           crate://crates.io/difference/2.0.0 \
-           crate://crates.io/glob/0.3.1 \
-           crate://crates.io/itoa/1.0.6 \
-           crate://crates.io/libc/0.2.142 \
-           crate://crates.io/once_cell/1.17.1 \
-           crate://crates.io/output_vt100/0.1.3 \
-           crate://crates.io/pretty_assertions/0.6.1 \
-           crate://crates.io/proc-macro2/1.0.56 \
-           crate://crates.io/quote/1.0.26 \
-           crate://crates.io/rustversion/1.0.12 \
-           crate://crates.io/ryu/1.0.13 \
-           crate://crates.io/serde/1.0.160 \
-           crate://crates.io/serde_derive/1.0.160 \
-           crate://crates.io/serde_json/1.0.96 \
-           crate://crates.io/static_assertions/1.1.0 \
-           crate://crates.io/syn/1.0.109 \
-           crate://crates.io/syn/2.0.15 \
-           crate://crates.io/termcolor/1.2.0 \
-           crate://crates.io/thiserror/1.0.40 \
-           crate://crates.io/thiserror-impl/1.0.40 \
-           crate://crates.io/trybuild/1.0.80 \
-           crate://crates.io/unicode-ident/1.0.8 \
-           crate://crates.io/winapi/0.3.9 \
-           crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
-           crate://crates.io/winapi-util/0.1.5 \
-           crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
-           crate://crates.io/asn1-rs/0.5.1 \
-           crate://crates.io/asn1-rs-derive/0.4.0 \
-           crate://crates.io/asn1-rs-impl/0.1.0 \
-           crate://crates.io/atty/0.2.14 \
-           crate://crates.io/autocfg/1.1.0 \
-           crate://crates.io/base64/0.13.1 \
-           crate://crates.io/basic-toml/0.1.2 \
-           crate://crates.io/bitvec/1.0.1 \
-           crate://crates.io/colored/2.0.0 \
-           crate://crates.io/cookie-factory/0.3.2 \
-           crate://crates.io/displaydoc/0.2.3 \
-           crate://crates.io/funty/2.0.0 \
-           crate://crates.io/glob/0.3.1 \
-           crate://crates.io/hermit-abi/0.1.19 \
-           crate://crates.io/hex-literal/0.3.4 \
-           crate://crates.io/itoa/1.0.6 \
-           crate://crates.io/lazy_static/1.4.0 \
-           crate://crates.io/libc/0.2.139 \
-           crate://crates.io/memchr/2.5.0 \
-           crate://crates.io/minimal-lexical/0.2.1 \
-           crate://crates.io/nom/7.1.3 \
-           crate://crates.io/num-bigint/0.4.3 \
-           crate://crates.io/num-integer/0.1.45 \
-           crate://crates.io/num-traits/0.2.15 \
-           crate://crates.io/oid-registry/0.6.1 \
-           crate://crates.io/once_cell/1.17.1 \
-           crate://crates.io/pem/1.1.1 \
-           crate://crates.io/proc-macro2/1.0.51 \
-           crate://crates.io/quote/1.0.23 \
-           crate://crates.io/radium/0.7.0 \
-           crate://crates.io/rusticata-macros/4.1.0 \
-           crate://crates.io/ryu/1.0.13 \
-           crate://crates.io/serde/1.0.152 \
-           crate://crates.io/serde_derive/1.0.152 \
-           crate://crates.io/serde_json/1.0.94 \
-           crate://crates.io/syn/1.0.109 \
-           crate://crates.io/synstructure/0.12.6 \
-           crate://crates.io/tap/1.0.1 \
-           crate://crates.io/termcolor/1.2.0 \
-           crate://crates.io/thiserror/1.0.39 \
-           crate://crates.io/thiserror-impl/1.0.39 \
-           crate://crates.io/time/0.3.20 \
-           crate://crates.io/time-core/0.1.0 \
-           crate://crates.io/time-macros/0.2.8 \
-           crate://crates.io/trybuild/1.0.79 \
-           crate://crates.io/unicode-ident/1.0.8 \
-           crate://crates.io/unicode-xid/0.2.4 \
-           crate://crates.io/winapi/0.3.9 \
-           crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
-           crate://crates.io/winapi-util/0.1.5 \
-           crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
-           crate://crates.io/wyz/0.5.1 \
-           crate://crates.io/alloc-no-stdlib/2.0.4 \
-           crate://crates.io/alloc-stdlib/0.2.2 \
-           crate://crates.io/block-buffer/0.10.4 \
-           crate://crates.io/brotli-decompressor/5.0.0 \
-           crate://crates.io/cfg-if/1.0.0 \
-           crate://crates.io/cpufeatures/0.2.17 \
-           crate://crates.io/crypto-common/0.1.6 \
-           crate://crates.io/digest/0.10.7 \
-           crate://crates.io/generic-array/0.14.7 \
-           crate://crates.io/libc/0.2.172 \
-           crate://crates.io/sha2/0.10.9 \
-           crate://crates.io/typenum/1.18.0 \
-           crate://crates.io/version_check/0.9.5 \
-           crate://crates.io/atty/0.2.14 \
-           crate://crates.io/autocfg/1.0.1 \
-           crate://crates.io/bitflags/1.2.1 \
-           crate://crates.io/bstr/0.2.16 \
-           crate://crates.io/bumpalo/3.7.0 \
-           crate://crates.io/cast/0.2.7 \
-           crate://crates.io/cfg-if/1.0.0 \
-           crate://crates.io/clap/2.33.3 \
-           crate://crates.io/criterion/0.3.4 \
-           crate://crates.io/criterion-plot/0.4.4 \
-           crate://crates.io/crossbeam-channel/0.5.1 \
-           crate://crates.io/crossbeam-deque/0.8.1 \
-           crate://crates.io/crossbeam-epoch/0.9.5 \
-           crate://crates.io/crossbeam-utils/0.8.5 \
-           crate://crates.io/csv/1.1.6 \
-           crate://crates.io/csv-core/0.1.10 \
-           crate://crates.io/either/1.6.1 \
-           crate://crates.io/getrandom/0.2.3 \
-           crate://crates.io/half/1.7.1 \
-           crate://crates.io/hermit-abi/0.1.19 \
-           crate://crates.io/itertools/0.10.1 \
-           crate://crates.io/itoa/0.4.7 \
-           crate://crates.io/js-sys/0.3.52 \
-           crate://crates.io/lazy_static/1.4.0 \
-           crate://crates.io/libc/0.2.99 \
-           crate://crates.io/log/0.4.14 \
-           crate://crates.io/memchr/2.4.0 \
-           crate://crates.io/memoffset/0.6.4 \
-           crate://crates.io/num-traits/0.2.14 \
-           crate://crates.io/num_cpus/1.13.0 \
-           crate://crates.io/oorandom/11.1.3 \
-           crate://crates.io/phf_shared/0.10.0 \
-           crate://crates.io/plotters/0.3.1 \
-           crate://crates.io/plotters-backend/0.3.2 \
-           crate://crates.io/plotters-svg/0.3.1 \
-           crate://crates.io/ppv-lite86/0.2.10 \
-           crate://crates.io/proc-macro2/1.0.28 \
-           crate://crates.io/quote/1.0.9 \
-           crate://crates.io/rand/0.8.4 \
-           crate://crates.io/rand_chacha/0.3.1 \
-           crate://crates.io/rand_core/0.6.3 \
-           crate://crates.io/rand_hc/0.3.1 \
-           crate://crates.io/rayon/1.5.1 \
-           crate://crates.io/rayon-core/1.9.1 \
-           crate://crates.io/regex/1.5.4 \
-           crate://crates.io/regex-automata/0.1.10 \
-           crate://crates.io/regex-syntax/0.6.25 \
-           crate://crates.io/rustc_version/0.4.0 \
-           crate://crates.io/ryu/1.0.5 \
-           crate://crates.io/same-file/1.0.6 \
-           crate://crates.io/scopeguard/1.1.0 \
-           crate://crates.io/semver/1.0.4 \
-           crate://crates.io/serde/1.0.127 \
-           crate://crates.io/serde_cbor/0.11.1 \
-           crate://crates.io/serde_derive/1.0.127 \
-           crate://crates.io/serde_json/1.0.66 \
-           crate://crates.io/siphasher/0.3.6 \
-           crate://crates.io/syn/1.0.74 \
-           crate://crates.io/textwrap/0.11.0 \
-           crate://crates.io/tinytemplate/1.2.1 \
-           crate://crates.io/unicode-width/0.1.8 \
-           crate://crates.io/unicode-xid/0.2.2 \
-           crate://crates.io/walkdir/2.3.2 \
-           crate://crates.io/wasi/0.10.2+wasi-snapshot-preview1 \
-           crate://crates.io/wasm-bindgen/0.2.75 \
-           crate://crates.io/wasm-bindgen-backend/0.2.75 \
-           crate://crates.io/wasm-bindgen-macro/0.2.75 \
-           crate://crates.io/wasm-bindgen-macro-support/0.2.75 \
-           crate://crates.io/wasm-bindgen-shared/0.2.75 \
-           crate://crates.io/web-sys/0.3.52 \
-           crate://crates.io/winapi/0.3.9 \
-           crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
-           crate://crates.io/winapi-util/0.1.5 \
-           crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
-           crate://crates.io/alloc-no-stdlib/2.0.4 \
-           crate://crates.io/asn1-rs/0.5.2 \
-           crate://crates.io/asn1-rs-derive/0.4.0 \
-           crate://crates.io/asn1-rs-impl/0.1.0 \
-           crate://crates.io/autocfg/1.1.0 \
-           crate://crates.io/bumpalo/3.13.0 \
-           crate://crates.io/cc/1.0.81 \
-           crate://crates.io/cfg-if/1.0.0 \
-           crate://crates.io/data-encoding/2.4.0 \
-           crate://crates.io/der-parser/8.2.0 \
-           crate://crates.io/deranged/0.3.7 \
-           crate://crates.io/displaydoc/0.2.4 \
-           crate://crates.io/itoa/1.0.9 \
-           crate://crates.io/js-sys/0.3.64 \
-           crate://crates.io/lazy_static/1.4.0 \
-           crate://crates.io/libc/0.2.147 \
-           crate://crates.io/log/0.4.19 \
-           crate://crates.io/memchr/2.5.0 \
-           crate://crates.io/minimal-lexical/0.2.1 \
-           crate://crates.io/nom/7.1.3 \
-           crate://crates.io/num-bigint/0.4.3 \
-           crate://crates.io/num-integer/0.1.45 \
-           crate://crates.io/num-traits/0.2.16 \
-           crate://crates.io/oid-registry/0.6.1 \
-           crate://crates.io/once_cell/1.18.0 \
-           crate://crates.io/proc-macro2/1.0.66 \
-           crate://crates.io/quote/1.0.32 \
-           crate://crates.io/ring/0.16.20 \
-           crate://crates.io/rusticata-macros/4.1.0 \
-           crate://crates.io/serde/1.0.180 \
-           crate://crates.io/spin/0.5.2 \
-           crate://crates.io/syn/1.0.109 \
-           crate://crates.io/syn/2.0.28 \
-           crate://crates.io/synstructure/0.12.6 \
-           crate://crates.io/thiserror/1.0.44 \
-           crate://crates.io/thiserror-impl/1.0.44 \
-           crate://crates.io/time/0.3.25 \
-           crate://crates.io/time-core/0.1.1 \
-           crate://crates.io/time-macros/0.2.11 \
-           crate://crates.io/unicode-ident/1.0.11 \
-           crate://crates.io/unicode-xid/0.2.4 \
-           crate://crates.io/untrusted/0.7.1 \
-           crate://crates.io/wasm-bindgen/0.2.87 \
-           crate://crates.io/wasm-bindgen-backend/0.2.87 \
-           crate://crates.io/wasm-bindgen-macro/0.2.87 \
-           crate://crates.io/wasm-bindgen-macro-support/0.2.87 \
-           crate://crates.io/wasm-bindgen-shared/0.2.87 \
-           crate://crates.io/web-sys/0.3.64 \
-           crate://crates.io/winapi/0.3.9 \
-           crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
-           crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
-           crate://crates.io/aho-corasick/0.7.18 \
-           crate://crates.io/cfg-if/1.0.0 \
-           crate://crates.io/getrandom/0.2.6 \
-           crate://crates.io/lazy_static/1.4.0 \
-           crate://crates.io/libc/0.2.125 \
-           crate://crates.io/memchr/2.5.0 \
-           crate://crates.io/quickcheck/1.0.3 \
-           crate://crates.io/rand/0.8.5 \
-           crate://crates.io/rand_core/0.6.3 \
-           crate://crates.io/regex-syntax/0.6.26 \
-           crate://crates.io/wasi/0.10.2+wasi-snapshot-preview1 \
-           crate://crates.io/addr2line/0.14.0 \
-           crate://crates.io/adler/0.2.3 \
-           crate://crates.io/aho-corasick/0.7.15 \
-           crate://crates.io/autocfg/1.0.1 \
-           crate://crates.io/backtrace/0.3.54 \
-           crate://crates.io/cfg-if/1.0.0 \
-           crate://crates.io/failure/0.1.8 \
-           crate://crates.io/failure_derive/0.1.8 \
-           crate://crates.io/gimli/0.23.0 \
-           crate://crates.io/lazy_static/1.4.0 \
-           crate://crates.io/libc/0.2.80 \
-           crate://crates.io/memchr/2.3.4 \
-           crate://crates.io/miniz_oxide/0.4.3 \
-           crate://crates.io/object/0.22.0 \
-           crate://crates.io/proc-macro2/1.0.24 \
-           crate://crates.io/quote/1.0.7 \
-           crate://crates.io/regex/1.4.2 \
-           crate://crates.io/regex-syntax/0.6.21 \
-           crate://crates.io/rustc-demangle/0.1.18 \
-           crate://crates.io/serde/1.0.117 \
-           crate://crates.io/serde_bytes/0.11.5 \
-           crate://crates.io/serde_derive/1.0.117 \
-           crate://crates.io/syn/1.0.48 \
-           crate://crates.io/synstructure/0.12.4 \
-           crate://crates.io/thread_local/1.0.1 \
-           crate://crates.io/unicode-xid/0.2.1 \
-           crate://crates.io/adler/1.0.2 \
-           crate://crates.io/cc/1.0.79 \
-           crate://crates.io/cfg-if/1.0.0 \
-           crate://crates.io/cloudflare-zlib-sys/0.3.0 \
-           crate://crates.io/cmake/0.1.50 \
-           crate://crates.io/crc32fast/1.3.2 \
-           crate://crates.io/getrandom/0.2.9 \
-           crate://crates.io/libc/0.2.144 \
-           crate://crates.io/libz-ng-sys/1.1.10 \
-           crate://crates.io/libz-sys/1.1.10 \
-           crate://crates.io/miniz_oxide/0.7.1 \
-           crate://crates.io/pkg-config/0.3.27 \
-           crate://crates.io/ppv-lite86/0.2.17 \
-           crate://crates.io/quickcheck/1.0.3 \
-           crate://crates.io/rand/0.8.5 \
-           crate://crates.io/rand_chacha/0.3.1 \
-           crate://crates.io/rand_core/0.6.4 \
-           crate://crates.io/vcpkg/0.2.15 \
-           crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \
-           "
+SRC_URI += " \
+    crate://crates.io/adler/1.0.2 \
+    crate://crates.io/aead/0.4.3 \
+    crate://crates.io/aes/0.7.5 \
+    crate://crates.io/aes-gcm/0.9.4 \
+    crate://crates.io/aho-corasick/0.7.20 \
+    crate://crates.io/alloc-no-stdlib/2.0.4 \
+    crate://crates.io/alloc-stdlib/0.2.2 \
+    crate://crates.io/asn1-rs/0.5.2 \
+    crate://crates.io/asn1-rs-derive/0.4.0 \
+    crate://crates.io/asn1-rs-impl/0.1.0 \
+    crate://crates.io/autocfg/1.1.0 \
+    crate://crates.io/base64/0.13.1 \
+    crate://crates.io/bendy/0.3.3 \
+    crate://crates.io/bitflags/1.2.1 \
+    crate://crates.io/block-buffer/0.10.4 \
+    crate://crates.io/brotli/8.0.1 \
+    crate://crates.io/brotli-decompressor/5.0.0 \
+    crate://crates.io/build_const/0.2.2 \
+    crate://crates.io/byteorder/1.4.3 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/cipher/0.3.0 \
+    crate://crates.io/cpufeatures/0.2.11 \
+    crate://crates.io/crc/1.8.1 \
+    crate://crates.io/crc32fast/1.3.2 \
+    crate://crates.io/crypto-common/0.1.6 \
+    crate://crates.io/ctr/0.8.0 \
+    crate://crates.io/data-encoding/2.4.0 \
+    crate://crates.io/der-oid-macro/0.5.0 \
+    crate://crates.io/der-parser/6.0.1 \
+    crate://crates.io/der-parser/8.2.0 \
+    crate://crates.io/digest/0.10.7 \
+    crate://crates.io/displaydoc/0.2.4 \
+    crate://crates.io/enum_primitive/0.1.1 \
+    crate://crates.io/failure/0.1.8 \
+    crate://crates.io/failure_derive/0.1.8 \
+    crate://crates.io/flate2/1.0.28 \
+    crate://crates.io/generic-array/0.14.7 \
+    crate://crates.io/getrandom/0.2.11 \
+    crate://crates.io/ghash/0.4.4 \
+    crate://crates.io/hex/0.4.3 \
+    crate://crates.io/hkdf/0.12.3 \
+    crate://crates.io/hmac/0.12.1 \
+    crate://crates.io/ipsec-parser/0.7.0 \
+    crate://crates.io/itoa/1.0.9 \
+    crate://crates.io/kerberos-parser/0.7.1 \
+    crate://crates.io/lazy_static/1.4.0 \
+    crate://crates.io/libc/0.2.150 \
+    crate://crates.io/lzma-rs/0.2.0 \
+    crate://crates.io/md-5/0.10.6 \
+    crate://crates.io/memchr/2.4.1 \
+    crate://crates.io/minimal-lexical/0.2.1 \
+    crate://crates.io/miniz_oxide/0.7.1 \
+    crate://crates.io/nom/7.1.3 \
+    crate://crates.io/nom-derive/0.10.1 \
+    crate://crates.io/nom-derive-impl/0.10.1 \
+    crate://crates.io/ntp-parser/0.6.0 \
+    crate://crates.io/num/0.2.1 \
+    crate://crates.io/num-bigint/0.2.6 \
+    crate://crates.io/num-bigint/0.4.4 \
+    crate://crates.io/num-complex/0.2.4 \
+    crate://crates.io/num-derive/0.4.2 \
+    crate://crates.io/num-integer/0.1.45 \
+    crate://crates.io/num-iter/0.1.43 \
+    crate://crates.io/num-rational/0.2.4 \
+    crate://crates.io/num-traits/0.1.43 \
+    crate://crates.io/num-traits/0.2.17 \
+    crate://crates.io/num_enum/0.5.11 \
+    crate://crates.io/num_enum_derive/0.5.11 \
+    crate://crates.io/num_threads/0.1.6 \
+    crate://crates.io/oid-registry/0.6.1 \
+    crate://crates.io/opaque-debug/0.3.0 \
+    crate://crates.io/phf/0.10.1 \
+    crate://crates.io/phf_codegen/0.10.0 \
+    crate://crates.io/phf_generator/0.10.0 \
+    crate://crates.io/phf_shared/0.10.0 \
+    crate://crates.io/polyval/0.5.3 \
+    crate://crates.io/ppv-lite86/0.2.17 \
+    crate://crates.io/proc-macro-crate/1.1.0 \
+    crate://crates.io/proc-macro2/1.0.69 \
+    crate://crates.io/quote/1.0.33 \
+    crate://crates.io/rand/0.8.5 \
+    crate://crates.io/rand_chacha/0.3.1 \
+    crate://crates.io/rand_core/0.6.4 \
+    crate://crates.io/regex/1.5.6 \
+    crate://crates.io/regex-syntax/0.6.29 \
+    crate://crates.io/rusticata-macros/4.1.0 \
+    crate://crates.io/rustversion/1.0.14 \
+    crate://crates.io/sawp/0.12.1 \
+    crate://crates.io/sawp-flags/0.12.1 \
+    crate://crates.io/sawp-flags-derive/0.12.1 \
+    crate://crates.io/sawp-modbus/0.12.1 \
+    crate://crates.io/serde/1.0.192 \
+    crate://crates.io/serde_derive/1.0.192 \
+    crate://crates.io/sha1/0.10.6 \
+    crate://crates.io/sha2/0.10.8 \
+    crate://crates.io/siphasher/0.3.11 \
+    crate://crates.io/snmp-parser/0.9.0 \
+    crate://crates.io/subtle/2.4.1 \
+    crate://crates.io/syn/1.0.109 \
+    crate://crates.io/syn/2.0.39 \
+    crate://crates.io/synstructure/0.12.6 \
+    crate://crates.io/test-case/1.1.0 \
+    crate://crates.io/thiserror/1.0.50 \
+    crate://crates.io/thiserror-impl/1.0.50 \
+    crate://crates.io/time/0.3.13 \
+    crate://crates.io/time-macros/0.2.4 \
+    crate://crates.io/tls-parser/0.11.0 \
+    crate://crates.io/toml/0.5.11 \
+    crate://crates.io/typenum/1.17.0 \
+    crate://crates.io/unicode-ident/1.0.12 \
+    crate://crates.io/unicode-xid/0.2.4 \
+    crate://crates.io/universal-hash/0.4.1 \
+    crate://crates.io/uuid/0.8.2 \
+    crate://crates.io/version_check/0.9.4 \
+    crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \
+    crate://crates.io/widestring/0.4.3 \
+    crate://crates.io/x509-parser/0.15.1 \
+"
 
 SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 SRC_URI[aead-0.4.3.sha256sum] = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877"
@@ -661,6 +239,97 @@ SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11
 SRC_URI[widestring-0.4.3.sha256sum] = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c"
 SRC_URI[x509-parser-0.15.1.sha256sum] = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da"
 # from rust/vendor/base64/Cargo.lock
+SRC_URI += " \
+    crate://crates.io/ansi_term/0.12.1 \
+    crate://crates.io/atty/0.2.14 \
+    crate://crates.io/autocfg/0.1.8 \
+    crate://crates.io/autocfg/1.1.0 \
+    crate://crates.io/bitflags/1.3.2 \
+    crate://crates.io/bstr/0.2.17 \
+    crate://crates.io/bumpalo/3.11.1 \
+    crate://crates.io/cast/0.2.7 \
+    crate://crates.io/cast/0.3.0 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/clap/2.34.0 \
+    crate://crates.io/cloudabi/0.0.3 \
+    crate://crates.io/criterion/0.3.2 \
+    crate://crates.io/criterion-plot/0.4.5 \
+    crate://crates.io/crossbeam-channel/0.5.6 \
+    crate://crates.io/crossbeam-deque/0.8.2 \
+    crate://crates.io/crossbeam-epoch/0.9.11 \
+    crate://crates.io/crossbeam-utils/0.8.12 \
+    crate://crates.io/csv/1.1.6 \
+    crate://crates.io/csv-core/0.1.10 \
+    crate://crates.io/either/1.8.0 \
+    crate://crates.io/fuchsia-cprng/0.1.1 \
+    crate://crates.io/heck/0.3.3 \
+    crate://crates.io/hermit-abi/0.1.19 \
+    crate://crates.io/itertools/0.9.0 \
+    crate://crates.io/itertools/0.10.5 \
+    crate://crates.io/itoa/0.4.8 \
+    crate://crates.io/itoa/1.0.4 \
+    crate://crates.io/js-sys/0.3.60 \
+    crate://crates.io/lazy_static/1.4.0 \
+    crate://crates.io/libc/0.2.135 \
+    crate://crates.io/log/0.4.17 \
+    crate://crates.io/memchr/2.5.0 \
+    crate://crates.io/memoffset/0.6.5 \
+    crate://crates.io/num-traits/0.2.15 \
+    crate://crates.io/num_cpus/1.13.1 \
+    crate://crates.io/once_cell/1.15.0 \
+    crate://crates.io/oorandom/11.1.3 \
+    crate://crates.io/plotters/0.2.15 \
+    crate://crates.io/proc-macro-error/1.0.4 \
+    crate://crates.io/proc-macro-error-attr/1.0.4 \
+    crate://crates.io/proc-macro2/1.0.47 \
+    crate://crates.io/quote/1.0.21 \
+    crate://crates.io/rand/0.6.5 \
+    crate://crates.io/rand_chacha/0.1.1 \
+    crate://crates.io/rand_core/0.3.1 \
+    crate://crates.io/rand_core/0.4.2 \
+    crate://crates.io/rand_hc/0.1.0 \
+    crate://crates.io/rand_isaac/0.1.1 \
+    crate://crates.io/rand_jitter/0.1.4 \
+    crate://crates.io/rand_os/0.1.3 \
+    crate://crates.io/rand_pcg/0.1.2 \
+    crate://crates.io/rand_xorshift/0.1.1 \
+    crate://crates.io/rayon/1.5.3 \
+    crate://crates.io/rayon-core/1.9.3 \
+    crate://crates.io/rdrand/0.4.0 \
+    crate://crates.io/regex/1.6.0 \
+    crate://crates.io/regex-automata/0.1.10 \
+    crate://crates.io/regex-syntax/0.6.27 \
+    crate://crates.io/rustc_version/0.4.0 \
+    crate://crates.io/ryu/1.0.11 \
+    crate://crates.io/same-file/1.0.6 \
+    crate://crates.io/scopeguard/1.1.0 \
+    crate://crates.io/semver/1.0.14 \
+    crate://crates.io/serde/1.0.146 \
+    crate://crates.io/serde_derive/1.0.146 \
+    crate://crates.io/serde_json/1.0.87 \
+    crate://crates.io/strsim/0.8.0 \
+    crate://crates.io/structopt/0.3.26 \
+    crate://crates.io/structopt-derive/0.4.18 \
+    crate://crates.io/syn/1.0.103 \
+    crate://crates.io/textwrap/0.11.0 \
+    crate://crates.io/tinytemplate/1.2.1 \
+    crate://crates.io/unicode-ident/1.0.5 \
+    crate://crates.io/unicode-segmentation/1.10.0 \
+    crate://crates.io/unicode-width/0.1.10 \
+    crate://crates.io/vec_map/0.8.2 \
+    crate://crates.io/version_check/0.9.4 \
+    crate://crates.io/walkdir/2.3.2 \
+    crate://crates.io/wasm-bindgen/0.2.83 \
+    crate://crates.io/wasm-bindgen-backend/0.2.83 \
+    crate://crates.io/wasm-bindgen-macro/0.2.83 \
+    crate://crates.io/wasm-bindgen-macro-support/0.2.83 \
+    crate://crates.io/wasm-bindgen-shared/0.2.83 \
+    crate://crates.io/web-sys/0.3.60 \
+    crate://crates.io/winapi/0.3.9 \
+    crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi-util/0.1.5 \
+    crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
+"
 
 SRC_URI[ansi_term-0.12.1.sha256sum] = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
 SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
@@ -751,7 +420,29 @@ SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761
 SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 SRC_URI[winapi-util-0.1.5.sha256sum] = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
 SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+# from rust/vendor/brotli-decompressor/Cargo.lock
+SRC_URI += " \
+    crate://crates.io/alloc-no-stdlib/2.0.4 \
+    crate://crates.io/alloc-stdlib/0.2.2 \
+"
+
+SRC_URI[alloc-no-stdlib-2.0.4.sha256sum] = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
+SRC_URI[alloc-stdlib-0.2.2.sha256sum] = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"
 # from rust/vendor/failure/Cargo.lock
+SRC_URI += " \
+    crate://crates.io/backtrace/0.3.46 \
+    crate://crates.io/backtrace-sys/0.1.37 \
+    crate://crates.io/cc/1.0.52 \
+    crate://crates.io/cfg-if/0.1.10 \
+    crate://crates.io/failure_derive/0.1.7 \
+    crate://crates.io/libc/0.2.69 \
+    crate://crates.io/proc-macro2/1.0.12 \
+    crate://crates.io/quote/1.0.4 \
+    crate://crates.io/rustc-demangle/0.1.16 \
+    crate://crates.io/syn/1.0.18 \
+    crate://crates.io/synstructure/0.12.3 \
+    crate://crates.io/unicode-xid/0.2.0 \
+"
 
 SRC_URI[backtrace-0.3.46.sha256sum] = "b1e692897359247cc6bb902933361652380af0f1b7651ae5c5013407f30e109e"
 SRC_URI[backtrace-sys-0.1.37.sha256sum] = "18fbebbe1c9d1f383a9cc7e8ccdb471b91c8d024ee9c2ca5b5346121fe8b4399"
@@ -765,21 +456,104 @@ SRC_URI[rustc-demangle-0.1.16.sha256sum] = "4c691c0e608126e00913e33f0ccf3727d5fc
 SRC_URI[syn-1.0.18.sha256sum] = "410a7488c0a728c7ceb4ad59b9567eb4053d02e8cc7f5c0e0eeeb39518369213"
 SRC_URI[synstructure-0.12.3.sha256sum] = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
 SRC_URI[unicode-xid-0.2.0.sha256sum] = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
-# from rust/vendor/toml/Cargo.lock
+# from rust/vendor/bendy/Cargo.lock
+SRC_URI += " \
+    crate://crates.io/addr2line/0.14.0 \
+    crate://crates.io/adler/0.2.3 \
+    crate://crates.io/aho-corasick/0.7.15 \
+    crate://crates.io/autocfg/1.0.1 \
+    crate://crates.io/backtrace/0.3.54 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/failure/0.1.8 \
+    crate://crates.io/failure_derive/0.1.8 \
+    crate://crates.io/gimli/0.23.0 \
+    crate://crates.io/lazy_static/1.4.0 \
+    crate://crates.io/libc/0.2.80 \
+    crate://crates.io/memchr/2.3.4 \
+    crate://crates.io/miniz_oxide/0.4.3 \
+    crate://crates.io/object/0.22.0 \
+    crate://crates.io/proc-macro2/1.0.24 \
+    crate://crates.io/quote/1.0.7 \
+    crate://crates.io/regex/1.4.2 \
+    crate://crates.io/regex-syntax/0.6.21 \
+    crate://crates.io/rustc-demangle/0.1.18 \
+    crate://crates.io/serde/1.0.117 \
+    crate://crates.io/serde_bytes/0.11.5 \
+    crate://crates.io/serde_derive/1.0.117 \
+    crate://crates.io/syn/1.0.48 \
+    crate://crates.io/synstructure/0.12.4 \
+    crate://crates.io/thread_local/1.0.1 \
+    crate://crates.io/unicode-xid/0.2.1 \
+"
 
-SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-SRC_URI[hashbrown-0.12.3.sha256sum] = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-SRC_URI[indexmap-1.9.2.sha256sum] = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
-SRC_URI[itoa-1.0.5.sha256sum] = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
-SRC_URI[proc-macro2-1.0.50.sha256sum] = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
-SRC_URI[quote-1.0.23.sha256sum] = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
-SRC_URI[ryu-1.0.12.sha256sum] = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
-SRC_URI[serde-1.0.152.sha256sum] = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
-SRC_URI[serde_derive-1.0.152.sha256sum] = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
-SRC_URI[serde_json-1.0.91.sha256sum] = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
-SRC_URI[syn-1.0.107.sha256sum] = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
-SRC_URI[unicode-ident-1.0.6.sha256sum] = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+SRC_URI[addr2line-0.14.0.sha256sum] = "7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423"
+SRC_URI[adler-0.2.3.sha256sum] = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
+SRC_URI[aho-corasick-0.7.15.sha256sum] = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
+SRC_URI[autocfg-1.0.1.sha256sum] = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+SRC_URI[backtrace-0.3.54.sha256sum] = "2baad346b2d4e94a24347adeee9c7a93f412ee94b9cc26e5b59dea23848e9f28"
+SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+SRC_URI[failure-0.1.8.sha256sum] = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86"
+SRC_URI[failure_derive-0.1.8.sha256sum] = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
+SRC_URI[gimli-0.23.0.sha256sum] = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
+SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+SRC_URI[libc-0.2.80.sha256sum] = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
+SRC_URI[memchr-2.3.4.sha256sum] = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+SRC_URI[miniz_oxide-0.4.3.sha256sum] = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d"
+SRC_URI[object-0.22.0.sha256sum] = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
+SRC_URI[proc-macro2-1.0.24.sha256sum] = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+SRC_URI[quote-1.0.7.sha256sum] = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
+SRC_URI[regex-1.4.2.sha256sum] = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
+SRC_URI[regex-syntax-0.6.21.sha256sum] = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
+SRC_URI[rustc-demangle-0.1.18.sha256sum] = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
+SRC_URI[serde-1.0.117.sha256sum] = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a"
+SRC_URI[serde_bytes-0.11.5.sha256sum] = "16ae07dd2f88a366f15bd0632ba725227018c69a1c8550a927324f8eb8368bb9"
+SRC_URI[serde_derive-1.0.117.sha256sum] = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e"
+SRC_URI[syn-1.0.48.sha256sum] = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac"
+SRC_URI[synstructure-0.12.4.sha256sum] = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
+SRC_URI[thread_local-1.0.1.sha256sum] = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
+SRC_URI[unicode-xid-0.2.1.sha256sum] = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+# from rust/vendor/alloc-stdlib/Cargo.lock
+SRC_URI += " \
+    crate://crates.io/alloc-no-stdlib/2.0.4 \
+"
+
+SRC_URI[alloc-no-stdlib-2.0.4.sha256sum] = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
 # from rust/vendor/nom/Cargo.lock
+SRC_URI += " \
+    crate://crates.io/autocfg/1.0.1 \
+    crate://crates.io/bit-set/0.5.2 \
+    crate://crates.io/bit-vec/0.6.3 \
+    crate://crates.io/bitflags/1.3.2 \
+    crate://crates.io/byteorder/1.4.3 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/doc-comment/0.3.3 \
+    crate://crates.io/fnv/1.0.7 \
+    crate://crates.io/getrandom/0.2.3 \
+    crate://crates.io/lazy_static/1.4.0 \
+    crate://crates.io/libc/0.2.106 \
+    crate://crates.io/memchr/2.4.1 \
+    crate://crates.io/minimal-lexical/0.2.1 \
+    crate://crates.io/num-traits/0.2.14 \
+    crate://crates.io/ppv-lite86/0.2.15 \
+    crate://crates.io/proptest/1.0.0 \
+    crate://crates.io/quick-error/1.2.3 \
+    crate://crates.io/quick-error/2.0.1 \
+    crate://crates.io/rand/0.8.4 \
+    crate://crates.io/rand_chacha/0.3.1 \
+    crate://crates.io/rand_core/0.6.3 \
+    crate://crates.io/rand_hc/0.3.1 \
+    crate://crates.io/rand_xorshift/0.3.0 \
+    crate://crates.io/redox_syscall/0.2.10 \
+    crate://crates.io/regex-syntax/0.6.25 \
+    crate://crates.io/remove_dir_all/0.5.3 \
+    crate://crates.io/rusty-fork/0.3.0 \
+    crate://crates.io/tempfile/3.2.0 \
+    crate://crates.io/wait-timeout/0.2.0 \
+    crate://crates.io/wasi/0.10.2+wasi-snapshot-preview1 \
+    crate://crates.io/winapi/0.3.9 \
+    crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
+"
 
 SRC_URI[autocfg-1.0.1.sha256sum] = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 SRC_URI[bit-set-0.5.2.sha256sum] = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de"
@@ -814,42 +588,129 @@ SRC_URI[wasi-0.10.2+wasi-snapshot-preview1.sha256sum] = "fd6fbd9a79829dd1ad0cc20
 SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-# from rust/vendor/brotli-decompressor/Cargo.lock
+# from rust/vendor/flate2/Cargo.lock
+SRC_URI += " \
+    crate://crates.io/adler/1.0.2 \
+    crate://crates.io/cc/1.0.79 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/cloudflare-zlib-sys/0.3.0 \
+    crate://crates.io/cmake/0.1.50 \
+    crate://crates.io/crc32fast/1.3.2 \
+    crate://crates.io/getrandom/0.2.9 \
+    crate://crates.io/libc/0.2.144 \
+    crate://crates.io/libz-ng-sys/1.1.10 \
+    crate://crates.io/libz-sys/1.1.10 \
+    crate://crates.io/miniz_oxide/0.7.1 \
+    crate://crates.io/pkg-config/0.3.27 \
+    crate://crates.io/ppv-lite86/0.2.17 \
+    crate://crates.io/quickcheck/1.0.3 \
+    crate://crates.io/rand/0.8.5 \
+    crate://crates.io/rand_chacha/0.3.1 \
+    crate://crates.io/rand_core/0.6.4 \
+    crate://crates.io/vcpkg/0.2.15 \
+    crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \
+"
 
-SRC_URI[alloc-no-stdlib-2.0.4.sha256sum] = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
-SRC_URI[alloc-stdlib-0.2.2.sha256sum] = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"
-# from rust/vendor/displaydoc/Cargo.lock
+SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+SRC_URI[cc-1.0.79.sha256sum] = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+SRC_URI[cloudflare-zlib-sys-0.3.0.sha256sum] = "2040b6d1edfee6d75f172d81e2d2a7807534f3f294ce18184c70e7bb0105cd6f"
+SRC_URI[cmake-0.1.50.sha256sum] = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
+SRC_URI[crc32fast-1.3.2.sha256sum] = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+SRC_URI[getrandom-0.2.9.sha256sum] = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
+SRC_URI[libc-0.2.144.sha256sum] = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
+SRC_URI[libz-ng-sys-1.1.10.sha256sum] = "425fb6808068335c8c7c69d1cff0a7d1ed8f681e9ac040272f160a89e6f43b8b"
+SRC_URI[libz-sys-1.1.10.sha256sum] = "24e6ab01971eb092ffe6a7d42f49f9ff42662f17604681e2843ad65077ba47dc"
+SRC_URI[miniz_oxide-0.7.1.sha256sum] = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+SRC_URI[pkg-config-0.3.27.sha256sum] = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+SRC_URI[quickcheck-1.0.3.sha256sum] = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
+SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+SRC_URI[vcpkg-0.2.15.sha256sum] = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+# from rust/vendor/regex/Cargo.lock
+SRC_URI += " \
+    crate://crates.io/aho-corasick/0.7.18 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/getrandom/0.2.6 \
+    crate://crates.io/lazy_static/1.4.0 \
+    crate://crates.io/libc/0.2.125 \
+    crate://crates.io/memchr/2.5.0 \
+    crate://crates.io/quickcheck/1.0.3 \
+    crate://crates.io/rand/0.8.5 \
+    crate://crates.io/rand_core/0.6.3 \
+    crate://crates.io/regex-syntax/0.6.26 \
+    crate://crates.io/wasi/0.10.2+wasi-snapshot-preview1 \
+"
 
-SRC_URI[ansi_term-0.11.0.sha256sum] = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-SRC_URI[basic-toml-0.1.2.sha256sum] = "5c0de75129aa8d0cceaf750b89013f0e08804d6ec61416da787b35ad0d7cddf1"
-SRC_URI[ctor-0.1.26.sha256sum] = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
-SRC_URI[difference-2.0.0.sha256sum] = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
-SRC_URI[glob-0.3.1.sha256sum] = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
-SRC_URI[itoa-1.0.6.sha256sum] = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
-SRC_URI[libc-0.2.142.sha256sum] = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
-SRC_URI[once_cell-1.17.1.sha256sum] = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
-SRC_URI[output_vt100-0.1.3.sha256sum] = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66"
-SRC_URI[pretty_assertions-0.6.1.sha256sum] = "3f81e1644e1b54f5a68959a29aa86cde704219254669da328ecfdf6a1f09d427"
-SRC_URI[proc-macro2-1.0.56.sha256sum] = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
-SRC_URI[quote-1.0.26.sha256sum] = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
-SRC_URI[rustversion-1.0.12.sha256sum] = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
-SRC_URI[ryu-1.0.13.sha256sum] = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
-SRC_URI[serde-1.0.160.sha256sum] = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
-SRC_URI[serde_derive-1.0.160.sha256sum] = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
-SRC_URI[serde_json-1.0.96.sha256sum] = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
-SRC_URI[static_assertions-1.1.0.sha256sum] = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-SRC_URI[syn-2.0.15.sha256sum] = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
-SRC_URI[termcolor-1.2.0.sha256sum] = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
-SRC_URI[thiserror-1.0.40.sha256sum] = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
-SRC_URI[thiserror-impl-1.0.40.sha256sum] = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
-SRC_URI[trybuild-1.0.80.sha256sum] = "501dbdbb99861e4ab6b60eb6a7493956a9defb644fd034bc4a5ef27c693c8a3a"
-SRC_URI[unicode-ident-1.0.8.sha256sum] = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
-SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-SRC_URI[winapi-util-0.1.5.sha256sum] = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+SRC_URI[aho-corasick-0.7.18.sha256sum] = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+SRC_URI[getrandom-0.2.6.sha256sum] = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
+SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+SRC_URI[libc-0.2.125.sha256sum] = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b"
+SRC_URI[memchr-2.5.0.sha256sum] = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+SRC_URI[quickcheck-1.0.3.sha256sum] = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
+SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+SRC_URI[rand_core-0.6.3.sha256sum] = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+SRC_URI[regex-syntax-0.6.26.sha256sum] = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
+SRC_URI[wasi-0.10.2+wasi-snapshot-preview1.sha256sum] = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 # from rust/vendor/asn1-rs/Cargo.lock
+SRC_URI += " \
+    crate://crates.io/asn1-rs/0.5.1 \
+    crate://crates.io/asn1-rs-derive/0.4.0 \
+    crate://crates.io/asn1-rs-impl/0.1.0 \
+    crate://crates.io/atty/0.2.14 \
+    crate://crates.io/autocfg/1.1.0 \
+    crate://crates.io/base64/0.13.1 \
+    crate://crates.io/basic-toml/0.1.2 \
+    crate://crates.io/bitvec/1.0.1 \
+    crate://crates.io/colored/2.0.0 \
+    crate://crates.io/cookie-factory/0.3.2 \
+    crate://crates.io/displaydoc/0.2.3 \
+    crate://crates.io/funty/2.0.0 \
+    crate://crates.io/glob/0.3.1 \
+    crate://crates.io/hermit-abi/0.1.19 \
+    crate://crates.io/hex-literal/0.3.4 \
+    crate://crates.io/itoa/1.0.6 \
+    crate://crates.io/lazy_static/1.4.0 \
+    crate://crates.io/libc/0.2.139 \
+    crate://crates.io/memchr/2.5.0 \
+    crate://crates.io/minimal-lexical/0.2.1 \
+    crate://crates.io/nom/7.1.3 \
+    crate://crates.io/num-bigint/0.4.3 \
+    crate://crates.io/num-integer/0.1.45 \
+    crate://crates.io/num-traits/0.2.15 \
+    crate://crates.io/oid-registry/0.6.1 \
+    crate://crates.io/once_cell/1.17.1 \
+    crate://crates.io/pem/1.1.1 \
+    crate://crates.io/proc-macro2/1.0.51 \
+    crate://crates.io/quote/1.0.23 \
+    crate://crates.io/radium/0.7.0 \
+    crate://crates.io/rusticata-macros/4.1.0 \
+    crate://crates.io/ryu/1.0.13 \
+    crate://crates.io/serde/1.0.152 \
+    crate://crates.io/serde_derive/1.0.152 \
+    crate://crates.io/serde_json/1.0.94 \
+    crate://crates.io/syn/1.0.109 \
+    crate://crates.io/synstructure/0.12.6 \
+    crate://crates.io/tap/1.0.1 \
+    crate://crates.io/termcolor/1.2.0 \
+    crate://crates.io/thiserror/1.0.39 \
+    crate://crates.io/thiserror-impl/1.0.39 \
+    crate://crates.io/time/0.3.20 \
+    crate://crates.io/time-core/0.1.0 \
+    crate://crates.io/time-macros/0.2.8 \
+    crate://crates.io/trybuild/1.0.79 \
+    crate://crates.io/unicode-ident/1.0.8 \
+    crate://crates.io/unicode-xid/0.2.4 \
+    crate://crates.io/winapi/0.3.9 \
+    crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi-util/0.1.5 \
+    crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
+    crate://crates.io/wyz/0.5.1 \
+"
 
 SRC_URI[asn1-rs-0.5.1.sha256sum] = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4"
 SRC_URI[asn1-rs-derive-0.4.0.sha256sum] = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c"
@@ -903,7 +764,216 @@ SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5c
 SRC_URI[winapi-util-0.1.5.sha256sum] = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
 SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 SRC_URI[wyz-0.5.1.sha256sum] = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+# from rust/vendor/x509-parser/Cargo.lock
+SRC_URI += " \
+    crate://crates.io/asn1-rs/0.5.2 \
+    crate://crates.io/asn1-rs-derive/0.4.0 \
+    crate://crates.io/asn1-rs-impl/0.1.0 \
+    crate://crates.io/autocfg/1.1.0 \
+    crate://crates.io/bumpalo/3.13.0 \
+    crate://crates.io/cc/1.0.81 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/data-encoding/2.4.0 \
+    crate://crates.io/der-parser/8.2.0 \
+    crate://crates.io/deranged/0.3.7 \
+    crate://crates.io/displaydoc/0.2.4 \
+    crate://crates.io/itoa/1.0.9 \
+    crate://crates.io/js-sys/0.3.64 \
+    crate://crates.io/lazy_static/1.4.0 \
+    crate://crates.io/libc/0.2.147 \
+    crate://crates.io/log/0.4.19 \
+    crate://crates.io/memchr/2.5.0 \
+    crate://crates.io/minimal-lexical/0.2.1 \
+    crate://crates.io/nom/7.1.3 \
+    crate://crates.io/num-bigint/0.4.3 \
+    crate://crates.io/num-integer/0.1.45 \
+    crate://crates.io/num-traits/0.2.16 \
+    crate://crates.io/oid-registry/0.6.1 \
+    crate://crates.io/once_cell/1.18.0 \
+    crate://crates.io/proc-macro2/1.0.66 \
+    crate://crates.io/quote/1.0.32 \
+    crate://crates.io/ring/0.16.20 \
+    crate://crates.io/rusticata-macros/4.1.0 \
+    crate://crates.io/serde/1.0.180 \
+    crate://crates.io/spin/0.5.2 \
+    crate://crates.io/syn/1.0.109 \
+    crate://crates.io/syn/2.0.28 \
+    crate://crates.io/synstructure/0.12.6 \
+    crate://crates.io/thiserror/1.0.44 \
+    crate://crates.io/thiserror-impl/1.0.44 \
+    crate://crates.io/time/0.3.25 \
+    crate://crates.io/time-core/0.1.1 \
+    crate://crates.io/time-macros/0.2.11 \
+    crate://crates.io/unicode-ident/1.0.11 \
+    crate://crates.io/unicode-xid/0.2.4 \
+    crate://crates.io/untrusted/0.7.1 \
+    crate://crates.io/wasm-bindgen/0.2.87 \
+    crate://crates.io/wasm-bindgen-backend/0.2.87 \
+    crate://crates.io/wasm-bindgen-macro/0.2.87 \
+    crate://crates.io/wasm-bindgen-macro-support/0.2.87 \
+    crate://crates.io/wasm-bindgen-shared/0.2.87 \
+    crate://crates.io/web-sys/0.3.64 \
+    crate://crates.io/winapi/0.3.9 \
+    crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
+"
+
+SRC_URI[asn1-rs-0.5.2.sha256sum] = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0"
+SRC_URI[asn1-rs-derive-0.4.0.sha256sum] = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c"
+SRC_URI[asn1-rs-impl-0.1.0.sha256sum] = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed"
+SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+SRC_URI[bumpalo-3.13.0.sha256sum] = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+SRC_URI[cc-1.0.81.sha256sum] = "6c6b2562119bf28c3439f7f02db99faf0aa1a8cdfe5772a2ee155d32227239f0"
+SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+SRC_URI[data-encoding-2.4.0.sha256sum] = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
+SRC_URI[der-parser-8.2.0.sha256sum] = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e"
+SRC_URI[deranged-0.3.7.sha256sum] = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929"
+SRC_URI[displaydoc-0.2.4.sha256sum] = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
+SRC_URI[itoa-1.0.9.sha256sum] = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+SRC_URI[js-sys-0.3.64.sha256sum] = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
+SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+SRC_URI[libc-0.2.147.sha256sum] = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+SRC_URI[log-0.4.19.sha256sum] = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
+SRC_URI[memchr-2.5.0.sha256sum] = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+SRC_URI[num-bigint-0.4.3.sha256sum] = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
+SRC_URI[num-integer-0.1.45.sha256sum] = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+SRC_URI[num-traits-0.2.16.sha256sum] = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+SRC_URI[oid-registry-0.6.1.sha256sum] = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff"
+SRC_URI[once_cell-1.18.0.sha256sum] = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+SRC_URI[proc-macro2-1.0.66.sha256sum] = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+SRC_URI[quote-1.0.32.sha256sum] = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
+SRC_URI[ring-0.16.20.sha256sum] = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+SRC_URI[rusticata-macros-4.1.0.sha256sum] = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632"
+SRC_URI[serde-1.0.180.sha256sum] = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed"
+SRC_URI[spin-0.5.2.sha256sum] = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+SRC_URI[syn-2.0.28.sha256sum] = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
+SRC_URI[synstructure-0.12.6.sha256sum] = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
+SRC_URI[thiserror-1.0.44.sha256sum] = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
+SRC_URI[thiserror-impl-1.0.44.sha256sum] = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
+SRC_URI[time-0.3.25.sha256sum] = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea"
+SRC_URI[time-core-0.1.1.sha256sum] = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+SRC_URI[time-macros-0.2.11.sha256sum] = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd"
+SRC_URI[unicode-ident-1.0.11.sha256sum] = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
+SRC_URI[unicode-xid-0.2.4.sha256sum] = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+SRC_URI[untrusted-0.7.1.sha256sum] = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+SRC_URI[wasm-bindgen-0.2.87.sha256sum] = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
+SRC_URI[wasm-bindgen-backend-0.2.87.sha256sum] = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
+SRC_URI[wasm-bindgen-macro-0.2.87.sha256sum] = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
+SRC_URI[wasm-bindgen-macro-support-0.2.87.sha256sum] = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
+SRC_URI[wasm-bindgen-shared-0.2.87.sha256sum] = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
+SRC_URI[web-sys-0.3.64.sha256sum] = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
+SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+# from rust/vendor/displaydoc/Cargo.lock
+SRC_URI += " \
+    crate://crates.io/ansi_term/0.11.0 \
+    crate://crates.io/basic-toml/0.1.2 \
+    crate://crates.io/ctor/0.1.26 \
+    crate://crates.io/difference/2.0.0 \
+    crate://crates.io/glob/0.3.1 \
+    crate://crates.io/itoa/1.0.6 \
+    crate://crates.io/libc/0.2.142 \
+    crate://crates.io/once_cell/1.17.1 \
+    crate://crates.io/output_vt100/0.1.3 \
+    crate://crates.io/pretty_assertions/0.6.1 \
+    crate://crates.io/proc-macro2/1.0.56 \
+    crate://crates.io/quote/1.0.26 \
+    crate://crates.io/rustversion/1.0.12 \
+    crate://crates.io/ryu/1.0.13 \
+    crate://crates.io/serde/1.0.160 \
+    crate://crates.io/serde_derive/1.0.160 \
+    crate://crates.io/serde_json/1.0.96 \
+    crate://crates.io/static_assertions/1.1.0 \
+    crate://crates.io/syn/1.0.109 \
+    crate://crates.io/syn/2.0.15 \
+    crate://crates.io/termcolor/1.2.0 \
+    crate://crates.io/thiserror/1.0.40 \
+    crate://crates.io/thiserror-impl/1.0.40 \
+    crate://crates.io/trybuild/1.0.80 \
+    crate://crates.io/unicode-ident/1.0.8 \
+    crate://crates.io/winapi/0.3.9 \
+    crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi-util/0.1.5 \
+    crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
+"
+
+SRC_URI[ansi_term-0.11.0.sha256sum] = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+SRC_URI[basic-toml-0.1.2.sha256sum] = "5c0de75129aa8d0cceaf750b89013f0e08804d6ec61416da787b35ad0d7cddf1"
+SRC_URI[ctor-0.1.26.sha256sum] = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
+SRC_URI[difference-2.0.0.sha256sum] = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
+SRC_URI[glob-0.3.1.sha256sum] = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+SRC_URI[itoa-1.0.6.sha256sum] = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+SRC_URI[libc-0.2.142.sha256sum] = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
+SRC_URI[once_cell-1.17.1.sha256sum] = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+SRC_URI[output_vt100-0.1.3.sha256sum] = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66"
+SRC_URI[pretty_assertions-0.6.1.sha256sum] = "3f81e1644e1b54f5a68959a29aa86cde704219254669da328ecfdf6a1f09d427"
+SRC_URI[proc-macro2-1.0.56.sha256sum] = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
+SRC_URI[quote-1.0.26.sha256sum] = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+SRC_URI[rustversion-1.0.12.sha256sum] = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
+SRC_URI[ryu-1.0.13.sha256sum] = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+SRC_URI[serde-1.0.160.sha256sum] = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
+SRC_URI[serde_derive-1.0.160.sha256sum] = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
+SRC_URI[serde_json-1.0.96.sha256sum] = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+SRC_URI[static_assertions-1.1.0.sha256sum] = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+SRC_URI[syn-2.0.15.sha256sum] = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
+SRC_URI[termcolor-1.2.0.sha256sum] = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
+SRC_URI[thiserror-1.0.40.sha256sum] = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+SRC_URI[thiserror-impl-1.0.40.sha256sum] = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+SRC_URI[trybuild-1.0.80.sha256sum] = "501dbdbb99861e4ab6b60eb6a7493956a9defb644fd034bc4a5ef27c693c8a3a"
+SRC_URI[unicode-ident-1.0.8.sha256sum] = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+SRC_URI[winapi-util-0.1.5.sha256sum] = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+# from rust/vendor/toml/Cargo.lock
+SRC_URI += " \
+    crate://crates.io/autocfg/1.1.0 \
+    crate://crates.io/hashbrown/0.12.3 \
+    crate://crates.io/indexmap/1.9.2 \
+    crate://crates.io/itoa/1.0.5 \
+    crate://crates.io/proc-macro2/1.0.50 \
+    crate://crates.io/quote/1.0.23 \
+    crate://crates.io/ryu/1.0.12 \
+    crate://crates.io/serde/1.0.152 \
+    crate://crates.io/serde_derive/1.0.152 \
+    crate://crates.io/serde_json/1.0.91 \
+    crate://crates.io/syn/1.0.107 \
+    crate://crates.io/unicode-ident/1.0.6 \
+"
+
+SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+SRC_URI[hashbrown-0.12.3.sha256sum] = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+SRC_URI[indexmap-1.9.2.sha256sum] = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
+SRC_URI[itoa-1.0.5.sha256sum] = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
+SRC_URI[proc-macro2-1.0.50.sha256sum] = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
+SRC_URI[quote-1.0.23.sha256sum] = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
+SRC_URI[ryu-1.0.12.sha256sum] = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
+SRC_URI[serde-1.0.152.sha256sum] = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
+SRC_URI[serde_derive-1.0.152.sha256sum] = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
+SRC_URI[serde_json-1.0.91.sha256sum] = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
+SRC_URI[syn-1.0.107.sha256sum] = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
+SRC_URI[unicode-ident-1.0.6.sha256sum] = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
 # from rust/vendor/brotli/Cargo.lock
+SRC_URI += " \
+    crate://crates.io/alloc-no-stdlib/2.0.4 \
+    crate://crates.io/alloc-stdlib/0.2.2 \
+    crate://crates.io/block-buffer/0.10.4 \
+    crate://crates.io/brotli-decompressor/5.0.0 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/cpufeatures/0.2.17 \
+    crate://crates.io/crypto-common/0.1.6 \
+    crate://crates.io/digest/0.10.7 \
+    crate://crates.io/generic-array/0.14.7 \
+    crate://crates.io/libc/0.2.172 \
+    crate://crates.io/sha2/0.10.9 \
+    crate://crates.io/typenum/1.18.0 \
+    crate://crates.io/version_check/0.9.5 \
+"
 
 SRC_URI[alloc-no-stdlib-2.0.4.sha256sum] = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
 SRC_URI[alloc-stdlib-0.2.2.sha256sum] = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"
@@ -919,6 +989,82 @@ SRC_URI[sha2-0.10.9.sha256sum] = "a7507d819769d01a365ab707794a4084392c824f54a7a6
 SRC_URI[typenum-1.18.0.sha256sum] = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
 SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 # from rust/vendor/phf_generator/Cargo.lock
+SRC_URI += " \
+    crate://crates.io/atty/0.2.14 \
+    crate://crates.io/autocfg/1.0.1 \
+    crate://crates.io/bitflags/1.2.1 \
+    crate://crates.io/bstr/0.2.16 \
+    crate://crates.io/bumpalo/3.7.0 \
+    crate://crates.io/cast/0.2.7 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/clap/2.33.3 \
+    crate://crates.io/criterion/0.3.4 \
+    crate://crates.io/criterion-plot/0.4.4 \
+    crate://crates.io/crossbeam-channel/0.5.1 \
+    crate://crates.io/crossbeam-deque/0.8.1 \
+    crate://crates.io/crossbeam-epoch/0.9.5 \
+    crate://crates.io/crossbeam-utils/0.8.5 \
+    crate://crates.io/csv/1.1.6 \
+    crate://crates.io/csv-core/0.1.10 \
+    crate://crates.io/either/1.6.1 \
+    crate://crates.io/getrandom/0.2.3 \
+    crate://crates.io/half/1.7.1 \
+    crate://crates.io/hermit-abi/0.1.19 \
+    crate://crates.io/itertools/0.10.1 \
+    crate://crates.io/itoa/0.4.7 \
+    crate://crates.io/js-sys/0.3.52 \
+    crate://crates.io/lazy_static/1.4.0 \
+    crate://crates.io/libc/0.2.99 \
+    crate://crates.io/log/0.4.14 \
+    crate://crates.io/memchr/2.4.0 \
+    crate://crates.io/memoffset/0.6.4 \
+    crate://crates.io/num-traits/0.2.14 \
+    crate://crates.io/num_cpus/1.13.0 \
+    crate://crates.io/oorandom/11.1.3 \
+    crate://crates.io/phf_shared/0.10.0 \
+    crate://crates.io/plotters/0.3.1 \
+    crate://crates.io/plotters-backend/0.3.2 \
+    crate://crates.io/plotters-svg/0.3.1 \
+    crate://crates.io/ppv-lite86/0.2.10 \
+    crate://crates.io/proc-macro2/1.0.28 \
+    crate://crates.io/quote/1.0.9 \
+    crate://crates.io/rand/0.8.4 \
+    crate://crates.io/rand_chacha/0.3.1 \
+    crate://crates.io/rand_core/0.6.3 \
+    crate://crates.io/rand_hc/0.3.1 \
+    crate://crates.io/rayon/1.5.1 \
+    crate://crates.io/rayon-core/1.9.1 \
+    crate://crates.io/regex/1.5.4 \
+    crate://crates.io/regex-automata/0.1.10 \
+    crate://crates.io/regex-syntax/0.6.25 \
+    crate://crates.io/rustc_version/0.4.0 \
+    crate://crates.io/ryu/1.0.5 \
+    crate://crates.io/same-file/1.0.6 \
+    crate://crates.io/scopeguard/1.1.0 \
+    crate://crates.io/semver/1.0.4 \
+    crate://crates.io/serde/1.0.127 \
+    crate://crates.io/serde_cbor/0.11.1 \
+    crate://crates.io/serde_derive/1.0.127 \
+    crate://crates.io/serde_json/1.0.66 \
+    crate://crates.io/siphasher/0.3.6 \
+    crate://crates.io/syn/1.0.74 \
+    crate://crates.io/textwrap/0.11.0 \
+    crate://crates.io/tinytemplate/1.2.1 \
+    crate://crates.io/unicode-width/0.1.8 \
+    crate://crates.io/unicode-xid/0.2.2 \
+    crate://crates.io/walkdir/2.3.2 \
+    crate://crates.io/wasi/0.10.2+wasi-snapshot-preview1 \
+    crate://crates.io/wasm-bindgen/0.2.75 \
+    crate://crates.io/wasm-bindgen-backend/0.2.75 \
+    crate://crates.io/wasm-bindgen-macro/0.2.75 \
+    crate://crates.io/wasm-bindgen-macro-support/0.2.75 \
+    crate://crates.io/wasm-bindgen-shared/0.2.75 \
+    crate://crates.io/web-sys/0.3.52 \
+    crate://crates.io/winapi/0.3.9 \
+    crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi-util/0.1.5 \
+    crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
+"
 
 SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 SRC_URI[autocfg-1.0.1.sha256sum] = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
@@ -994,120 +1140,3 @@ SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761
 SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 SRC_URI[winapi-util-0.1.5.sha256sum] = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
 SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-# from rust/vendor/alloc-stdlib/Cargo.lock
-
-SRC_URI[alloc-no-stdlib-2.0.4.sha256sum] = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
-# from rust/vendor/x509-parser/Cargo.lock
-
-SRC_URI[asn1-rs-0.5.2.sha256sum] = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0"
-SRC_URI[asn1-rs-derive-0.4.0.sha256sum] = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c"
-SRC_URI[asn1-rs-impl-0.1.0.sha256sum] = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed"
-SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-SRC_URI[bumpalo-3.13.0.sha256sum] = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
-SRC_URI[cc-1.0.81.sha256sum] = "6c6b2562119bf28c3439f7f02db99faf0aa1a8cdfe5772a2ee155d32227239f0"
-SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-SRC_URI[data-encoding-2.4.0.sha256sum] = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
-SRC_URI[der-parser-8.2.0.sha256sum] = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e"
-SRC_URI[deranged-0.3.7.sha256sum] = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929"
-SRC_URI[displaydoc-0.2.4.sha256sum] = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
-SRC_URI[itoa-1.0.9.sha256sum] = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
-SRC_URI[js-sys-0.3.64.sha256sum] = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
-SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-SRC_URI[libc-0.2.147.sha256sum] = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
-SRC_URI[log-0.4.19.sha256sum] = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
-SRC_URI[memchr-2.5.0.sha256sum] = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-SRC_URI[num-bigint-0.4.3.sha256sum] = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
-SRC_URI[num-integer-0.1.45.sha256sum] = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
-SRC_URI[num-traits-0.2.16.sha256sum] = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
-SRC_URI[oid-registry-0.6.1.sha256sum] = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff"
-SRC_URI[once_cell-1.18.0.sha256sum] = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
-SRC_URI[proc-macro2-1.0.66.sha256sum] = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
-SRC_URI[quote-1.0.32.sha256sum] = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
-SRC_URI[ring-0.16.20.sha256sum] = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-SRC_URI[rusticata-macros-4.1.0.sha256sum] = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632"
-SRC_URI[serde-1.0.180.sha256sum] = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed"
-SRC_URI[spin-0.5.2.sha256sum] = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-SRC_URI[syn-2.0.28.sha256sum] = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
-SRC_URI[synstructure-0.12.6.sha256sum] = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
-SRC_URI[thiserror-1.0.44.sha256sum] = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
-SRC_URI[thiserror-impl-1.0.44.sha256sum] = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
-SRC_URI[time-0.3.25.sha256sum] = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea"
-SRC_URI[time-core-0.1.1.sha256sum] = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
-SRC_URI[time-macros-0.2.11.sha256sum] = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd"
-SRC_URI[unicode-ident-1.0.11.sha256sum] = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
-SRC_URI[unicode-xid-0.2.4.sha256sum] = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
-SRC_URI[untrusted-0.7.1.sha256sum] = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-SRC_URI[wasm-bindgen-0.2.87.sha256sum] = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
-SRC_URI[wasm-bindgen-backend-0.2.87.sha256sum] = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
-SRC_URI[wasm-bindgen-macro-0.2.87.sha256sum] = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
-SRC_URI[wasm-bindgen-macro-support-0.2.87.sha256sum] = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
-SRC_URI[wasm-bindgen-shared-0.2.87.sha256sum] = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
-SRC_URI[web-sys-0.3.64.sha256sum] = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
-SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-# from rust/vendor/regex/Cargo.lock
-
-SRC_URI[aho-corasick-0.7.18.sha256sum] = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
-SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-SRC_URI[getrandom-0.2.6.sha256sum] = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
-SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-SRC_URI[libc-0.2.125.sha256sum] = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b"
-SRC_URI[memchr-2.5.0.sha256sum] = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-SRC_URI[quickcheck-1.0.3.sha256sum] = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
-SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-SRC_URI[rand_core-0.6.3.sha256sum] = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
-SRC_URI[regex-syntax-0.6.26.sha256sum] = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
-SRC_URI[wasi-0.10.2+wasi-snapshot-preview1.sha256sum] = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
-# from rust/vendor/bendy/Cargo.lock
-
-SRC_URI[addr2line-0.14.0.sha256sum] = "7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423"
-SRC_URI[adler-0.2.3.sha256sum] = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
-SRC_URI[aho-corasick-0.7.15.sha256sum] = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
-SRC_URI[autocfg-1.0.1.sha256sum] = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
-SRC_URI[backtrace-0.3.54.sha256sum] = "2baad346b2d4e94a24347adeee9c7a93f412ee94b9cc26e5b59dea23848e9f28"
-SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-SRC_URI[failure-0.1.8.sha256sum] = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86"
-SRC_URI[failure_derive-0.1.8.sha256sum] = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
-SRC_URI[gimli-0.23.0.sha256sum] = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
-SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-SRC_URI[libc-0.2.80.sha256sum] = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
-SRC_URI[memchr-2.3.4.sha256sum] = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
-SRC_URI[miniz_oxide-0.4.3.sha256sum] = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d"
-SRC_URI[object-0.22.0.sha256sum] = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
-SRC_URI[proc-macro2-1.0.24.sha256sum] = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
-SRC_URI[quote-1.0.7.sha256sum] = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
-SRC_URI[regex-1.4.2.sha256sum] = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
-SRC_URI[regex-syntax-0.6.21.sha256sum] = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
-SRC_URI[rustc-demangle-0.1.18.sha256sum] = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
-SRC_URI[serde-1.0.117.sha256sum] = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a"
-SRC_URI[serde_bytes-0.11.5.sha256sum] = "16ae07dd2f88a366f15bd0632ba725227018c69a1c8550a927324f8eb8368bb9"
-SRC_URI[serde_derive-1.0.117.sha256sum] = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e"
-SRC_URI[syn-1.0.48.sha256sum] = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac"
-SRC_URI[synstructure-0.12.4.sha256sum] = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
-SRC_URI[thread_local-1.0.1.sha256sum] = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
-SRC_URI[unicode-xid-0.2.1.sha256sum] = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
-# from rust/vendor/flate2/Cargo.lock
-
-SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-SRC_URI[cc-1.0.79.sha256sum] = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
-SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-SRC_URI[cloudflare-zlib-sys-0.3.0.sha256sum] = "2040b6d1edfee6d75f172d81e2d2a7807534f3f294ce18184c70e7bb0105cd6f"
-SRC_URI[cmake-0.1.50.sha256sum] = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
-SRC_URI[crc32fast-1.3.2.sha256sum] = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
-SRC_URI[getrandom-0.2.9.sha256sum] = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
-SRC_URI[libc-0.2.144.sha256sum] = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
-SRC_URI[libz-ng-sys-1.1.10.sha256sum] = "425fb6808068335c8c7c69d1cff0a7d1ed8f681e9ac040272f160a89e6f43b8b"
-SRC_URI[libz-sys-1.1.10.sha256sum] = "24e6ab01971eb092ffe6a7d42f49f9ff42662f17604681e2843ad65077ba47dc"
-SRC_URI[miniz_oxide-0.7.1.sha256sum] = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
-SRC_URI[pkg-config-0.3.27.sha256sum] = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
-SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-SRC_URI[quickcheck-1.0.3.sha256sum] = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
-SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-SRC_URI[vcpkg-0.2.15.sha256sum] = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
diff --git a/recipes-ids/suricata/suricata_7.0.12.bb b/recipes-ids/suricata/suricata_7.0.13.bb
similarity index 98%
rename from recipes-ids/suricata/suricata_7.0.12.bb
rename to recipes-ids/suricata/suricata_7.0.13.bb
index e958fad..cfb01c5 100644
--- a/recipes-ids/suricata/suricata_7.0.12.bb
+++ b/recipes-ids/suricata/suricata_7.0.13.bb
@@ -5,7 +5,7 @@ require suricata.inc
 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] = "da5a591c749fed2bd986fc3b3cac25d9cfd3b453f57becf14610746999d3c5dd"
+SRC_URI[sha256sum] = "bbc94cf0a297f4560c64569ed72867c799287defdaf6e6572ce769f48dd2559b"
 
 DEPENDS = "lz4 libhtp"
 
-- 
2.51.0



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [meta-security][PATCH 2/8] clamav: Add recipe for version 1.4.3
  2025-12-22 16:51 [meta-security][PATCH 0/8] Assorted updates 12/22 Scott Murray
  2025-12-22 16:51 ` [meta-security][PATCH 1/8] suricata: update to 7.0.13 Scott Murray
@ 2025-12-22 16:51 ` Scott Murray
  2025-12-22 16:51 ` [meta-security][PATCH 3/8] libmhash: add UPSTREAM_CHECK_URI Scott Murray
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: Scott Murray @ 2025-12-22 16:51 UTC (permalink / raw)
  To: yocto-patches; +Cc: Marta Rybczynska

From: Hemant Jadhav <hemant.jadhav@emerson.com>

Add modern ClamAV 1.4.3 recipe with comprehensive improvements over
the legacy 0.104.4 version. Remove the end-of-life 0.104.4 recipe and
associated patches as they are superseded by this version.

Major changes in 1.4.3:
- Upgraded core engine with improved threat detection capabilities
- Added Rust components requiring cross-compilation support
- Updated CMake build system replacing legacy autotools
- Modernized library dependencies (LLVM, JSON-C, PCre2)
- Added comprehensive license compliance for multi-component package
- Enhanced cross-compilation support for all target architectures

The recipe includes dynamic Cargo configuration using Yocto variables
to support cross-compilation to any target architecture supported by
the build system.

Runtime configuration improvements:
- Set APP_CONFIG_DIRECTORY to ${sysconfdir}/clamav for proper config paths
- Added volatiles/tmpfiles support for /var/lib/clamav and /var/log/clamav
- Added pkg_postinst scripts to ensure correct directory ownership
- Implemented CMake cache variables for cross-compilation
- Updated all license checksums for compliance
- Added Rust toolchain integration with automatic environment setup
- Use Cargo vendoring with cargo + cargo-update-recipe-crates classes

Security rationale:
- ClamAV 0.104.4 reached end-of-life and is no longer maintained
- Upstream strongly recommends migration to 1.4.x for security updates

Signed-off-by: Hemant Jadhav <hemant.jadhav@emerson.com>
(regenerated diff, fixed building with systemd,
 fixed target Rust configuration, disabled for 32-bit targets)
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
 .../packagegroup-core-security.bb             |   6 +-
 recipes-scanners/clamav/clamav-crates.inc     | 286 ++++++++++++++++++
 recipes-scanners/clamav/clamav-git-crates.inc |   9 +
 recipes-scanners/clamav/clamav_0.104.4.bb     | 156 ----------
 recipes-scanners/clamav/clamav_1.4.3.bb       | 236 +++++++++++++++
 .../clamav/files/headers_fixup.patch          |  58 ----
 .../clamav/files/oe_cmake_fixup.patch         |  39 ---
 recipes-scanners/clamav/files/tmpfiles.clamav |   1 +
 .../clamav/files/volatiles.03_clamav          |   1 +
 9 files changed, 537 insertions(+), 255 deletions(-)
 create mode 100644 recipes-scanners/clamav/clamav-crates.inc
 create mode 100644 recipes-scanners/clamav/clamav-git-crates.inc
 delete mode 100644 recipes-scanners/clamav/clamav_0.104.4.bb
 create mode 100644 recipes-scanners/clamav/clamav_1.4.3.bb
 delete mode 100644 recipes-scanners/clamav/files/headers_fixup.patch
 delete mode 100644 recipes-scanners/clamav/files/oe_cmake_fixup.patch

diff --git a/recipes-core/packagegroup/packagegroup-core-security.bb b/recipes-core/packagegroup/packagegroup-core-security.bb
index 9c14240..d3d3d7e 100644
--- a/recipes-core/packagegroup/packagegroup-core-security.bb
+++ b/recipes-core/packagegroup/packagegroup-core-security.bb
@@ -57,11 +57,13 @@ RDEPENDS:packagegroup-security-utils:remove:libc-musl = "krill firejail"
 ARPWATCH = "arpwatch"
 ARPWATCH:riscv32 = ""
 ARPWATCH:riscv64 = ""
-ARPWATCH:qemuriscv64 = ""
 CLAMAV = "clamav clamav-daemon clamav-freshclam"
+CLAMAV:arm = ""
+CLAMAV:mips = ""
+CLAMAV:powerpc = ""
 CLAMAV:riscv32 = ""
 CLAMAV:riscv64 = ""
-CLAMAV:qemuriscv64 = ""
+CLAMAV:x86 = ""
 
 SUMMARY:packagegroup-security-scanners = "Security scanners"
 RDEPENDS:packagegroup-security-scanners = "\
diff --git a/recipes-scanners/clamav/clamav-crates.inc b/recipes-scanners/clamav/clamav-crates.inc
new file mode 100644
index 0000000..ed7f453
--- /dev/null
+++ b/recipes-scanners/clamav/clamav-crates.inc
@@ -0,0 +1,286 @@
+# Autogenerated with 'bitbake -c update_crates clamav'
+
+# from Cargo.lock
+SRC_URI += " \
+    crate://crates.io/adler/1.0.2 \
+    crate://crates.io/adler32/1.2.0 \
+    crate://crates.io/aho-corasick/1.1.3 \
+    crate://crates.io/android-tzdata/0.1.1 \
+    crate://crates.io/android_system_properties/0.1.5 \
+    crate://crates.io/autocfg/1.3.0 \
+    crate://crates.io/base64/0.21.7 \
+    crate://crates.io/bindgen/0.65.1 \
+    crate://crates.io/bit_field/0.10.2 \
+    crate://crates.io/bitflags/1.3.2 \
+    crate://crates.io/bitflags/2.5.0 \
+    crate://crates.io/block-buffer/0.10.4 \
+    crate://crates.io/bumpalo/3.16.0 \
+    crate://crates.io/bytemuck/1.21.0 \
+    crate://crates.io/byteorder/1.5.0 \
+    crate://crates.io/bytes/1.9.0 \
+    crate://crates.io/bzip2-rs/0.1.2 \
+    crate://crates.io/cbindgen/0.25.0 \
+    crate://crates.io/cc/1.0.97 \
+    crate://crates.io/cexpr/0.6.0 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/chrono/0.4.38 \
+    crate://crates.io/clang-sys/1.7.0 \
+    crate://crates.io/color_quant/1.1.0 \
+    crate://crates.io/core-foundation-sys/0.8.6 \
+    crate://crates.io/cpufeatures/0.2.12 \
+    crate://crates.io/crc32fast/1.4.0 \
+    crate://crates.io/crossbeam-deque/0.8.5 \
+    crate://crates.io/crossbeam-epoch/0.9.18 \
+    crate://crates.io/crossbeam-utils/0.8.19 \
+    crate://crates.io/crunchy/0.2.2 \
+    crate://crates.io/crypto-common/0.1.6 \
+    crate://crates.io/delharc/0.6.1 \
+    crate://crates.io/digest/0.10.7 \
+    crate://crates.io/either/1.11.0 \
+    crate://crates.io/encoding_rs/0.8.34 \
+    crate://crates.io/enum-primitive-derive/0.2.2 \
+    crate://crates.io/errno/0.3.8 \
+    crate://crates.io/exr/1.72.0 \
+    crate://crates.io/fastrand/2.1.0 \
+    crate://crates.io/fdeflate/0.3.4 \
+    crate://crates.io/flate2/1.0.30 \
+    crate://crates.io/flume/0.11.0 \
+    crate://crates.io/generic-array/0.14.7 \
+    crate://crates.io/gif/0.13.1 \
+    crate://crates.io/glob/0.3.1 \
+    crate://crates.io/half/2.4.1 \
+    crate://crates.io/hashbrown/0.12.3 \
+    crate://crates.io/heck/0.4.1 \
+    crate://crates.io/hex/0.4.3 \
+    crate://crates.io/hex-literal/0.4.1 \
+    crate://crates.io/home/0.5.9 \
+    crate://crates.io/iana-time-zone/0.1.60 \
+    crate://crates.io/iana-time-zone-haiku/0.1.2 \
+    crate://crates.io/image/0.24.9 \
+    crate://crates.io/indexmap/1.9.3 \
+    crate://crates.io/inflate/0.4.5 \
+    crate://crates.io/itertools/0.10.5 \
+    crate://crates.io/itoa/1.0.11 \
+    crate://crates.io/jpeg-decoder/0.3.1 \
+    crate://crates.io/js-sys/0.3.69 \
+    crate://crates.io/lazy_static/1.4.0 \
+    crate://crates.io/lazycell/1.3.0 \
+    crate://crates.io/lebe/0.5.2 \
+    crate://crates.io/libc/0.2.155 \
+    crate://crates.io/libloading/0.8.3 \
+    crate://crates.io/linux-raw-sys/0.4.13 \
+    crate://crates.io/lock_api/0.4.12 \
+    crate://crates.io/log/0.4.21 \
+    crate://crates.io/memchr/2.7.2 \
+    crate://crates.io/minimal-lexical/0.2.1 \
+    crate://crates.io/miniz_oxide/0.7.2 \
+    crate://crates.io/nom/7.1.3 \
+    crate://crates.io/num-complex/0.4.5 \
+    crate://crates.io/num-integer/0.1.46 \
+    crate://crates.io/num-traits/0.2.19 \
+    crate://crates.io/once_cell/1.19.0 \
+    crate://crates.io/paste/1.0.14 \
+    crate://crates.io/peeking_take_while/0.1.2 \
+    crate://crates.io/png/0.17.13 \
+    crate://crates.io/prettyplease/0.2.19 \
+    crate://crates.io/primal-check/0.3.3 \
+    crate://crates.io/proc-macro2/1.0.81 \
+    crate://crates.io/qoi/0.4.1 \
+    crate://crates.io/quote/1.0.36 \
+    crate://crates.io/rayon/1.10.0 \
+    crate://crates.io/rayon-core/1.12.1 \
+    crate://crates.io/regex/1.10.4 \
+    crate://crates.io/regex-automata/0.4.6 \
+    crate://crates.io/regex-syntax/0.8.3 \
+    crate://crates.io/rustc-hash/1.1.0 \
+    crate://crates.io/rustdct/0.7.1 \
+    crate://crates.io/rustfft/6.2.0 \
+    crate://crates.io/rustix/0.38.34 \
+    crate://crates.io/ryu/1.0.17 \
+    crate://crates.io/scopeguard/1.2.0 \
+    crate://crates.io/serde/1.0.200 \
+    crate://crates.io/serde_derive/1.0.200 \
+    crate://crates.io/serde_json/1.0.116 \
+    crate://crates.io/sha1/0.10.6 \
+    crate://crates.io/sha2/0.10.8 \
+    crate://crates.io/shlex/1.3.0 \
+    crate://crates.io/simd-adler32/0.3.7 \
+    crate://crates.io/smallvec/1.13.2 \
+    crate://crates.io/spin/0.9.8 \
+    crate://crates.io/strength_reduce/0.2.4 \
+    crate://crates.io/syn/1.0.109 \
+    crate://crates.io/syn/2.0.60 \
+    crate://crates.io/tempfile/3.10.1 \
+    crate://crates.io/thiserror/1.0.59 \
+    crate://crates.io/thiserror-impl/1.0.59 \
+    crate://crates.io/tiff/0.9.1 \
+    crate://crates.io/tinyvec/1.6.0 \
+    crate://crates.io/toml/0.5.11 \
+    crate://crates.io/transpose/0.2.3 \
+    crate://crates.io/typenum/1.17.0 \
+    crate://crates.io/unicode-ident/1.0.12 \
+    crate://crates.io/unicode-segmentation/1.11.0 \
+    crate://crates.io/uuid/1.8.0 \
+    crate://crates.io/version_check/0.9.4 \
+    crate://crates.io/wasm-bindgen/0.2.92 \
+    crate://crates.io/wasm-bindgen-backend/0.2.92 \
+    crate://crates.io/wasm-bindgen-macro/0.2.92 \
+    crate://crates.io/wasm-bindgen-macro-support/0.2.92 \
+    crate://crates.io/wasm-bindgen-shared/0.2.92 \
+    crate://crates.io/weezl/0.1.8 \
+    crate://crates.io/which/4.4.2 \
+    crate://crates.io/widestring/1.1.0 \
+    crate://crates.io/windows-core/0.52.0 \
+    crate://crates.io/windows-sys/0.52.0 \
+    crate://crates.io/windows-targets/0.52.5 \
+    crate://crates.io/windows_aarch64_gnullvm/0.52.5 \
+    crate://crates.io/windows_aarch64_msvc/0.52.5 \
+    crate://crates.io/windows_i686_gnu/0.52.5 \
+    crate://crates.io/windows_i686_gnullvm/0.52.5 \
+    crate://crates.io/windows_i686_msvc/0.52.5 \
+    crate://crates.io/windows_x86_64_gnu/0.52.5 \
+    crate://crates.io/windows_x86_64_gnullvm/0.52.5 \
+    crate://crates.io/windows_x86_64_msvc/0.52.5 \
+    crate://crates.io/zune-inflate/0.2.54 \
+"
+
+SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+SRC_URI[adler32-1.2.0.sha256sum] = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
+SRC_URI[aho-corasick-1.1.3.sha256sum] = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+SRC_URI[android-tzdata-0.1.1.sha256sum] = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+SRC_URI[autocfg-1.3.0.sha256sum] = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+SRC_URI[base64-0.21.7.sha256sum] = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+SRC_URI[bindgen-0.65.1.sha256sum] = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5"
+SRC_URI[bit_field-0.10.2.sha256sum] = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
+SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+SRC_URI[bitflags-2.5.0.sha256sum] = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+SRC_URI[block-buffer-0.10.4.sha256sum] = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+SRC_URI[bumpalo-3.16.0.sha256sum] = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+SRC_URI[bytemuck-1.21.0.sha256sum] = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3"
+SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+SRC_URI[bytes-1.9.0.sha256sum] = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
+SRC_URI[bzip2-rs-0.1.2.sha256sum] = "beeb59e7e4c811ab37cc73680c798c7a5da77fc9989c62b09138e31ee740f735"
+SRC_URI[cbindgen-0.25.0.sha256sum] = "faeaa693e5a727975a79211b8f35c0cb09b031fdb6eaa4a788bc6713d01488ca"
+SRC_URI[cc-1.0.97.sha256sum] = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4"
+SRC_URI[cexpr-0.6.0.sha256sum] = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+SRC_URI[chrono-0.4.38.sha256sum] = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+SRC_URI[clang-sys-1.7.0.sha256sum] = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1"
+SRC_URI[color_quant-1.1.0.sha256sum] = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
+SRC_URI[core-foundation-sys-0.8.6.sha256sum] = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+SRC_URI[cpufeatures-0.2.12.sha256sum] = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+SRC_URI[crc32fast-1.4.0.sha256sum] = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+SRC_URI[crossbeam-deque-0.8.5.sha256sum] = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+SRC_URI[crossbeam-epoch-0.9.18.sha256sum] = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+SRC_URI[crossbeam-utils-0.8.19.sha256sum] = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+SRC_URI[crunchy-0.2.2.sha256sum] = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+SRC_URI[crypto-common-0.1.6.sha256sum] = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+SRC_URI[delharc-0.6.1.sha256sum] = "1c93ba2617f5094875af777b3e1e5d66e79d7c832e4ae2e25722c965a482e5a1"
+SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+SRC_URI[either-1.11.0.sha256sum] = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
+SRC_URI[encoding_rs-0.8.34.sha256sum] = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
+SRC_URI[enum-primitive-derive-0.2.2.sha256sum] = "c375b9c5eadb68d0a6efee2999fef292f45854c3444c86f09d8ab086ba942b0e"
+SRC_URI[errno-0.3.8.sha256sum] = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+SRC_URI[exr-1.72.0.sha256sum] = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4"
+SRC_URI[fastrand-2.1.0.sha256sum] = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+SRC_URI[fdeflate-0.3.4.sha256sum] = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
+SRC_URI[flate2-1.0.30.sha256sum] = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+SRC_URI[flume-0.11.0.sha256sum] = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
+SRC_URI[generic-array-0.14.7.sha256sum] = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+SRC_URI[gif-0.13.1.sha256sum] = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2"
+SRC_URI[glob-0.3.1.sha256sum] = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+SRC_URI[half-2.4.1.sha256sum] = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
+SRC_URI[hashbrown-0.12.3.sha256sum] = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+SRC_URI[heck-0.4.1.sha256sum] = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+SRC_URI[hex-0.4.3.sha256sum] = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+SRC_URI[hex-literal-0.4.1.sha256sum] = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
+SRC_URI[home-0.5.9.sha256sum] = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+SRC_URI[iana-time-zone-0.1.60.sha256sum] = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+SRC_URI[iana-time-zone-haiku-0.1.2.sha256sum] = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+SRC_URI[image-0.24.9.sha256sum] = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
+SRC_URI[indexmap-1.9.3.sha256sum] = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+SRC_URI[inflate-0.4.5.sha256sum] = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff"
+SRC_URI[itertools-0.10.5.sha256sum] = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+SRC_URI[itoa-1.0.11.sha256sum] = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+SRC_URI[jpeg-decoder-0.3.1.sha256sum] = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
+SRC_URI[js-sys-0.3.69.sha256sum] = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+SRC_URI[lazycell-1.3.0.sha256sum] = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+SRC_URI[lebe-0.5.2.sha256sum] = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
+SRC_URI[libc-0.2.155.sha256sum] = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+SRC_URI[libloading-0.8.3.sha256sum] = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
+SRC_URI[linux-raw-sys-0.4.13.sha256sum] = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+SRC_URI[lock_api-0.4.12.sha256sum] = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+SRC_URI[log-0.4.21.sha256sum] = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+SRC_URI[memchr-2.7.2.sha256sum] = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+SRC_URI[miniz_oxide-0.7.2.sha256sum] = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+SRC_URI[num-complex-0.4.5.sha256sum] = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6"
+SRC_URI[num-integer-0.1.46.sha256sum] = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+SRC_URI[num-traits-0.2.19.sha256sum] = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+SRC_URI[paste-1.0.14.sha256sum] = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+SRC_URI[peeking_take_while-0.1.2.sha256sum] = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
+SRC_URI[png-0.17.13.sha256sum] = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
+SRC_URI[prettyplease-0.2.19.sha256sum] = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550"
+SRC_URI[primal-check-0.3.3.sha256sum] = "9df7f93fd637f083201473dab4fee2db4c429d32e55e3299980ab3957ab916a0"
+SRC_URI[proc-macro2-1.0.81.sha256sum] = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
+SRC_URI[qoi-0.4.1.sha256sum] = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"
+SRC_URI[quote-1.0.36.sha256sum] = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+SRC_URI[rayon-1.10.0.sha256sum] = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+SRC_URI[rayon-core-1.12.1.sha256sum] = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+SRC_URI[regex-1.10.4.sha256sum] = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+SRC_URI[regex-automata-0.4.6.sha256sum] = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+SRC_URI[regex-syntax-0.8.3.sha256sum] = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+SRC_URI[rustc-hash-1.1.0.sha256sum] = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+SRC_URI[rustdct-0.7.1.sha256sum] = "8b61555105d6a9bf98797c063c362a1d24ed8ab0431655e38f1cf51e52089551"
+SRC_URI[rustfft-6.2.0.sha256sum] = "43806561bc506d0c5d160643ad742e3161049ac01027b5e6d7524091fd401d86"
+SRC_URI[rustix-0.38.34.sha256sum] = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+SRC_URI[ryu-1.0.17.sha256sum] = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+SRC_URI[serde-1.0.200.sha256sum] = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f"
+SRC_URI[serde_derive-1.0.200.sha256sum] = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb"
+SRC_URI[serde_json-1.0.116.sha256sum] = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
+SRC_URI[sha1-0.10.6.sha256sum] = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+SRC_URI[sha2-0.10.8.sha256sum] = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+SRC_URI[simd-adler32-0.3.7.sha256sum] = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+SRC_URI[smallvec-1.13.2.sha256sum] = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+SRC_URI[spin-0.9.8.sha256sum] = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+SRC_URI[strength_reduce-0.2.4.sha256sum] = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82"
+SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+SRC_URI[syn-2.0.60.sha256sum] = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
+SRC_URI[tempfile-3.10.1.sha256sum] = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+SRC_URI[thiserror-1.0.59.sha256sum] = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
+SRC_URI[thiserror-impl-1.0.59.sha256sum] = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
+SRC_URI[tiff-0.9.1.sha256sum] = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e"
+SRC_URI[tinyvec-1.6.0.sha256sum] = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+SRC_URI[toml-0.5.11.sha256sum] = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+SRC_URI[transpose-0.2.3.sha256sum] = "1ad61aed86bc3faea4300c7aee358b4c6d0c8d6ccc36524c96e4c92ccf26e77e"
+SRC_URI[typenum-1.17.0.sha256sum] = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+SRC_URI[unicode-ident-1.0.12.sha256sum] = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+SRC_URI[unicode-segmentation-1.11.0.sha256sum] = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+SRC_URI[uuid-1.8.0.sha256sum] = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
+SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+SRC_URI[wasm-bindgen-0.2.92.sha256sum] = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+SRC_URI[wasm-bindgen-backend-0.2.92.sha256sum] = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+SRC_URI[wasm-bindgen-macro-0.2.92.sha256sum] = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+SRC_URI[wasm-bindgen-macro-support-0.2.92.sha256sum] = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+SRC_URI[wasm-bindgen-shared-0.2.92.sha256sum] = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+SRC_URI[weezl-0.1.8.sha256sum] = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
+SRC_URI[which-4.4.2.sha256sum] = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+SRC_URI[widestring-1.1.0.sha256sum] = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
+SRC_URI[windows-core-0.52.0.sha256sum] = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+SRC_URI[windows-targets-0.52.5.sha256sum] = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+SRC_URI[windows_aarch64_gnullvm-0.52.5.sha256sum] = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+SRC_URI[windows_aarch64_msvc-0.52.5.sha256sum] = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+SRC_URI[windows_i686_gnu-0.52.5.sha256sum] = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+SRC_URI[windows_i686_gnullvm-0.52.5.sha256sum] = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+SRC_URI[windows_i686_msvc-0.52.5.sha256sum] = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+SRC_URI[windows_x86_64_gnu-0.52.5.sha256sum] = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+SRC_URI[windows_x86_64_gnullvm-0.52.5.sha256sum] = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+SRC_URI[windows_x86_64_msvc-0.52.5.sha256sum] = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+SRC_URI[zune-inflate-0.2.54.sha256sum] = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
diff --git a/recipes-scanners/clamav/clamav-git-crates.inc b/recipes-scanners/clamav/clamav-git-crates.inc
new file mode 100644
index 0000000..01237c8
--- /dev/null
+++ b/recipes-scanners/clamav/clamav-git-crates.inc
@@ -0,0 +1,9 @@
+# Git-based Rust dependencies for ClamAV
+# onenote_parser from Cisco-Talos/onenote.rs
+
+SRC_URI += "\
+    git://github.com/Cisco-Talos/onenote.rs.git;protocol=https;nobranch=1;name=onenote_parser;destsuffix=onenote_parser;type=git-dependency \
+"
+
+SRCREV_FORMAT .= "_onenote_parser"
+SRCREV_onenote_parser = "8b450447e58143004b68dd21c11b710fdb79be92"
diff --git a/recipes-scanners/clamav/clamav_0.104.4.bb b/recipes-scanners/clamav/clamav_0.104.4.bb
deleted file mode 100644
index 7b81fd0..0000000
--- a/recipes-scanners/clamav/clamav_0.104.4.bb
+++ /dev/null
@@ -1,156 +0,0 @@
-SUMMARY = "ClamAV anti-virus utility for Unix - command-line interface"
-DESCRIPTION = "ClamAV is an open source antivirus engine for detecting trojans, viruses, malware & other malicious threats."
-HOMEPAGE = "http://www.clamav.net/index.html"
-SECTION = "security"
-LICENSE = "LGPL-2.1-only"
-
-DEPENDS = "glibc llvm libtool db openssl zlib curl libxml2 bison pcre2 json-c libcheck"
- 
-COMPATIBLE_HOST:libc-musl:class-target = "null"
-
-LIC_FILES_CHKSUM = "file://COPYING.txt;beginline=2;endline=3;md5=f7029fbbc5898b273d5902896f7bbe17"
-
-# July 30th, 2022
-SRCREV = "563ba93052f3b7b46fb8725a65ee6299a9c332cf"
-
-SRC_URI = "git://github.com/Cisco-Talos/clamav;branch=rel/0.104;protocol=https \
-    file://clamd.conf \
-    file://freshclam.conf \
-    file://volatiles.03_clamav \
-    file://tmpfiles.clamav \
-    file://headers_fixup.patch \
-    file://oe_cmake_fixup.patch \
-"
-
-LEAD_SONAME = "libclamav.so"
-SO_VER = "9.6.0"
-
-BINCONFIG = "${bindir}/clamav-config"
-
-inherit cmake chrpath pkgconfig useradd systemd multilib_header multilib_script
-
-UPSTREAM_CHECK_COMMITS = "1"
-
-CLAMAV_UID ?= "clamav"
-CLAMAV_GID ?= "clamav"
-
-MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/clamav-config"
-
-EXTRA_OECMAKE = " -DCMAKE_BUILD_TYPE=Release -DOPTIMIZE=ON -DENABLE_JSON_SHARED=OFF \
-                  -DCLAMAV_GROUP=${CLAMAV_GID} -DCLAMAV_USER=${CLAMAV_UID} \ 
-                  -DENABLE_TESTS=OFF -DBUILD_SHARED_LIBS=ON \
-                  -DDISABLE_MPOOL=ON -DENABLE_FRESHCLAM_DNS_FIX=ON \
-                   "
-
-PACKAGECONFIG ?= "  clamonacc \
-                 ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", "", d)}"
-
-PACKAGECONFIG[milter] = "-DENABLE_MILTER=ON ,-DENABLE_MILTER=OFF, curl, curl"
-PACKAGECONFIG[clamonacc] = "-DENABLE_CLAMONACC=ON ,-DENABLE_CLAMONACC=OFF,"
-PACKAGECONFIG[unrar] = "-DENABLE_UNRAR=ON ,-DENABLE_UNRAR=OFF,"
-PACKAGECONFIG[systemd] = "-DENABLE_SYSTEMD=ON -DSYSTEMD_UNIT_DIR=${systemd_system_unitdir}, -DENABLE_SYSTEMD=OFF, systemd"
-
-export OECMAKE_C_FLAGS += " -I${STAGING_INCDIR} -L ${RECIPE_SYSROOT}${nonarch_libdir} -L${STAGING_LIBDIR} -lpthread" 
-
-do_install:append () {
-    install -d ${D}/${sysconfdir}
-    install -d -o ${PN} -g ${CLAMAV_GID} ${D}/${localstatedir}/lib/clamav
-    install -d ${D}${sysconfdir}/clamav ${D}${sysconfdir}/default/volatiles
-
-    install -m 644 ${UNPACKDIR}/clamd.conf ${D}/${prefix}/${sysconfdir}
-    install -m 644 ${UNPACKDIR}/freshclam.conf ${D}/${prefix}/${sysconfdir}
-    install -m 0644 ${UNPACKDIR}/volatiles.03_clamav  ${D}${sysconfdir}/default/volatiles/03_clamav
-    sed -i -e 's#${STAGING_DIR_HOST}##g' ${D}${libdir}/pkgconfig/libclamav.pc
-    rm ${D}/${libdir}/libclamav.so
-    if [ "${INSTALL_CLAMAV_CVD}" = "1" ]; then
-        install -m 666 ${S}/clamav_db/* ${D}/${localstatedir}/lib/clamav/.
-    fi
-
-    rm ${D}/${libdir}/libfreshclam.so
-
-    if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then
-        install -d ${D}${sysconfdir}/tmpfiles.d
-        install -m 0644 ${UNPACKDIR}/tmpfiles.clamav ${D}${sysconfdir}/tmpfiles.d/clamav.conf
-    fi
-    oe_multilib_header clamav-types.h
-}
-
-pkg_postinst:${PN} () {
-    if [ -z "$D" ]; then
-        if command -v systemd-tmpfiles >/dev/null; then
-            systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/clamav.conf
-        elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then
-            ${sysconfdir}/init.d/populate-volatile.sh update
-        fi
-    fi
-}
-
-PACKAGES += "${PN}-daemon ${PN}-clamdscan ${PN}-freshclam ${PN}-libclamav"
-
-FILES:${PN} = "${bindir}/clambc ${bindir}/clamscan ${bindir}/clamsubmit ${sbindir}/clamonacc \
-                ${bindir}/*sigtool ${mandir}/man1/clambc* ${mandir}/man1/clamscan* \
-                ${mandir}/man1/sigtool* ${mandir}/man1/clambsubmit*  \
-                ${docdir}/clamav/*"
-
-FILES:${PN}-clamdscan = " ${bindir}/clamdscan \
-                        ${docdir}/clamdscan/* \
-                        ${mandir}/man1/clamdscan* \
-                        "
-
-FILES:${PN}-daemon = "${bindir}/clamconf ${bindir}/clamdtop ${sbindir}/clamd \
-                        ${mandir}/man1/clamconf* ${mandir}/man1/clamdtop* \
-                        ${mandir}/man5/clamd*  ${mandir}/man8/clamd* \
-                        ${sysconfdir}/clamd.conf* \
-                        /usr/etc/clamd.conf* \
-                        ${systemd_system_unitdir}/clamav-daemon/* \
-                        ${docdir}/clamav-daemon/*  ${sysconfdir}/clamav-daemon \
-                        ${sysconfdir}/logcheck/ignore.d.server/clamav-daemon \
-                        ${systemd_system_unitdir}/clamav-daemon.service \
-                        ${systemd_system_unitdir}/clamav-clamonacc.service \
-                        "
-
-FILES:${PN}-freshclam = "${bindir}/freshclam \
-                        ${sysconfdir}/freshclam.conf*  \
-                        /usr/etc/freshclam.conf*  \
-                        ${sysconfdir}/clamav ${sysconfdir}/default/volatiles \
-                        ${sysconfdir}/tmpfiles.d/*.conf \
-                        ${localstatedir}/lib/clamav \
-                        ${docdir}/${PN}-freshclam ${mandir}/man1/freshclam.* \
-                        ${mandir}/man5/freshclam.conf.* \
-                        ${systemd_system_unitdir}/clamav-freshclam.service"
-
-FILES:${PN}-dev = " ${bindir}/clamav-config ${libdir}/*.la \
-                    ${libdir}/pkgconfig/*.pc \
-                    ${mandir}/man1/clamav-config.* \
-                    ${includedir}/*.h ${docdir}/libclamav* \
-                    ${libdir}/libmspack.so"
-
-FILES:${PN}-staticdev = "${libdir}/*.a"
-
-FILES:${PN}-libclamav = "${libdir}/libclamav.so* ${libdir}/libclammspack.so* \
-                         ${libdir}/libfreshclam.so* ${docdir}/libclamav/* \
-                         ${libdir}/libmspack* "
-
-FILES:${PN}-doc = "${mandir}/man/* \
-                   ${datadir}/man/* \
-                   ${docdir}/* "
-
-USERADD_PACKAGES = "${PN}-freshclam "
-GROUPADD_PARAM:${PN}-freshclam = "--system ${CLAMAV_UID}"
-USERADD_PARAM:${PN}-freshclam = "--system -g ${CLAMAV_GID} --home-dir  \
-    ${localstatedir}/lib/${BPN} \
-    --no-create-home  --shell /sbin/nologin ${PN}"
-
-RPROVIDES:${PN} += "${PN}-systemd"
-RREPLACES:${PN} += "${PN}-systemd"
-RCONFLICTS:${PN} += "${PN}-systemd"
-SYSTEMD_PACKAGES  = "${PN}-daemon ${PN}-freshclam"
-SYSTEMD_SERVICE:${PN}-daemon = "clamav-daemon.service"
-SYSTEMD_SERVICE:${PN}-freshclam = "clamav-freshclam.service"
-
-INSANE_SKIP:${PN}-libclamav  += "dev-so"
-
-RDEPENDS:${PN} = "openssl ncurses-libncurses libxml2 libbz2 ncurses-libtinfo curl libpcre2 clamav-libclamav"
-RRECOMMENDS:${PN} = "clamav-freshclam"
-RDEPENDS:${PN}-freshclam = "clamav"
-RDEPENDS:${PN}-daemon = "clamav clamav-freshclam"
diff --git a/recipes-scanners/clamav/clamav_1.4.3.bb b/recipes-scanners/clamav/clamav_1.4.3.bb
new file mode 100644
index 0000000..f123512
--- /dev/null
+++ b/recipes-scanners/clamav/clamav_1.4.3.bb
@@ -0,0 +1,236 @@
+SUMMARY = "ClamAV anti-virus utilities and scanner tools"
+DESCRIPTION = "ClamAV is an open source antivirus engine for detecting trojans, viruses, malware & other malicious threats."
+HOMEPAGE = "http://www.clamav.net/index.html"
+SECTION = "security"
+LICENSE = "GPL-2.0-only & LGPL-2.1-only & BSD-2-Clause & Zlib & Apache-2.0-with-LLVM-exception"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=2c0b5770a62017a3121c69bb9f680b0c \
+                    file://COPYING/COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+                    file://COPYING/COPYING.bzip2;md5=ae8d555c34b656ff864ea9437a10d3a0 \
+                    file://COPYING/COPYING.zlib;md5=3648a0b9713ab246e11536055165a41a \
+                    file://COPYING/COPYING.llvm;md5=c82fc668ef1809acdd0684811df93bfc \
+                    file://COPYING/COPYING.unrar;md5=6a741ba21afc8b71aeaee3b5f86a8111 \
+                    file://COPYING/COPYING.file;md5=e63a61022c36cff2fdfbf02dd51674bd \
+                    file://COPYING/COPYING.curl;md5=be5d9e1419c4363f4b32037a2d3b7ffa \
+                    "
+
+DEPENDS = "glibc llvm libtool db openssl zlib curl libxml2 bison pcre2 json-c libcheck rust-native cargo-native libmspack"
+
+SRC_URI = "git://github.com/Cisco-Talos/clamav;branch=rel/1.4;protocol=https \
+           file://clamd.conf \
+           file://freshclam.conf \
+           file://volatiles.03_clamav \
+           file://tmpfiles.clamav \
+           "
+
+# ClamAV version 1.4.3
+SRCREV = "d8b053865fd5995f7af98bfbcd98c9a5644bfe2b"
+
+COMPATIBLE_HOST:libc-musl:class-target = "null"
+# As of 1.4.3 compilation is broken on 32-bit platforms
+COMPATIBLE_HOST:arm = "null"
+COMPATIBLE_HOST:mips = "null"
+COMPATIBLE_HOST:powerpc = "null"
+COMPATIBLE_HOST:riscv32 = "null"
+COMPATIBLE_HOST:x86 = "null"
+
+LEAD_SONAME = "libclamav.so"
+SO_VER = "12.0.0"
+BINCONFIG = "${bindir}/clamav-config"
+
+inherit cmake chrpath pkgconfig useradd systemd multilib_header multilib_script cargo cargo-update-recipe-crates
+
+# Rust code is in libclamav_rust subdirectory
+CARGO_SRC_DIR = "libclamav_rust"
+# Cargo.lock is in the root directory
+CARGO_LOCK_PATH = "${S}/Cargo.lock"
+
+require ${BPN}-crates.inc
+require ${BPN}-git-crates.inc
+
+UPSTREAM_CHECK_COMMITS = "1"
+
+CLAMAV_USER ?= "clamav"
+CLAMAV_GROUP ?= "clamav"
+
+PACKAGECONFIG ?= "clamonacc \
+                  ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", "", d)}"
+PACKAGECONFIG[milter] = "-DENABLE_MILTER=ON ,-DENABLE_MILTER=OFF, curl, curl"
+PACKAGECONFIG[clamonacc] = "-DENABLE_CLAMONACC=ON ,-DENABLE_CLAMONACC=OFF,"
+PACKAGECONFIG[unrar] = "-DENABLE_UNRAR=ON ,-DENABLE_UNRAR=OFF,"
+PACKAGECONFIG[freshclamdnsfix] = "-DENABLE_FRESHCLAM_DNS_FIX=ON ,-DENABLE_FRESHCLAM_DNS_FIX=OFF,"
+PACKAGECONFIG[systemd] = "-DENABLE_SYSTEMD=ON -DSYSTEMD_UNIT_DIR=${systemd_system_unitdir}, -DENABLE_SYSTEMD=OFF, systemd"
+
+EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DOPTIMIZE=ON -DENABLE_JSON_SHARED=OFF \
+                 -DCLAMAV_GROUP=${CLAMAV_GROUP} -DCLAMAV_USER=${CLAMAV_USER} \
+                 -DENABLE_TESTS=OFF -DBUILD_SHARED_LIBS=ON \
+                 -DDO_NOT_SET_RPATH=ON \
+                 -DCMAKE_INSTALL_PREFIX=${prefix} \
+                 -DCMAKE_INSTALL_SYSCONFDIR=${sysconfdir} \
+                 -DCMAKE_INSTALL_FULL_SYSCONFDIR=${sysconfdir} \
+                 -DSYSCONFDIR=${sysconfdir} \
+                 -DAPP_CONFIG_DIRECTORY=${sysconfdir}/clamav \
+                 -DHAVE_SIGNED_RIGHT_SHIFT=1 \
+                 -DHAVE_UNAME_SYSCALL=1 \
+                 -DHAVE_FD_PASSING=1 \
+                 -Dtest_run_result=0 \
+                 -Dtest_run_result__TRYRUN_OUTPUT='' \
+                 -DCMAKE_C_FLAGS='${CFLAGS} -Wno-error=format-truncation -Wno-error=unused-function' \
+                 -DRUST_COMPILER_TARGET=${RUST_TARGET_SYS} \
+                 "
+
+MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/clamav-config"
+
+# ClamAV uses both CMake and Rust/Cargo, so we need to configure both
+do_configure() {
+    cargo_common_do_configure
+    export RUSTFLAGS="${RUSTFLAGS}"
+    cmake_do_configure
+}
+
+# Override do_compile to handle CMake build separately from Cargo
+do_compile() {
+    # Build with CMake (this will also trigger the Rust build via CMake)
+    cmake_do_compile
+}
+
+do_compile:append() {
+    # Remove build path references from Rust static library
+    ${OBJCOPY} --remove-section .debug_line ${B}/libclamav_rust/target/${RUST_TARGET_SYS}/release/libclamav_rust.a || true
+}
+
+# Override do_install to use CMake install (Rust library is statically linked, no separate install needed)
+do_install() {
+    # Install with CMake
+    cmake_do_install
+}
+
+do_install:append() {
+    install -d ${D}/${sysconfdir}
+    install -d ${D}/${localstatedir}/lib/clamav
+    install -d ${D}${sysconfdir}/clamav ${D}${sysconfdir}/default/volatiles
+
+    install -m 644 ${UNPACKDIR}/clamd.conf ${D}${sysconfdir}/clamav
+    install -m 644 ${UNPACKDIR}/freshclam.conf ${D}${sysconfdir}/clamav
+    install -m 0644 ${UNPACKDIR}/volatiles.03_clamav  ${D}${sysconfdir}/default/volatiles/03_clamav
+
+    if [ -d ${D}${prefix}/etc ]; then
+        cp -r ${D}${prefix}/etc/* ${D}${sysconfdir}/ 2>/dev/null || true
+        rm -rf ${D}${prefix}/etc
+    fi
+
+    sed -i -e 's#${STAGING_DIR_HOST}##g' ${D}${libdir}/pkgconfig/libclamav.pc
+
+    # Remove build path references from binaries
+    chrpath -d ${D}${bindir}/clambc || true
+    chrpath -d ${D}${bindir}/sigtool || true
+    chrpath -d ${D}${libdir}/libclamav.so.${SO_VER} || true
+    chrpath -d ${D}${libdir}/libfreshclam.so.* || true
+
+    rm ${D}/${libdir}/libclamav.so
+    if [ "${INSTALL_CLAMAV_CVD}" = "1" ]; then
+        install -m 666 ${S}/clamav_db/* ${D}/${localstatedir}/lib/clamav/.
+    fi
+
+    rm ${D}/${libdir}/libfreshclam.so
+
+    if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then
+        install -d ${D}${sysconfdir}/tmpfiles.d
+        install -m 0644 ${UNPACKDIR}/tmpfiles.clamav ${D}${sysconfdir}/tmpfiles.d/clamav.conf
+    fi
+    oe_multilib_header clamav-types.h
+}
+
+pkg_postinst:${PN}-freshclam () {
+    if [ -n "$D" ]; then
+        return 0
+    fi
+
+    # Ensure correct ownership on directories (volatiles may not fix existing dirs)
+    if [ -d ${localstatedir}/lib/clamav ]; then
+        chown -R ${CLAMAV_USER}:${CLAMAV_GROUP} ${localstatedir}/lib/clamav
+    fi
+    if [ -d ${localstatedir}/log/clamav ]; then
+        chown -R ${CLAMAV_USER}:${CLAMAV_GROUP} ${localstatedir}/log/clamav
+    fi
+}
+
+PACKAGES += "${PN}-daemon ${PN}-clamdscan ${PN}-freshclam ${PN}-libclamav ${PN}-libclammspack"
+
+FILES:${PN} = "${bindir}/clambc ${bindir}/clamscan ${bindir}/clamsubmit ${sbindir}/clamonacc \
+               ${bindir}/*sigtool ${mandir}/man1/clambc* ${mandir}/man1/clamscan* \
+               ${mandir}/man1/sigtool* ${mandir}/man1/clambsubmit* \
+               ${docdir}/clamav/*"
+
+FILES:${PN}-clamdscan = "${bindir}/clamdscan \
+                         ${docdir}/clamdscan/* \
+                         ${mandir}/man1/clamdscan* \
+                         "
+
+FILES:${PN}-daemon = "${bindir}/clamconf ${bindir}/clamdtop ${sbindir}/clamd \
+                      ${mandir}/man1/clamconf* ${mandir}/man1/clamdtop* \
+                      ${mandir}/man5/clamd* ${mandir}/man8/clamd* \
+                      ${sysconfdir}/clamav/clamd.conf* \
+                      ${systemd_system_unitdir}/clamav-daemon/* \
+                      ${docdir}/clamav-daemon/* ${sysconfdir}/clamav-daemon \
+                      ${sysconfdir}/logcheck/ignore.d.server/clamav-daemon \
+                      ${systemd_system_unitdir}/clamav-daemon.service \
+                      ${systemd_system_unitdir}/clamav-clamonacc.service \
+                      "
+
+FILES:${PN}-freshclam = "${bindir}/freshclam \
+                         ${sysconfdir}/clamav/freshclam.conf* \
+                         ${sysconfdir}/clamav ${sysconfdir}/default/volatiles \
+                         ${sysconfdir}/tmpfiles.d/*.conf \
+                         ${localstatedir}/lib/clamav \
+                         ${docdir}/${PN}-freshclam ${mandir}/man1/freshclam.* \
+                         ${mandir}/man5/freshclam.conf.* \
+                         ${systemd_system_unitdir}/clamav-freshclam.service \
+                         ${systemd_system_unitdir}/clamav-freshclam-once.service \
+                         ${systemd_system_unitdir}/clamav-freshclam-once.timer"
+
+FILES:${PN}-libclamav = "${libdir}/libclamav.so* \
+                         ${libdir}/libfreshclam.so* ${docdir}/libclamav/* \
+                         "
+
+FILES:${PN}-libclammspack = "${libdir}/libclammspack.so* \
+                             ${libdir}/libmspack.so* \
+                             "
+
+FILES:${PN}-dev = "${bindir}/clamav-config ${libdir}/*.la \
+                   ${libdir}/pkgconfig/*.pc \
+                   ${mandir}/man1/clamav-config.* \
+                   ${includedir}/*.h ${docdir}/libclamav*"
+
+FILES:${PN}-staticdev = "${libdir}/*.a"
+
+FILES:${PN}-doc = "${mandir}/man/* \
+                   ${datadir}/man/* \
+                   ${docdir}/* \
+                   "
+
+RDEPENDS:${PN} = "openssl ncurses-libncurses libxml2 libbz2 ncurses-libtinfo curl libpcre2 clamav-libclamav"
+RDEPENDS:${PN}-daemon = "clamav clamav-freshclam"
+RDEPENDS:${PN}-freshclam = "clamav"
+RDEPENDS:${PN}-libclamav = "clamav-libclammspack"
+
+RRECOMMENDS:${PN} = "clamav-freshclam"
+
+RPROVIDES:${PN} += "${PN}-systemd"
+RREPLACES:${PN} += "${PN}-systemd"
+RCONFLICTS:${PN} += "${PN}-systemd"
+
+SYSTEMD_PACKAGES = "${PN}-daemon ${PN}-freshclam"
+SYSTEMD_SERVICE:${PN}-daemon = "clamav-daemon.service"
+SYSTEMD_SERVICE:${PN}-freshclam = "clamav-freshclam.service"
+
+USERADD_PACKAGES = "${PN}-freshclam"
+GROUPADD_PARAM:${PN}-freshclam = "--system ${CLAMAV_GROUP}"
+USERADD_PARAM:${PN}-freshclam = "--system -g ${CLAMAV_GROUP} --home-dir \
+                                 ${localstatedir}/lib/${BPN} \
+                                 --no-create-home --shell /sbin/nologin ${CLAMAV_USER}"
+
+INSANE_SKIP:${PN}-libclamav += "dev-so"
+INSANE_SKIP:${PN}-libclammspack += "dev-so"
+INSANE_SKIP:${PN} += "buildpaths"
+INSANE_SKIP:${PN}-libclamav += "buildpaths"
+INSANE_SKIP:${PN}-staticdev += "buildpaths"
diff --git a/recipes-scanners/clamav/files/headers_fixup.patch b/recipes-scanners/clamav/files/headers_fixup.patch
deleted file mode 100644
index 369aa58..0000000
--- a/recipes-scanners/clamav/files/headers_fixup.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Fixes checks not needed do to glibc 2.33
-
-Upstream-Status: Pending
-Signed-off-by: Armin Kuster <akuster808@gmail.com>
-
-Index: git/CMakeLists.txt
-===================================================================
---- git.orig/CMakeLists.txt
-+++ git/CMakeLists.txt
-@@ -443,8 +443,6 @@ check_include_file("stdlib.h"
- check_include_file("string.h"           HAVE_STRING_H)
- check_include_file("strings.h"          HAVE_STRINGS_H)
- check_include_file("sys/cdefs.h"        HAVE_SYS_CDEFS_H)
--check_include_file("sys/dl.h"           HAVE_SYS_DL_H)
--check_include_file("sys/fileio.h"       HAVE_SYS_FILIO_H)
- check_include_file("sys/mman.h"         HAVE_SYS_MMAN_H)
- check_include_file("sys/param.h"        HAVE_SYS_PARAM_H)
- check_include_file("sys/queue.h"        HAVE_SYS_QUEUE_H)
-@@ -479,8 +477,6 @@ endif()
- 
- # int-types variants
- check_include_file("inttypes.h"         HAVE_INTTYPES_H)
--check_include_file("sys/inttypes.h"     HAVE_SYS_INTTYPES_H)
--check_include_file("sys/int_types.h"    HAVE_SYS_INT_TYPES_H)
- check_include_file("stdint.h"           HAVE_STDINT_H)
- 
- # this hack required to silence warnings on systems with inttypes.h
-@@ -608,17 +604,11 @@ check_type_size("time_t"  SIZEOF_TIME_T)
- # Checks for library functions.
- include(CheckSymbolExists)
- check_symbol_exists(_Exit           "stdlib.h"      HAVE__EXIT)
--check_symbol_exists(accept4         "sys/types.h"   HAVE_ACCEPT4)
- check_symbol_exists(snprintf        "stdio.h"       HAVE_SNPRINTF)
--check_symbol_exists(stat64          "sys/stat.h"    HAVE_STAT64)
--check_symbol_exists(strcasestr      "string.h"      HAVE_STRCASESTR)
- check_symbol_exists(strerror_r      "string.h"      HAVE_STRERROR_R)
--check_symbol_exists(strlcat         "string.h"      HAVE_STRLCAT)
--check_symbol_exists(strlcpy         "string.h"      HAVE_STRLCPY)
- check_symbol_exists(strndup         "string.h"      HAVE_STRNDUP)
- check_symbol_exists(strnlen         "string.h"      HAVE_STRNLEN)
--check_symbol_exists(strnstr         "string.h"      HAVE_STRNSTR)
--check_symbol_exists(sysctlbyname    "sysctl.h"      HAVE_SYSCTLBYNAME)
-+check_symbol_exists(strcasecmp      "string.h"      HAVE_STRNCMP)
- check_symbol_exists(timegm          "time.h"        HAVE_TIMEGM)
- check_symbol_exists(vsnprintf       "stdio.h"       HAVE_VSNPRINTF)
- 
-@@ -632,10 +622,9 @@ else()
-     check_symbol_exists(fseeko          "stdio.h"       HAVE_FSEEKO)
-     check_symbol_exists(getaddrinfo     "netdb.h"       HAVE_GETADDRINFO)
-     check_symbol_exists(getpagesize     "unistd.h"      HAVE_GETPAGESIZE)
--    check_symbol_exists(mkstemp         "unistd.h"      HAVE_MKSTEMP)
-     check_symbol_exists(poll            "poll.h"        HAVE_POLL)
--    check_symbol_exists(setgroups       "unistd.h"      HAVE_SETGROUPS)
-     check_symbol_exists(setsid          "unistd.h"      HAVE_SETSID)
-+    set(HAVE_SYSCONF_SC_PAGESIZE 1)
- endif()
- 
- include(CheckSymbolExists)
diff --git a/recipes-scanners/clamav/files/oe_cmake_fixup.patch b/recipes-scanners/clamav/files/oe_cmake_fixup.patch
deleted file mode 100644
index c9c88b9..0000000
--- a/recipes-scanners/clamav/files/oe_cmake_fixup.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Issue with rpath including /usr/lib and crosscompile checkes causing oe configure to fail
-
-Use oe's cmake rpath framework and exclude some of the cmake checks that fail in our env
-
-Upstream-Status: Inappropriate [configuration]
-Singed-off-by: Armin Kuster <akuster808@gmail.com>
-
-Index: git/CMakeLists.txt
-===================================================================
---- git.orig/CMakeLists.txt
-+++ git/CMakeLists.txt
-@@ -162,12 +162,6 @@ endif()
- 
- include(GNUInstallDirs)
- 
--if(CMAKE_INSTALL_FULL_LIBDIR)
--    set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
--else()
--    set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
--endif()
--
- if(C_LINUX)
-     if(CMAKE_COMPILER_IS_GNUCXX)
-         # Set _GNU_SOURCE for O_LARGEFILE, O_CLOEXEC, O_DIRECTORY, O_NOFOLLOW, etc flags on older systems
-@@ -581,14 +575,8 @@ include(TestInline)
- include(CheckFileOffsetBits)
- # Determine how to pack structs on this platform.
- include(CheckStructPacking)
--# Check for signed right shift implementation.
--include(CheckSignedRightShift)
- # Check if systtem fts implementation available
- include(CheckFTS)
--# Check if uname(2) follows POSIX standard.
--include(CheckUnamePosix)
--# Check support for file descriptor passing
--include(CheckFDPassing)
- 
- # Check if big-endian
- include(TestBigEndian)
diff --git a/recipes-scanners/clamav/files/tmpfiles.clamav b/recipes-scanners/clamav/files/tmpfiles.clamav
index fd5adfe..8e0849e 100644
--- a/recipes-scanners/clamav/files/tmpfiles.clamav
+++ b/recipes-scanners/clamav/files/tmpfiles.clamav
@@ -1,3 +1,4 @@
 #Type Path        Mode UID  GID  Age Argument
+d /var/lib/clamav 0755 clamav clamav -
 d /var/log/clamav 0755 clamav clamav -
 f /var/log/clamav/freshclam.log 0644 clamav clamav -
diff --git a/recipes-scanners/clamav/files/volatiles.03_clamav b/recipes-scanners/clamav/files/volatiles.03_clamav
index ee2153c..0561c4d 100644
--- a/recipes-scanners/clamav/files/volatiles.03_clamav
+++ b/recipes-scanners/clamav/files/volatiles.03_clamav
@@ -1,3 +1,4 @@
 # <type> <owner> <group> <mode> <path> <linksource>
+d clamav clamav 0755 /var/lib/clamav none
 d clamav clamav 0755 /var/log/clamav none
 f clamav clamav 0655 /var/log/clamav/freshclam.log none
-- 
2.51.0



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [meta-security][PATCH 3/8] libmhash: add UPSTREAM_CHECK_URI
  2025-12-22 16:51 [meta-security][PATCH 0/8] Assorted updates 12/22 Scott Murray
  2025-12-22 16:51 ` [meta-security][PATCH 1/8] suricata: update to 7.0.13 Scott Murray
  2025-12-22 16:51 ` [meta-security][PATCH 2/8] clamav: Add recipe for version 1.4.3 Scott Murray
@ 2025-12-22 16:51 ` Scott Murray
  2025-12-22 16:51 ` [meta-security][PATCH 4/8] sssd: inherit github-releases class Scott Murray
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: Scott Murray @ 2025-12-22 16:51 UTC (permalink / raw)
  To: yocto-patches; +Cc: Marta Rybczynska

From: Yi Zhao <yi.zhao@eng.windriver.com>

Add UPSTREAM_CHECK_URI to check the correct latest stable verison.

Before the patch:
$ devtool latest-version libmash
INFO: Current version: 0.9.9.9
INFO: Latest version:

After the patch:
$ devtool latest-version libmash
INFO: Current version: 0.9.9.9
INFO: Latest version: 0.9.9.9

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 recipes-security/libmhash/libmhash_0.9.9.9.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes-security/libmhash/libmhash_0.9.9.9.bb b/recipes-security/libmhash/libmhash_0.9.9.9.bb
index 805cf05..7c7fb11 100644
--- a/recipes-security/libmhash/libmhash_0.9.9.9.bb
+++ b/recipes-security/libmhash/libmhash_0.9.9.9.bb
@@ -23,6 +23,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/mhash/mhash-${PV}.tar.bz2 \
 SRC_URI[md5sum] = "f91c74f9ccab2b574a98be5bc31eb280"
 SRC_URI[sha256sum] = "56521c52a9033779154432d0ae47ad7198914785265e1f570cee21ab248dfef0"
 
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/mhash/files/"
+
 inherit autotools-brokensep ptest multilib_header
 
 CFLAGS += "-std=gnu17"
-- 
2.51.0



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [meta-security][PATCH 4/8] sssd: inherit github-releases class
  2025-12-22 16:51 [meta-security][PATCH 0/8] Assorted updates 12/22 Scott Murray
                   ` (2 preceding siblings ...)
  2025-12-22 16:51 ` [meta-security][PATCH 3/8] libmhash: add UPSTREAM_CHECK_URI Scott Murray
@ 2025-12-22 16:51 ` Scott Murray
  2025-12-22 16:51 ` [meta-security][PATCH 5/8] scap-security-guide: add UPSTREAM_CHECK_GITTAGREGEX Scott Murray
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: Scott Murray @ 2025-12-22 16:51 UTC (permalink / raw)
  To: yocto-patches; +Cc: Marta Rybczynska

From: Yi Zhao <yi.zhao@eng.windriver.com>

Inherit github-releases class to check the correct latest stable
verison.

Before the patch:
$ devtool latest-version sssd
INFO: Current version: 2.10.2
INFO: Latest version:

After the patch:
$ devtool latest-version sssd
INFO: Current version: 2.10.2
INFO: Latest version: 2.11.1

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 .../networking-layer/recipes-security/sssd/sssd_2.10.2.bb     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dynamic-layers/networking-layer/recipes-security/sssd/sssd_2.10.2.bb b/dynamic-layers/networking-layer/recipes-security/sssd/sssd_2.10.2.bb
index b02710e..8ee61ce 100644
--- a/dynamic-layers/networking-layer/recipes-security/sssd/sssd_2.10.2.bb
+++ b/dynamic-layers/networking-layer/recipes-security/sssd/sssd_2.10.2.bb
@@ -26,9 +26,7 @@ SRC_URI = "https://github.com/SSSD/sssd/releases/download/${PV}/${BP}.tar.gz \
            "
 SRC_URI[sha256sum] = "e8aa5e6b48ae465bea7064048715ce7e9c53b50ec6a9c69304f59e0d35be40ff"
 
-UPSTREAM_CHECK_URI = "https://github.com/SSSD/${BPN}/releases"
-
-inherit autotools pkgconfig gettext python3native features_check systemd useradd
+inherit autotools pkgconfig gettext python3native features_check systemd useradd github-releases
 
 REQUIRED_DISTRO_FEATURES = "pam"
 
-- 
2.51.0



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [meta-security][PATCH 5/8] scap-security-guide: add UPSTREAM_CHECK_GITTAGREGEX
  2025-12-22 16:51 [meta-security][PATCH 0/8] Assorted updates 12/22 Scott Murray
                   ` (3 preceding siblings ...)
  2025-12-22 16:51 ` [meta-security][PATCH 4/8] sssd: inherit github-releases class Scott Murray
@ 2025-12-22 16:51 ` Scott Murray
  2025-12-22 16:51 ` [meta-security][PATCH 6/8] scap-security-guide: update branch Scott Murray
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: Scott Murray @ 2025-12-22 16:51 UTC (permalink / raw)
  To: yocto-patches; +Cc: Marta Rybczynska

From: Yi Zhao <yi.zhao@eng.windriver.com>

Add UPSTREAM_CHECK_GITTAGREGEX to check the correct latest stable
verison.

Before the patch:
$ devtool latest-version scap-security-guide
INFO: Current version: 0.1.78
INFO: Latest version: 0.5.0
INFO: Latest version's commit: b0a1b1c3db40f5fe8610c43cbc391bde92cc78b6

After the patch:
$ devtool latest-version scap-security-guide
INFO: Current version: 0.1.78
INFO: Latest version: 0.1.78
INFO: Latest version's commit: f7d794851971087db77d4be8eeb716944a1aae21

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 .../scap-security-guide/scap-security-guide_0.1.78.bb            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-compliance/scap-security-guide/scap-security-guide_0.1.78.bb b/recipes-compliance/scap-security-guide/scap-security-guide_0.1.78.bb
index 8489218..40a677f 100644
--- a/recipes-compliance/scap-security-guide/scap-security-guide_0.1.78.bb
+++ b/recipes-compliance/scap-security-guide/scap-security-guide_0.1.78.bb
@@ -11,6 +11,7 @@ SRC_URI = "git://github.com/ComplianceAsCode/content.git;nobranch=1;protocol=htt
            file://run_eval.sh \
            "
 
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)$"
 
 DEPENDS = "openscap-native python3-pyyaml-native python3-jinja2-native libxml2-native expat-native coreutils-native"
 
-- 
2.51.0



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [meta-security][PATCH 6/8] scap-security-guide: update branch
  2025-12-22 16:51 [meta-security][PATCH 0/8] Assorted updates 12/22 Scott Murray
                   ` (4 preceding siblings ...)
  2025-12-22 16:51 ` [meta-security][PATCH 5/8] scap-security-guide: add UPSTREAM_CHECK_GITTAGREGEX Scott Murray
@ 2025-12-22 16:51 ` Scott Murray
  2025-12-22 16:51 ` [meta-security][PATCH 7/8] openscap: switch to libpcre2 Scott Murray
  2025-12-22 16:51 ` [meta-security][PATCH 8/8] suricata: drop deprecated nss, nspr PACKAGECONFIGs Scott Murray
  7 siblings, 0 replies; 9+ messages in thread
From: Scott Murray @ 2025-12-22 16:51 UTC (permalink / raw)
  To: yocto-patches; +Cc: Marta Rybczynska

Switch back to the "stable" branch in SRC_URI now that upstream
has changed its branch maintenance model so it is indeed stable.

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
 .../scap-security-guide/scap-security-guide_0.1.78.bb           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-compliance/scap-security-guide/scap-security-guide_0.1.78.bb b/recipes-compliance/scap-security-guide/scap-security-guide_0.1.78.bb
index 40a677f..919a09c 100644
--- a/recipes-compliance/scap-security-guide/scap-security-guide_0.1.78.bb
+++ b/recipes-compliance/scap-security-guide/scap-security-guide_0.1.78.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9bfa86579213cb4c6adaffface6b2820"
 LICENSE = "BSD-3-Clause"
 
 SRCREV = "f7d794851971087db77d4be8eeb716944a1aae21"
-SRC_URI = "git://github.com/ComplianceAsCode/content.git;nobranch=1;protocol=https \
+SRC_URI = "git://github.com/ComplianceAsCode/content.git;protocol=https;branch=stable \
            file://run_eval.sh \
            "
 
-- 
2.51.0



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [meta-security][PATCH 7/8] openscap: switch to libpcre2
  2025-12-22 16:51 [meta-security][PATCH 0/8] Assorted updates 12/22 Scott Murray
                   ` (5 preceding siblings ...)
  2025-12-22 16:51 ` [meta-security][PATCH 6/8] scap-security-guide: update branch Scott Murray
@ 2025-12-22 16:51 ` Scott Murray
  2025-12-22 16:51 ` [meta-security][PATCH 8/8] suricata: drop deprecated nss, nspr PACKAGECONFIGs Scott Murray
  7 siblings, 0 replies; 9+ messages in thread
From: Scott Murray @ 2025-12-22 16:51 UTC (permalink / raw)
  To: yocto-patches; +Cc: Marta Rybczynska

From: hongxu <hongxu.jia@windriver.com>

The openscap added PCRE2 library since 2023 [1]

[1] https://github.com/OpenSCAP/openscap/commit/cd1d4289581fa15527e516ddd07be814af7cba55

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 recipes-compliance/openscap/openscap_1.4.2.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-compliance/openscap/openscap_1.4.2.bb b/recipes-compliance/openscap/openscap_1.4.2.bb
index da1dbbb..7b3786e 100644
--- a/recipes-compliance/openscap/openscap_1.4.2.bb
+++ b/recipes-compliance/openscap/openscap_1.4.2.bb
@@ -6,8 +6,8 @@ HOME_URL = "https://www.open-scap.org/tools/openscap-base/"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 LICENSE = "LGPL-2.1-only"
 
-DEPENDS = "dbus acl bzip2 pkgconfig gconf procps curl libxml2 libxslt libcap swig libpcre  xmlsec1"
-DEPENDS:class-native = "pkgconfig-native swig-native curl-native libxml2-native libxslt-native libcap-native libpcre-native xmlsec1-native"
+DEPENDS = "dbus acl bzip2 pkgconfig gconf procps curl libxml2 libxslt libcap swig libpcre2  xmlsec1"
+DEPENDS:class-native = "pkgconfig-native swig-native curl-native libxml2-native libxslt-native libcap-native libpcre2-native xmlsec1-native"
 
 SRC_URI = "git://github.com/OpenSCAP/openscap.git;branch=main;protocol=https \
            file://0001-CMakeLists.txt-fix-installation-directory-for-system.patch \
-- 
2.51.0



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [meta-security][PATCH 8/8] suricata: drop deprecated nss, nspr PACKAGECONFIGs
  2025-12-22 16:51 [meta-security][PATCH 0/8] Assorted updates 12/22 Scott Murray
                   ` (6 preceding siblings ...)
  2025-12-22 16:51 ` [meta-security][PATCH 7/8] openscap: switch to libpcre2 Scott Murray
@ 2025-12-22 16:51 ` Scott Murray
  7 siblings, 0 replies; 9+ messages in thread
From: Scott Murray @ 2025-12-22 16:51 UTC (permalink / raw)
  To: yocto-patches; +Cc: Marta Rybczynska

From: Clayton Casciato <majortomtosourcecontrol@gmail.com>

Default add in 3f95047ae1e1d ("suricata: package update to 2.0.8")

https://docs.suricata.io/en/suricata-8.0.1/upgrade.html#id7
As of 7.0, "NSS is no longer required. File hashing and JA3 can now be
used without the NSS compile time dependency."

Removed in 8.0:
https://github.com/OISF/suricata/blob/suricata-8.0.1/ChangeLog#L647

Signed-off-by: Clayton Casciato <majortomtosourcecontrol@gmail.com>
---
 recipes-ids/suricata/suricata_7.0.13.bb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/recipes-ids/suricata/suricata_7.0.13.bb b/recipes-ids/suricata/suricata_7.0.13.bb
index cfb01c5..0635bf3 100644
--- a/recipes-ids/suricata/suricata_7.0.13.bb
+++ b/recipes-ids/suricata/suricata_7.0.13.bb
@@ -37,7 +37,7 @@ CARGO_BUILD_FLAGS:append = " --offline"
 B = "${S}"
 
 # nfnetlink has a dependancy to meta-networking
-PACKAGECONFIG ??= "jansson file pcre2 yaml python pcap cap-ng net nss nspr "
+PACKAGECONFIG ??= "jansson file pcre2 yaml python pcap cap-ng net"
 PACKAGECONFIG:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'unittests', '', d)}"
 
 PACKAGECONFIG[pcre2] = "--with-libpcre2-includes=${STAGING_INCDIR} --with-libpcre2-libraries=${STAGING_LIBDIR}, ,libpcre2 ," 
@@ -50,8 +50,6 @@ PACKAGECONFIG[nfq] = "--enable-nfqueue, --disable-nfqueue,libnetfilter-queue,"
 
 PACKAGECONFIG[jansson] = "--with-libjansson-includes=${STAGING_INCDIR} --with-libjansson-libraries=${STAGING_LIBDIR},,jansson, jansson"
 PACKAGECONFIG[file] = ",,file, file"
-PACKAGECONFIG[nss] = "--with-libnss-includes=${STAGING_INCDIR} --with-libnss-libraries=${STAGING_LIBDIR}, nss, nss," 
-PACKAGECONFIG[nspr] = "--with-libnspr-includes=${STAGING_INCDIR} --with-libnspr-libraries=${STAGING_LIBDIR}, nspr, nspr," 
 PACKAGECONFIG[python] = "--enable-python, --disable-python, python3, python3-core" 
 PACKAGECONFIG[unittests] = "--enable-unittests, --disable-unittests," 
 
-- 
2.51.0



^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2025-12-22 16:52 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-12-22 16:51 [meta-security][PATCH 0/8] Assorted updates 12/22 Scott Murray
2025-12-22 16:51 ` [meta-security][PATCH 1/8] suricata: update to 7.0.13 Scott Murray
2025-12-22 16:51 ` [meta-security][PATCH 2/8] clamav: Add recipe for version 1.4.3 Scott Murray
2025-12-22 16:51 ` [meta-security][PATCH 3/8] libmhash: add UPSTREAM_CHECK_URI Scott Murray
2025-12-22 16:51 ` [meta-security][PATCH 4/8] sssd: inherit github-releases class Scott Murray
2025-12-22 16:51 ` [meta-security][PATCH 5/8] scap-security-guide: add UPSTREAM_CHECK_GITTAGREGEX Scott Murray
2025-12-22 16:51 ` [meta-security][PATCH 6/8] scap-security-guide: update branch Scott Murray
2025-12-22 16:51 ` [meta-security][PATCH 7/8] openscap: switch to libpcre2 Scott Murray
2025-12-22 16:51 ` [meta-security][PATCH 8/8] suricata: drop deprecated nss, nspr PACKAGECONFIGs Scott Murray

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.