1.6.0

Upstream Changelog:

	- Implemented new admin panel, available at /admin
		- To use it, you need to set the ADMIN_TOKEN variable to authenticate
		- Note: The old admin_email functionality has been removed
	- Added email invite functionality
	- Web vault updated to v2.8.0
	- Fixed AArch64 build, disables Yubikey support
	- Implemented TTLs for the icon cache
	- Improved error handling
	- Bug fixes

4 files changed, 24 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 48010252c403..455ea86bbc10 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bitwarden_rs
 	pkgdesc = An unofficial lightweight implementation of the bitwarden-server using rust and sqlite. Does NOT include the web-interface.
-	pkgver = 1.5.0
+	pkgver = 1.6.0
 	pkgrel = 1
 	url = https://github.com/dani-garcia/bitwarden_rs
 	install = bitwarden_rs.install
@@ -15,14 +15,14 @@ pkgbase = bitwarden_rs
 	optdepends = bitwarden_rs-vault: Web Interface 'Vault'
 	conflicts = bitwarden_rs-git
 	backup = etc/bitwarden_rs.env
-	source = https://github.com/dani-garcia/bitwarden_rs/archive/1.5.0.tar.gz
+	source = https://github.com/dani-garcia/bitwarden_rs/archive/1.6.0.tar.gz
 	source = bitwarden_rs.install
 	source = bitwarden_rs.service
 	source = 0001-Disable-Vault.patch
-	sha512sums = 0986a6b9202906c214661b0dbc21cd71d2a324fc5f3ad0b49e53b48110668f3451cd96868f59effd4b237d886df09668f480ff98b20e1ab430cdc98c6ea0a203
+	sha512sums = 08f8987b6cc7f42d9bec08b67edaebfa872582c79e0959a03aa1a7b50fcffe29824f9d9015d956344e0ab75081e996ea0c375def8f12a430b6dc22b5bea8bf51
 	sha512sums = 399e63002acb764895bbcf3b983642c8858343b36909eeeb73133de1a9740a3d81232bc206ff6bf3daed50f72354c5e6fd5314d0d044acd9f1cb23a933b1dd74
-	sha512sums = 773dc0830b4eaf3a1d4134a52a6157e6a94265c6212ae8cc24b9584f9c444b9a0f822325f487ce9c23c363f743f1f64f269352f030e98e336816aee0a68048f6
-	sha512sums = a9ed56a349ba6243fbb5aa775681feecbf5dff62acb301e0f214455eb0e55b9c9d01ef8c19432b6b204bc0bc9be43adb2f33d0c48712419d4030182b13931754
+	sha512sums = 4ce188956f6fe7cfdb711b1505f6344ed2775751ea112a0506dc96455c2705ab8529ec442e4747d7810fc3535b4ca78d1864e874dab5b5306373587097e02658
+	sha512sums = a6f2361c7aa83e63b9a557500406b0cd660e0d7f8b16345f859faa3f96e22bdcecd7589711960486fa0401896291f7d46f66882744c69117fc146056f4a49028
 
 pkgname = bitwarden_rs
 
diff --git a/0001-Disable-Vault.patch b/0001-Disable-Vault.patch
index 5f460a778be7..a17e9065ffe9 100644
--- a/0001-Disable-Vault.patch
+++ b/0001-Disable-Vault.patch
@@ -1,13 +1,13 @@
-diff --git a/.env b/.env
-index 475df85..4dfbb0e 100644
---- a/.env
-+++ b/.env
-@@ -12,7 +12,7 @@
+diff --git a/.env.template b/.env.template
+index 51bb9e0..2e838fc 100644
+--- a/.env.template
++++ b/.env.template
+@@ -17,7 +17,7 @@
  
  ## Web vault settings
  # WEB_VAULT_FOLDER=web-vault/
 -# WEB_VAULT_ENABLED=true
 +WEB_VAULT_ENABLED=false
  
- ## Controls if new users can register
- # SIGNUPS_ALLOWED=true
+ ## Controls the WebSocket server address and port
+ # WEBSOCKET_ADDRESS=0.0.0.0
diff --git a/PKGBUILD b/PKGBUILD
index 344bdcd23d66..3ce36b70d629 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=bitwarden_rs
 _pkgbase=bitwarden_rs
