Merge pull request #1507 from citrus-it/vaultwarden

vaultwarden - update from 1.30.5 to 1.32.0

Author: citrus-it

build/vaultwarden/build.sh

@@ -17,15 +17,15 @@
 . ../../lib/build.sh
 
 PROG=vaultwarden
-VER=1.30.5
+VER=1.32.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.5.0
-WEBVAULTSHA256=35001cea3c4ec52a66a2331ecc11efd20b2ad77c34e47dc6061a315f3b5706e4
+WEBVAULTVER=2024.6.2
+WEBVAULTSHA256=c6f71f1f98290b91670c8f717b59aa27baaaa49bdfe4a3f2be38da426021d843
 
 set_arch 64
 
@@ -57,6 +57,12 @@ XFORM_ARGS="
 
 SKIP_LICENCES=bitwarden
 
+# configure runs mysql_config/pg_config to determine the proper paths
+# for the database libraries. To avoid having to rely on a particular
+# mediator value for the installed packages, set the explicitly versioned
+# bin directories first in the PATH.
+PATH=$PREFIX/mariadb-$MARIASQLVER/bin:$PREFIX/pgsql-$PGSQLVER/bin:$PATH
+
 copy_sample_config() {
     local relative_conffile=${CONFFILE#/}
     local dest_confdir=$DESTDIR/${relative_conffile%/*}
@@ -97,6 +103,8 @@ init
 clone_github_source $PROG "$DANIGARCIA/$PROG" $VER
 BUILDDIR+=/$PROG
 patch_source
+# mio needs bumping to work around https://github.com/tokio-rs/mio/pull/1824
+run_inbuild cargo update -p mio
 prep_build
 build_rust $CARGO_ARGS
 install_rust

build/vaultwarden/patches/Cargo.toml.patch

@@ -1,11 +1,19 @@
 diff -wpruN --no-dereference '--exclude=*.orig' a~/vaultwarden/Cargo.toml a/vaultwarden/Cargo.toml
 --- a~/vaultwarden/Cargo.toml	1970-01-01 00:00:00
 +++ a/vaultwarden/Cargo.toml	1970-01-01 00:00:00
-@@ -168,7 +168,6 @@ rpassword = "7.3.1"
+@@ -167,7 +167,6 @@ rpassword = "7.3.1"
  # The symbols are the provide better panic traces
  # Also enable fat LTO and use 1 codegen unit for optimizations
  [profile.release]
 -strip = "debuginfo"
  lto = "fat"
  codegen-units = 1
 
+@@ -244,3 +243,7 @@ unnecessary_self_imports = "deny"
+ unused_async = "deny"
+ verbose_file_reads = "deny"
+ zero_sized_map_values = "deny"
++
++[patch.crates-io]
++mysqlclient-sys = { git = "https://github.com/citrus-it/mysqlclient-sys", branch = "illumos" }
++

build/vaultwarden/patches/rust-1.79.patch

@@ -1,2 +1 @@
 Cargo.toml.patch
-rust-1.79.patch

build/vaultwarden/patches/series

@@ -27,7 +27,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.30.5	| https://github.com/dani-garcia/vaultwarden/releases/ | [omniosorg](https://github.com/omniosorg)
+| ooce/application/vaultwarden	| 1.32.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)