summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Richter2018-10-13 18:24:06 +0200
committerMarkus Richter2018-10-13 18:24:06 +0200
commit60f27b58114bf52c4f2c75be64a28f87ec6538e7 (patch)
tree5a69041074ae33bf1581e00c5897bdefab95d8ce
parent8bde8472885bb1ddf0c91f36794748d00d60672b (diff)
downloadaur-60f27b58114bf52c4f2c75be64a28f87ec6538e7.tar.gz
use git-diff patches appropriately
-rw-r--r--.SRCINFO4
-rw-r--r--0001-Disable-Vault.patch6
-rw-r--r--PKGBUILD6
3 files changed, 9 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 87203ca91f81..b55add8b0d6e 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.0.0.r0.g1c57c9d
+ pkgver = 1.3.0.r0.ge061462
pkgrel = 1
url = https://github.com/dani-garcia/bitwarden_rs
install = bitwarden_rs.install
@@ -22,7 +22,7 @@ pkgbase = bitwarden_rs-git
sha512sums = SKIP
sha512sums = 399e63002acb764895bbcf3b983642c8858343b36909eeeb73133de1a9740a3d81232bc206ff6bf3daed50f72354c5e6fd5314d0d044acd9f1cb23a933b1dd74
sha512sums = 773dc0830b4eaf3a1d4134a52a6157e6a94265c6212ae8cc24b9584f9c444b9a0f822325f487ce9c23c363f743f1f64f269352f030e98e336816aee0a68048f6
- sha512sums = 704057f0bf6d71ab9888378c3d66ee97c5019e8b18d0f22f93615fef60bef7df80a11ad7ebf5cca1cc49c90ba3f9d84515a160555e395790f325510f8a81f5cd
+ sha512sums = a9ed56a349ba6243fbb5aa775681feecbf5dff62acb301e0f214455eb0e55b9c9d01ef8c19432b6b204bc0bc9be43adb2f33d0c48712419d4030182b13931754
pkgname = bitwarden_rs-git
diff --git a/0001-Disable-Vault.patch b/0001-Disable-Vault.patch
index 1b29f53e66c2..5f460a778be7 100644
--- a/0001-Disable-Vault.patch
+++ b/0001-Disable-Vault.patch
@@ -1,5 +1,7 @@
---- .env 2018-07-12 12:10:14.679534090 +0200
-+++ .env 2018-07-12 12:19:46.984580164 +0200
+diff --git a/.env b/.env
+index 475df85..4dfbb0e 100644
+--- a/.env
++++ b/.env
@@ -12,7 +12,7 @@
## Web vault settings
diff --git a/PKGBUILD b/PKGBUILD
index f8f098daa5bc..511c0aa807cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=bitwarden_rs-git
_pkgbase=bitwarden_rs
-pkgver=1.0.0.r0.g1c57c9d
+pkgver=1.3.0.r0.ge061462
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')
@@ -25,7 +25,7 @@ noextract=()
sha512sums=('SKIP'
'399e63002acb764895bbcf3b983642c8858343b36909eeeb73133de1a9740a3d81232bc206ff6bf3daed50f72354c5e6fd5314d0d044acd9f1cb23a933b1dd74'
'773dc0830b4eaf3a1d4134a52a6157e6a94265c6212ae8cc24b9584f9c444b9a0f822325f487ce9c23c363f743f1f64f269352f030e98e336816aee0a68048f6'
- '704057f0bf6d71ab9888378c3d66ee97c5019e8b18d0f22f93615fef60bef7df80a11ad7ebf5cca1cc49c90ba3f9d84515a160555e395790f325510f8a81f5cd')
+ 'a9ed56a349ba6243fbb5aa775681feecbf5dff62acb301e0f214455eb0e55b9c9d01ef8c19432b6b204bc0bc9be43adb2f33d0c48712419d4030182b13931754')
pkgver() {
@@ -39,7 +39,7 @@ pkgver() {
build() {
#build bitwarden_rs
cd "$srcdir/$_pkgbase"
- patch -N -i "$srcdir/0001-Disable-Vault.patch"
+ patch -N -p1 -i "$srcdir/0001-Disable-Vault.patch"
cargo build --release
}