diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | 0001-Set-Vault-BaseURL.patch | 13 | ||||
-rw-r--r-- | PKGBUILD | 9 |
3 files changed, 15 insertions, 13 deletions
@@ -1,12 +1,14 @@ pkgbase = bitwarden_rs-vault-git pkgdesc = Integrates the Vault Web-Interface into bitwarden_rs. - pkgver = v2.10.1.r5.ge7b2557b + pkgver = v2.12.0.r13.g9ebd7003 pkgrel = 1 url = https://github.com/bitwarden/web install = bitwarden_rs-vault.install arch = any license = AGPL3 makedepends = npm + makedepends = nodejs-lts-dubnium + makedepends = python2 depends = bitwarden_rs provides = bitwarden_rs-vault conflicts = bitwarden_rs-vault @@ -14,7 +16,7 @@ pkgbase = bitwarden_rs-vault-git source = 0001-Set-Vault-BaseURL.patch source = bitwarden_rs-vault.install sha512sums = SKIP - sha512sums = 02bada10c338b8fd6fd792b1d5f275109d296416a0f75f03399a763bf4edb5d2594352511169997c1ec7e532af0335bb322a925bb7f91d0bb067dadaca5a3bd8 + sha512sums = cd4764f1b5ff6dc2a139da3c806d9c51c4c813acedd07afdcb19f483d8363db5f24c843c85525df4b95886e3c7b16432a26463157e53d316ae4633afe863cf7f sha512sums = 5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1 pkgname = bitwarden_rs-vault-git diff --git a/0001-Set-Vault-BaseURL.patch b/0001-Set-Vault-BaseURL.patch index e82463ff1644..e2e2f7ad5a71 100644 --- a/0001-Set-Vault-BaseURL.patch +++ b/0001-Set-Vault-BaseURL.patch @@ -1,9 +1,9 @@ -index f1b5b392..2bfc2f2e 100644 +index a92bf70c..cf5a4cb4 100644 --- a/src/app/services/services.module.ts +++ b/src/app/services/services.module.ts -@@ -120,20 +120,16 @@ const notificationsService = new NotificationsService(userService, syncService, - const environmentService = new EnvironmentService(apiService, storageService, notificationsService); +@@ -123,20 +123,16 @@ const environmentService = new EnvironmentService(apiService, storageService, no const auditService = new AuditService(cryptoFunctionService, apiService); + const eventLoggingService = new EventLoggingService(storageService, apiService, userService, cipherService); -const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost(), +const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost() || true, @@ -37,10 +37,10 @@ index 5560c476..a9b954a8 100644 }], [], (data: any) => { this.ngZone.run(() => { this.u2fListening = false; -index 3df655fd..7e57cffe 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 3df655fd..7e57cffe 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; } @@ -1,13 +1,16 @@ # Maintainer: Markus Richter <mqus at disroot dot org> pkgname=bitwarden_rs-vault-git -pkgver=v2.10.1.r5.ge7b2557b +pkgver=v2.12.0.r13.g9ebd7003 pkgrel=1 pkgdesc="Integrates the Vault Web-Interface into bitwarden_rs." arch=('any') url="https://github.com/bitwarden/web" license=('AGPL3') -makedepends=('npm') + +# nodejs-lts-dubnium is included because nodejs>=12 doesn't work. otherwise this would be covered by npm. +# python2 is included because the used npm package node-sass depends on node-gyp (and therefore python2) transitively. This should be covered by the official node-gyp package (https://bugs.archlinux.org/task/62277?project=5&string=node-gyp ) which is pulled in by npm. +makedepends=('npm' 'nodejs-lts-dubnium' 'python2') depends=('bitwarden_rs') conflicts=("bitwarden_rs-vault") provides=('bitwarden_rs-vault') @@ -16,7 +19,7 @@ source=("git+https://github.com/bitwarden/web.git" "0001-Set-Vault-BaseURL.patch" "${pkgname%-git}.install") sha512sums=('SKIP' - '02bada10c338b8fd6fd792b1d5f275109d296416a0f75f03399a763bf4edb5d2594352511169997c1ec7e532af0335bb322a925bb7f91d0bb067dadaca5a3bd8' + 'cd4764f1b5ff6dc2a139da3c806d9c51c4c813acedd07afdcb19f483d8363db5f24c843c85525df4b95886e3c7b16432a26463157e53d316ae4633afe863cf7f' '5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1') pkgver() { |