Fixed 1.0.776, and added pkgver().

4 files changed, 26 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 174e7c09dbdf..6c8d695306c6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = binaryninja-personal
 	pkgdesc = Binary Ninja is a binary multi-tool and reversing platform
-	pkgver = 1.0.320
+	pkgver = 1.0.776
 	pkgrel = 1
 	url = https://binary.ninja
 	arch = x86_64
 	license = custom:Binary Ninja License Agreement
 	makedepends = git
+	makedepends = curl
 	depends = libcurl-compat
 	provides = binaryninja
 	conflicts = binaryninja
@@ -13,12 +14,10 @@ pkgbase = binaryninja-personal
 	source = binaryninja-personal
 	source = binaryninja.png
 	source = binaryninja-personal.desktop
-	source = libpython2.7.so.1
-	sha256sums = 53a72b4d5b1c2de542a19885b799f173c94c9f1902d87326116bdc76063d21f1
-	sha256sums = 6e74aae25261e7a37f9d1982b3604bd201182c69b1985ea5d5c55befb56b476a
+	sha256sums = 52203ee89212e042d5c7e8d9829f34bd9284a58f16500745da0baa8f629b6a4d
+	sha256sums = 14025caefa4201062d7334505c56534dd237185f5ecdb4c20d7aad17c80647a7
 	sha256sums = ac2e652f617d5ef8aaa34a5113164f51f3f673c872a635d29c93878a00650bf8
 	sha256sums = 36aea5c3f72563703b937b98381195de01084fcddacd6e4a3ed4bc48ae75c9a2
-	sha256sums = SKIP
 
 pkgname = binaryninja-personal
 
diff --git a/PKGBUILD b/PKGBUILD
index 8412a0296f9c..bf80de960c01 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,6 @@
 # Maintainer: David Manouchehri
 # Contributor: Alex Palaistras <alex+archlinux@deuill.org>
+# Contributor: Elen Eisendle
 
 _pkgname=binaryninja
 pkgname="${_pkgname}-personal"
@@ -15,42 +16,42 @@ provides=("${_pkgname}")
 source=("file://BinaryNinja-personal.zip"
 		"binaryninja-personal"
 		"binaryninja.png"
-		"binaryninja-personal.desktop"
-		"libpython2.7.so.1")
+		"binaryninja-personal.desktop")
 
-# https://binary.ninja/js/hashes.js
-sha256sums=('53a72b4d5b1c2de542a19885b799f173c94c9f1902d87326116bdc76063d21f1'
-			'6e74aae25261e7a37f9d1982b3604bd201182c69b1985ea5d5c55befb56b476a'
+_hash=$(curl -s https://binary.ninja/js/hashes.js | grep -m1 -oP '"BinaryNinja-personal.zip"\s*:\s*"\K[^"]+')
+
+sha256sums=("${_hash}"
+			'14025caefa4201062d7334505c56534dd237185f5ecdb4c20d7aad17c80647a7'
 			'ac2e652f617d5ef8aaa34a5113164f51f3f673c872a635d29c93878a00650bf8'
-			'36aea5c3f72563703b937b98381195de01084fcddacd6e4a3ed4bc48ae75c9a2'
-			'SKIP')
+			'36aea5c3f72563703b937b98381195de01084fcddacd6e4a3ed4bc48ae75c9a2')
 
 # @TODO: Figure out what's really needed.
 depends=('libcurl-compat')
-makedepends=('git')
-pkgver=1.0.320
+makedepends=('git' 'curl')
+pkgver=1.0.776
 pkgrel=1
 
-# pkgver() {
-# 	# @TODO: Use https://binary.ninja/js/changelog.js and
-# 	# https://binary.ninja/js/hashes.js to bump the version automatically. 
-# }
+pkgver() {
+	curl -s https://binary.ninja/js/changelog.js | grep -m1 -oP '"version"\s*:\s*"\K[^"]+' | head -1
+}
 
 package() {
 	cd "${srcdir}/${_pkgname}"
-	mkdir "${pkgdir}/opt"
-	mkdir -p "${pkgdir}/usr/share/icons/hicolor/128x128/apps"
-	mkdir -p "${pkgdir}/usr/share/applications"
-	mkdir -p "${pkgdir}/usr/bin"
+	mkdir -v "${pkgdir}/opt"
+	mkdir -v -p "${pkgdir}/usr/share/icons/hicolor/128x128/apps"
+	mkdir -v -p "${pkgdir}/usr/share/applications"
+	mkdir -v -p "${pkgdir}/usr/bin"
 
-	mv "${srcdir}/binaryninja" "${pkgdir}/opt/binaryninja-personal"
+	mv -v "${srcdir}/binaryninja" "${pkgdir}/opt/binaryninja-personal"
 
 	install -m644 "${srcdir}/binaryninja.png" "${pkgdir}/usr/share/icons/hicolor/128x128/apps/"
 	install -m644 "${srcdir}/binaryninja-personal.desktop" "${pkgdir}/usr/share/applications/"
 	install -m755 "${srcdir}/binaryninja-personal" "${pkgdir}/usr/bin"
 
-	mv "${srcdir}/libpython2.7.so.1" "${pkgdir}/opt/binaryninja-personal/plugins/libpython2.7.so.1"
-	# ln -s "/usr/lib/libpython2.7.so" "${pkgdir}"/opt/binaryninja-personal/libpython2.7.so.1
+	# Not a proper fix, but hey, it works.
+	mv -v "${pkgdir}/opt/binaryninja-personal/plugins/libssl.so" "${pkgdir}/opt/binaryninja-personal/plugins/libssl.so.bak"
+
+	ln -v -s "/usr/lib/libpython2.7.so" "${pkgdir}"/opt/binaryninja-personal/plugins/libpython2.7.so.1
 }
 
 # vim:set et sw=2 sts=2 tw=80:
diff --git a/binaryninja-personal b/binaryninja-personal
index 568fb7c1712c..5398109fe129 100755
--- a/binaryninja-personal
+++ b/binaryninja-personal
@@ -1,2 +1,2 @@
 #!/bin/sh
-LD_PRELOAD=libcurl.so.3 exec /opt/binaryninja-personal/binaryninja "$@"
+LD_PRELOAD=libcurl.so.3:libssl.so.1.0.0 exec /opt/binaryninja-personal/binaryninja "$@"
diff --git a/libpython2.7.so.1 b/libpython2.7.so.1
deleted file mode 120000
index 527b3eec240f..000000000000
--- a/libpython2.7.so.1
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/libpython2.7.so
\ No newline at end of file