Release 0.96.3.99 (0.96.4 RC1)

6 files changed, 93 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 09c9e0190a7f..8867bdb36938 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,36 +1,36 @@
 # Generated by mksrcinfo v8
-# Sat May  7 19:53:28 UTC 2016
+# Fri Oct 13 02:38:24 UTC 2017
 pkgbase = armory
-	pkgdesc = Python-Based Bitcoin Software
-	pkgver = 0.94.1
+	pkgdesc = Full-featured Bitcoin wallet management application
+	pkgver = 0.96.3.99
 	pkgrel = 1
 	url = https://github.com/goatpig/BitcoinArmory
+	install = armory.install
 	arch = i686
 	arch = x86_64
 	license = AGPL3
+	license = MIT
 	makedepends = git
 	makedepends = gcc
 	makedepends = make
 	depends = crypto++
 	depends = swig
-	depends = python2
-	depends = twisted
 	depends = qt4
+	depends = python2
+	depends = python2-twisted
 	depends = python2-pyqt4
 	depends = python2-bsddb
 	depends = python2-psutil
-	optdepends = bitcoin-daemon: Connect to BitCoin network
+	optdepends = bitcoin-daemon: Communicate with the Bitcoin network
 	provides = armory
 	conflicts = armory
 	conflicts = armory-git
+	conflicts = armory-bin
+	conflicts = armory-goatpig-git
+	source = https://github.com/goatpig/BitcoinArmory/releases/download/v0.96.3.99/armory_0.96.3.99_src.tar.gz
 	source = run-armory.sh
-	source = https://github.com/goatpig/BitcoinArmory/archive/v0.94.1.tar.gz
-	source = https://github.com/goatpig/BitcoinArmory/releases/download/v0.94.1/sha256sum.asc.txt
-	source = armory.desktop
-	sha512sums = 385a035f4b24559f199b5ab59d16a94285c5a486129c1493a445b6d266c9dff85253bef439c4d615e1b3326f5224bda84b47dc9bb2b355125d9fd1ac4a1a49c9
-	sha512sums = f5da0ef9759e9e2b7e01ca8e864c4af2f03759a7ffa24cec87501426f9ba7cc01b25ab8aed7fcaa22acc925be7dcc8d62bb17d552bcd6eb3b4b66708b007b42e
-	sha512sums = 19737b389f77027b9477eadf7078498d7e51bde232804648f84ff7d62fb4c0d26ed9d6f10be95190fb9b1e9e841d3ed42e37d22aa08591286daa9b69c1240218
-	sha512sums = 95801e8d471225e45b3c77e11cb002fd433254914c64120ca9222f9bcb9d8dbef1f10f3cd6e41015a8f0541cd2b3453627a1865216e84f5848698bf5c31ed70a
+	sha512sums = afe73e2f52834dead3f085eca3daf27406f64c30678d1b68ee3de47acb7d38a2c5ae2d326e686cce0a91f1cf97ea69e8f81d208da4d0e57a0b6c152482ef7059
+	sha512sums = af44a8edfdf751f3343a8bdf6fa21c125389de3435c4b03c7f581b980525a9f32af177f496830f847b70c8e2619c42908536698e0fd28f862f16083cf7396715
 
 pkgname = armory
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..f2f8cf5dd8b6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*pkg.tar.xz
+*.tar.gz
+src/
+pkg/
diff --git a/PKGBUILD b/PKGBUILD
index c1cba1e4c4a6..3a5c378c0a17 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,81 @@
-# Maintainer: William Grieshaber <me@zee.li>
+# Maintainer: Jonathan la Cour <jon@lacour.me>
+# Contributor: Patrick Glandien <patrick@synix.io>
+# Contributor: William Grieshaber <me@zee.li>
 # Contributor: portals <portals at riseup.net> Base on work of: 2bluesc <2bluesc at gmail.com> and mazzolino <maze+aur at strahlungsfrei.de>
 # Contributor: Pieter Kokx <pieter@kokx.nl>
 
 pkgname=armory
-_pkgname=BitcoinArmory
-pkgver=0.94.1 
-_pkgver=0.94.1
+pkgver=0.96.3.99
 pkgrel=1
-pkgdesc="Python-Based Bitcoin Software"
+pkgdesc="Full-featured Bitcoin wallet management application"
 arch=('i686' 'x86_64')
 url="https://github.com/goatpig/BitcoinArmory"
