From: TinfoilSubmarine <TinfoilSubmarine@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] vaultwarden build (checking i686 LLVM OOM w/ `disable_parallel_build`)
Date: Wed, 10 Jul 2024 18:12:58 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-51195@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1328 bytes --]
There is a new pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages test/vaultwarden
https://github.com/void-linux/void-packages/pull/51195
vaultwarden build (checking i686 LLVM OOM w/ `disable_parallel_build`)
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### 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/51195.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-test/vaultwarden-51195.patch --]
[-- Type: text/x-diff, Size: 3340 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/3] 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/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
From b09ecf4f68d7586732c3caed10c03a42f801a839 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 10 Jul 2024 12:10:54 -0400
Subject: [PATCH 3/3] vaultwarden: update to 1.31.0.
---
srcpkgs/vaultwarden/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/vaultwarden/template b/srcpkgs/vaultwarden/template
index 98e4bf9c6be443..415560ed0a9f93 100644
--- a/srcpkgs/vaultwarden/template
+++ b/srcpkgs/vaultwarden/template
@@ -20,6 +20,10 @@ _vaultwarden_homedir="/var/lib/vaultwarden"
make_dirs="/var/lib/vaultwarden 0750 _vaultwarden _vaultwarden"
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ disable_parallel_build=yes # getting "rustc-LLVM ERROR: out of memory"
+fi
+
post_install() {
vsconf .env.template vaultwarden.conf
vsv vaultwarden
next reply other threads:[~2024-07-10 16:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-10 16:12 TinfoilSubmarine [this message]
2024-07-10 16:14 ` [PR PATCH] [Closed]: " TinfoilSubmarine
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-51195@inbox.vuxu.org \
--to=tinfoilsubmarine@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).