From 15e1c756ec03a56bde013c617a5bd55e6f32c77c Mon Sep 17 00:00:00 2001
From: Andrew Clemons <andrew.clemons@gmail.com>
Date: Fri, 24 Jul 2020 19:26:16 +1200
Subject: network/sslcan: Updated for version 2.0.0.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
---
 network/sslscan/README             |  6 +++---
 network/sslscan/sslscan.SlackBuild | 12 ++++++------
 network/sslscan/sslscan.info       | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'network/sslscan')

diff --git a/network/sslscan/README b/network/sslscan/README
index 6626f8fa0c..681709f7d3 100644
--- a/network/sslscan/README
+++ b/network/sslscan/README
@@ -3,8 +3,8 @@ ciphers that are supported.  SSLScan is designed to be easy, lean and
 fast.  The output includes prefered ciphers of the SSL service, the
 certificate, and is in Text and XML formats.
 
-Upstream recommends building statically against OpenSSL 1.0.2 (with weak
-ciphers and small DH keys re-enabled) for the widest compatibility for
-scanning. You can build against the system openssl with:
+Upstream recommends building statically against OpenSSL 1.1.1 for the
+widest compatibility for scanning. You can build against the system
+ openssl with:
 
 STATIC=no ./sslscan.SlackBuild
diff --git a/network/sslscan/sslscan.SlackBuild b/network/sslscan/sslscan.SlackBuild
index 2292ef2d7b..198258bb7f 100644
--- a/network/sslscan/sslscan.SlackBuild
+++ b/network/sslscan/sslscan.SlackBuild
@@ -5,7 +5,7 @@
 # Copyright (c) 2010  Markus Reichelt, Aachen, DE
 # Copyright (c) 2014  Andrew Clemons, Wellington, New Zealand
 # Copyright (c) 2015  Andrew Clemons, Leimen, Germany
-# Copyright (c) 2016-2019  Andrew Clemons, Wellington, New Zealand
+# Copyright (c) 2016-2020  Andrew Clemons, Wellington, New Zealand
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -33,7 +33,7 @@
 # 2014-10-23 - changed to build rbsec's fork from github
 
 PRGNAM=sslscan
-VERSION=${VERSION:-1.11.13}
+VERSION=${VERSION:-2.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,9 +65,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION-rbsec
-tar xvf $CWD/$PRGNAM-$VERSION-rbsec.tar.gz
-cd $PRGNAM-$VERSION-rbsec
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 
 sed -i 's/^\(\.openssl.is.fresh:\).*$/\1/' Makefile
 sed -i "s/^GIT_VERSION = .*$/GIT_VERSION = $VERSION/" Makefile
@@ -75,7 +75,7 @@ sed -i "s/^GIT_VERSION = .*$/GIT_VERSION = $VERSION/" Makefile
 STATIC=${STATIC:-yes}
 
 if [ "$STATIC" = "yes" ] ; then
-  OPENSSLVERSION=${OPENSSLVERSION:-83abb7af5cee7dd1c9ab500a10a776c586a18f1b}
+  OPENSSLVERSION=${OPENSSLVERSION:-72a9868fe53e01bfe912a56b56e4474ff6e0a063}
   tar xf "$CWD/openssl-$OPENSSLVERSION.tar.gz"
   mv "openssl-$OPENSSLVERSION" openssl
 fi
diff --git a/network/sslscan/sslscan.info b/network/sslscan/sslscan.info
index 69dc61865c..6ad878c97e 100644
--- a/network/sslscan/sslscan.info
+++ b/network/sslscan/sslscan.info
@@ -1,10 +1,10 @@
 PRGNAM="sslscan"
-VERSION="1.11.13"
+VERSION="2.0.0"
 HOMEPAGE="https://github.com/rbsec/sslscan"
-DOWNLOAD="https://github.com/rbsec/sslscan/archive/1.11.13-rbsec/sslscan-1.11.13-rbsec.tar.gz \
-          https://github.com/PeterMosmans/openssl/archive/83abb7af5cee7dd1c9ab500a10a776c586a18f1b/openssl-83abb7af5cee7dd1c9ab500a10a776c586a18f1b.tar.gz"
-MD5SUM="ca73b626b93dc228989241b4decd42e6 \
-        7bc7d20f588c8467fdfcddd92a88e3d9"
+DOWNLOAD="https://github.com/rbsec/sslscan/archive/2.0.0/sslscan-2.0.0.tar.gz \
+          https://github.com/openssl/openssl/archive/72a9868fe53e01bfe912a56b56e4474ff6e0a063/openssl-72a9868fe53e01bfe912a56b56e4474ff6e0a063.tar.gz"
+MD5SUM="42c413af0900ad80bb9081b0e0dee6b3 \
+        ea39a46aa274621885626f848ebbc27f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3