Update to v3.6.2

2 files changed, 30 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 37f57d556480..f3022f9a48b8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = hush3-bin
 	pkgdesc = HUSH (Privacy Cryptocurrency and Messenger) full node that supports z-addresses
-	pkgver = 3.6.1
+	pkgver = 3.6.2
 	pkgrel = 1
 	url = http://git.hush.is/hush/hush3
 	arch = x86_64
@@ -11,9 +11,9 @@ pkgbase = hush3-bin
 	depends = libsodium
 	depends = lib32-zlib
 	conflicts = hush3
-	source = hush3-3.6.1.tar.gz::https://git.hush.is/jahway603/arch-bins/raw/branch/master/hush3/hush3_v3_6_1.tar.gz
+	source = hush3-3.6.2.tar.gz::https://git.hush.is/attachments/3f62bccc-259b-4f7a-83c3-a7ede68c9034
 	source = http://git.hush.is/hush/hush3/raw/branch/master/LICENSE
-	sha256sums = c2acf75036b74bc092c47e1fc3f8a80bd6f72a9e230f7edc06b72412f99a0048
+	sha256sums = 4bc02cc740878d6fb604ae56b02890a0100a8355fa398d7ecc8b666d2f8ab57a
 	sha256sums = 6eae06cda3a8320e607ac0ee96cbdfc52b977463151ff4d5b119a26ee0cf666d
 
 pkgname = hush3-bin
diff --git a/PKGBUILD b/PKGBUILD
index 5819c649ea08..4c7fe5a5e90c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=hush3-bin
 _pkgname=hush3
-pkgver=3.6.1
+pkgver=3.6.2
 pkgrel=1
 pkgdesc='HUSH (Privacy Cryptocurrency and Messenger) full node that supports z-addresses'
 url='http://git.hush.is/hush/hush3'
@@ -11,42 +11,40 @@ license=('GPL3')
 depends=('libsodium' 'lib32-zlib')
 makedepends=('wget' 'git' 'curl')
 conflicts=('hush3')