-license=('AGPL3')
-groups=()
-depends=('crypto++' 'swig' 'python2' 'twisted' 'qt4' 'python2-pyqt4' 'python2-bsddb' 'python2-psutil')
+license=('AGPL3' 'MIT')
+depends=('crypto++' 'swig' 'qt4' 'python2' 'python2-twisted' 'python2-pyqt4' 'python2-bsddb' 'python2-psutil')
 makedepends=('git' 'gcc' 'make')
+optdepends=('bitcoin-daemon: Communicate with the Bitcoin network')
 provides=('armory')
-conflicts=('armory' 'armory-git')
-replaces=()
-backup=()
-options=()
-optdepends=('bitcoin-daemon: Connect to BitCoin network')
-install=
-source=("run-armory.sh" "https://github.com/goatpig/BitcoinArmory/archive/v$_pkgver.tar.gz"
-"https://github.com/goatpig/BitcoinArmory/releases/download/v0.94.1/sha256sum.asc.txt"
-"armory.desktop")
-sha512sums=('385a035f4b24559f199b5ab59d16a94285c5a486129c1493a445b6d266c9dff85253bef439c4d615e1b3326f5224bda84b47dc9bb2b355125d9fd1ac4a1a49c9'
-            'f5da0ef9759e9e2b7e01ca8e864c4af2f03759a7ffa24cec87501426f9ba7cc01b25ab8aed7fcaa22acc925be7dcc8d62bb17d552bcd6eb3b4b66708b007b42e'
-            '19737b389f77027b9477eadf7078498d7e51bde232804648f84ff7d62fb4c0d26ed9d6f10be95190fb9b1e9e841d3ed42e37d22aa08591286daa9b69c1240218'
-            '95801e8d471225e45b3c77e11cb002fd433254914c64120ca9222f9bcb9d8dbef1f10f3cd6e41015a8f0541cd2b3453627a1865216e84f5848698bf5c31ed70a')
+conflicts=('armory' 'armory-git' 'armory-bin' 'armory-goatpig-git')
+install="${pkgname}.install"
+
+# Don't blindly trust a random AUR package with your coins! Signed hashes available at
+# https://github.com/goatpig/BitcoinArmory/releases with GPG ID 8C5211764922589A
+_signatures="https://github.com/goatpig/BitcoinArmory/releases/download/v${pkgver}/sha256sum.txt.asc"
+source=("https://github.com/goatpig/BitcoinArmory/releases/download/v${pkgver}/armory_${pkgver}_src.tar.gz"
+        'run-armory.sh')
+sha512sums=('afe73e2f52834dead3f085eca3daf27406f64c30678d1b68ee3de47acb7d38a2c5ae2d326e686cce0a91f1cf97ea69e8f81d208da4d0e57a0b6c152482ef7059'
+            'af44a8edfdf751f3343a8bdf6fa21c125389de3435c4b03c7f581b980525a9f32af177f496830f847b70c8e2619c42908536698e0fd28f862f16083cf7396715')
+
+check() {
+  msg 'Validating GPG signature...'
+  msg2 '(To disable: remove/rename check() function from PKGBUILD)'
+  gpg --recv-key 8C5211764922589A
+  curl -sL $_signatures -o sha256sum.txt.asc
+  msg2 "Downloading $_signatures"
+  gpg --verify 'sha256sum.txt.asc'
+  msg2 'GPG signature is valid.'
+
+  msg 'Validating signed checksum of downloaded binary...'
+  grep "${pkgver}_src.tar.gz" 'sha256sum.txt.asc' | tr -d '\r' | sha256sum -c -
+  msg2 'Checksum valid.'
+}
+
+prepare() {
+  cd "$srcdir/${pkgname}_${pkgver}-src"
+
+  git submodule update --init
+
+  ## Get Python2 Version
+  _py2longver=$(pacman -Qi python2 | grep "Version" | sed 's/^Version\s*:\s//')
+  _py2ver=${_py2longver%.*}
+  PYTHON_VERSION=${_py2ver} ./autogen.sh
+}
 
 build() {
-    cd $srcdir/BitcoinArmory-$_pkgver/
+  cd "$srcdir/${pkgname}_${pkgver}-src"
+
+  ## Get Python2 Version
+  _py2longver=$(pacman -Qi python2 | grep "Version" | sed 's/^Version\s*:\s//')
+  _py2ver=${_py2longver%.*}
+  PYTHON_VERSION=${_py2ver} ./configure
 
-    make PYVER=python2.7
+  ## Build using current python2 version
+  PYTHON_VERSION=${_py2ver} make -j"${nproc}"
 }
 
 package() {
+  install -Dm644 "$srcdir/${pkgname}_${pkgver}-src/dpkgfiles/armory.desktop" "$pkgdir/usr/share/applications/armory.desktop"
+  install -Dm644 "$srcdir/${pkgname}_${pkgver}-src/dpkgfiles/armoryoffline.desktop" "$pkgdir/usr/share/applications/armoryoffline.desktop"
+  install -Dm644 "$srcdir/${pkgname}_${pkgver}-src/dpkgfiles/armorytestnet.desktop" "$pkgdir/usr/share/applications/armorytestnet.desktop"
+  install -Dm644 "$srcdir/${pkgname}_${pkgver}-src/img/armory_icon_64x64.png" "$pkgdir/usr/share/armory/img/armory_icon_64x64.png"
+  install -Dm644 "$srcdir/${pkgname}_${pkgver}-src/img/armory_icon_green_64x64.png" "$pkgdir/usr/share/armory/img/armory_icon_green_64x64.png"
+
   install -Dm 755 "$srcdir/run-armory.sh" "$pkgdir/usr/bin/armory"
-  install -Dm 644 "$srcdir/armory.desktop" "$pkgdir/usr/share/applications/armory.desktop"
+
   mkdir -p "$pkgdir/opt"
-  cp -R "$srcdir/$_pkgname-$_pkgver/" "$pkgdir/opt/"
-  mv "$pkgdir/opt/$_pkgname-$_pkgver" "$pkgdir/opt/$_pkgname"
+  cp -R "$srcdir/${pkgname}_${pkgver}-src/." "$pkgdir/opt/$pkgname/"
 
-  rm -rf "$pkgdir/opt/$_pkgname/cppForSwig/"
-  rm -rf "$pkgdir/opt/$_pkgname/.git/"
-  rm -rf "$pkgdir/opt/$_pkgname/.gitignore"
+  rm -rf "$pkgdir/opt/$pkgname/cppForSwig/"
+  rm -rf "$pkgdir/opt/$pkgname/.git/"
+  rm -rf "$pkgdir/opt/$pkgname/.gitignore"
 }
