From 2ce3717d44d81371dcd5766bddf160968190950a Mon Sep 17 00:00:00 2001 From: Sunshine Date: Wed, 30 Apr 2025 17:51:10 +0000 Subject: [PATCH 1/3] bump version number (2.10.1 -> 2.11.0), update README and crates --- Cargo.lock | 26 ++++++++++++------------- Cargo.toml | 55 +++++++++++++++++++++++++++++------------------------ README.md | 7 ++++--- src/main.rs | 2 +- 4 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 51a053b9..abf679f5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -120,9 +120,9 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "assert_cmd" -version = "2.0.16" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d" +checksum = "2bd389a4b2970a01282ee455294913c0a43724daedcd1a24c3eb0ec1c1320b66" dependencies = [ "anstyle", "bstr", @@ -339,9 +339,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" +checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" dependencies = [ "android-tzdata", "iana-time-zone", @@ -353,9 +353,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.35" +version = "4.5.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944" +checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071" dependencies = [ "clap_builder", "clap_derive", @@ -363,9 +363,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.35" +version = "4.5.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9" +checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2" dependencies = [ "anstream", "anstyle", @@ -1673,7 +1673,7 @@ dependencies = [ [[package]] name = "monolith" -version = "2.10.1" +version = "2.11.0" dependencies = [ "assert_cmd", "atty", @@ -2186,9 +2186,9 @@ checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" [[package]] name = "redb" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0a72cd7140de9fc3e318823b883abf819c20d478ec89ce880466dc2ef263c6" +checksum = "34bc6763177194266fc3773e2b2bb3693f7b02fdf461e285aa33202e3164b74e" dependencies = [ "libc", ] @@ -2460,9 +2460,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.8" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", "cpufeatures", diff --git a/Cargo.toml b/Cargo.toml index 6543d28a..a2b7c01a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "monolith" -version = "2.10.1" +version = "2.11.0" authors = [ "Sunshine ", "Mahdi Robatipoor ", @@ -16,29 +16,28 @@ repository = "https://github.com/Y2Z/monolith" readme = "README.md" keywords = ["web", "http", "html", "download", "command-line"] categories = ["command-line-utilities", "web-programming"] -include = [ - "src/*.rs", - "Cargo.toml", -] +include = ["src/*.rs", "Cargo.toml"] license = "CC0-1.0" [dependencies] -atty = "0.2.14" # Used for highlighting network errors -base64 = "0.22.1" # Used for integrity attributes -chrono = "0.4.40" # Used for formatting timestamps -clap = { version = "4.5.35", features = ["derive"], optional = true } # Used for processing CLI arguments -cssparser = "0.35.0" # Used for dealing with CSS -directories = { version = "6.0.0", optional = true } # Used for GUI -druid = { version = "0.8.3", optional = true } # Used for GUI -encoding_rs = "0.8.35" # Used for parsing and converting document charsets -html5ever = "0.29.1" # Used for all things DOM -markup5ever_rcdom = "=0.5.0-unofficial" # Used for manipulating DOM -percent-encoding = "2.3.1" # Used for encoding URLs -sha2 = "0.10.8" # Used for calculating checksums during integrity checks -redb = "2.4.0" # Used for on-disk caching of remote assets -tempfile = { version = "3.19.1", optional = true } # Used for on-disk caching of remote assets -url = "2.5.4" # Used for parsing URLs -openssl = "0.10.72" # Used for static linking of the OpenSSL library +atty = "0.2.14" # Used for highlighting network errors +base64 = "0.22.1" # Used for integrity attributes +chrono = "0.4.41" # Used for formatting timestamps +clap = { version = "4.5.37", features = [ + "derive", +], optional = true } # Used for processing CLI arguments +cssparser = "0.35.0" # Used for dealing with CSS +directories = { version = "6.0.0", optional = true } # Used for GUI +druid = { version = "0.8.3", optional = true } # Used for GUI +encoding_rs = "0.8.35" # Used for parsing and converting document charsets +html5ever = "0.29.1" # Used for all things DOM +markup5ever_rcdom = "=0.5.0-unofficial" # Used for manipulating DOM +percent-encoding = "2.3.1" # Used for encoding URLs +sha2 = "0.10.9" # Used for calculating checksums during integrity checks +redb = "2.5.0" # Used for on-disk caching of remote assets +tempfile = { version = "3.19.1", optional = true } # Used for on-disk caching of remote assets +url = "2.5.4" # Used for parsing URLs +openssl = "0.10.72" # Used for static linking of the OpenSSL library # Used for unwrapping NOSCRIPT [dependencies.regex] @@ -53,13 +52,19 @@ default-features = false features = ["default-tls", "blocking", "gzip", "brotli", "deflate"] [dev-dependencies] -assert_cmd = "2.0.16" +assert_cmd = "2.0.17" [features] default = ["cli", "vendored-openssl"] -cli = ["clap", "tempfile"] # Build a CLI tool that includes main() function -gui = ["directories", "druid", "tempfile"] # Build a GUI executable that includes main() function -vendored-openssl = ["openssl/vendored"] # Compile and statically link a copy of OpenSSL +cli = ["clap", "tempfile"] # Build a CLI tool that includes main() function +gui = [ + "directories", + "druid", + "tempfile", +] # Build a GUI executable that includes main() function +vendored-openssl = [ + "openssl/vendored", +] # Compile and statically link a copy of OpenSSL [lib] name = "monolith" diff --git a/README.md b/README.md index 36cae5e3..ad7d35ed 100644 --- a/README.md +++ b/README.md @@ -138,13 +138,13 @@ Dependencies: `libssl`, `cargo`
Install cargo (GNU/Linux) Check if cargo is installed - + ```console cargo -v ``` If cargo is not already installed, install and add it to your existing ```$PATH``` (paraphrasing the [official installation instructions](https://doc.rust-lang.org/cargo/getting-started/installation.html)): - + ```console curl https://sh.rustup.rs -sSf | sh . "$HOME/.cargo/env" @@ -198,6 +198,7 @@ cat some-site-page.html | monolith -aIiFfcMv -b https://some.site/ - > some-site - `-I`: Isolate the document - `-j`: Exclude JavaScript - `-k`: Accept invalid X.509 (TLS) certificates + - `-m`: Output in MHTML format instead of HTML - `-M`: Don't add timestamp and URL information - `-n`: Extract contents of NOSCRIPT elements - `-o`: Write output to `file` (use “-” for STDOUT) @@ -258,7 +259,7 @@ Please set `https_proxy`, `http_proxy`, and `no_proxy` environment variables. --------------------------------------------------- -### Apify Actor Usage +### Apify Actor Usage Run Monolith Actor on Apify diff --git a/src/main.rs b/src/main.rs index 490ee6d3..89bcc293 100644 --- a/src/main.rs +++ b/src/main.rs @@ -88,7 +88,7 @@ struct Cli { #[arg(short = 'k', long)] insecure: bool, - /// Output in MHTML format instead of HTML + /// Use MHTML as output format #[arg(short = 'm', long)] mhtml: bool, From ae3254815ae2984654d692ae37ce721443ca0ffd Mon Sep 17 00:00:00 2001 From: Sunshine Date: Wed, 30 Apr 2025 18:01:31 +0000 Subject: [PATCH 2/3] roll redb back to 2.4.0 due to NetBSD not yet supporting edition2024 --- Cargo.lock | 120 ++++++++++++++++++++++++++--------------------------- Cargo.toml | 2 +- 2 files changed, 61 insertions(+), 61 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index abf679f5..b4a85516 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -108,9 +108,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.97" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" [[package]] name = "arrayvec" @@ -142,9 +142,9 @@ checksum = "46016233fc1bb55c23b856fe556b7db6ccd05119a0a392e04f0b3b7c79058f16" [[package]] name = "async-compression" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a194f9d963d8099596278594b3107448656ba73831c9d8c783e613ce86da64" +checksum = "b37fc50485c4f3f736a4fb14199f6d5f5ba008d7f28fe710306c92780f004c07" dependencies = [ "brotli", "flate2", @@ -245,9 +245,9 @@ dependencies = [ [[package]] name = "brotli" -version = "7.0.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd" +checksum = "cf19e729cdbd51af9a397fb9ef8ac8378007b797f8273cfbfdf45dcaa316167b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -256,9 +256,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "4.0.2" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74fa05ad7d803d413eb8380983b092cbbaf9a85f151b871360e7b00cd7060b37" +checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -314,9 +314,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.18" +version = "1.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525046617d8376e3db1deffb079e91cef90a89fc3ca5c185bbf8c9ecdd15cd5c" +checksum = "04da6a0d40b948dfc4fa8f5bbf402b0fc1a64a28dbf7d12ffd683550f2c1b63a" dependencies = [ "shlex", ] @@ -382,7 +382,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.100", + "syn 2.0.101", ] [[package]] @@ -537,7 +537,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.100", + "syn 2.0.101", ] [[package]] @@ -594,7 +594,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.100", + "syn 2.0.101", ] [[package]] @@ -862,7 +862,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.100", + "syn 2.0.101", ] [[package]] @@ -965,9 +965,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "libc", @@ -1411,7 +1411,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.100", + "syn 2.0.101", ] [[package]] @@ -1530,9 +1530,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.171" +version = "0.2.172" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" [[package]] name = "libredox" @@ -1546,9 +1546,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413" +checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" [[package]] name = "litemap" @@ -1621,7 +1621,7 @@ checksum = "88a9689d8d44bf9964484516275f5cd4c9b59457a6940c1d5d0ecbb94510a36b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.100", + "syn 2.0.101", ] [[package]] @@ -1791,7 +1791,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.100", + "syn 2.0.101", ] [[package]] @@ -1802,9 +1802,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-src" -version = "300.4.2+3.4.1" +version = "300.5.0+3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168ce4e058f975fe43e89d9ccf78ca668601887ae736090aacc23ae353c298e2" +checksum = "e8ce546f549326b0e6052b649198487d91320875da901e7bd11a06d1ee3f9c2f" dependencies = [ "cc", ] @@ -1956,7 +1956,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.100", + "syn 2.0.101", ] [[package]] @@ -2147,9 +2147,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] @@ -2208,7 +2208,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b" dependencies = [ - "getrandom 0.2.15", + "getrandom 0.2.16", "libredox", "thiserror 2.0.12", ] @@ -2390,14 +2390,14 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" dependencies = [ - "self_cell 1.1.0", + "self_cell 1.2.0", ] [[package]] name = "self_cell" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2fdfc24bc566f839a2da4c4295b82db7d25a24253867d5c64355abb5799bdbe" +checksum = "0f7d95a54511e0c7be3f51e8867aa8cf35148d7b9445d44de2f943e2b206e749" [[package]] name = "semver" @@ -2422,7 +2422,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.100", + "syn 2.0.101", ] [[package]] @@ -2565,9 +2565,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.100" +version = "2.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" dependencies = [ "proc-macro2", "quote", @@ -2585,13 +2585,13 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.100", + "syn 2.0.101", ] [[package]] @@ -2669,7 +2669,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.100", + "syn 2.0.101", ] [[package]] @@ -2680,7 +2680,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.100", + "syn 2.0.101", ] [[package]] @@ -2749,9 +2749,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.14" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034" +checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" dependencies = [ "bytes", "futures-core", @@ -2762,21 +2762,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.20" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148" +checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.24", + "toml_edit 0.22.26", ] [[package]] name = "toml_datetime" -version = "0.6.8" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3" dependencies = [ "serde", ] @@ -2794,15 +2794,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.24" +version = "0.22.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" +checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.7.6", + "winnow 0.7.7", ] [[package]] @@ -2851,7 +2851,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.100", + "syn 2.0.101", ] [[package]] @@ -3102,7 +3102,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.100", + "syn 2.0.101", "wasm-bindgen-shared", ] @@ -3137,7 +3137,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.100", + "syn 2.0.101", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3204,7 +3204,7 @@ checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.100", + "syn 2.0.101", ] [[package]] @@ -3215,7 +3215,7 @@ checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.100", + "syn 2.0.101", ] [[package]] @@ -3419,9 +3419,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10" +checksum = "6cb8234a863ea0e8cd7284fcdd4f145233eb00fee02bbdd9861aec44e6477bc5" dependencies = [ "memchr", ] @@ -3493,7 +3493,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.100", + "syn 2.0.101", "synstructure", ] @@ -3514,7 +3514,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.100", + "syn 2.0.101", "synstructure", ] @@ -3537,5 +3537,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.100", + "syn 2.0.101", ] diff --git a/Cargo.toml b/Cargo.toml index a2b7c01a..874763be 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,7 @@ html5ever = "0.29.1" # Used for all things DOM markup5ever_rcdom = "=0.5.0-unofficial" # Used for manipulating DOM percent-encoding = "2.3.1" # Used for encoding URLs sha2 = "0.10.9" # Used for calculating checksums during integrity checks -redb = "2.5.0" # Used for on-disk caching of remote assets +redb = "2.4.0" # Used for on-disk caching of remote assets tempfile = { version = "3.19.1", optional = true } # Used for on-disk caching of remote assets url = "2.5.4" # Used for parsing URLs openssl = "0.10.72" # Used for static linking of the OpenSSL library From a5cfc3e53400a0ec387b09baa5ef7fbbf0725104 Mon Sep 17 00:00:00 2001 From: Sunshine Date: Wed, 30 Apr 2025 18:14:49 +0000 Subject: [PATCH 3/3] use specific package versions --- Cargo.lock | 4 ++-- Cargo.toml | 36 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b4a85516..584ffb55 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2186,9 +2186,9 @@ checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" [[package]] name = "redb" -version = "2.5.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34bc6763177194266fc3773e2b2bb3693f7b02fdf461e285aa33202e3164b74e" +checksum = "ea0a72cd7140de9fc3e318823b883abf819c20d478ec89ce880466dc2ef263c6" dependencies = [ "libc", ] diff --git a/Cargo.toml b/Cargo.toml index 874763be..40eb34fe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,39 +20,39 @@ include = ["src/*.rs", "Cargo.toml"] license = "CC0-1.0" [dependencies] -atty = "0.2.14" # Used for highlighting network errors -base64 = "0.22.1" # Used for integrity attributes -chrono = "0.4.41" # Used for formatting timestamps -clap = { version = "4.5.37", features = [ +atty = "=0.2.14" # Used for highlighting network errors +base64 = "=0.22.1" # Used for integrity attributes +chrono = "=0.4.41" # Used for formatting timestamps +clap = { version = "=4.5.37", features = [ "derive", ], optional = true } # Used for processing CLI arguments -cssparser = "0.35.0" # Used for dealing with CSS -directories = { version = "6.0.0", optional = true } # Used for GUI -druid = { version = "0.8.3", optional = true } # Used for GUI -encoding_rs = "0.8.35" # Used for parsing and converting document charsets -html5ever = "0.29.1" # Used for all things DOM +cssparser = "=0.35.0" # Used for dealing with CSS +directories = { version = "=6.0.0", optional = true } # Used for GUI +druid = { version = "=0.8.3", optional = true } # Used for GUI +encoding_rs = "=0.8.35" # Used for parsing and converting document charsets +html5ever = "=0.29.1" # Used for all things DOM markup5ever_rcdom = "=0.5.0-unofficial" # Used for manipulating DOM -percent-encoding = "2.3.1" # Used for encoding URLs -sha2 = "0.10.9" # Used for calculating checksums during integrity checks -redb = "2.4.0" # Used for on-disk caching of remote assets -tempfile = { version = "3.19.1", optional = true } # Used for on-disk caching of remote assets -url = "2.5.4" # Used for parsing URLs -openssl = "0.10.72" # Used for static linking of the OpenSSL library +percent-encoding = "=2.3.1" # Used for encoding URLs +sha2 = "=0.10.9" # Used for calculating checksums during integrity checks +redb = "=2.4.0" # Used for on-disk caching of remote assets +tempfile = { version = "=3.19.1", optional = true } # Used for on-disk caching of remote assets +url = "=2.5.4" # Used for parsing URLs +openssl = "=0.10.72" # Used for static linking of the OpenSSL library # Used for unwrapping NOSCRIPT [dependencies.regex] -version = "1.11.1" +version = "=1.11.1" default-features = false features = ["std", "perf-dfa", "unicode-perl"] # Used for making network requests [dependencies.reqwest] -version = "0.12.15" +version = "=0.12.15" default-features = false features = ["default-tls", "blocking", "gzip", "brotli", "deflate"] [dev-dependencies] -assert_cmd = "2.0.17" +assert_cmd = "=2.0.17" [features] default = ["cli", "vendored-openssl"]