2.12.0

Upstream Changelog:
	- SCA payment method updates
	- Importers for SecureSafe and LogMeOnce
	- Locale names for language selection
	- Added Hebrew language

3 files changed, 14 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 25d4486546c8..cba9ffe9efcc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bitwarden_rs-vault
 	pkgdesc = Integrates the Vault Web-Interface into bitwarden_rs.
-	pkgver = 2.11.0
-	pkgrel = 2
+	pkgver = 2.12.0
+	pkgrel = 1
 	url = https://github.com/bitwarden/web
 	install = bitwarden_rs-vault.install
 	arch = any
@@ -11,14 +11,14 @@ pkgbase = bitwarden_rs-vault
 	makedepends = python2
 	depends = bitwarden_rs
 	conflicts = bitwarden_rs-vault-git
-	source = https://github.com/bitwarden/web/archive/v2.11.0.tar.gz
-	source = https://github.com/bitwarden/jslib/archive/692d1ec20163edaa404b52888af2ea45b13b59cd.tar.gz
+	source = https://github.com/bitwarden/web/archive/v2.12.0.tar.gz
+	source = https://github.com/bitwarden/jslib/archive/255bd3962d268bec8f66411676049803bb29e0d3.tar.gz
 	source = 0001-Set-Vault-BaseURL.patch
 	source = 0002-Disable-Git-Submodule-Commands.patch
 	source = bitwarden_rs-vault.install
-	sha512sums = 06cb7d1e39b72fc1bba5823a67716a932dafba126387a4049481857c5a7af41ca2e4b56bbebda1d283429981b65688c5fbc0535007d52a10c89f06c16784e7ab
-	sha512sums = 92297cc98b655fe3e8c45983f5c58c9af8615012e0ce4177522a461592cf1c1d50110f837cdab67246fe70e76d66e14e849de4c0886e6385df4743691ad96ddd
-	sha512sums = 1a47ae5a1e5664fb207dc021c59b36fe31d3641282b53fdd6092176fa44c86915c8a209619c07f0a031ca7153a1a69514ae9e1d29c3bfcd4fb27fd3ab24a677a
+	sha512sums = 098191b55473259483bfd545d04f534627957fd19e5938f25d65b3c68ce9bc8e38c469de731a43bd141e3bb15f3b3d8761c29ce511ad4eeffc2ceacd1a5af0f9
+	sha512sums = e2b8cbb83d1997899378e8a09b0bc4a6aff05d194a58ca25d29845970344579eaa70f8ab6d3ef0b93125d2971e63307692e468de3a03e5a63aa6fbe7fcc2660f
+	sha512sums = cd4764f1b5ff6dc2a139da3c806d9c51c4c813acedd07afdcb19f483d8363db5f24c843c85525df4b95886e3c7b16432a26463157e53d316ae4633afe863cf7f
 	sha512sums = adaa6037e59f08a6a44f681c8eab915c0738069989f9d6acbf46e4d3135f69696fa7735a65158979fbc924b27f43bdf255648e615b33495ac7da418e89f27c90
 	sha512sums = 5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1
 
diff --git a/0001-Set-Vault-BaseURL.patch b/0001-Set-Vault-BaseURL.patch
index 5f7c58bf0682..e2e2f7ad5a71 100644
--- a/0001-Set-Vault-BaseURL.patch
+++ b/0001-Set-Vault-BaseURL.patch
@@ -40,7 +40,7 @@ index 5560c476..a9b954a8 100644
 index 2e1dbec9..2d9b635f 100644
 --- a/src/scss/styles.scss
 +++ b/src/scss/styles.scss
-@@ -1,5 +1,34 @@
+@@ -1,5 +1,31 @@
  @import "../css/webfonts.css";
  
 +/**** START Bitwarden_RS CHANGES ****/
@@ -59,9 +59,6 @@ index 2e1dbec9..2d9b635f 100644
 +/* Hide Two-Factor menu in Organization settings */
 +app-org-settings a[href$="/settings/two-factor"] { @extend %bwrs-hide; }
 +
-+/* Hide 2FA Email button */
-+ul.list-group.list-group-2fa > li:nth-child(5) button { @extend %bwrs-hide; }
-+
 +/* Hide organization plans */
 +app-organization-plans > form > div.form-check { @extend %bwrs-hide; }
 +app-organization-plans > form > h2.mt-5 { @extend %bwrs-hide; }
diff --git a/PKGBUILD b/PKGBUILD
index 3dd98665a550..3f9dc537eefc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Markus Richter <mqus at disroot dot org>
 
-_jslib_commit="692d1ec20163edaa404b52888af2ea45b13b59cd"
+_jslib_commit="255bd3962d268bec8f66411676049803bb29e0d3"
 pkgname=bitwarden_rs-vault
-pkgver=2.11.0
-pkgrel=2
+pkgver=2.12.0
+pkgrel=1
 pkgdesc="Integrates the Vault Web-Interface into bitwarden_rs."
 arch=('any')
 url="https://github.com/bitwarden/web"
@@ -20,9 +20,9 @@ source=("https://github.com/bitwarden/web/archive/v$pkgver.tar.gz"
 	"0001-Set-Vault-BaseURL.patch"
 	"0002-Disable-Git-Submodule-Commands.patch"
 	"$pkgname.install")
-sha512sums=('06cb7d1e39b72fc1bba5823a67716a932dafba126387a4049481857c5a7af41ca2e4b56bbebda1d283429981b65688c5fbc0535007d52a10c89f06c16784e7ab'
-            '92297cc98b655fe3e8c45983f5c58c9af8615012e0ce4177522a461592cf1c1d50110f837cdab67246fe70e76d66e14e849de4c0886e6385df4743691ad96ddd'
-            '1a47ae5a1e5664fb207dc021c59b36fe31d3641282b53fdd6092176fa44c86915c8a209619c07f0a031ca7153a1a69514ae9e1d29c3bfcd4fb27fd3ab24a677a'
+sha512sums=('098191b55473259483bfd545d04f534627957fd19e5938f25d65b3c68ce9bc8e38c469de731a43bd141e3bb15f3b3d8761c29ce511ad4eeffc2ceacd1a5af0f9'
+            'e2b8cbb83d1997899378e8a09b0bc4a6aff05d194a58ca25d29845970344579eaa70f8ab6d3ef0b93125d2971e63307692e468de3a03e5a63aa6fbe7fcc2660f'
+            'cd4764f1b5ff6dc2a139da3c806d9c51c4c813acedd07afdcb19f483d8363db5f24c843c85525df4b95886e3c7b16432a26463157e53d316ae4633afe863cf7f'
             'adaa6037e59f08a6a44f681c8eab915c0738069989f9d6acbf46e4d3135f69696fa7735a65158979fbc924b27f43bdf255648e615b33495ac7da418e89f27c90'
             '5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1')