-pkgver=1.5.0
+pkgver=1.6.0
 pkgrel=1
 pkgdesc="An unofficial lightweight implementation of the bitwarden-server using rust and sqlite. Does NOT include the web-interface."
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
@@ -18,10 +18,10 @@ source=("https://github.com/dani-garcia/bitwarden_rs/archive/$pkgver.tar.gz"
 	"${_pkgbase}.install"
 	"${_pkgbase}.service"
 	"0001-Disable-Vault.patch")
-sha512sums=('0986a6b9202906c214661b0dbc21cd71d2a324fc5f3ad0b49e53b48110668f3451cd96868f59effd4b237d886df09668f480ff98b20e1ab430cdc98c6ea0a203'
+sha512sums=('08f8987b6cc7f42d9bec08b67edaebfa872582c79e0959a03aa1a7b50fcffe29824f9d9015d956344e0ab75081e996ea0c375def8f12a430b6dc22b5bea8bf51'
             '399e63002acb764895bbcf3b983642c8858343b36909eeeb73133de1a9740a3d81232bc206ff6bf3daed50f72354c5e6fd5314d0d044acd9f1cb23a933b1dd74'
-            '773dc0830b4eaf3a1d4134a52a6157e6a94265c6212ae8cc24b9584f9c444b9a0f822325f487ce9c23c363f743f1f64f269352f030e98e336816aee0a68048f6'
-            'a9ed56a349ba6243fbb5aa775681feecbf5dff62acb301e0f214455eb0e55b9c9d01ef8c19432b6b204bc0bc9be43adb2f33d0c48712419d4030182b13931754')
+            '4ce188956f6fe7cfdb711b1505f6344ed2775751ea112a0506dc96455c2705ab8529ec442e4747d7810fc3535b4ca78d1864e874dab5b5306373587097e02658'
+            'a6f2361c7aa83e63b9a557500406b0cd660e0d7f8b16345f859faa3f96e22bdcecd7589711960486fa0401896291f7d46f66882744c69117fc146056f4a49028')
 _src="$pkgname-$pkgver"
 
 build() {
@@ -35,7 +35,7 @@ package() {
 	# setup systemd service
 	install -D -m 0644 "$srcdir/bitwarden_rs.service" "$pkgdir/usr/lib/systemd/system/bitwarden_rs.service"
 	# copy default config file
-	install -D -m 0644 "$srcdir/$_src/.env" "$pkgdir/etc/bitwarden_rs.env"
+	install -D -m 0644 "$srcdir/$_src/.env.template" "$pkgdir/etc/bitwarden_rs.env"
 	# copy binary
 	install -D -m0755 "$srcdir/$_src/target/release/bitwarden_rs" "$pkgdir/usr/bin/bitwarden_rs"
 }
diff --git a/bitwarden_rs.service b/bitwarden_rs.service
index ff6e7a7a8061..458600a27ea6 100644
--- a/bitwarden_rs.service
+++ b/bitwarden_rs.service
@@ -4,18 +4,25 @@ Documentation=https://github.com/dani-garcia/bitwarden_rs
 After=network.target
 
 [Service]
+# The user/group bitwarden_rs is run under. the working directory (see below) should allow write and read access to this user/group
 User=bitwarden_rs
 Group=bitwarden_rs
+# The location of the .env file for configuration
 EnvironmentFile=/etc/bitwarden_rs.env
+# The location of the compiled binary
 ExecStart=/usr/bin/bitwarden_rs
+# Set reasonable connection and process limits
 LimitNOFILE=1048576
 LimitNPROC=64
+# Isolate bitwarden_rs from the rest of the system
 PrivateTmp=true
 PrivateDevices=true
 ProtectHome=true
 ProtectSystem=strict
+# Only allow writes to the following directory and set it to the working directory (user and password data are stored here)
 WorkingDirectory=/var/lib/bitwarden_rs
 ReadWriteDirectories=/var/lib/bitwarden_rs
+# Allow bitwarden_rs to bind ports in the range of 0-1024
 AmbientCapabilities=CAP_NET_BIND_SERVICE
 
 [Install]