updpkg, use upstream .env, fix license, add openssl dep

5 files changed, 31 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5b24d358ec13..c9af53de2eac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bitwarden_rs-vault-git
-	pkgdesc = A lightweight implementation of the bitwarden-server using rust and sqlite. Includes the web-interface 'vault'.
-	pkgver = r161.869352c
+	pkgdesc = An unofficial lightweight implementation of the bitwarden-server using rust and sqlite. Includes the web-interface 'vault'.
+	pkgver = r166.470ad14
 	pkgrel = 1
 	url = https://github.com/dani-garcia/bitwarden_rs
 	install = bitwarden_rs.install
@@ -8,10 +8,11 @@ pkgbase = bitwarden_rs-vault-git
 	arch = x86_64
 	arch = armv7h
 	arch = aarch64
-	license = GPLv3
+	license = GPL3
 	makedepends = rust-nightly
 	makedepends = cargo-nightly
 	makedepends = npm
+	depends = openssl
 	provides = bitwarden_rs
 	provides = bitwarden_rs-vault
 	conflicts = bitwarden_rs
@@ -19,15 +20,15 @@ pkgbase = bitwarden_rs-vault-git
 	conflicts = bitwarden_rs-vault
 	source = git+https://github.com/dani-garcia/bitwarden_rs.git
 	source = https://github.com/bitwarden/web/archive/v1.27.0.tar.gz
-	source = 0001-Change-vault-paths.patch
+	source = 0001-Change-Vault-Settings.patch
+	source = 0002-Set-Vault-Location.patch
 	source = bitwarden_rs.install
-	source = bitwarden_rs-vault.env
 	source = bitwarden_rs.service
 	sha512sums = SKIP
 	sha512sums = 493588b8ec965775d0bcb58e5830d6c523131858957d5656d0480edcc93a45860606d190f0d0847ce529f43911efad4af7ca8bd2b0f21d12c05da333dcb1b4d5
 	sha512sums = c2c8971abc23d874d8f822f59f1543c3f3a5bba106b146ec2065256c77209857e5915281de1b93efe8b937a1c172592e0c20b8ac1b50bf323eb54014b097156c
+	sha512sums = 5fd4ca0f1a87170a6753b9fd4fa38b77a877a3415a936d08550ffe5dfac272974221e9d61c53b6391fff85dc6ced57113117fb0d27ba19bd07ef1b5424a2e44a
 	sha512sums = ea6ac7d915887078d7e091b99d53f2ee6fbf11ad5a80e04309263e7b06ce43de6e90e69ad62e3c99eaf81f825aebe930bf45888041225a156d74f324dfa10578
-	sha512sums = b41fd790ca2432030dc68608e9c96288077ccb5fbbf28c6b54ed03670583a04082be1a6cf4e1efe9f59fd831bc6b841631de96bdafb5aa732760d698ebf72468
 	sha512sums = 773dc0830b4eaf3a1d4134a52a6157e6a94265c6212ae8cc24b9584f9c444b9a0f822325f487ce9c23c363f743f1f64f269352f030e98e336816aee0a68048f6
 
 pkgname = bitwarden_rs-vault-git
diff --git a/0001-Change-vault-paths.patch b/0001-Change-Vault-Settings.patch
index 145362c937a5..145362c937a5 100644
--- a/0001-Change-vault-paths.patch
+++ b/0001-Change-Vault-Settings.patch
diff --git a/0002-Set-Vault-Location.patch b/0002-Set-Vault-Location.patch
new file mode 100644
index 000000000000..00beaf1da121
--- /dev/null
+++ b/0002-Set-Vault-Location.patch
@@ -0,0 +1,11 @@
+--- .env	2018-07-12 12:10:14.679534090 +0200
++++ .env	2018-07-12 12:21:34.165391938 +0200
+@@ -11,7 +11,7 @@
+ # ATTACHMENTS_FOLDER=data/attachments
+ 
+ ## Web vault settings
+-# WEB_VAULT_FOLDER=web-vault/
++WEB_VAULT_FOLDER=/usr/share/bitwarden_rs/vault/
+ # WEB_VAULT_ENABLED=true
+ 
+ ## Controls if new users can register
diff --git a/PKGBUILD b/PKGBUILD
index 5db76a5d9205..43aeccf3657e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,16 @@
 
 pkgname=bitwarden_rs-vault-git
 _pkgbase=bitwarden_rs
-pkgver=r161.869352c
+pkgver=r166.470ad14
 _vaultver=1.27.0
 pkgrel=1
-pkgdesc="A lightweight implementation of the bitwarden-server using rust and sqlite. Includes the web-interface 'vault'."
+pkgdesc="An unofficial lightweight implementation of the bitwarden-server using rust and sqlite. Includes the web-interface 'vault'."
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
 url="https://github.com/dani-garcia/bitwarden_rs"
