2.7-cli-1

3 files changed, 15 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6e84c207624b..e67a352e8e7c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = masterpassword-cli
 	pkgdesc = CLI version of Master Password
-	pkgver = 2.6
-	pkgrel = 4
+	pkgver = 2.7
+	pkgrel = 1
 	url = https://masterpassword.app/
 	arch = i686
 	arch = x86_64
@@ -11,13 +11,10 @@ pkgbase = masterpassword-cli
 	depends = json-c
 	depends = libsodium
 	optdepends = xclip: copy password to clipboard
-	source = https://masterpassword.app/mpw-2.6-cli-5-0-g344771db.tar.gz
-	source = https://masterpassword.app/mpw-2.6-cli-5-0-g344771db.tar.gz.sig
-	source = fix-build.patch
+	source = https://gitlab.com/MasterPassword/MasterPassword/-/raw/1e7491e0d9f39ac6d49e4078cf445ca69e71020a/mpw-2.7-cli-1-0-gd5959582.tar.gz
+	source = https://gitlab.com/MasterPassword/MasterPassword/-/raw/1e7491e0d9f39ac6d49e4078cf445ca69e71020a/mpw-2.7-cli-1-0-gd5959582.tar.gz.sig
 	validpgpkeys = 5C2D1D61853F20F2FCDDCCB70EF21226F43EA6BC
-	sha256sums = 954c07b1713ecc2b30a07bead9c11e6204dd774ca67b5bdf7d2d6ad1c4eec170
+	sha256sums = 480206dfaad5d5a7d71fba235f1f3d9041e70b02a8c1d3dda8ecba1da39d3e96
 	sha256sums = SKIP
-	sha256sums = ae6cb494dba01f9941580840e7412b91973c7767cae75c935d8dd2fd2392adc3
 
 pkgname = masterpassword-cli
-
diff --git a/PKGBUILD b/PKGBUILD
index 9056673ad803..1c137c6227cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,10 @@
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=masterpassword-cli
-pkgver=2.6
-_relver=5
-_hash=g344771db
-pkgrel=4
+pkgver=2.7
+_relver=1
+_hash=gd5959582
+pkgrel=1
 pkgdesc='CLI version of Master Password'
 arch=('i686' 'x86_64')
 url='https://masterpassword.app/'
@@ -13,26 +13,23 @@ license=('GPL3')
 depends=('ncurses' 'json-c' 'libsodium')
 makedepends=('openssl')
 optdepends=('xclip: copy password to clipboard')
-source=("https://masterpassword.app/mpw-${pkgver}-cli-${_relver}-0-${_hash}.tar.gz"{,.sig}
-        'fix-build.patch')
-sha256sums=('954c07b1713ecc2b30a07bead9c11e6204dd774ca67b5bdf7d2d6ad1c4eec170'
-            'SKIP'
-            'ae6cb494dba01f9941580840e7412b91973c7767cae75c935d8dd2fd2392adc3')
+source=("https://gitlab.com/MasterPassword/MasterPassword/-/raw/1e7491e0d9f39ac6d49e4078cf445ca69e71020a/mpw-${pkgver}-cli-${_relver}-0-${_hash}.tar.gz"{,.sig})
+sha256sums=('480206dfaad5d5a7d71fba235f1f3d9041e70b02a8c1d3dda8ecba1da39d3e96'
+            'SKIP')
 validpgpkeys=('5C2D1D61853F20F2FCDDCCB70EF21226F43EA6BC') # Maarten Billemont
 
-prepare() {
-  patch -p0 -i fix-build.patch
-}
-
 build() {
   export LDFLAGS="$LDFLAGS -ltinfo"
+  cd cli
   ./build
 }
 
 check() {
+  cd cli
   ./mpw-cli-tests
 }
 
 package() {
+  cd cli
   /usr/bin/install -Dm755 mpw "$pkgdir/usr/bin/mpw"
 }
diff --git a/fix-build.patch b/fix-build.patch
deleted file mode 100644
index d72dd87d6461..000000000000
--- a/fix-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- core/mpw-marshal-util.c~	2020-04-30 15:20:51.775480937 +0200
-+++ core/mpw-marshal-util.c	2020-04-30 15:20:58.518832576 +0200
-@@ -94,7 +94,7 @@
-     if (!json_value)
-         return defaultValue;
-
--    return json_object_get_boolean( json_value ) == TRUE;
-+    return json_object_get_boolean( json_value ) == true;
- }
- #endif
-