Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b.
@ 2024-07-10  3:48 TinfoilSubmarine
  2024-07-10 20:10 ` [PR PATCH] [Updated] " TinfoilSubmarine
                   ` (10 more replies)
  0 siblings, 11 replies; 12+ messages in thread
From: TinfoilSubmarine @ 2024-07-10  3:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1285 bytes --]

There is a new pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages maint/vaultwarden
https://github.com/void-linux/void-packages/pull/51188

vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/51188.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/vaultwarden-51188.patch --]
[-- Type: text/x-diff, Size: 2539 bytes --]

From ceb724979360195903c4250125d7789a0db3d859 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 9 Jul 2024 21:43:08 -0400
Subject: [PATCH 1/2] vaultwarden: update to 1.31.0.

---
 srcpkgs/vaultwarden/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vaultwarden/template b/srcpkgs/vaultwarden/template
index af91af3ca392e6..98e4bf9c6be443 100644
--- a/srcpkgs/vaultwarden/template
+++ b/srcpkgs/vaultwarden/template
@@ -1,19 +1,19 @@
 # Template file for 'vaultwarden'
 pkgname=vaultwarden
-version=1.30.5
+version=1.31.0
 revision=1
 build_style=cargo
 configure_args="--features sqlite,mysql,postgresql"
 hostmakedepends="pkg-config"
 makedepends="openssl-devel libmysqlclient-devel postgresql-libs-devel
- sqlite-devel"
+ sqlite-devel zlib-devel"
 short_desc="Unofficial Bitwarden compatible server written in Rust"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 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=6a5b1792fc53e94445033390f594dd1075390bf1339daa54ae92569ca902391d
+checksum=c5859e406596aa3a57666442867b9a3ec77106bf02af31b751599a5c5a1772a9
 
 system_accounts="_vaultwarden"
 _vaultwarden_homedir="/var/lib/vaultwarden"

From 5812652d9c32ca8b915820befdbcfe61e330bd93 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 9 Jul 2024 21:43:10 -0400
Subject: [PATCH 2/2] vaultwarden-web: update to 2024.5.1b.

---
 srcpkgs/vaultwarden-web/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vaultwarden-web/template b/srcpkgs/vaultwarden-web/template
index 15549d307ea099..509f3e73ca2216 100644
--- a/srcpkgs/vaultwarden-web/template
+++ b/srcpkgs/vaultwarden-web/template
@@ -1,13 +1,13 @@
 # Template file for 'vaultwarden-web'
 pkgname=vaultwarden-web
-version=2024.5.1
+version=2024.5.1b
 revision=1
 short_desc="Web vault builds for vaultwarden"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/dani-garcia/bw_web_builds"
 distfiles="https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"
-checksum=a0e457da4e39730ffd77542404d104f80bf8541a456ef259f23757c7c8f23833
+checksum=bceadff6ff96aec71fbab91dbf67cb7909635f6d4bd8a902a58bd9b3e7cae6d3
 
 do_install() {
 	vmkdir usr/share/webapps/vaultwarden-web

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b.
  2024-07-10  3:48 [PR PATCH] vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b TinfoilSubmarine
@ 2024-07-10 20:10 ` TinfoilSubmarine
  2024-07-10 20:11 ` TinfoilSubmarine
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: TinfoilSubmarine @ 2024-07-10 20:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1290 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages maint/vaultwarden
https://github.com/void-linux/void-packages/pull/51188

vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/51188.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/vaultwarden-51188.patch --]
[-- Type: text/x-diff, Size: 3963 bytes --]

From 1359131e7073eb707048f2d588f8b77d7243f802 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 10 Jul 2024 16:07:23 -0400
Subject: [PATCH 1/3] common/build-style/cargo.sh: set profile to release only
 if not specified

---
 common/build-style/cargo.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/common/build-style/cargo.sh b/common/build-style/cargo.sh
index 751911d8dbee8d..e842164bd9ad54 100644
--- a/common/build-style/cargo.sh
+++ b/common/build-style/cargo.sh
@@ -5,13 +5,17 @@
 do_build() {
 	: ${make_cmd:=cargo auditable}
 
-	${make_cmd} build --release --locked --target ${RUST_TARGET} ${configure_args}
+	if ! [[ ${configure_args} =~ .*--profile=.* ]]; then
+		configure_args+=" --profile=release"
+	fi
+
+	${make_cmd} build --locked --target ${RUST_TARGET} ${configure_args}
 }
 
 do_check() {
 	: ${make_cmd:=cargo auditable}
 
-	${make_check_pre} ${make_cmd} test --release --locked --target ${RUST_TARGET} \
+	${make_check_pre} ${make_cmd} test --locked --target ${RUST_TARGET} \
 		${configure_args} ${make_check_args}
 }
 

