updpkg to 2.2.0, updated patch from github.com/dani-garcia/bitwarden_rs/docker/set-vault-baseurl.patch

3 files changed, 19 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 438ceb6204bd..8b3a8c6609b0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bitwarden_rs-vault
 	pkgdesc = Integrates the Vault Web-Interface into bitwarden_rs.
-	pkgver = 2.1.1
-	pkgrel = 2
+	pkgver = 2.2.0
+	pkgrel = 1
 	url = https://github.com/bitwarden/web
 	install = bitwarden_rs-vault.install
 	arch = any
@@ -9,13 +9,13 @@ pkgbase = bitwarden_rs-vault
 	makedepends = npm
 	depends = bitwarden_rs
 	conflicts = bitwarden_rs-vault-git
-	source = https://github.com/bitwarden/web/archive/v2.1.1.tar.gz
-	source = https://github.com/bitwarden/jslib/archive/4ca7a9709e9ccd0e67ce09309ae605f2057bf089.tar.gz
+	source = https://github.com/bitwarden/web/archive/v2.2.0.tar.gz
+	source = https://github.com/bitwarden/jslib/archive/6f43b73237fc64394441d5821bd88090b26cbe5b.tar.gz
 	source = 0001-Set-Vault-BaseURL.patch
 	source = bitwarden_rs-vault.install
-	sha512sums = c5a61ecda4b7ea010c62f561c85ae325dc71a22af898809dd3a853f311b404354bd9bbd81b58f3edd1e438df881abda51d972d5a40fa53d3776a6cd261ab00c5
-	sha512sums = 4a59194a426a91df029cfd3b8ebc576d2033bdaafa3daa47c89b1405f646af27e9c6b6793a3735cedd46efe0c99e8010565905885cff714573600bdc4265f854
-	sha512sums = 7f69c25e19f6cc1dac3e227b764e664af66f89cf05f4b0f21fa427624e698cf96066ee85ccc8d0cb65fbb3fd97336897784c5895dfc4a7a5f2f3cd62c5114791
+	sha512sums = d97c24c8d09ac18a985852a5fdf5da917f61398b0c3f771928bb2456cde1564853842733c831fe97a8c28cbd8d812d41937bdb29da40a03315b6195c8de331f5
+	sha512sums = 69718e2953b2a7d196d95cfb5f27beaa51b6dce23c2fbe897d292c4bb984fd8e7839cda54b163d24d0012a1103bcea3811fa73a028faa7b752c55ca22c5f93b3
+	sha512sums = 9a9885298fceb8de737aae0e616158ed5c41a15acbfc723048ed8d509cb40d0e32048e12b9aeb4a6a4c67485ba08f0b8e52ba7cb4d8d2036ae4dc19e39431961
 	sha512sums = 5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1
 
 pkgname = bitwarden_rs-vault
diff --git a/0001-Set-Vault-BaseURL.patch b/0001-Set-Vault-BaseURL.patch
index 492f6b647376..073b7d80ed90 100644
--- a/0001-Set-Vault-BaseURL.patch
+++ b/0001-Set-Vault-BaseURL.patch
@@ -1,6 +1,6 @@
 --- a/src/app/services/services.module.ts
 +++ b/src/app/services/services.module.ts
-@@ -116,17 +116,15 @@ const exportService = new ExportService(folderService, cipherService, apiService
+@@ -120,20 +120,17 @@ const exportService = new ExportService(folderService, cipherService, apiService
  const importService = new ImportService(cipherService, folderService, apiService, i18nService, collectionService);
  const auditService = new AuditService(cryptoFunctionService, apiService);
  
@@ -15,9 +15,14 @@
 -        const isDev = platformUtilsService.isDev();
 -        if (!isDev && platformUtilsService.isSelfHost()) {
 -            environmentService.baseUrl = window.location.origin;
+-        } else {
+-            environmentService.notificationsUrl = isDev ? 'http://localhost:61840' :
+-                'https://notifications.bitwarden.com'; // window.location.origin + '/notifications';
 -        }
 +        const isDev = false;
 +        environmentService.baseUrl = window.location.origin;
++        environmentService.notificationsUrl = window.location.origin + '/notifications';
++
          await apiService.setUrls({
              base: isDev ? null : window.location.origin,
              api: isDev ? 'http://localhost:4000' : null,
diff --git a/PKGBUILD b/PKGBUILD
index dd2e2d6414d5..c8e2382b6ad3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Markus Richter <mqus at disroot dot org>
 
-_jslib_commit="4ca7a9709e9ccd0e67ce09309ae605f2057bf089"
+_jslib_commit="6f43b73237fc64394441d5821bd88090b26cbe5b"
 pkgname=bitwarden_rs-vault
-pkgver=2.1.1
-pkgrel=2
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="Integrates the Vault Web-Interface into bitwarden_rs."
 arch=('any')
 url="https://github.com/bitwarden/web"
@@ -16,9 +16,9 @@ source=("https://github.com/bitwarden/web/archive/v$pkgver.tar.gz"
 	"https://github.com/bitwarden/jslib/archive/${_jslib_commit}.tar.gz"
 	"0001-Set-Vault-BaseURL.patch"
 	"$pkgname.install")
-sha512sums=('c5a61ecda4b7ea010c62f561c85ae325dc71a22af898809dd3a853f311b404354bd9bbd81b58f3edd1e438df881abda51d972d5a40fa53d3776a6cd261ab00c5'
-            '4a59194a426a91df029cfd3b8ebc576d2033bdaafa3daa47c89b1405f646af27e9c6b6793a3735cedd46efe0c99e8010565905885cff714573600bdc4265f854'
-            '7f69c25e19f6cc1dac3e227b764e664af66f89cf05f4b0f21fa427624e698cf96066ee85ccc8d0cb65fbb3fd97336897784c5895dfc4a7a5f2f3cd62c5114791'
+sha512sums=('d97c24c8d09ac18a985852a5fdf5da917f61398b0c3f771928bb2456cde1564853842733c831fe97a8c28cbd8d812d41937bdb29da40a03315b6195c8de331f5'
+            '69718e2953b2a7d196d95cfb5f27beaa51b6dce23c2fbe897d292c4bb984fd8e7839cda54b163d24d0012a1103bcea3811fa73a028faa7b752c55ca22c5f93b3'
+            '9a9885298fceb8de737aae0e616158ed5c41a15acbfc723048ed8d509cb40d0e32048e12b9aeb4a6a4c67485ba08f0b8e52ba7cb4d8d2036ae4dc19e39431961'
             '5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1')