summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Richter2020-06-03 19:35:59 +0200
committerMarkus Richter2020-06-03 19:35:59 +0200
commitb9cb1c88b9e0ef5ba2a863db932acf6eec171188 (patch)
tree0f919e9d83988b2a717cd698013771c3bb72d9af
parent8a8bad940b337816a931b0163725549388937320 (diff)
downloadaur-b9cb1c88b9e0ef5ba2a863db932acf6eec171188.tar.gz
update baseurl patch
-rw-r--r--.SRCINFO4
-rw-r--r--0001-Set-Vault-BaseURL.patch8
-rw-r--r--PKGBUILD4
3 files changed, 10 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9f254a05406d..cc8d922c65bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = bitwarden_rs-vault-git
pkgdesc = Integrates the Vault Web-Interface into bitwarden_rs.
- pkgver = v2.13.2.r2.gfb6e85c5
+ pkgver = v2.14.0.r13.g2cc0aa6f
pkgrel = 1
url = https://github.com/bitwarden/web
install = bitwarden_rs-vault.install
@@ -18,7 +18,7 @@ pkgbase = bitwarden_rs-vault-git
source = 0001-Set-Vault-BaseURL.patch
source = bitwarden_rs-vault.install
sha512sums = SKIP
- sha512sums = 642aec31a9d9c702b100cecca89f2e815fc8265fc61d9c8b096922c7c6cd9fec2bed353e191e985b154dd2c8576c2be22efeda69f3aac6aaea1560e50fa95ae4
+ sha512sums = bb4d3bdec5e9868f316bd74e07e2bfc6cc412a6bf0d38ddace98278806ca6aff487cec2cb4fdfb87b3af68103eb175a636c3f8dc6ed5710f5780f36c21f5dd8f
sha512sums = 0b93ea1a442f15ac2445bc0cb759887b0826215edbc73dabb150de8ac136c8712c18b798ff397a06d50989332562a36382b5b7d962e60c2f2619d0f46cf9b04d
pkgname = bitwarden_rs-vault-git
diff --git a/0001-Set-Vault-BaseURL.patch b/0001-Set-Vault-BaseURL.patch
index bf6092c27f7c..7d1b69cb7119 100644
--- a/0001-Set-Vault-BaseURL.patch
+++ b/0001-Set-Vault-BaseURL.patch
@@ -1,3 +1,4 @@
+diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 2c694d95..bba34865 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -57,6 +58,7 @@ index c74261dd..f61ccefe 100644
api: isDev ? 'http://localhost:4000' : null,
identity: isDev ? 'http://localhost:33656' : null,
events: isDev ? 'http://localhost:46273' : null,
+diff --git a/src/app/settings/two-factor-u2f.component.ts b/src/app/settings/two-factor-u2f.component.ts
index 5560c476..a9b954a8 100644
--- a/src/app/settings/two-factor-u2f.component.ts
+++ b/src/app/settings/two-factor-u2f.component.ts
@@ -68,6 +70,7 @@ index 5560c476..a9b954a8 100644
}], [], (data: any) => {
this.ngZone.run(() => {
this.u2fListening = false;
+diff --git a/src/scss/styles.scss b/src/scss/styles.scss
index 80951953..5c784175 100644
--- a/src/scss/styles.scss
+++ b/src/scss/styles.scss
@@ -100,9 +103,10 @@ index 80951953..5c784175 100644
+app-org-account > a.btn.btn-outline-secondary { @extend %bwrs-hide; }
+/**** END Bitwarden_RS CHANGES ****/
+
- $primary: #3c8dbc;
- $primary-accent: #286090;
+ $primary: #175DDC;
+ $primary-accent: #1252A3;
$secondary: #ced4da;
+diff --git a/webpack.config.js b/webpack.config.js
index aecb1860..44acdc1d 100644
--- a/webpack.config.js
+++ b/webpack.config.js
diff --git a/PKGBUILD b/PKGBUILD
index 4a895d4a2359..2357ca60c5ec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Markus Richter <mqus at disroot dot org>
pkgname=bitwarden_rs-vault-git
-pkgver=v2.13.2.r2.gfb6e85c5
+pkgver=v2.14.0.r13.g2cc0aa6f
pkgrel=1
pkgdesc="Integrates the Vault Web-Interface into bitwarden_rs."
arch=('any')
@@ -19,7 +19,7 @@ source=("git+https://github.com/bitwarden/web.git"
"0001-Set-Vault-BaseURL.patch"
"${pkgname%-git}.install")
sha512sums=('SKIP'
- '642aec31a9d9c702b100cecca89f2e815fc8265fc61d9c8b096922c7c6cd9fec2bed353e191e985b154dd2c8576c2be22efeda69f3aac6aaea1560e50fa95ae4'
+ 'bb4d3bdec5e9868f316bd74e07e2bfc6cc412a6bf0d38ddace98278806ca6aff487cec2cb4fdfb87b3af68103eb175a636c3f8dc6ed5710f5780f36c21f5dd8f'
'0b93ea1a442f15ac2445bc0cb759887b0826215edbc73dabb150de8ac136c8712c18b798ff397a06d50989332562a36382b5b7d962e60c2f2619d0f46cf9b04d')
pkgver() {