Re: [PR PATCH] [Updated] New packages: vaultwarden-web-2022.8.1, vaultwarden-1.25.1

[TinfoilSubmarine <TinfoilSubmarine@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1279 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/37258

New packages: vaultwarden-web-2022.8.1, vaultwarden-1.25.1
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

<!-- 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/37258.patch is attached

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

From dca30e4aecfb6b66f3c7aa8820c72db66df9caae Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 17 Feb 2022 13:25:21 -0500
Subject: [PATCH 1/2] New package: vaultwarden-1.25.2

---
 srcpkgs/vaultwarden/files/vaultwarden/log/run |  1 +
 srcpkgs/vaultwarden/files/vaultwarden/run     |  6 ++++
 srcpkgs/vaultwarden/patches/config.patch      | 35 +++++++++++++++++++
 srcpkgs/vaultwarden/template                  | 25 +++++++++++++
 4 files changed, 67 insertions(+)
 create mode 120000 srcpkgs/vaultwarden/files/vaultwarden/log/run
 create mode 100644 srcpkgs/vaultwarden/files/vaultwarden/run
 create mode 100644 srcpkgs/vaultwarden/patches/config.patch
 create mode 100644 srcpkgs/vaultwarden/template

diff --git a/srcpkgs/vaultwarden/files/vaultwarden/log/run b/srcpkgs/vaultwarden/files/vaultwarden/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/vaultwarden/files/vaultwarden/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/vaultwarden/files/vaultwarden/run b/srcpkgs/vaultwarden/files/vaultwarden/run
new file mode 100644
index 000000000000..ff5d0c6af46d
--- /dev/null
+++ b/srcpkgs/vaultwarden/files/vaultwarden/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+[ -r ./conf ] && . ./conf
+ENV_FILE=${ENV_FILE:-/etc/vaultwarden.conf}
+export ENV_FILE
+
+exec chpst -u _vaultwarden:_vaultwarden vaultwarden
diff --git a/srcpkgs/vaultwarden/patches/config.patch b/srcpkgs/vaultwarden/patches/config.patch
new file mode 100644
index 000000000000..36114bee2474
--- /dev/null
+++ b/srcpkgs/vaultwarden/patches/config.patch
@@ -0,0 +1,35 @@
+configure several paths to sane/expected locations
+
+diff --git a/.env.template b/.env.template
+index 66a0434..cebac33 100644
+--- a/.env.template
++++ b/.env.template
+@@ -10,7 +10,7 @@
+ ## vaultwarden.
+ 
+ ## Main data folder
+-# DATA_FOLDER=data
++DATA_FOLDER=/var/lib/vaultwarden
+ 
+ ## Database URL
+ ## When using SQLite, this is the path to the DB file, default to %DATA_FOLDER%/db.sqlite3
+@@ -61,8 +61,8 @@
+ # ICON_CACHE_NEGTTL=259200
+ 
+ ## Web vault settings
+-# WEB_VAULT_FOLDER=web-vault/
+-# WEB_VAULT_ENABLED=true
++# WEB_VAULT_FOLDER=/usr/share/webapps/vaultwarden-web
++WEB_VAULT_ENABLED=false
+ 
+ ## Enables websocket notifications
+ # WEBSOCKET_ENABLED=false
+@@ -117,7 +117,7 @@
+ # LOG_TIMESTAMP_FORMAT="%Y-%m-%d %H:%M:%S.%3f"
+ 
+ ## Logging to file
+-# LOG_FILE=/path/to/log
++# LOG_FILE=/var/log/vaultwarden.log
+ 
+ ## Logging to Syslog
+ ## This requires extended logging
diff --git a/srcpkgs/vaultwarden/template b/srcpkgs/vaultwarden/template
new file mode 100644
index 000000000000..5d46f1b4f867
--- /dev/null
+++ b/srcpkgs/vaultwarden/template
@@ -0,0 +1,25 @@
+# Template file for 'vaultwarden'
+pkgname=vaultwarden
+version=1.25.2
+revision=1
+build_style=cargo
+configure_args="--features sqlite,mysql,postgresql"
+hostmakedepends="pkg-config"
+makedepends="openssl-devel libmysqlclient-devel postgresql-libs-devel
+ sqlite-devel"
+short_desc="Unofficial Bitwarden compatible server written in Rust"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/dani-garcia/vaultwarden"
+distfiles="https://github.com/dani-garcia/vaultwarden/archive/${version}.tar.gz"
+checksum=f4afc2d8aa7aa59dd1ae16497b6a7f9b412ff426a24868e3081054e611d4824d
+
+system_accounts="_vaultwarden"
+_vaultwarden_homedir="/var/lib/vaultwarden"
+
+make_dirs="/var/lib/vaultwarden 0750 _vaultwarden _vaultwarden"
+
+post_install() {
+	vsconf .env.template vaultwarden.conf
+	vsv vaultwarden
+}

From ad81b8e1836a33d4d1050a8ad05209a51a24f6fc Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Sat, 26 Mar 2022 20:55:52 -0400
Subject: [PATCH 2/2] New package: vaultwarden-web-2022.8.1

---
 srcpkgs/vaultwarden-web/template | 39 ++++++++++++++++++++++++++++++++
 srcpkgs/vaultwarden-web/update   |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 srcpkgs/vaultwarden-web/template
 create mode 100644 srcpkgs/vaultwarden-web/update

diff --git a/srcpkgs/vaultwarden-web/template b/srcpkgs/vaultwarden-web/template
new file mode 100644
index 000000000000..557c3e195256
--- /dev/null
+++ b/srcpkgs/vaultwarden-web/template
@@ -0,0 +1,39 @@
+# Template file for 'vaultwarden-web'
+pkgname=vaultwarden-web
+version=2022.8.1
+revision=1
+_patch_ver=2022.8.0
+create_wrksrc=yes
+build_wrksrc="clients-web-v${version}"
+hostmakedepends="git nodejs"
+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/bitwarden/clients/archive/web-v${version}.tar.gz
+ https://raw.githubusercontent.com/dani-garcia/bw_web_builds/master/patches/v${_patch_ver}.patch"
+checksum="9dff38f13d8be047fe0fd6426bda3c409bb222b787bd6b21a3559f5d29255a92
+ 1199bcf5edb0cad2e0fc1e839b5bdc690565d6af5b32cc1c38348f0b13c69ee9"
+
+post_extract() {
+	mv v$_patch_ver.patch ${build_wrksrc}
+}
+
+post_patch() {
+	patch -Np1 -i v$_patch_ver.patch
+}
+
+do_configure() {
+	npm ci --ignore-scripts
+}
+
+do_build() {
+	cd apps/web
+	npm run dist:oss:selfhost
+}
+
+do_install() {
+	cd apps/web
+	vmkdir usr/share/webapps/vaultwarden-web
+	vcopy build/* usr/share/webapps/vaultwarden-web
+}
diff --git a/srcpkgs/vaultwarden-web/update b/srcpkgs/vaultwarden-web/update
new file mode 100644
index 000000000000..7d10386dd670
--- /dev/null
+++ b/srcpkgs/vaultwarden-web/update
@@ -0,0 +1,2 @@
+pkgname=bw_web
+site="https://github.com/dani-garcia/bw_web_builds/releases"