-source=("$_pkgname-$pkgver.tar.gz::https://git.hush.is/jahway603/arch-bins/raw/branch/master/hush3/hush3_v3_6_1.tar.gz"
+source=("$_pkgname-$pkgver.tar.gz::https://git.hush.is/attachments/3f62bccc-259b-4f7a-83c3-a7ede68c9034"
         "$url/raw/branch/master/LICENSE")
-sha256sums=('c2acf75036b74bc092c47e1fc3f8a80bd6f72a9e230f7edc06b72412f99a0048'
+sha256sums=('4bc02cc740878d6fb604ae56b02890a0100a8355fa398d7ecc8b666d2f8ab57a'
             '6eae06cda3a8320e607ac0ee96cbdfc52b977463151ff4d5b119a26ee0cf666d')
-yeah="${_pkgname}_v3_6_1"
-
-build() {
-  tar xzvf $_pkgname-$pkgver.tar.gz
-}
 
 package() {
   install -Dm644 "${srcdir}/LICENSE" "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
 
-  cd "$_pkgname_v3_6_1"
-  install -Dm755 "${srcdir}/$yeah/hush-cli" "${pkgdir}/opt/$_pkgname/hush-cli"
-  install -Dm755 "${srcdir}/$yeah/hushd" "${pkgdir}/opt/$_pkgname/hushd"
-  install -Dm755 "${srcdir}/$yeah/hush-smart-chain" "${pkgdir}/opt/$_pkgname/hush-smart-chain"
-  install -Dm755 "${srcdir}/$yeah/hush-tx" "${pkgdir}/opt/$_pkgname/hush-tx"
-  install -Dm755 "${srcdir}/$yeah/hush-komodo-cli" "${pkgdir}/opt/$_pkgname/hush-komodo-cli"
-  install -Dm755 "${srcdir}/$yeah/hush-komodod" "${pkgdir}/opt/$_pkgname/hush-komodod"
-  install -Dm755 "${srcdir}/$yeah/hush-komodo-tx" "${pkgdir}/opt/$_pkgname/hush-komodo-tx"
+  # install required scripts
+  install -Dm755 "${srcdir}/hush-cli" "${pkgdir}/opt/$_pkgname/hush-cli"
+  install -Dm755 "${srcdir}/hushd" "${pkgdir}/opt/$_pkgname/hushd"
+  install -Dm755 "${srcdir}/hush-smart-chain" "${pkgdir}/opt/$_pkgname/hush-smart-chain"
+  install -Dm755 "${srcdir}/hush-tx" "${pkgdir}/opt/$_pkgname/hush-tx"
+  install -Dm755 "${srcdir}/komodo-cli" "${pkgdir}/opt/$_pkgname/hush-komodo-cli"
+  install -Dm755 "${srcdir}/komodod" "${pkgdir}/opt/$_pkgname/hush-komodod"
+  install -Dm755 "${srcdir}/komodo-tx" "${pkgdir}/opt/$_pkgname/hush-komodo-tx"
 
-  # install required sapling files
-  install -Dm644 "${srcdir}/$yeah/sapling-output.params" "${pkgdir}/opt/$_pkgname/sapling-output.params"
-  install -Dm644 "${srcdir}/$yeah/sapling-spend.params" "${pkgdir}/opt/$_pkgname/sapling-spend.params"
+  # install required sapling files and asmap.dat
+  install -Dm644 "${srcdir}/sapling-output.params" "${pkgdir}/opt/$_pkgname/sapling-output.params"
+  install -Dm644 "${srcdir}/sapling-spend.params" "${pkgdir}/opt/$_pkgname/sapling-spend.params"
+  install -Dm644 "${srcdir}/asmap.dat" "${pkgdir}/opt/$_pkgname/asmap.dat"
 
-  # links scripts to /usr/bin
+  # create symlinks
   install -d "${pkgdir}/usr/bin"
+  ln -s /opt/${_pkgname}/hush-cli "${pkgdir}/usr/bin"
+  ln -s /opt/${_pkgname}/hushd "${pkgdir}/usr/bin"
+  ln -s /opt/${_pkgname}/hush-smart-chain "${pkgdir}/usr/bin"
+  ln -s /opt/${_pkgname}/hush-tx "${pkgdir}/usr/bin"
+  ln -s /opt/${_pkgname}/hush-komodo-cli "${pkgdir}/usr/bin"
+  ln -s /opt/${_pkgname}/hush-komodod "${pkgdir}/usr/bin"
+  ln -s /opt/${_pkgname}/hush-komodo-tx "${pkgdir}/usr/bin"
+
   install -d "${pkgdir}/usr/share/hush"
-  ln -s /opt/$_pkgname/hush-cli "${pkgdir}/usr/bin"
-  ln -s /opt/$_pkgname/hushd "${pkgdir}/usr/bin"
-  ln -s /opt/$_pkgname/hush-smart-chain "${pkgdir}/usr/bin"
-  ln -s /opt/$_pkgname/hush-tx "${pkgdir}/usr/bin"
-  ln -s /opt/$_pkgname/hush-komodo-cli "${pkgdir}/usr/bin"
-  ln -s /opt/$_pkgname/hush-komodod "${pkgdir}/usr/bin"
-  ln -s /opt/$_pkgname/hush-komodo-tx "${pkgdir}/usr/bin"
-  ln -s /opt/$_pkgname/sapling-output.params "${pkgdir}/usr/share/hush"
-  ln -s /opt/$_pkgname/sapling-spend.params "${pkgdir}/usr/share/hush"
+  ln -s /opt/${_pkgname}/sapling-output.params "${pkgdir}/usr/share/hush"
+  ln -s /opt/${_pkgname}/sapling-spend.params "${pkgdir}/usr/share/hush"
+  ln -s /opt/${_pkgname}/asmap.dat "${pkgdir}/usr/share/hush"
 }