[arch-commits] Commit in vaultwarden-web/repos/community-any (4 files)

[George Rawlinson]

    Date: Monday, October 18, 2021 @ 22:36:06
  Author: grawlinson
Revision: 1030922

archrelease: copy trunk to community-any

Added:
  vaultwarden-web/repos/community-any/PKGBUILD
    (from rev 1030921, vaultwarden-web/trunk/PKGBUILD)
  vaultwarden-web/repos/community-any/vaultwarden-web.install
    (from rev 1030921, vaultwarden-web/trunk/vaultwarden-web.install)
Deleted:
  vaultwarden-web/repos/community-any/PKGBUILD
  vaultwarden-web/repos/community-any/vaultwarden-web.install

-------------------------+
 PKGBUILD                |   95 +++++++++++++++++++++++-----------------------
 vaultwarden-web.install |   18 ++++----
 2 files changed, 58 insertions(+), 55 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-18 22:35:14 UTC (rev 1030921)
+++ PKGBUILD	2021-10-18 22:36:06 UTC (rev 1030922)
@@ -1,46 +0,0 @@
-# Maintainer: Daniel M. Capella <polyzen at archlinux.org>
-# Contributor: Markus Richter <mqus at disroot dot org>
-
-pkgname=vaultwarden-web
-_pkgver=2.23.0
-pkgver=2.23.0
-_upstreamver=${_pkgver%[[:lower:]]}
-_patchver=$_upstreamver
-pkgrel=1
-pkgdesc='Bitwarden web vault with the patches to make it work with vaultwarden'
-arch=('any')
-url=https://github.com/dani-garcia/bw_web_builds
-license=('GPL3')
-depends=('vaultwarden')
-makedepends=('git' 'nodejs-lts-fermium' 'npm')
-provides=('bitwarden_rs-vault' 'bitwarden_rs-web')
-replaces=('bitwarden_rs-vault' 'bitwarden_rs-web')
-install=$pkgname.install
-source=("bitwarden-web::git+https://github.com/bitwarden/web.git#tag=v$_upstreamver"
-        "$pkgname-v$_patchver.patch::https://raw.githubusercontent.com/dani-garcia/bw_web_builds/v$_pkgver/patches/v$_patchver.patch")
-b2sums=('SKIP'
-        'bfd08114bd701366189d626b5c768affc45bde84dc6f0aa0f86ffa866ab4b9c79f896ae1f9c25b4d42fbfb709577ed10e5b9d43f7ed25aaa5b13d3f832c07d25')
-
-pkgver() {
-  echo $_pkgver | sed 's/[[:lower:]]$/.&/'
-}
-
-prepare() {
-  cd bitwarden-web
-  git submodule update --init
-  patch --forward --strip=1 --input=../$pkgname-v$_patchver.patch
-  npm ci
-}
-
-build() {
-  cd bitwarden-web
-  npm run dist
-}
-
-package() {
-  cd bitwarden-web
-  install -d "$pkgdir"/usr/share/webapps/$pkgname
-  cp -R build/* "$pkgdir"/usr/share/webapps/$pkgname
-}
-
-# vim:set ts=2 sw=2 et:

Copied: vaultwarden-web/repos/community-any/PKGBUILD (from rev 1030921, vaultwarden-web/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-10-18 22:36:06 UTC (rev 1030922)
@@ -0,0 +1,49 @@
+# Maintainer: Daniel M. Capella <polyzen at archlinux.org>
+# Contributor: Markus Richter <mqus at disroot dot org>
+
+pkgname=vaultwarden-web
+_pkgver=2.23.0c
+pkgver=2.23.0.c
+_upstreamver=${_pkgver%[[:lower:]]}
+_patchver=$_upstreamver
+pkgrel=1
+pkgdesc='Bitwarden web vault with the patches to make it work with vaultwarden'
+arch=('any')
+url=https://github.com/dani-garcia/bw_web_builds
+license=('GPL3')
+depends=('vaultwarden')
+makedepends=('git' 'nodejs-lts-fermium' 'npm')
+provides=('bitwarden_rs-vault' 'bitwarden_rs-web')
+replaces=('bitwarden_rs-vault' 'bitwarden_rs-web')
+install=$pkgname.install
+source=("bitwarden-web::git+https://github.com/bitwarden/web.git#tag=v$_upstreamver"
+        "$pkgname-v$_patchver.patch::https://raw.githubusercontent.com/dani-garcia/bw_web_builds/v$_pkgver/patches/v$_patchver.patch")
+b2sums=('SKIP'
+        '2721a96db72714c7db93b7d468e8a7aad27db07fe5e3ab9d6d9656ae261388f6ee304ae1b38531a10f2c4d9a4cb1e4c174eef4e0c6bd0500de950fd43aa4f425')
+
+pkgver() {
+  echo $_pkgver | sed 's/[[:lower:]]$/.&/'
+}
+
+prepare() {
+  cd bitwarden-web
+  git submodule update --init
+  patch --forward --strip=1 --input=../$pkgname-v$_patchver.patch
+
+  # ref: https://github.com/dani-garcia/bw_web_builds/blob/v2.23.0c/Dockerfile#L29
+  sed -i 's/"gulp-google-webfonts": "^4.0.0"/"gulp-google-webfonts": "^4.1.0"/' package.json
+  npm ci --legacy-peer-deps
+}
+
+build() {
+  cd bitwarden-web
+  npm run dist
+}
+
+package() {
+  cd bitwarden-web
+  install -d "$pkgdir"/usr/share/webapps/$pkgname
+  cp -R build/* "$pkgdir"/usr/share/webapps/$pkgname
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: vaultwarden-web.install
===================================================================
--- vaultwarden-web.install	2021-10-18 22:35:14 UTC (rev 1030921)
+++ vaultwarden-web.install	2021-10-18 22:36:06 UTC (rev 1030922)
@@ -1,9 +0,0 @@
-post_install() {
-  cat << EOF
-Uncomment WEB_VAULT_FOLDER and set WEB_VAULT_ENABLED to true in your
-/etc/vaultwarden.env.
-
-Restart vaultwarden after configuration changes have been made:
-# systemctl restart vaultwarden
-EOF
-}

Copied: vaultwarden-web/repos/community-any/vaultwarden-web.install (from rev 1030921, vaultwarden-web/trunk/vaultwarden-web.install)
===================================================================
--- vaultwarden-web.install	                        (rev 0)
+++ vaultwarden-web.install	2021-10-18 22:36:06 UTC (rev 1030922)
@@ -0,0 +1,9 @@
+post_install() {
+  cat << EOF
+Uncomment WEB_VAULT_FOLDER and set WEB_VAULT_ENABLED to true in your
+/etc/vaultwarden.env.
+
+Restart vaultwarden after configuration changes have been made:
+# systemctl restart vaultwarden
+EOF
+}