diff --git a/armory.desktop b/armory.desktop
deleted file mode 100644
index f2cfc4750403..000000000000
--- a/armory.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Armory
-GenericName=Bitcoin Client
-Comment=Full-featured Bitcoin wallet management application
-Categories=Qt;Network;
-Exec=/usr/bin/armory
-Icon=/opt/BitcoinArmory/img/armory256x256.ico
-StartupNotify=false
-Terminal=false
-Keywords=bitcoin;finance;wallet;money;
diff --git a/armory.install b/armory.install
new file mode 100644
index 000000000000..7bbaf885f11e
--- /dev/null
+++ b/armory.install
@@ -0,0 +1,13 @@
+ARMORY_IMG_DIR="/usr/share/armory/img"
+
+post_install() {
+  xdg-icon-resource install --novendor --context apps --size 64 "${ARMORY_IMG_DIR}/armory_icon_64x64.png" armoryicon
+  xdg-icon-resource install --novendor --context apps --size 64 "${ARMORY_IMG_DIR}/armory_icon_64x64.png" armoryofflineicon
+  xdg-icon-resource install --novendor --context apps --size 64 "${ARMORY_IMG_DIR}/armory_icon_green_64x64.png" armorytestneticon
+}
+
+pre_remove() {
+  xdg-icon-resource uninstall --size 64 armoryicon
+  xdg-icon-resource uninstall --size 64 armorytestneticon
+  xdg-icon-resource uninstall --size 64 armoryofflineicon
+}
diff --git a/run-armory.sh b/run-armory.sh
index fe336847438c..aa1b3c31561f 100644
--- a/run-armory.sh
+++ b/run-armory.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-python2 /opt/BitcoinArmory/ArmoryQt.py $@
+python2 /opt/armory/ArmoryQt.py $@