Update PKGBUILD

- add postgresql variant to conflicts
- add vault to optdepends
- add armv7 workaround
- make it more similar to the versioned package PKGBUILD

3 files changed, 25 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 76321ca6d96a..ca4771299f5a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bitwarden_rs-git
 	pkgdesc = An unofficial lightweight implementation of the bitwarden-server using rust and sqlite. Does NOT include the web-interface.
-	pkgver = 1.10.0.r12.g469318b
+	pkgver = 1.11.0.r8.g0586c00
 	pkgrel = 1
 	url = https://github.com/dani-garcia/bitwarden_rs
 	install = bitwarden_rs.install
@@ -12,9 +12,11 @@ pkgbase = bitwarden_rs-git
 	makedepends = rust-nightly
 	makedepends = cargo-nightly
 	depends = openssl
+	optdepends = bitwarden_rs-vault: Web Interface 'Vault'
 	provides = bitwarden_rs
 	conflicts = bitwarden_rs
 	conflicts = bitwarden_rs-mysql
+	conflicts = bitwarden_rs-postgresql
 	backup = etc/bitwarden_rs.env
 	source = git+https://github.com/dani-garcia/bitwarden_rs.git
 	source = bitwarden_rs.install
@@ -24,6 +26,8 @@ pkgbase = bitwarden_rs-git
 	sha512sums = 399e63002acb764895bbcf3b983642c8858343b36909eeeb73133de1a9740a3d81232bc206ff6bf3daed50f72354c5e6fd5314d0d044acd9f1cb23a933b1dd74
 	sha512sums = 4ce188956f6fe7cfdb711b1505f6344ed2775751ea112a0506dc96455c2705ab8529ec442e4747d7810fc3535b4ca78d1864e874dab5b5306373587097e02658
 	sha512sums = a6f2361c7aa83e63b9a557500406b0cd660e0d7f8b16345f859faa3f96e22bdcecd7589711960486fa0401896291f7d46f66882744c69117fc146056f4a49028
+	source_armv7h = 0002-Rollback-ARM-Toolchain.patch
+	sha512sums_armv7h = f26044402b04cc8494cf97b8592ad792bdda875f13598028f020757f8b79bce03059fabf11c80f78bec392f45ab713e861711026881b152df4fb2dcf675e8247
 
 pkgname = bitwarden_rs-git
 
diff --git a/0002-Rollback-ARM-Toolchain.patch b/0002-Rollback-ARM-Toolchain.patch
new file mode 100644
index 000000000000..bc65dd2518c2
--- /dev/null
+++ b/0002-Rollback-ARM-Toolchain.patch
@@ -0,0 +1,7 @@
+diff --git a/rust-toolchain b/rust-toolchain
+index 3f7cead..2ad2d88 100644
+--- a/rust-toolchain
++++ b/rust-toolchain
+@@ -1 +1 @@
+-nightly-2019-08-27
++nightly-2019-05-11
diff --git a/PKGBUILD b/PKGBUILD
index a73eef2ccc23..1e8101c3de7c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,30 +2,29 @@
 
 pkgname=bitwarden_rs-git
 _pkgbase=bitwarden_rs
-pkgver=1.10.0.r12.g469318b
+pkgver=1.11.0.r8.g0586c00
 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')
 url="https://github.com/dani-garcia/bitwarden_rs"
 license=('GPL3')
-groups=()
-makedepends=('rust-nightly' 'cargo-nightly')
 depends=('openssl')
+makedepends=('rust-nightly' 'cargo-nightly')
 provides=("$_pkgbase") 
-conflicts=("$_pkgbase" "$_pkgbase-mysql") 
-replaces=()
+optdepends=("bitwarden_rs-vault: Web Interface 'Vault'")
+conflicts=("${_pkgbase}" "${_pkgbase}-mysql" "${_pkgbase}-postgresql")
 backup=('etc/bitwarden_rs.env')
-options=()
 install=bitwarden_rs.install
 source=('git+https://github.com/dani-garcia/bitwarden_rs.git'
 	"${_pkgbase}.install"
 	"${_pkgbase}.service"
 	"0001-Disable-Vault.patch")
-noextract=()
+source_armv7h=("0002-Rollback-ARM-Toolchain.patch")
 sha512sums=('SKIP'
             '399e63002acb764895bbcf3b983642c8858343b36909eeeb73133de1a9740a3d81232bc206ff6bf3daed50f72354c5e6fd5314d0d044acd9f1cb23a933b1dd74'
             '4ce188956f6fe7cfdb711b1505f6344ed2775751ea112a0506dc96455c2705ab8529ec442e4747d7810fc3535b4ca78d1864e874dab5b5306373587097e02658'
             'a6f2361c7aa83e63b9a557500406b0cd660e0d7f8b16345f859faa3f96e22bdcecd7589711960486fa0401896291f7d46f66882744c69117fc146056f4a49028')
+sha512sums_armv7h=('f26044402b04cc8494cf97b8592ad792bdda875f13598028f020757f8b79bce03059fabf11c80f78bec392f45ab713e861711026881b152df4fb2dcf675e8247')
 
 
 pkgver() {
@@ -40,6 +39,13 @@ build() {
 	#build bitwarden_rs
 	cd "$srcdir/$_pkgbase"
 	patch -N -p1 -i "$srcdir/0001-Disable-Vault.patch"
+
+	# Check if the build is on armv7h
+	if [ -e "$srcdir/0002-Rollback-ARM-Toolchain.patch" ] ;then
+		# workaround for armv7h bug: https://github.com/rust-lang/rust/issues/62896
+		echo "nightly-2019-05-11" > rust-toolchain
+	fi
+
 	cargo build --release --features sqlite
 }