From 34ffa591e009d9b9e5c97c2e5dba1d549b086daa Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 9 Jul 2024 21:43:08 -0400
Subject: [PATCH 2/3] vaultwarden: update to 1.31.0.

---
 srcpkgs/vaultwarden/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vaultwarden/template b/srcpkgs/vaultwarden/template
index af91af3ca392e6..482abb58811049 100644
--- a/srcpkgs/vaultwarden/template
+++ b/srcpkgs/vaultwarden/template
@@ -1,25 +1,30 @@
 # Template file for 'vaultwarden'
 pkgname=vaultwarden
-version=1.30.5
+version=1.31.0
 revision=1
 build_style=cargo
 configure_args="--features sqlite,mysql,postgresql"
 hostmakedepends="pkg-config"
 makedepends="openssl-devel libmysqlclient-devel postgresql-libs-devel
- sqlite-devel"
+ sqlite-devel zlib-devel"
 short_desc="Unofficial Bitwarden compatible server written in Rust"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 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=6a5b1792fc53e94445033390f594dd1075390bf1339daa54ae92569ca902391d
+checksum=c5859e406596aa3a57666442867b9a3ec77106bf02af31b751599a5c5a1772a9
 
 system_accounts="_vaultwarden"
 _vaultwarden_homedir="/var/lib/vaultwarden"
 
 make_dirs="/var/lib/vaultwarden 0750 _vaultwarden _vaultwarden"
 
