Update for v0.13.4, changes in build structure, remove obsolete launcher

2 files changed, 20 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c526da268a36..fdd22ca32808 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Jan  5 11:48:00 UTC 2016
+# Sat Mar  5 18:10:46 UTC 2016
 pkgbase = sslyze-git
 	pkgdesc = Fast and full-featured SSL scanner.
-	pkgver = 0.12.440
+	pkgver = 0.13.4.r8.g2d501f4
 	pkgrel = 1
 	url = https://github.com/nabla-c0d3/sslyze
 	arch = i686
@@ -16,7 +16,7 @@ pkgbase = sslyze-git
 	source = git://github.com/nabla-c0d3/nassl.git
 	source = git://github.com/nabla-c0d3/sslyze.git
 	source = http://zlib.net/zlib-1.2.8.tar.gz
-	source = https://www.openssl.org/source/openssl-1.0.2e.tar.gz
+	source = https://www.openssl.org/source/old/1.0.2/openssl-1.0.2e.tar.gz
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = 36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d
diff --git a/PKGBUILD b/PKGBUILD
index f5a072d059e4..2e310096913b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,7 @@
 # Maintainer: Fabian Zaremba <fabian at youremail dot eu>
+
 pkgname=sslyze-git
-pkgver=0.12.440
+pkgver=0.13.4.r8.g2d501f4
 pkgrel=1
 pkgdesc="Fast and full-featured SSL scanner."
 arch=('i686' 'x86_64')
@@ -14,7 +15,7 @@ options=('!makeflags')
 source=("git://github.com/nabla-c0d3/nassl.git"
 "git://github.com/nabla-c0d3/sslyze.git"
 "http://zlib.net/zlib-1.2.8.tar.gz"
-"https://www.openssl.org/source/openssl-1.0.2e.tar.gz")
+"https://www.openssl.org/source/old/1.0.2/openssl-1.0.2e.tar.gz")
 sha256sums=('SKIP'
             'SKIP'
             '36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d'
@@ -22,48 +23,44 @@ sha256sums=('SKIP'
 
 
 pkgver() {
+
 cd "$srcdir/sslyze"
-echo $(grep "##" CHANGELOG.md | head -n 1 | sed 's/## v//').$(git rev-list --count HEAD)
+git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+
 } 
 
 build() {
 
 cd "$srcdir/"
 
-mv "$srcdir/openssl-1.0.2e" "$srcdir/nassl/"
+mv "$srcdir/openssl-1.0.2e" "$srcdir/nassl/openssl"
 mv "$srcdir/zlib-1.2.8" "$srcdir/nassl/"
 
 cd "$srcdir/nassl"
 
-python2.7 buildAll_unix.py
+# Delete binaries that are shipped within the git repository
+find "$srcdir/nassl/bin" -type f -delete
 
-cd "$srcdir/nassl/test/nassl"
+python2.7 build_from_scratch.py
+python2.7 run_tests.py
+
+cd "$srcdir/nassl/nassl"
 rm *.pyc
 
-mv "$srcdir/nassl/test/nassl" "$srcdir/sslyze/"
+mv "$srcdir/nassl/nassl" "$srcdir/sslyze/"
 
 }
 
 package() {
 
-#Packaging routine derived from sslyze PKGBUILD by goll
-
 # Install files in /opt
 mkdir -p "$pkgdir/opt/sslyze"
 cp -a "$srcdir/sslyze/." "$pkgdir/opt/sslyze"
-
 rm -rf "$pkgdir/opt/sslyze/.git"
 
-# Create an indirect launcher in /usr/bin
-# Needed until https://github.com/nabla-c0d3/sslyze/pull/65 is resolved
-
+# Create cli launcher symlink in /usr/bin
 mkdir -p "$pkgdir/usr/bin"
-
-cat << EOF > "$pkgdir/usr/bin/sslyze"
-#!/usr/bin/sh
-/usr/bin/python2.7 /opt/sslyze/sslyze.py \$@
-EOF
-
-chmod 755 "$pkgdir/usr/bin/sslyze"
+ln -s /opt/sslyze/sslyze_cli.py "$pkgdir/usr/bin/sslyze"
+chmod 755 "$pkgdir/opt/sslyze/sslyze_cli.py"
 
 }