summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Richter2019-02-09 16:04:32 +0100
committerMarkus Richter2019-02-09 16:04:32 +0100
commitc4e9215b4dbd0a16f5f18bf09833a62c0cc4611d (patch)
tree47fc9581e8c6b3f4d0c46e43f2cfe589bdd768ae
parent4ea4734af95c8e003a6fedf4b0311bbc62c3ca18 (diff)
downloadaur-c4e9215b4dbd0a16f5f18bf09833a62c0cc4611d.tar.gz
added changes to patch from github.com/dani-garcia/bw_web_builds
-rw-r--r--.SRCINFO4
-rw-r--r--0001-Set-Vault-BaseURL.patch13
-rw-r--r--PKGBUILD4
3 files changed, 16 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index de304a49cbcb..787620a11839 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = bitwarden_rs-vault
pkgdesc = Integrates the Vault Web-Interface into bitwarden_rs.
pkgver = 2.8.0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/bitwarden/web
install = bitwarden_rs-vault.install
arch = any
@@ -15,7 +15,7 @@ pkgbase = bitwarden_rs-vault
source = bitwarden_rs-vault.install
sha512sums = bb7dba7775c2822a11b22159d6e4c2493638fff1287d34797cbc618d237f4b9e37e78943efe9c1f4bc4215cf51acd3d530b227b4e4b66072c0e77d03bdd7c434
sha512sums = 6a5c020a0758f3f63862a1813df817b7672f8d7760f1fb76fb34e32221a1ba0ecca141b4df2e8c9ed1d0c91a0ae25ff467e8788baa926a7d592ddb086a513fa7
- sha512sums = 743d234780c9fe18e14d933f3315cb3248876b0bfc7932586f9c8b83288c95afd864391866357b87806e24e643370d3f57b2e0c8579bbe6364eece13e71c72e9
+ sha512sums = 08dabddcba9dc917c40e2a8e1058b2b7b7246e747a1178c7f5774366cef35c689e3058c60c3bd659f6aab3bca737c26d4b63bab19c914f35f8e91dabc388923f
sha512sums = 5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1
pkgname = bitwarden_rs-vault
diff --git a/0001-Set-Vault-BaseURL.patch b/0001-Set-Vault-BaseURL.patch
index 9e25e48ab8d8..cff463775461 100644
--- a/0001-Set-Vault-BaseURL.patch
+++ b/0001-Set-Vault-BaseURL.patch
@@ -26,7 +26,18 @@ index 90aad7df..95ceff61 100644
apiService.setUrls({
base: isDev ? null : window.location.origin,
api: isDev ? 'http://localhost:4000' : null,
-index 5c114af5..70e7cb12 100644
+index 5560c476..a9b954a8 100644
+--- a/src/app/settings/two-factor-u2f.component.ts
++++ b/src/app/settings/two-factor-u2f.component.ts
+@@ -128,6 +128,7 @@ export class TwoFactorU2fComponent extends TwoFactorBaseComponent implements OnI
+ (window as any).u2f.register(u2fChallenge.appId, [{
+ version: u2fChallenge.version,
+ challenge: u2fChallenge.challenge,
++ attestation: 'direct',
+ }], [], (data: any) => {
+ this.ngZone.run(() => {
+ this.u2fListening = false;
+index 5c114af5..6839385d 100644
--- a/src/scss/styles.scss
+++ b/src/scss/styles.scss
@@ -1,5 +1,23 @@
diff --git a/PKGBUILD b/PKGBUILD
index 9166a34d5d75..e49d3d6b674d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_jslib_commit="fc5fcb905fe465e99e85540f6b645c0f11b6704d"
pkgname=bitwarden_rs-vault
pkgver=2.8.0
-pkgrel=1
+pkgrel=2
pkgdesc="Integrates the Vault Web-Interface into bitwarden_rs."
arch=('any')
url="https://github.com/bitwarden/web"
@@ -18,7 +18,7 @@ source=("https://github.com/bitwarden/web/archive/v$pkgver.tar.gz"
"$pkgname.install")
sha512sums=('bb7dba7775c2822a11b22159d6e4c2493638fff1287d34797cbc618d237f4b9e37e78943efe9c1f4bc4215cf51acd3d530b227b4e4b66072c0e77d03bdd7c434'
'6a5c020a0758f3f63862a1813df817b7672f8d7760f1fb76fb34e32221a1ba0ecca141b4df2e8c9ed1d0c91a0ae25ff467e8788baa926a7d592ddb086a513fa7'
- '743d234780c9fe18e14d933f3315cb3248876b0bfc7932586f9c8b83288c95afd864391866357b87806e24e643370d3f57b2e0c8579bbe6364eece13e71c72e9'
+ '08dabddcba9dc917c40e2a8e1058b2b7b7246e747a1178c7f5774366cef35c689e3058c60c3bd659f6aab3bca737c26d4b63bab19c914f35f8e91dabc388923f'
'5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1')