+# fails on i686, see https://github.com/dani-garcia/vaultwarden/issues/4320
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+	configure_args+=" --profile release-low"
+fi
+
 post_install() {
 	vsconf .env.template vaultwarden.conf
 	vsv vaultwarden

From b2fc8178a645f3ec369a6dbcc62c97ef73b57b22 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 9 Jul 2024 21:43:10 -0400
Subject: [PATCH 3/3] vaultwarden-web: update to 2024.5.1b.

---
 srcpkgs/vaultwarden-web/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vaultwarden-web/template b/srcpkgs/vaultwarden-web/template
index 15549d307ea099..509f3e73ca2216 100644
--- a/srcpkgs/vaultwarden-web/template
+++ b/srcpkgs/vaultwarden-web/template
@@ -1,13 +1,13 @@
 # Template file for 'vaultwarden-web'
 pkgname=vaultwarden-web
-version=2024.5.1
+version=2024.5.1b
 revision=1
 short_desc="Web vault builds for vaultwarden"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/dani-garcia/bw_web_builds"
 distfiles="https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"
-checksum=a0e457da4e39730ffd77542404d104f80bf8541a456ef259f23757c7c8f23833
+checksum=bceadff6ff96aec71fbab91dbf67cb7909635f6d4bd8a902a58bd9b3e7cae6d3
 
 do_install() {
 	vmkdir usr/share/webapps/vaultwarden-web

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b.
  2024-07-10  3:48 [PR PATCH] vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b TinfoilSubmarine
  2024-07-10 20:10 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2024-07-10 20:11 ` TinfoilSubmarine
  2024-07-10 20:12 ` TinfoilSubmarine
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: TinfoilSubmarine @ 2024-07-10 20:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1290 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages maint/vaultwarden
https://github.com/void-linux/void-packages/pull/51188

vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/51188.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/vaultwarden-51188.patch --]
[-- Type: text/x-diff, Size: 3963 bytes --]

From 1359131e7073eb707048f2d588f8b77d7243f802 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 10 Jul 2024 16:07:23 -0400
Subject: [PATCH 1/3] common/build-style/cargo.sh: set profile to release only
 if not specified

---
 common/build-style/cargo.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/common/build-style/cargo.sh b/common/build-style/cargo.sh
index 751911d8dbee8d..e842164bd9ad54 100644
--- a/common/build-style/cargo.sh
+++ b/common/build-style/cargo.sh
@@ -5,13 +5,17 @@
 do_build() {
 	: ${make_cmd:=cargo auditable}
 
-	${make_cmd} build --release --locked --target ${RUST_TARGET} ${configure_args}
+	if ! [[ ${configure_args} =~ .*--profile=.* ]]; then
+		configure_args+=" --profile=release"
+	fi
+
+	${make_cmd} build --locked --target ${RUST_TARGET} ${configure_args}
 }
 
 do_check() {
 	: ${make_cmd:=cargo auditable}
 
-	${make_check_pre} ${make_cmd} test --release --locked --target ${RUST_TARGET} \
+	${make_check_pre} ${make_cmd} test --locked --target ${RUST_TARGET} \
 		${configure_args} ${make_check_args}
 }
 

From 179390f708c27ed43a053436d1eb35dfbbe01149 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 9 Jul 2024 21:43:08 -0400
Subject: [PATCH 2/3] vaultwarden: update to 1.31.0.

---
 srcpkgs/vaultwarden/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vaultwarden/template b/srcpkgs/vaultwarden/template
index af91af3ca392e6..99df271a3fe133 100644
--- a/srcpkgs/vaultwarden/template
+++ b/srcpkgs/vaultwarden/template
@@ -1,25 +1,30 @@
 # Template file for 'vaultwarden'
 pkgname=vaultwarden
-version=1.30.5
+version=1.31.0
 revision=1
 build_style=cargo
 configure_args="--features sqlite,mysql,postgresql"
 hostmakedepends="pkg-config"
 makedepends="openssl-devel libmysqlclient-devel postgresql-libs-devel
- sqlite-devel"
+ sqlite-devel zlib-devel"
 short_desc="Unofficial Bitwarden compatible server written in Rust"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 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=6a5b1792fc53e94445033390f594dd1075390bf1339daa54ae92569ca902391d
+checksum=c5859e406596aa3a57666442867b9a3ec77106bf02af31b751599a5c5a1772a9
 
 system_accounts="_vaultwarden"
 _vaultwarden_homedir="/var/lib/vaultwarden"
 
 make_dirs="/var/lib/vaultwarden 0750 _vaultwarden _vaultwarden"
 
+# fails on i686, see https://github.com/dani-garcia/vaultwarden/issues/4320
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+	configure_args+=" --profile=release-low"
+fi
+
 post_install() {
 	vsconf .env.template vaultwarden.conf
 	vsv vaultwarden

From 5b736d27f65c7621d91b7d38affbea5ac2fec500 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 9 Jul 2024 21:43:10 -0400
Subject: [PATCH 3/3] vaultwarden-web: update to 2024.5.1b.

---
 srcpkgs/vaultwarden-web/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vaultwarden-web/template b/srcpkgs/vaultwarden-web/template
index 15549d307ea099..509f3e73ca2216 100644
--- a/srcpkgs/vaultwarden-web/template
+++ b/srcpkgs/vaultwarden-web/template
@@ -1,13 +1,13 @@
 # Template file for 'vaultwarden-web'
 pkgname=vaultwarden-web
-version=2024.5.1
+version=2024.5.1b
 revision=1
 short_desc="Web vault builds for vaultwarden"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/dani-garcia/bw_web_builds"
 distfiles="https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"
-checksum=a0e457da4e39730ffd77542404d104f80bf8541a456ef259f23757c7c8f23833
+checksum=bceadff6ff96aec71fbab91dbf67cb7909635f6d4bd8a902a58bd9b3e7cae6d3
 
 do_install() {
 	vmkdir usr/share/webapps/vaultwarden-web

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b.
  2024-07-10  3:48 [PR PATCH] vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b TinfoilSubmarine
  2024-07-10 20:10 ` [PR PATCH] [Updated] " TinfoilSubmarine
  2024-07-10 20:11 ` TinfoilSubmarine
@ 2024-07-10 20:12 ` TinfoilSubmarine
  2024-07-10 20:41 ` TinfoilSubmarine
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: TinfoilSubmarine @ 2024-07-10 20:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1290 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages maint/vaultwarden
https://github.com/void-linux/void-packages/pull/51188

vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/51188.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/vaultwarden-51188.patch --]
[-- Type: text/x-diff, Size: 3962 bytes --]

From 47ad7edf05709b413e40cf3b82e78f73c13c72cb Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 10 Jul 2024 16:07:23 -0400
Subject: [PATCH 1/3] common/build-style/cargo.sh: set profile to release only
 if not specified

---
 common/build-style/cargo.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/common/build-style/cargo.sh b/common/build-style/cargo.sh
index 751911d8dbee8d..b256899d42cf3e 100644
--- a/common/build-style/cargo.sh
+++ b/common/build-style/cargo.sh
@@ -5,13 +5,17 @@
 do_build() {
 	: ${make_cmd:=cargo auditable}
 
-	${make_cmd} build --release --locked --target ${RUST_TARGET} ${configure_args}
+	if ! [[ ${configure_args} =~ .*--profile.* ]]; then
+		configure_args+=" --profile=release"
+	fi
+
+	${make_cmd} build --locked --target ${RUST_TARGET} ${configure_args}
 }
 
 do_check() {
 	: ${make_cmd:=cargo auditable}
 
-	${make_check_pre} ${make_cmd} test --release --locked --target ${RUST_TARGET} \
+	${make_check_pre} ${make_cmd} test --locked --target ${RUST_TARGET} \
 		${configure_args} ${make_check_args}
 }
 

From d4da35fbbc411d25c6937285d6d80a5710a6f4ac Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 9 Jul 2024 21:43:08 -0400
Subject: [PATCH 2/3] vaultwarden: update to 1.31.0.

---
 srcpkgs/vaultwarden/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vaultwarden/template b/srcpkgs/vaultwarden/template
index af91af3ca392e6..99df271a3fe133 100644
--- a/srcpkgs/vaultwarden/template
+++ b/srcpkgs/vaultwarden/template
@@ -1,25 +1,30 @@
 # Template file for 'vaultwarden'
 pkgname=vaultwarden
-version=1.30.5
+version=1.31.0
 revision=1
 build_style=cargo
 configure_args="--features sqlite,mysql,postgresql"
 hostmakedepends="pkg-config"
 makedepends="openssl-devel libmysqlclient-devel postgresql-libs-devel
- sqlite-devel"
+ sqlite-devel zlib-devel"
 short_desc="Unofficial Bitwarden compatible server written in Rust"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 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=6a5b1792fc53e94445033390f594dd1075390bf1339daa54ae92569ca902391d
+checksum=c5859e406596aa3a57666442867b9a3ec77106bf02af31b751599a5c5a1772a9
 
 system_accounts="_vaultwarden"
 _vaultwarden_homedir="/var/lib/vaultwarden"
 
 make_dirs="/var/lib/vaultwarden 0750 _vaultwarden _vaultwarden"
 
+# fails on i686, see https://github.com/dani-garcia/vaultwarden/issues/4320
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+	configure_args+=" --profile=release-low"
+fi
+
 post_install() {
 	vsconf .env.template vaultwarden.conf
 	vsv vaultwarden

From b734496822fb98de15043147257e5077482bff9d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 9 Jul 2024 21:43:10 -0400
Subject: [PATCH 3/3] vaultwarden-web: update to 2024.5.1b.

---
 srcpkgs/vaultwarden-web/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vaultwarden-web/template b/srcpkgs/vaultwarden-web/template
index 15549d307ea099..509f3e73ca2216 100644
--- a/srcpkgs/vaultwarden-web/template
+++ b/srcpkgs/vaultwarden-web/template
@@ -1,13 +1,13 @@
 # Template file for 'vaultwarden-web'
 pkgname=vaultwarden-web
-version=2024.5.1
+version=2024.5.1b
 revision=1
 short_desc="Web vault builds for vaultwarden"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/dani-garcia/bw_web_builds"
 distfiles="https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"
-checksum=a0e457da4e39730ffd77542404d104f80bf8541a456ef259f23757c7c8f23833
+checksum=bceadff6ff96aec71fbab91dbf67cb7909635f6d4bd8a902a58bd9b3e7cae6d3
 
 do_install() {
 	vmkdir usr/share/webapps/vaultwarden-web

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b.
  2024-07-10  3:48 [PR PATCH] vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b TinfoilSubmarine
                   ` (2 preceding siblings ...)
  2024-07-10 20:12 ` TinfoilSubmarine
@ 2024-07-10 20:41 ` TinfoilSubmarine
  2024-07-11  2:10 ` [PR REVIEW] " ahesford
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: TinfoilSubmarine @ 2024-07-10 20:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1290 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages maint/vaultwarden
https://github.com/void-linux/void-packages/pull/51188

vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/51188.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/vaultwarden-51188.patch --]
[-- Type: text/x-diff, Size: 3977 bytes --]

From 491041036efc2bf0034e5f5a151438496a41da2b Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 10 Jul 2024 16:07:23 -0400
Subject: [PATCH 1/3] common/build-style/cargo.sh: set profile to release only
 if not specified

---
 common/build-style/cargo.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/common/build-style/cargo.sh b/common/build-style/cargo.sh
index 751911d8dbee8d..6e8a5cb70ae6fa 100644
--- a/common/build-style/cargo.sh
+++ b/common/build-style/cargo.sh
@@ -5,13 +5,17 @@
 do_build() {
 	: ${make_cmd:=cargo auditable}
 
-	${make_cmd} build --release --locked --target ${RUST_TARGET} ${configure_args}
+	if ! [[ ${configure_args} =~ .*--profile([[:space:]]|=).* ]]; then
+		configure_args+=" --profile=release"
+	fi
+
+	${make_cmd} build --locked --target ${RUST_TARGET} ${configure_args}
 }
 
 do_check() {
 	: ${make_cmd:=cargo auditable}
 
-	${make_check_pre} ${make_cmd} test --release --locked --target ${RUST_TARGET} \
+	${make_check_pre} ${make_cmd} test --locked --target ${RUST_TARGET} \
 		${configure_args} ${make_check_args}
 }
 

From 0e315e2d022b2572c356f0a80a7f32df58703136 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 9 Jul 2024 21:43:08 -0400
Subject: [PATCH 2/3] vaultwarden: update to 1.31.0.

---
 srcpkgs/vaultwarden/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vaultwarden/template b/srcpkgs/vaultwarden/template
index af91af3ca392e6..99df271a3fe133 100644
--- a/srcpkgs/vaultwarden/template
+++ b/srcpkgs/vaultwarden/template
@@ -1,25 +1,30 @@
 # Template file for 'vaultwarden'
 pkgname=vaultwarden
-version=1.30.5
+version=1.31.0
 revision=1
 build_style=cargo
 configure_args="--features sqlite,mysql,postgresql"
 hostmakedepends="pkg-config"
 makedepends="openssl-devel libmysqlclient-devel postgresql-libs-devel
- sqlite-devel"
+ sqlite-devel zlib-devel"
 short_desc="Unofficial Bitwarden compatible server written in Rust"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 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=6a5b1792fc53e94445033390f594dd1075390bf1339daa54ae92569ca902391d
+checksum=c5859e406596aa3a57666442867b9a3ec77106bf02af31b751599a5c5a1772a9
 
 system_accounts="_vaultwarden"
 _vaultwarden_homedir="/var/lib/vaultwarden"
 
 make_dirs="/var/lib/vaultwarden 0750 _vaultwarden _vaultwarden"
 
+# fails on i686, see https://github.com/dani-garcia/vaultwarden/issues/4320
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+	configure_args+=" --profile=release-low"
+fi
+
 post_install() {
 	vsconf .env.template vaultwarden.conf
 	vsv vaultwarden

From 38a1809f1e7063a48647ff6e91dbe7a05b793cfd Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 9 Jul 2024 21:43:10 -0400
Subject: [PATCH 3/3] vaultwarden-web: update to 2024.5.1b.

---
 srcpkgs/vaultwarden-web/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vaultwarden-web/template b/srcpkgs/vaultwarden-web/template
index 15549d307ea099..509f3e73ca2216 100644
--- a/srcpkgs/vaultwarden-web/template
+++ b/srcpkgs/vaultwarden-web/template
@@ -1,13 +1,13 @@
 # Template file for 'vaultwarden-web'
 pkgname=vaultwarden-web
-version=2024.5.1
+version=2024.5.1b
 revision=1
 short_desc="Web vault builds for vaultwarden"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/dani-garcia/bw_web_builds"
 distfiles="https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"
-checksum=a0e457da4e39730ffd77542404d104f80bf8541a456ef259f23757c7c8f23833
+checksum=bceadff6ff96aec71fbab91dbf67cb7909635f6d4bd8a902a58bd9b3e7cae6d3
 
 do_install() {
 	vmkdir usr/share/webapps/vaultwarden-web

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR REVIEW] vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b.
  2024-07-10  3:48 [PR PATCH] vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b TinfoilSubmarine
                   ` (3 preceding siblings ...)
  2024-07-10 20:41 ` TinfoilSubmarine
@ 2024-07-11  2:10 ` ahesford
  2024-07-11 15:47 ` [PR PATCH] [Updated] " TinfoilSubmarine
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: ahesford @ 2024-07-11  2:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 204 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/51188#discussion_r1673299027

Comment:
I think this change merits discussion in a separate PR.

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b.
  2024-07-10  3:48 [PR PATCH] vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b TinfoilSubmarine
                   ` (4 preceding siblings ...)
  2024-07-11  2:10 ` [PR REVIEW] " ahesford
@ 2024-07-11 15:47 ` TinfoilSubmarine
  2024-07-11 16:03 ` [PR REVIEW] " ahesford
                   ` (4 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: TinfoilSubmarine @ 2024-07-11 15:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1290 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages maint/vaultwarden
https://github.com/void-linux/void-packages/pull/51188

vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/51188.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/vaultwarden-51188.patch --]
[-- Type: text/x-diff, Size: 3170 bytes --]

From 450e61c6eee4f102a7077ffbe32836a097b979ed Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 9 Jul 2024 21:43:08 -0400
Subject: [PATCH 1/2] vaultwarden: update to 1.31.0.

---
 srcpkgs/vaultwarden/template | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vaultwarden/template b/srcpkgs/vaultwarden/template
index af91af3ca392e6..979ecdde42c4c8 100644
--- a/srcpkgs/vaultwarden/template
+++ b/srcpkgs/vaultwarden/template
@@ -1,25 +1,41 @@
 # Template file for 'vaultwarden'
 pkgname=vaultwarden
-version=1.30.5
+version=1.31.0
 revision=1
 build_style=cargo
 configure_args="--features sqlite,mysql,postgresql"
 hostmakedepends="pkg-config"
 makedepends="openssl-devel libmysqlclient-devel postgresql-libs-devel
- sqlite-devel"
+ sqlite-devel zlib-devel"
 short_desc="Unofficial Bitwarden compatible server written in Rust"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 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=6a5b1792fc53e94445033390f594dd1075390bf1339daa54ae92569ca902391d
+checksum=c5859e406596aa3a57666442867b9a3ec77106bf02af31b751599a5c5a1772a9
 
 system_accounts="_vaultwarden"
 _vaultwarden_homedir="/var/lib/vaultwarden"
 
 make_dirs="/var/lib/vaultwarden 0750 _vaultwarden _vaultwarden"
 
+# fails on i686, see https://github.com/dani-garcia/vaultwarden/issues/4320
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+	configure_args+=" --profile=release-low"
+	do_build() {
+		: ${make_cmd:=cargo auditable}
+
+		${make_cmd} build --locked --target ${RUST_TARGET} ${configure_args}
+	}
+	do_check() {
+		: ${make_cmd:=cargo auditable}
+
+		${make_check_pre} ${make_cmd} test --locked --target ${RUST_TARGET} \
+			${configure_args} ${make_check_args}
+	}
+fi
+
 post_install() {
 	vsconf .env.template vaultwarden.conf
 	vsv vaultwarden

From 5c6ed9984a1b28b06ab1e3d3a57a3d80aa606a5e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 9 Jul 2024 21:43:10 -0400
Subject: [PATCH 2/2] vaultwarden-web: update to 2024.5.1b.

---
 srcpkgs/vaultwarden-web/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vaultwarden-web/template b/srcpkgs/vaultwarden-web/template
index 15549d307ea099..509f3e73ca2216 100644
--- a/srcpkgs/vaultwarden-web/template
+++ b/srcpkgs/vaultwarden-web/template
@@ -1,13 +1,13 @@
 # Template file for 'vaultwarden-web'
 pkgname=vaultwarden-web
-version=2024.5.1
+version=2024.5.1b
 revision=1
 short_desc="Web vault builds for vaultwarden"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/dani-garcia/bw_web_builds"
 distfiles="https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"
-checksum=a0e457da4e39730ffd77542404d104f80bf8541a456ef259f23757c7c8f23833
+checksum=bceadff6ff96aec71fbab91dbf67cb7909635f6d4bd8a902a58bd9b3e7cae6d3
 
 do_install() {
 	vmkdir usr/share/webapps/vaultwarden-web

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR REVIEW] vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b.
  2024-07-10  3:48 [PR PATCH] vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b TinfoilSubmarine
                   ` (5 preceding siblings ...)
  2024-07-11 15:47 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2024-07-11 16:03 ` ahesford
  2024-07-11 16:03 ` ahesford
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: ahesford @ 2024-07-11 16:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 243 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/51188#discussion_r1674284351

Comment:
```suggestion
		cargo auditable build --locked --target ${RUST_TARGET} ${configure_args}
```

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR REVIEW] vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b.
  2024-07-10  3:48 [PR PATCH] vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b TinfoilSubmarine
                   ` (6 preceding siblings ...)
  2024-07-11 16:03 ` [PR REVIEW] " ahesford
@ 2024-07-11 16:03 ` ahesford
  2024-07-11 17:32 ` [PR PATCH] [Updated] " TinfoilSubmarine
                   ` (2 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: ahesford @ 2024-07-11 16:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 267 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/51188#discussion_r1674286867

Comment:
```suggestion
		cargo auditable test --locked --target ${RUST_TARGET} \
			${configure_args} ${make_check_args}
```

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b.
  2024-07-10  3:48 [PR PATCH] vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b TinfoilSubmarine
                   ` (7 preceding siblings ...)
  2024-07-11 16:03 ` ahesford
@ 2024-07-11 17:32 ` TinfoilSubmarine
  2024-07-11 17:34 ` TinfoilSubmarine
  2024-07-12  1:58 ` [PR PATCH] [Updated] " TinfoilSubmarine
  10 siblings, 0 replies; 12+ messages in thread
From: TinfoilSubmarine @ 2024-07-11 17:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1290 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages maint/vaultwarden
https://github.com/void-linux/void-packages/pull/51188

vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/51188.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/vaultwarden-51188.patch --]
[-- Type: text/x-diff, Size: 3084 bytes --]

From 8786e49bb19fd58174c30ba6f40278c7e99472b8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 9 Jul 2024 21:43:08 -0400
Subject: [PATCH 1/2] vaultwarden: update to 1.31.0.

---
 srcpkgs/vaultwarden/template | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vaultwarden/template b/srcpkgs/vaultwarden/template
index af91af3ca392e6..eb22b02c9fb639 100644
--- a/srcpkgs/vaultwarden/template
+++ b/srcpkgs/vaultwarden/template
@@ -1,25 +1,37 @@
 # Template file for 'vaultwarden'
 pkgname=vaultwarden
-version=1.30.5
+version=1.31.0
 revision=1
 build_style=cargo
 configure_args="--features sqlite,mysql,postgresql"
 hostmakedepends="pkg-config"
 makedepends="openssl-devel libmysqlclient-devel postgresql-libs-devel
- sqlite-devel"
+ sqlite-devel zlib-devel"
 short_desc="Unofficial Bitwarden compatible server written in Rust"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 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=6a5b1792fc53e94445033390f594dd1075390bf1339daa54ae92569ca902391d
+checksum=c5859e406596aa3a57666442867b9a3ec77106bf02af31b751599a5c5a1772a9
 
 system_accounts="_vaultwarden"
 _vaultwarden_homedir="/var/lib/vaultwarden"
 
 make_dirs="/var/lib/vaultwarden 0750 _vaultwarden _vaultwarden"
 
+# fails on i686, see https://github.com/dani-garcia/vaultwarden/issues/4320
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+	configure_args+=" --profile=release-low"
+	do_build() {
+		cargo auditable build --locked --target ${RUST_TARGET} ${configure_args}
+	}
+	do_check() {
+		cargo auditable test --locked --target ${RUST_TARGET} \
+			${configure_args} ${make_check_args}
+	}
+fi
+
 post_install() {
 	vsconf .env.template vaultwarden.conf
 	vsv vaultwarden

From 780c616394a51f920398c12d47836ba57807c0ca Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 9 Jul 2024 21:43:10 -0400
Subject: [PATCH 2/2] vaultwarden-web: update to 2024.5.1b.

---
 srcpkgs/vaultwarden-web/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vaultwarden-web/template b/srcpkgs/vaultwarden-web/template
index 15549d307ea099..509f3e73ca2216 100644
--- a/srcpkgs/vaultwarden-web/template
+++ b/srcpkgs/vaultwarden-web/template
@@ -1,13 +1,13 @@
 # Template file for 'vaultwarden-web'
 pkgname=vaultwarden-web
-version=2024.5.1
+version=2024.5.1b
 revision=1
 short_desc="Web vault builds for vaultwarden"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/dani-garcia/bw_web_builds"
 distfiles="https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"
-checksum=a0e457da4e39730ffd77542404d104f80bf8541a456ef259f23757c7c8f23833
+checksum=bceadff6ff96aec71fbab91dbf67cb7909635f6d4bd8a902a58bd9b3e7cae6d3
 
 do_install() {
 	vmkdir usr/share/webapps/vaultwarden-web

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b.
  2024-07-10  3:48 [PR PATCH] vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b TinfoilSubmarine
                   ` (8 preceding siblings ...)
  2024-07-11 17:32 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2024-07-11 17:34 ` TinfoilSubmarine
  2024-07-12  1:58 ` [PR PATCH] [Updated] " TinfoilSubmarine
  10 siblings, 0 replies; 12+ messages in thread
From: TinfoilSubmarine @ 2024-07-11 17:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 222 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/51188#issuecomment-2223508650

Comment:
> There's no need for indirection with the function overrides.

fixed

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b.
  2024-07-10  3:48 [PR PATCH] vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b TinfoilSubmarine
                   ` (9 preceding siblings ...)
  2024-07-11 17:34 ` TinfoilSubmarine
@ 2024-07-12  1:58 ` TinfoilSubmarine
  10 siblings, 0 replies; 12+ messages in thread
From: TinfoilSubmarine @ 2024-07-12  1:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1290 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages maint/vaultwarden
https://github.com/void-linux/void-packages/pull/51188

vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/51188.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/vaultwarden-51188.patch --]
[-- Type: text/x-diff, Size: 2901 bytes --]

From 70cd1939e8e5a1cec5470bef60be8dd6f278eca9 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 9 Jul 2024 21:43:08 -0400
Subject: [PATCH 1/2] vaultwarden: update to 1.31.0.

---
 srcpkgs/vaultwarden/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vaultwarden/template b/srcpkgs/vaultwarden/template
index af91af3ca392e6..7dcbe9ac5e7eab 100644
--- a/srcpkgs/vaultwarden/template
+++ b/srcpkgs/vaultwarden/template
@@ -1,25 +1,31 @@
 # Template file for 'vaultwarden'
 pkgname=vaultwarden
-version=1.30.5
+version=1.31.0
 revision=1
 build_style=cargo
 configure_args="--features sqlite,mysql,postgresql"
 hostmakedepends="pkg-config"
 makedepends="openssl-devel libmysqlclient-devel postgresql-libs-devel
- sqlite-devel"
+ sqlite-devel zlib-devel"
 short_desc="Unofficial Bitwarden compatible server written in Rust"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 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=6a5b1792fc53e94445033390f594dd1075390bf1339daa54ae92569ca902391d
+checksum=c5859e406596aa3a57666442867b9a3ec77106bf02af31b751599a5c5a1772a9
 
 system_accounts="_vaultwarden"
 _vaultwarden_homedir="/var/lib/vaultwarden"
 
 make_dirs="/var/lib/vaultwarden 0750 _vaultwarden _vaultwarden"
 
+# fails to build on i686 with default release profile, see
+# https://github.com/dani-garcia/vaultwarden/issues/4320
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+	export CARGO_PROFILE_RELEASE_LTO=thin
+fi
+
 post_install() {
 	vsconf .env.template vaultwarden.conf
 	vsv vaultwarden

From b039069c8ce9320fa27e8a09d71c05ec4e4f2ac8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 9 Jul 2024 21:43:10 -0400
Subject: [PATCH 2/2] vaultwarden-web: update to 2024.5.1b.

---
 srcpkgs/vaultwarden-web/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vaultwarden-web/template b/srcpkgs/vaultwarden-web/template
index 15549d307ea099..509f3e73ca2216 100644
--- a/srcpkgs/vaultwarden-web/template
+++ b/srcpkgs/vaultwarden-web/template
@@ -1,13 +1,13 @@
 # Template file for 'vaultwarden-web'
 pkgname=vaultwarden-web
-version=2024.5.1
+version=2024.5.1b
 revision=1
 short_desc="Web vault builds for vaultwarden"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/dani-garcia/bw_web_builds"
 distfiles="https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"
-checksum=a0e457da4e39730ffd77542404d104f80bf8541a456ef259f23757c7c8f23833
+checksum=bceadff6ff96aec71fbab91dbf67cb7909635f6d4bd8a902a58bd9b3e7cae6d3
 
 do_install() {
 	vmkdir usr/share/webapps/vaultwarden-web

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2024-07-12  1:58 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-07-10  3:48 [PR PATCH] vaultwarden: update to 1.31.0; vaultwarden-web: update to 2024.5.1b TinfoilSubmarine
2024-07-10 20:10 ` [PR PATCH] [Updated] " TinfoilSubmarine
2024-07-10 20:11 ` TinfoilSubmarine
2024-07-10 20:12 ` TinfoilSubmarine
2024-07-10 20:41 ` TinfoilSubmarine
2024-07-11  2:10 ` [PR REVIEW] " ahesford
2024-07-11 15:47 ` [PR PATCH] [Updated] " TinfoilSubmarine
2024-07-11 16:03 ` [PR REVIEW] " ahesford
2024-07-11 16:03 ` ahesford
2024-07-11 17:32 ` [PR PATCH] [Updated] " TinfoilSubmarine
2024-07-11 17:34 ` TinfoilSubmarine
2024-07-12  1:58 ` [PR PATCH] [Updated] " TinfoilSubmarine

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).