From 3fd009f7183c55d7bbdd5529fc3c32a49bbc301b Mon Sep 17 00:00:00 2001 From: Jorge Schrauwen Date: Sun, 26 Jan 2025 09:46:46 +0100 Subject: [PATCH] vaultwarden 1.33.0 --- build/vaultwarden/build.sh | 6 +-- build/vaultwarden/patches/rust_2024.patch | 62 ----------------------- build/vaultwarden/patches/series | 1 - doc/packages.md | 2 +- 4 files changed, 4 insertions(+), 67 deletions(-) delete mode 100644 build/vaultwarden/patches/rust_2024.patch delete mode 100644 build/vaultwarden/patches/series diff --git a/build/vaultwarden/build.sh b/build/vaultwarden/build.sh index 09a032c20..d05bb5088 100755 --- a/build/vaultwarden/build.sh +++ b/build/vaultwarden/build.sh @@ -17,15 +17,15 @@ . ../../lib/build.sh PROG=vaultwarden -VER=1.32.7 +VER=1.33.0 PKG=ooce/application/vaultwarden SUMMARY="Bitwarden compatible server" DESC="Unofficial Bitwarden compatible server written in Rust, formerly known " DESC+="as bitwarden_rs" DANIGARCIA=$GITHUB/dani-garcia -WEBVAULTVER=2024.6.2c -WEBVAULTSHA256=ff26268b6ff667d7db93891381b029a599aa59f8ecd56c6756ab7205b0e4c854 +WEBVAULTVER=2025.1.1 +WEBVAULTSHA256=3f01eff59bd463a9e1881f58653af88a52fdafb191bf915b069c238267cfd245 set_arch 64 diff --git a/build/vaultwarden/patches/rust_2024.patch b/build/vaultwarden/patches/rust_2024.patch deleted file mode 100644 index 26afacd48..000000000 --- a/build/vaultwarden/patches/rust_2024.patch +++ /dev/null @@ -1,62 +0,0 @@ -From f8880abf85ce02abc5f7bec7c42a61f843264b05 Mon Sep 17 00:00:00 2001 -From: BlackDex -Date: Thu, 9 Jan 2025 09:41:14 +0100 -Subject: [PATCH] Allow building with Rust v1.84.0 or newer - -These changes allow building Vaultwarden using Rust v1.84.0 or newer. -The two lints specifically allowed are part of the `rust_2024_compatibility` list. -These two lint checks seem to have no impact on our code as far as i could tell. -Also building and running both 2021 edition and 2024 edition binary work fine. - -Closes #5370 - -Signed-off-by: BlackDex ---- - Cargo.toml | 4 ++++ - src/api/notifications.rs | 4 +++- - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/Cargo.toml b/Cargo.toml -index a5c320d8e0..547de58e3a 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -230,6 +230,10 @@ unused_import_braces = "deny" - unused_lifetimes = "deny" - unused_qualifications = "deny" - variant_size_differences = "deny" -+# Allow the following lints since these cause issues with Rust v1.84.0 or newer -+# Building Vaultwarden with Rust v1.85.0 and edition 2024 also works without issues -+if_let_rescope = "allow" -+tail_expr_drop_order = "allow" - - # https://rust-lang.github.io/rust-clippy/stable/index.html - [lints.clippy] -diff --git a/src/api/notifications.rs b/src/api/notifications.rs -index 8c925e37bb..9a53b95ffc 100644 ---- a/src/api/notifications.rs -+++ b/src/api/notifications.rs -@@ -101,6 +101,7 @@ impl Drop for WSAnonymousEntryMapGuard { - } - } - -+#[allow(tail_expr_drop_order)] - #[get("/hub?")] - fn websockets_hub<'r>( - ws: WebSocket, -@@ -186,6 +187,7 @@ fn websockets_hub<'r>( - }) - } - -+#[allow(tail_expr_drop_order)] - #[get("/anonymous-hub?")] - fn anonymous_websockets_hub<'r>(ws: WebSocket, token: String, ip: ClientIp) -> Result { - let addr = ip.ip; -@@ -290,7 +292,7 @@ fn serialize(val: Value) -> Vec { - fn serialize_date(date: NaiveDateTime) -> Value { - let seconds: i64 = date.and_utc().timestamp(); - let nanos: i64 = date.and_utc().timestamp_subsec_nanos().into(); -- let timestamp = nanos << 34 | seconds; -+ let timestamp = (nanos << 34) | seconds; - - let bs = timestamp.to_be_bytes(); - diff --git a/build/vaultwarden/patches/series b/build/vaultwarden/patches/series deleted file mode 100644 index 01a9cc8c6..000000000 --- a/build/vaultwarden/patches/series +++ /dev/null @@ -1 +0,0 @@ -rust_2024.patch diff --git a/doc/packages.md b/doc/packages.md index a2e464857..416e740f3 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -28,7 +28,7 @@ | ooce/application/tidy | 5.8.0 | https://github.com/htacg/tidy-html5/releases | [omniosorg](https://github.com/omniosorg) | ooce/application/tig | 2.5.10 | https://github.com/jonas/tig/releases | [omniosorg](https://github.com/omniosorg) | ooce/application/vagrant | 2.2.19 | https://github.com/hashicorp/vagrant/tags | [omniosorg](https://github.com/omniosorg) -| ooce/application/vaultwarden | 1.32.7 | https://github.com/dani-garcia/vaultwarden/releases/ | [omniosorg](https://github.com/omniosorg) +| ooce/application/vaultwarden | 1.33.0 | https://github.com/dani-garcia/vaultwarden/releases/ | [omniosorg](https://github.com/omniosorg) | ooce/application/zabbix | 6.2.3 | https://www.zabbix.com/download_sources | [omniosorg](https://github.com/omniosorg) | ooce/audio/flac | 1.4.3 | https://ftp.osuosl.org/pub/xiph/releases/flac/ https://xiph.org/flac/changelog.html | [omniosorg](https://github.com/omniosorg) | ooce/compress/pbzip2 | 1.1.13 | https://launchpad.net/pbzip2/+download | [omniosorg](https://github.com/omniosorg)