New maintainer: switched to official goatpig fork, add GPG check, add licenses

3 files changed, 38 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 506f60959634..508c8030699a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,13 @@
+# Generated by mksrcinfo v8
+# Sun Apr  3 04:44:20 UTC 2016
 pkgbase = armory-bin
-	pkgdesc = Full-featured Bitcoin wallet (official binary)
-	pkgver = 0.93.3
+	pkgdesc = Full-featured Bitcoin wallet management application (official binary)
+	pkgver = 0.94.0
 	pkgrel = 1
-	url = https://bitcoinarmory.com
+	url = https://github.com/goatpig/BitcoinArmory
 	arch = x86_64
-	license = AGPL
+	license = AGPL3
+	license = MIT
 	depends = bitcoin-daemon
 	depends = crypto++
 	depends = python2
@@ -15,8 +18,8 @@ pkgbase = armory-bin
 	depends = xdg-utils
 	conflicts = armory
 	conflicts = armory-git
-	source = https://s3.amazonaws.com/bitcoinarmory-releases/armory_0.93.3_ubuntu-64bit.deb
-	sha256sums = 89a28d7b4c262abc31bb09696e368a0ed633a1d9c7f8bf8922814014258f78d5
+	source = https://github.com/goatpig/BitcoinArmory/releases/download/v0.94.0/armory_0.94.0_amd64.deb
+	sha256sums = 31df185f873f14abb2957c14499dc274135b60cf0ad7c4801e09c86d95f89ced
 
 pkgname = armory-bin
 
diff --git a/.gitignore b/.gitignore
index 0341edba99bc..484a92be17d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.tar*
 *.deb
+*.asc*
 src/
 pkg/
diff --git a/PKGBUILD b/PKGBUILD
index 04b35c6c929e..fd39a66f325d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,44 @@
 # Maintainer: Veeti Paananen <veeti.paananen@rojekti.fi>
 pkgname=armory-bin
-pkgver=0.93.3
+pkgver=0.94.0
 pkgrel=1
-pkgdesc="Full-featured Bitcoin wallet (official binary)"
+pkgdesc="Full-featured Bitcoin wallet management application (official binary)"
 arch=('x86_64')
-url="https://bitcoinarmory.com"
-license=('AGPL')
-depends=(
-  'bitcoin-daemon'
-  'crypto++'
-  'python2'
-  'python2-pyqt4'
-  'python2-twisted'
-  'python2-psutil'
-  'swig'
-  'xdg-utils'
-)
+url="https://github.com/goatpig/BitcoinArmory"
+license=('AGPL3' 'MIT')
+depends=('bitcoin-daemon' 'crypto++' 'python2' 'python2-pyqt4' 'python2-twisted' 'python2-psutil' 'swig' 'xdg-utils')
 conflicts=('armory' 'armory-git')
 
 # Don't blindly trust a random AUR package with your coins! Signed hashes available at
-# https://bitcoinarmory.com/download/ with GPG ID 0x98832223
-source=("https://s3.amazonaws.com/bitcoinarmory-releases/armory_${pkgver}_ubuntu-64bit.deb")
-sha256sums=('89a28d7b4c262abc31bb09696e368a0ed633a1d9c7f8bf8922814014258f78d5')
+# https://github.com/goatpig/BitcoinArmory/releases with GPG ID 8C5211764922589A
+_signatures="https://github.com/goatpig/BitcoinArmory/releases/download/v${pkgver}/sha256sum.asc.txt"
+source=("https://github.com/goatpig/BitcoinArmory/releases/download/v${pkgver}/armory_${pkgver}_amd64.deb")
+sha256sums=('31df185f873f14abb2957c14499dc274135b60cf0ad7c4801e09c86d95f89ced')
+
+check() {
+  msg 'Validating GPG signature...'
+  msg2 '(To disable: remove/rename check() function from PKGBUILD)'
+  gpg --recv-key 8C5211764922589A
+  wget -q $_signatures -O 'sha256sum.asc.txt'
+  msg2 "Downloading $_signatures"
+  gpg --verify 'sha256sum.asc.txt'
+  msg2 'GPG signature is valid.'
+
+  cd $srcdir
+  msg 'Validating signed checksum of downloaded binary...'
+  grep 'amd64.deb' '../sha256sum.asc.txt' | tr -d '\r' | sha256sum -c -
+  msg2 'Checksum valid.'
+}
 
 package() {
-  tar xvf "$srcdir/data.tar.xz"
+  tar xvf "$srcdir/data.tar.gz"
 
-  # Python 2.
   sed -i 's/python/python2/g' usr/bin/armory
   find usr/lib/ -type f -exec sed -i 's|/usr/bin/python|/usr/bin/python2|g' {} \;
   find usr/lib/ -type f -exec sed -i 's|/usr/bin/env python|/usr/bin/env python2|g' {} \;
 
   mv usr $pkgdir
+
+  cat "$pkgdir/usr/lib/armory/LICENSE.py" | tail -n +3 | head -n -1 > LICENSE
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }