Switch to released packages instead of git, patch to use openssl 1.0, update to 2.1

4 files changed, 38 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eab53992cb17..5d8435982023 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,24 @@
 # Generated by mksrcinfo v8
-# Thu Aug 18 21:57:52 UTC 2016
+# Tue Nov  7 17:48:34 UTC 2017
 pkgbase = scallion
-	pkgdesc = Creates vanity GPG keys and .onion addresses (for Tor's hidden services) using OpenCL.
-	pkgver = 2.0
+	pkgdesc = Creates vanity GPG keys and .onion addresses using OpenCL.
+	pkgver = 2.1
 	pkgrel = 1
 	url = https://github.com/lachesis/scallion
 	arch = i686
 	arch = x86_64
 	license = MIT
-	makedepends = git
 	makedepends = mono
 	depends = mono
-	optdepends = opencl-nvidia: OpenCL support for NVIDIA
-	optdepends = opencl-mesa: OpenCL support for AMD/ATI Radeon mesa
+	depends = openssl-1.0
+	optdepends = opencl-nvidia: For NVIDIA
+	optdepends = opencl-mesa: For AMD/ATI Radeon mesa
+	source = https://github.com/lachesis/scallion/archive/v2.1.tar.gz
 	source = scallion.sh
+	source = set_openssl_1.0_paths.patch
+	sha256sums = 0b1a8daec7873546d89b1174af2e475963af86de3016ed63b28302bf5bb80c1c
 	sha256sums = 1090325b7cd46c5b90ac0c9c841ca6ccf15141fd3c7b2f409ebecf0db1d39dff
+	sha256sums = 28a1a2429bef1e150316176a07c5dfc7f5c2052e152c94ed22dd563b86408546
 
 pkgname = scallion
 
diff --git a/PKGBUILD b/PKGBUILD
index a83cca2101ac..42252dc9f1d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,40 @@
-# Maintainer: Dylan <dylan@hashflo.net>
+# Maintainer: Dylan <dylan@psilly.com>
 
 pkgname=scallion
-pkgver=2.0
+pkgver=2.1
 pkgrel=1
-pkgdesc="Creates vanity GPG keys and .onion addresses (for Tor's hidden services) using OpenCL."
-arch=('i686' 'x86_64')
+pkgdesc="Creates vanity GPG keys and .onion addresses using OpenCL."
+arch=("i686" "x86_64")
 url="https://github.com/lachesis/scallion"
 license=('MIT')
-makedepends=('git' 'mono')
-depends=('mono')
+makedepends=('mono')
+depends=('mono' 'openssl-1.0')
 optdepends=(
-  'opencl-nvidia: OpenCL support for NVIDIA'
-  'opencl-mesa: OpenCL support for AMD/ATI Radeon mesa'
+  "opencl-nvidia: For NVIDIA"
+  "opencl-mesa: For AMD/ATI Radeon mesa"
+)
+source=(
+    "$url/archive/v$pkgver.tar.gz"
+    "scallion.sh"
+    "set_openssl_1.0_paths.patch"
+)
+sha256sums=(
+    "0b1a8daec7873546d89b1174af2e475963af86de3016ed63b28302bf5bb80c1c"
+    "1090325b7cd46c5b90ac0c9c841ca6ccf15141fd3c7b2f409ebecf0db1d39dff"
+    "28a1a2429bef1e150316176a07c5dfc7f5c2052e152c94ed22dd563b86408546"
 )
-source=('scallion.sh')
-sha256sums=('1090325b7cd46c5b90ac0c9c841ca6ccf15141fd3c7b2f409ebecf0db1d39dff')
-
-_gitroot="git://github.com/lachesis/scallion.git"
-_gitname=scallion
 
 build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
-
-  if [[ -d "$_gitname" ]]; then
-    cd "$_gitname" && git pull origin
-    msg "The local files are updated."
-  else
-    git clone "$_gitroot" "$_gitname"
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting build..."
-
-  rm -rf "$srcdir/$_gitname-build"
-  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  cd "$srcdir/$_gitname-build"
-
+  pushd "$srcdir/$pkgname-$pkgver"
   xbuild scallion.sln
+  popd
+  patch "$srcdir/$pkgname-$pkgver/$pkgname/bin/Debug/openssl.dll.config" "set_openssl_1.0_paths.patch"
 }
 
 package() {
   install -Dm755 scallion.sh "$pkgdir/usr/bin/$pkgname"
   install -d "$pkgdir/usr/share"
-  cp -r "$srcdir/$_gitname-build/$pkgname/bin/Debug" "$pkgdir/usr/share/$pkgname"
+  cp -r "$srcdir/$pkgname-$pkgver/$pkgname/bin/Debug" "$pkgdir/usr/share/$pkgname"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/scallion.sh b/scallion.sh
index 3e1a737c1f6c..3e1a737c1f6c 100755..100644
--- a/scallion.sh
+++ b/scallion.sh
diff --git a/set_openssl_1.0_paths.patch b/set_openssl_1.0_paths.patch
new file mode 100644
index 000000000000..7e3b11ed4f6a
--- /dev/null
+++ b/set_openssl_1.0_paths.patch
@@ -0,0 +1,6 @@
+4,5c4,5
+< 	<dllmap os="!windows,osx" dll="libeay32" target="libcrypto.so"/>
+< 	<dllmap os="!windows,osx" dll="ssleay32" target="libssl.so"/>
+---
+> 	<dllmap os="!windows,osx" dll="libeay32" target="/usr/lib/openssl-1.0/libcrypto.so"/>
+> 	<dllmap os="!windows,osx" dll="ssleay32" target="/usr/lib/openssl-1.0/libssl.so"/>