From 8914b149eb2dc7535cc4c6007dec9061f950c058 Mon Sep 17 00:00:00 2001 From: VirtualMachinist Date: Fri, 13 Nov 2026 23:32:47 -0500 Subject: [PATCH] app: bump the Lapis pin to v0.5.0 to clear RUSTSEC-2026-0459 The old pin brought in libsqlite3-sys 0.38.2, whose bundled SQLite is covered by RUSTSEC-2026-0459. Lapis 42aa3b8 (v0.5.0) is on rusqlite 0.42 and libsqlite3-sys 0.40. - lapis-lattice and lapis-notes: rev da4d1ce -> 42aa3b8 - rusqlite dev-dependency: 0.40 -> 0.42, to match the engine - rust-version: 1.85 -> 1.89, the engine's MSRV app/Cargo.lock was regenerated against the existing lock, so only the crates the bump needs moved. Co-Authored-By: Claude Opus 5.5 --- app/Cargo.lock | 112 +++++++------------------------------------------ app/Cargo.toml | 13 +++--- 2 files changed, 21 insertions(+), 104 deletions(-) diff --git a/app/Cargo.lock b/app/Cargo.lock index 78d9f3b..dbb2fae 100644 --- a/app/Cargo.lock +++ b/app/Cargo.lock @@ -27,12 +27,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "bumpalo" -version = "3.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" - [[package]] name = "cc" version = "1.10.0" @@ -43,12 +37,6 @@ dependencies = [ "shlex", ] -[[package]] -name = "cfg-if" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7648175b45a9a48536d676f68d918270699102aa8dab5496df06904c914600" - [[package]] name = "crossbeam-deque" version = "0.8.8" @@ -117,15 +105,6 @@ dependencies = [ "regex-syntax", ] -[[package]] -name = "hashbrown" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" -dependencies = [ - "foldhash", -] - [[package]] name = "hashbrown" version = "0.17.1" @@ -141,7 +120,7 @@ version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a596f1b20ed2cc5ecac41a164aaebc7258057060f06c0cf7a2ba3991ee7990fb" dependencies = [ - "hashbrown 0.17.1", + "hashbrown", ] [[package]] @@ -167,7 +146,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc4e190f5d26ca7051642629da2c52fc03bde85a03197c99408dcd291734c855" dependencies = [ "equivalent", - "hashbrown 0.17.1", + "hashbrown", ] [[package]] @@ -176,20 +155,10 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" -[[package]] -name = "js-sys" -version = "0.3.107" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dc09d2154098bbf4ef54eab6b117a3c24cbbffe94046b16ee6d6d4510584d3a" -dependencies = [ - "cfg-if", - "wasm-bindgen", -] - [[package]] name = "lapis-lattice" -version = "0.4.2" -source = "git+https://github.com/Hedronite/lapis-lattice?rev=da4d1ce815d55f89db5cbf8ec2879e14f8957add#da4d1ce815d55f89db5cbf8ec2879e14f8957add" +version = "0.5.0" +source = "git+https://github.com/Hedronite/lapis-lattice?rev=42aa3b8dcdac51c684bd3cd4c3c6a5c3c17a9092#42aa3b8dcdac51c684bd3cd4c3c6a5c3c17a9092" dependencies = [ "ignore", "regex", @@ -202,8 +171,8 @@ dependencies = [ [[package]] name = "lapis-notes" -version = "0.4.2" -source = "git+https://github.com/Hedronite/lapis-lattice?rev=da4d1ce815d55f89db5cbf8ec2879e14f8957add#da4d1ce815d55f89db5cbf8ec2879e14f8957add" +version = "0.5.0" +source = "git+https://github.com/Hedronite/lapis-lattice?rev=42aa3b8dcdac51c684bd3cd4c3c6a5c3c17a9092#42aa3b8dcdac51c684bd3cd4c3c6a5c3c17a9092" dependencies = [ "serde", "serde_json", @@ -213,9 +182,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.38.2" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1d20bef17f513b9b3004532233187769cd072d790971f4e4da0e346eb6401e8" +checksum = "b06e69070b7e12262b0cd90832f0a7396f142a2b330181255562decf9f0c6215" dependencies = [ "cc", "pkg-config", @@ -330,19 +299,18 @@ checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" [[package]] name = "rsqlite-vfs" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c51c9ae4df8a7fba42103df5c621fa3c37eccf3a3c650879e90fc48b11cc192c" +checksum = "353b74f9810d5b085b6c42c9d86a5f0fdb795553235cdd48753b32e3809d18a7" dependencies = [ - "hashbrown 0.16.1", "thiserror", ] [[package]] name = "rusqlite" -version = "0.40.2" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23f2a97da3e3873c73cb2a2e71b35c40ff95e0b1eefa8d72d8499a6928c3b5b3" +checksum = "a4edff0039f148731aee2fd80f76dbfeb12d204ab3d1c544838d34e02151049b" dependencies = [ "bitflags", "fallible-iterator", @@ -353,12 +321,6 @@ dependencies = [ "sqlite-wasm-rs", ] -[[package]] -name = "rustversion" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f" - [[package]] name = "ryu" version = "1.0.23" @@ -442,14 +404,12 @@ dependencies = [ [[package]] name = "sqlite-wasm-rs" -version = "0.5.5" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc3efc0da82635d7e1ced0053bbbfa8c7ab9645d0bf36ceb4f7127bb85315d75" +checksum = "a6cd504cecbfe7eef649988840f9a6cb768d11085efec138f8e99f160632d867" dependencies = [ "cc", - "js-sys", "rsqlite-vfs", - "wasm-bindgen", ] [[package]] @@ -505,50 +465,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "wasm-bindgen" -version = "0.2.130" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0181c14ddd6c7b8b0b0132a5f1ea2f32be0d893cd3ea97b6e3b28886b8a3d1c" -dependencies = [ - "cfg-if", - "rustversion", - "wasm-bindgen-macro", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.130" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e931a02a39abdbf66966fc35902b5ed58344750a70885bed4ebb3d8eaf28ed9" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.130" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ca4b54280e455bd831e33a6b8e734baf432fe63fbc35c42ac14ce67a043a53a" -dependencies = [ - "bumpalo", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.130" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b1f9c3798725016c6ee5f2f57869ec0831e8bbc0ab0310a86e787e97f41389e" -dependencies = [ - "unicode-ident", -] - [[package]] name = "winapi-util" version = "0.1.11" diff --git a/app/Cargo.toml b/app/Cargo.toml index 4ad5c49..2122c89 100644 --- a/app/Cargo.toml +++ b/app/Cargo.toml @@ -2,7 +2,7 @@ name = "pendant-app" version = "0.0.1" edition = "2021" -rust-version = "1.85" +rust-version = "1.89" license = "MIT" repository = "https://github.com/Hedronite/pendant" description = "Pendant's phone app" @@ -13,10 +13,11 @@ publish = false path = "src/notes/store.rs" [dependencies] -# Pinned to the Lapis engine merge that carries GOAL-mobile G0-G3. lapis-notes -# is publish = false, so both stay git deps at this exact rev, never a version. -lapis-lattice = { git = "https://github.com/Hedronite/lapis-lattice", rev = "da4d1ce815d55f89db5cbf8ec2879e14f8957add" } -lapis-notes = { git = "https://github.com/Hedronite/lapis-lattice", rev = "da4d1ce815d55f89db5cbf8ec2879e14f8957add" } +# Pinned to the Lapis v0.5.0 release merge (rusqlite 0.42, libsqlite3-sys 0.40; +# clears RUSTSEC-2026-0459). It still carries GOAL-mobile G0-G3. lapis-notes is +# publish = false, so both stay git deps at this exact rev, never a version. +lapis-lattice = { git = "https://github.com/Hedronite/lapis-lattice", rev = "42aa3b8dcdac51c684bd3cd4c3c6a5c3c17a9092" } +lapis-notes = { git = "https://github.com/Hedronite/lapis-lattice", rev = "42aa3b8dcdac51c684bd3cd4c3c6a5c3c17a9092" } # NSURLIsExcludedFromBackupKey on the index directory (iOS, and macOS dev hosts). [target.'cfg(target_vendor = "apple")'.dependencies] @@ -24,7 +25,7 @@ objc2-foundation = { version = "0.3", default-features = false, features = ["std [dev-dependencies] # Same major as lapis-lattice's, so it unifies: the tests read the index file. -rusqlite = "0.40" +rusqlite = "0.42" # Its own workspace, apart from the bridge crates at the repo root. [workspace]