From cfe35bb710b3fafc535e622a165f17a54b31271d Mon Sep 17 00:00:00 2001 From: kpcyrd Date: Thu, 22 Aug 2024 21:08:02 +0200 Subject: [PATCH] Update dependencies --- Cargo.lock | 330 ++++++++++++++++++++++++++++++++++++----------------- Cargo.toml | 2 +- Dockerfile | 4 +- 3 files changed, 228 insertions(+), 108 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ca75069..36e54f6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -58,23 +58,24 @@ dependencies = [ [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.2" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" @@ -91,17 +92,17 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -138,7 +139,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.28", + "time 0.3.36", ] [[package]] @@ -306,7 +307,7 @@ dependencies = [ "env_logger 0.9.3", "lazy_static", "lazycell", - "log 0.4.20", + "log 0.4.22", "peeking_take_while", "proc-macro2 1.0.66", "quote 1.0.33", @@ -392,7 +393,7 @@ dependencies = [ "close_fds", "errno 0.2.8", "libc", - "log 0.4.20", + "log 0.4.22", "nix 0.24.3", "pledge", "regex", @@ -525,7 +526,7 @@ dependencies = [ "serde", "time 0.1.45", "wasm-bindgen", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -543,7 +544,7 @@ dependencies = [ "hyper 0.12.36", "hyper-rustls", "ipconfig", - "log 0.4.20", + "log 0.4.22", "lru-cache", "rustls 0.16.0", "serde", @@ -595,34 +596,33 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.1" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27" +checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" dependencies = [ "clap_builder", - "clap_derive 4.4.0", - "once_cell", + "clap_derive 4.4.7", ] [[package]] name = "clap_builder" -version = "4.4.1" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d" +checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" dependencies = [ "anstream", "anstyle", - "clap_lex 0.5.1", + "clap_lex 0.6.0", "strsim 0.10.0", ] [[package]] name = "clap_complete" -version = "4.4.0" +version = "4.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5" +checksum = "b5a2d6eec27fce550d708b2be5d798797e5a55b246b323ef36924a0001996352" dependencies = [ - "clap 4.4.1", + "clap 4.4.18", ] [[package]] @@ -640,9 +640,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.0" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck 0.4.1", "proc-macro2 1.0.66", @@ -661,9 +661,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "clipboard-win" @@ -715,7 +715,7 @@ checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" dependencies = [ "is-terminal", "lazy_static", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -753,7 +753,7 @@ dependencies = [ "cookie 0.12.0", "failure", "idna 0.1.5", - "log 0.4.20", + "log 0.4.22", "publicsuffix 1.5.6", "serde", "serde_json", @@ -965,7 +965,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a011bbe2c35ce9c1f143b7af6f94f29a167beb4cd1d29e6740ce836f723120e" dependencies = [ "nix 0.26.4", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1063,9 +1063,12 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] [[package]] name = "derive_more" @@ -1311,6 +1314,16 @@ dependencies = [ "syn 0.15.44", ] +[[package]] +name = "env_filter" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" +dependencies = [ + "log 0.4.22", + "regex", +] + [[package]] name = "env_logger" version = "0.9.3" @@ -1319,7 +1332,7 @@ checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" dependencies = [ "atty", "humantime 2.1.0", - "log 0.4.20", + "log 0.4.22", "regex", "termcolor", ] @@ -1332,11 +1345,24 @@ checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ "humantime 2.1.0", "is-terminal", - "log 0.4.20", + "log 0.4.22", "regex", "termcolor", ] +[[package]] +name = "env_logger" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime 2.1.0", + "log 0.4.22", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -1362,7 +1388,7 @@ checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1427,7 +1453,7 @@ checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" dependencies = [ "cfg-if 1.0.0", "rustix", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1439,7 +1465,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall 0.3.5", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1602,7 +1628,7 @@ dependencies = [ "float_next_after", "geo-types", "geographiclib-rs", - "log 0.4.20", + "log 0.4.22", "num-traits", "robust", "rstar", @@ -1685,7 +1711,7 @@ dependencies = [ "futures", "http 0.1.21", "indexmap 1.9.3", - "log 0.4.20", + "log 0.4.22", "slab", "string", "tokio-io", @@ -1698,7 +1724,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d82e5750d8027a97b9640e3fefa66bbaf852a35228e1c90790efd13c4b09c166" dependencies = [ "lazy_static", - "log 0.4.20", + "log 0.4.22", "pest", "pest_derive", "quick-error", @@ -1803,7 +1829,7 @@ version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" dependencies = [ - "log 0.4.20", + "log 0.4.22", "mac", "markup5ever", "proc-macro2 1.0.66", @@ -1909,7 +1935,7 @@ dependencies = [ "httparse", "iovec", "itoa 0.4.8", - "log 0.4.20", + "log 0.4.22", "net2", "rustc_version 0.2.3", "time 0.1.45", @@ -2137,9 +2163,15 @@ checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.2", "rustix", - "windows-sys", + "windows-sys 0.48.0", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + [[package]] name = "itertools" version = "0.10.5" @@ -2340,14 +2372,14 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" dependencies = [ - "log 0.4.20", + "log 0.4.22", ] [[package]] name = "log" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru-cache" @@ -2387,7 +2419,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" dependencies = [ - "log 0.4.20", + "log 0.4.22", "phf", "phf_codegen", "string_cache", @@ -2408,7 +2440,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe2ba61113f9f7a9f0e87c519682d39c43a6f3f79c2cc42c3ba3dda83b1fa334" dependencies = [ "ipnetwork 0.18.0", - "log 0.4.20", + "log 0.4.22", "memchr", "serde", ] @@ -2553,7 +2585,7 @@ dependencies = [ "iovec", "kernel32-sys", "libc", - "log 0.4.20", + "log 0.4.22", "miow", "net2", "slab", @@ -2567,7 +2599,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" dependencies = [ "lazycell", - "log 0.4.20", + "log 0.4.22", "mio", "slab", ] @@ -2603,7 +2635,7 @@ checksum = "ca0b17380dc69fbcf5f967828cfd10e55028ba83a57da1f580c5b0792ab807ac" dependencies = [ "byteorder", "lazy_static", - "log 0.4.20", + "log 0.4.22", "regex", "thiserror", ] @@ -2622,7 +2654,7 @@ checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ "lazy_static", "libc", - "log 0.4.20", + "log 0.4.22", "openssl", "openssl-probe", "openssl-sys", @@ -2732,7 +2764,7 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec60c60a693226186f5d6edf073232bfb6464ed97eb22cf3b01c1e8198fd97f5" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2761,7 +2793,7 @@ checksum = "629bf84f31f765ba48058371c6eb3c5eed0fcdec68b814eb11f6f65dec0adbe3" dependencies = [ "failure", "image", - "log 0.4.20", + "log 0.4.22", "rand 0.7.3", ] @@ -2786,6 +2818,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" version = "0.1.45" @@ -2928,9 +2966,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.60" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ "bitflags 2.4.0", "cfg-if 1.0.0", @@ -2960,9 +2998,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.96" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -3034,7 +3072,7 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec 1.11.0", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -3245,7 +3283,7 @@ dependencies = [ "line-wrap", "quick-xml", "serde", - "time 0.3.28", + "time 0.3.36", ] [[package]] @@ -3260,6 +3298,12 @@ dependencies = [ "miniz_oxide 0.3.7", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -3393,7 +3437,7 @@ version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" dependencies = [ - "log 0.4.20", + "log 0.4.22", "parking_lot 0.12.1", "scheduled-thread-pool", ] @@ -3722,7 +3766,7 @@ dependencies = [ "http 0.1.21", "hyper 0.12.36", "hyper-tls", - "log 0.4.20", + "log 0.4.22", "mime 0.3.17", "mime_guess", "native-tls", @@ -3769,7 +3813,7 @@ checksum = "83b9d9dc08c5dcc1d8126a9dd615545e6a358f8c13c883c8dfed8c0376fa355e" dependencies = [ "atty", "base64 0.13.1", - "log 0.4.20", + "log 0.4.22", "memchr", "num_cpus", "pear", @@ -3805,7 +3849,7 @@ checksum = "e20efbc6a211cb3df5375accf532d4186f224b623f39eca650b19b96240c596b" dependencies = [ "glob", "handlebars", - "log 0.4.20", + "log 0.4.22", "notify", "rocket", "serde", @@ -3934,7 +3978,7 @@ dependencies = [ "errno 0.3.3", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -3944,7 +3988,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b25a18b1bf7387f0145e7f8324e700805aade3842dd3db2e74e4cdeb4677c09e" dependencies = [ "base64 0.10.1", - "log 0.4.20", + "log 0.4.22", "ring", "sct", "webpki", @@ -3957,7 +4001,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81" dependencies = [ "base64 0.12.3", - "log 0.4.20", + "log 0.4.22", "ring", "sct", "webpki", @@ -3981,7 +4025,7 @@ dependencies = [ "dirs-next", "fd-lock", "libc", - "log 0.4.20", + "log 0.4.22", "memchr", "nix 0.25.1", "radix_trie 0.2.1", @@ -4019,7 +4063,7 @@ version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -4095,7 +4139,7 @@ dependencies = [ "cssparser", "derive_more", "fxhash", - "log 0.4.20", + "log 0.4.22", "matches", "phf", "phf_codegen", @@ -4310,7 +4354,7 @@ dependencies = [ "base64 0.13.1", "byteorder", "hex", - "log 0.4.20", + "log 0.4.22", "serde", "sha-1 0.9.8", ] @@ -4340,7 +4384,7 @@ dependencies = [ "caps", "chrono", "chrootable-https", - "clap 4.4.1", + "clap 4.4.18", "clap_complete", "colored", "crossbeam-channel", @@ -4351,7 +4395,7 @@ dependencies = [ "digest 0.10.7", "dirs-next", "embedded-triple", - "env_logger 0.10.0", + "env_logger 0.11.5", "failure", "glob", "hlua-badtouch", @@ -4360,7 +4404,7 @@ dependencies = [ "ipnetwork 0.20.0", "lazy_static", "libsqlite3-sys", - "log 0.4.20", + "log 0.4.22", "maplit", "md-5", "nix 0.27.1", @@ -4400,7 +4444,7 @@ name = "sn0int-common" version = "0.14.0" dependencies = [ "anyhow", - "clap 4.4.1", + "clap 4.4.18", "nom", "rocket_failure_errors", "serde", @@ -4419,7 +4463,7 @@ dependencies = [ "failure", "hex", "lazy_static", - "log 0.4.20", + "log 0.4.22", "maplit", "oauth2", "reqwest", @@ -4458,7 +4502,7 @@ dependencies = [ "img_hash_median", "kamadak-exif", "kuchiki", - "log 0.4.20", + "log 0.4.22", "maplit", "maxminddb", "mqtt-protocol", @@ -4746,7 +4790,7 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "110ff7f267e583b58489bb0b01fa62ce71c032cd193df3affe9b3b51369aa6ad" dependencies = [ - "log 0.4.20", + "log 0.4.22", "pkg-config", "seccomp-sys", "strum 0.21.0", @@ -4763,7 +4807,7 @@ dependencies = [ "fastrand", "redox_syscall 0.3.5", "rustix", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -4860,12 +4904,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.28" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa 1.0.9", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -4873,16 +4919,17 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.14" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -4986,7 +5033,7 @@ checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" dependencies = [ "bytes 0.4.12", "futures", - "log 0.4.20", + "log 0.4.22", ] [[package]] @@ -4998,7 +5045,7 @@ dependencies = [ "crossbeam-utils 0.7.2", "futures", "lazy_static", - "log 0.4.20", + "log 0.4.22", "mio", "num_cpus", "parking_lot 0.9.0", @@ -5057,7 +5104,7 @@ dependencies = [ "crossbeam-utils 0.7.2", "futures", "lazy_static", - "log 0.4.20", + "log 0.4.22", "num_cpus", "slab", "tokio-executor", @@ -5083,7 +5130,7 @@ checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82" dependencies = [ "bytes 0.4.12", "futures", - "log 0.4.20", + "log 0.4.22", "mio", "tokio-codec", "tokio-io", @@ -5100,7 +5147,7 @@ dependencies = [ "futures", "iovec", "libc", - "log 0.4.20", + "log 0.4.22", "mio", "mio-uds", "tokio-codec", @@ -5185,7 +5232,7 @@ dependencies = [ "failure", "futures", "lazy_static", - "log 0.4.20", + "log 0.4.22", "radix_trie 0.1.6", "rand 0.7.3", "tokio", @@ -5206,7 +5253,7 @@ dependencies = [ "futures", "idna 0.2.3", "lazy_static", - "log 0.4.20", + "log 0.4.22", "rand 0.7.3", "smallvec 0.6.14", "socket2 0.3.19", @@ -5246,7 +5293,7 @@ dependencies = [ "http 0.2.9", "httparse", "input_buffer", - "log 0.4.20", + "log 0.4.22", "rand 0.8.5", "sha-1 0.9.8", "thiserror", @@ -5443,7 +5490,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" dependencies = [ "futures", - "log 0.4.20", + "log 0.4.22", "try-lock", ] @@ -5482,7 +5529,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", - "log 0.4.20", + "log 0.4.22", "once_cell", "proc-macro2 1.0.66", "quote 1.0.33", @@ -5638,7 +5685,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -5647,7 +5694,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -5656,13 +5712,29 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -5671,42 +5743,90 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + [[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + [[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + [[package]] name = "winnow" version = "0.5.15" @@ -5750,7 +5870,7 @@ dependencies = [ "oid-registry", "rusticata-macros", "thiserror", - "time 0.3.28", + "time 0.3.36", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 755f790..766e85e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,7 @@ sn0int-common = { version="0.14.0", path="sn0int-common" } sn0int-std = { version="=0.26.0", path="sn0int-std" } rustyline = "10.0" log = "0.4" -env_logger = "0.10" +env_logger = "0.11" hlua-badtouch = "0.4" clap = { version = "4.3.11", features = ["derive", "env"] } clap_complete = "4.3.2" diff --git a/Dockerfile b/Dockerfile index 8bfe052..26084f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:alpine3.18 +FROM rust:alpine3.20 ENV RUSTFLAGS="-C target-feature=-crt-static" RUN apk add --no-cache musl-dev sqlite-dev libseccomp-dev libsodium-dev WORKDIR /usr/src/sn0int @@ -10,7 +10,7 @@ RUN --mount=type=cache,target=/var/cache/buildkit \ cp -v /var/cache/buildkit/target/release/sn0int / RUN strip /sn0int -FROM alpine:3.18 +FROM alpine:3.20 RUN apk add --no-cache libgcc sqlite-libs libseccomp libsodium COPY --from=0 /sn0int /usr/local/bin/sn0int VOLUME ["/data", "/cache"]