From b8851ca828ce832aeffd104a5cee412440a76c74 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Mon, 27 Jan 2025 09:52:33 -0500 Subject: [PATCH] vaultwarden: update to 1.33.0. --- .../patches/reference-static-in-constant.patch | 13 +++++++++++++ srcpkgs/vaultwarden/patches/rust-version.patch | 13 +++++++++++++ srcpkgs/vaultwarden/template | 4 ++-- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/vaultwarden/patches/reference-static-in-constant.patch create mode 100644 srcpkgs/vaultwarden/patches/rust-version.patch diff --git a/srcpkgs/vaultwarden/patches/reference-static-in-constant.patch b/srcpkgs/vaultwarden/patches/reference-static-in-constant.patch new file mode 100644 index 00000000000000..444e147e460a4b --- /dev/null +++ b/srcpkgs/vaultwarden/patches/reference-static-in-constant.patch @@ -0,0 +1,13 @@ +diff --git a/src/crypto.rs b/src/crypto.rs +index a987b0f..eff1785 100644 +--- a/src/crypto.rs ++++ b/src/crypto.rs +@@ -6,7 +6,7 @@ use std::num::NonZeroU32; + use data_encoding::{Encoding, HEXLOWER}; + use ring::{digest, hmac, pbkdf2}; + +-const DIGEST_ALG: pbkdf2::Algorithm = pbkdf2::PBKDF2_HMAC_SHA256; ++static DIGEST_ALG: pbkdf2::Algorithm = pbkdf2::PBKDF2_HMAC_SHA256; + const OUTPUT_LEN: usize = digest::SHA256_OUTPUT_LEN; + + pub fn hash_password(secret: &[u8], salt: &[u8], iterations: u32) -> Vec { diff --git a/srcpkgs/vaultwarden/patches/rust-version.patch b/srcpkgs/vaultwarden/patches/rust-version.patch new file mode 100644 index 00000000000000..c20ca5f999fafd --- /dev/null +++ b/srcpkgs/vaultwarden/patches/rust-version.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.toml b/Cargo.toml +index e3755e2..1fbe7a6 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -5,7 +5,7 @@ name = "vaultwarden" + version = "1.0.0" + authors = ["Daniel GarcĂ­a "] + edition = "2021" +-rust-version = "1.83.0" ++rust-version = "1.82.0" + resolver = "2" + + repository = "https://github.com/dani-garcia/vaultwarden" diff --git a/srcpkgs/vaultwarden/template b/srcpkgs/vaultwarden/template index 7af4091d7babd3..65072b01192765 100644 --- a/srcpkgs/vaultwarden/template +++ b/srcpkgs/vaultwarden/template @@ -1,6 +1,6 @@ # Template file for 'vaultwarden' pkgname=vaultwarden -version=1.32.7 +version=1.33.0 revision=1 build_style=cargo configure_args="--features sqlite,mysql,postgresql" @@ -13,7 +13,7 @@ license="AGPL-3.0-only" homepage="https://github.com/dani-garcia/vaultwarden" changelog="https://github.com/dani-garcia/vaultwarden/releases" distfiles="https://github.com/dani-garcia/vaultwarden/archive/${version}.tar.gz" -checksum=9452e9acf5ebbbf71ea1427750b4c39f3a4a6989edcced1d0dc7e1a47086c6df +checksum=4e3a1a5fcb83878ed06100d6fb81476e8462f90d9cd0acd9ac0380b31ad457b5 system_accounts="_vaultwarden" _vaultwarden_homedir="/var/lib/vaultwarden"