upgpkg: testssl.sh-git v2.4.r2097.g7585ab6-1

sync with community repo PKGBUILD

4 files changed, 59 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3621fa2230e1..44dc88e1f7e3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,29 @@
 pkgbase = testssl.sh-git
 	pkgdesc = Testing TLS/SSL encryption (git version)
-	pkgver = v2.4.r243.g6406e18
+	pkgver = v2.4.r2097.g7585ab6
 	pkgrel = 1
 	url = https://github.com/drwetter/testssl.sh
+	install = testssl.sh.install
 	arch = any
-	license = GPL
+	license = GPL2
+	checkdepends = perl-data-dump
+	checkdepends = perl-json
+	checkdepends = perl-test-base
 	makedepends = git
+	depends = perl
 	depends = bash
 	depends = coreutils
 	depends = util-linux
 	depends = openssl
+	depends = inetutils
+	depends = bind-tools
+	depends = procps-ng
 	provides = testssl.sh
 	conflicts = testssl.sh
 	source = testssl.sh-git::git+https://github.com/drwetter/testssl.sh.git
+	source = set-install-dir.patch
 	sha256sums = SKIP
+	sha256sums = 896d9867cd816b706ca6170fea07285e6daee5ff7bfc246a8ee9a7f682dcbdeb
 
 pkgname = testssl.sh-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 7032c618c18d..66bc93cd662c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,26 +2,47 @@
 # Please report issues at https://github.com/jojosch/pkgbuilds
 
 pkgname='testssl.sh-git'
-pkgver=v2.4.r243.g6406e18
+pkgver=v2.4.r2097.g7585ab6
 pkgrel=1
 pkgdesc="Testing TLS/SSL encryption (git version)"
 arch=('any')
 url="https://github.com/drwetter/testssl.sh"
-license=("GPL")
-depends=('bash' 'coreutils' 'util-linux' 'openssl')
+license=("GPL2")
+depends=('perl' 'bash' 'coreutils' 'util-linux' 'openssl' 'inetutils' 'bind-tools' 'procps-ng')
 makedepends=('git')
+checkdepends=('perl-data-dump' 'perl-json' 'perl-test-base')
 conflicts=('testssl.sh')
 provides=('testssl.sh')
-source=("${pkgname}::git+https://github.com/drwetter/${pkgname/-git/}.git")
-sha256sums=('SKIP')
+install="${pkgname/-git/}.install"
+source=(
+    "${pkgname}::git+https://github.com/drwetter/${pkgname/-git/}.git"
+    'set-install-dir.patch'
+)
+sha256sums=(
+    'SKIP'
+    '896d9867cd816b706ca6170fea07285e6daee5ff7bfc246a8ee9a7f682dcbdeb'
+)
 
 pkgver () {
-  cd "${srcdir}/${pkgname}"
-  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+    cd "${srcdir}/${pkgname}"
+    git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+    cd "${srcdir}/${pkgname}"
+    patch -p0 < "${srcdir}/set-install-dir.patch"
+}
+
+check() {
+    cd "${srcdir}/${pkgname}"
+    TESTSSL_INSTALL_DIR="$(pwd)" prove -v
 }
 
 package() {
-  cd "${srcdir}/${pkgname}"
+    cd "${srcdir}/${pkgname}"
 
-  install -D -m755 "testssl.sh" "${pkgdir}/usr/bin/testssl.sh"
+    install -Dm 755 testssl.sh "${pkgdir}/usr/bin/testssl"
+    install -Dm 644 etc/* -t "${pkgdir}/usr/share/testssl.sh/etc"
+    install -Dm 644 Readme.md doc/testssl.1.md -t "${pkgdir}/usr/share/doc/${pkgname}"
+    install -Dm 644 doc/testssl.1 -t "${pkgdir}/usr/share/man/man1"
 }
diff --git a/set-install-dir.patch b/set-install-dir.patch
new file mode 100644
index 000000000000..eaafef57be12
--- /dev/null
+++ b/set-install-dir.patch
@@ -0,0 +1,11 @@
+--- testssl.sh.orig	2017-09-21 11:49:04.161576009 +0200
++++ testssl.sh	2017-09-21 11:49:28.451753722 +0200
+@@ -112,7 +112,7 @@
+
+ readonly PROG_NAME="$(basename "$0")"
+ readonly RUN_DIR="$(dirname "$0")"
+-TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"  # if you run testssl.sh from a different path you can set either TESTSSL_INSTALL_DIR
++TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-"/usr/share/testssl.sh"}"  # if you run testssl.sh from a different path you can set either TESTSSL_INSTALL_DIR
+ CA_BUNDLES_PATH="${CA_BUNDLES_PATH:-""}"          # or CA_BUNDLES_PATH to find the CA BUNDLES. TESTSSL_INSTALL_DIR helps you to find the RFC mapping also
+ CIPHERS_BY_STRENGTH_FILE=""
+ TLS_DATA_FILE=""                                  # mandatory file for socket based handdhakes
diff --git a/testssl.sh.install b/testssl.sh.install
new file mode 100644
index 000000000000..9058d5e27dfc
--- /dev/null
+++ b/testssl.sh.install
@@ -0,0 +1,6 @@
+post_upgrade() {
+    echo
+    echo ":: testssl.sh installed as testssl"
+    echo ":: previous versions < v2.4.r2097.g7585ab6 were installed as testssl.sh"
+    echo
+}
\ No newline at end of file