-license=('GPLv3')
+license=('GPL3')
 groups=()
 makedepends=('rust-nightly' 'cargo-nightly' 'npm')
+depends=('openssl')
 provides=("$_pkgbase" "${_pkgbase}-vault") 
 conflicts=("$_pkgbase" "${_pkgbase}-git" "${_pkgbase}-vault") 
 replaces=()
@@ -19,16 +20,16 @@ options=()
 install=bitwarden_rs.install
 source=('git+https://github.com/dani-garcia/bitwarden_rs.git'
 	"https://github.com/bitwarden/web/archive/v$_vaultver.tar.gz"
-	"0001-Change-vault-paths.patch"
+	"0001-Change-Vault-Settings.patch"
+	"0002-Set-Vault-Location.patch"
 	"${_pkgbase}.install"
-	"${_pkgbase}-vault.env"
 	"${_pkgbase}.service")
 noextract=()
 sha512sums=('SKIP'
             '493588b8ec965775d0bcb58e5830d6c523131858957d5656d0480edcc93a45860606d190f0d0847ce529f43911efad4af7ca8bd2b0f21d12c05da333dcb1b4d5'
             'c2c8971abc23d874d8f822f59f1543c3f3a5bba106b146ec2065256c77209857e5915281de1b93efe8b937a1c172592e0c20b8ac1b50bf323eb54014b097156c'
+            '5fd4ca0f1a87170a6753b9fd4fa38b77a877a3415a936d08550ffe5dfac272974221e9d61c53b6391fff85dc6ced57113117fb0d27ba19bd07ef1b5424a2e44a'
             'ea6ac7d915887078d7e091b99d53f2ee6fbf11ad5a80e04309263e7b06ce43de6e90e69ad62e3c99eaf81f825aebe930bf45888041225a156d74f324dfa10578'
-            'b41fd790ca2432030dc68608e9c96288077ccb5fbbf28c6b54ed03670583a04082be1a6cf4e1efe9f59fd831bc6b841631de96bdafb5aa732760d698ebf72468'
             '773dc0830b4eaf3a1d4134a52a6157e6a94265c6212ae8cc24b9584f9c444b9a0f822325f487ce9c23c363f743f1f64f269352f030e98e336816aee0a68048f6')
 
 
@@ -44,12 +45,13 @@ prepare() {
 	#fix gulp install
 	rm package-lock.json
 	#patch all
-	patch -N -i "$srcdir/0001-Change-vault-paths.patch"
+	patch -N -i "$srcdir/0001-Change-Vault-Settings.patch"
 }
 
 build() {
 	#build bitwarden_rs
 	cd "$srcdir/$_pkgbase"
+	patch -N -i "$srcdir/0002-Set-Vault-Location.patch"
 	cargo build --release
 	
 	#build vault webinterface
@@ -61,11 +63,14 @@ build() {
 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/bitwarden_rs-vault.env" "$pkgdir/etc/bitwarden_rs.env"
+	install -D -m 0644 "$srcdir/$_pkgbase/.env" "$pkgdir/etc/bitwarden_rs.env"
+
 	# install vault files
 	install -d "$pkgdir/usr/share/bitwarden_rs"
 	cp -r "$srcdir/web-$_vaultver/dist" "$pkgdir/usr/share/bitwarden_rs/vault"
+
 	# copy binary
 	install -D -m0755 "$srcdir/$_pkgbase/target/release/bitwarden_rs" "$pkgdir/usr/bin/bitwarden_rs"
 }
diff --git a/bitwarden_rs-vault.env b/bitwarden_rs-vault.env
deleted file mode 100644
index 282504e05449..000000000000
--- a/bitwarden_rs-vault.env
+++ /dev/null
@@ -1,23 +0,0 @@
-# Environment-variables to configure bitwarden_rs
-
-# --- Bitwarden config
-
-# DATA_FOLDER = data
-# RSA_KEY_FILENAME = data/rsa_key
-# DATABASE_URL = data/db.sqlite3
-# ICON_CACHE_FOLDER = data/icon_cache
-# ATTACHMENTS_FOLDER = data/attachments
-# LOCAL_ICON_EXTRACTOR = false
-# SIGNUPS_ALLOWED = true
-# PASSWORD_ITERATIONS = 100000
-
-# --- Web-Vault-config
-
-# Web-Vault can not be enabled because of missing files.
-# WEB_VAULT_ENABLED = true
-WEB_VAULT_FOLDER = /usr/share/bitwarden_rs/vault/
-
-# --- Rocket-config
-# ROCKET_PORT = 8000
-# ROCKET_LISTEN = localhost
-# ... See https://api.rocket.rs/rocket/config/index.html for more options, e.g. TLS.