diff options
Diffstat (limited to 'network')
| -rw-r--r-- | network/sslscan/Makefile.diff | 15 | ||||
| -rw-r--r-- | network/sslscan/sslscan.SlackBuild | 11 | ||||
| -rw-r--r-- | network/sslscan/sslscan.info | 10 |
3 files changed, 10 insertions, 26 deletions
diff --git a/network/sslscan/Makefile.diff b/network/sslscan/Makefile.diff deleted file mode 100644 index 9a8cf3888a..0000000000 --- a/network/sslscan/Makefile.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur sslscan-1.11.7-rbsec.orig/Makefile sslscan-1.11.7-rbsec/Makefile ---- sslscan-1.11.7-rbsec.orig/Makefile 2016-06-14 00:42:11.000000000 +1200 -+++ sslscan-1.11.7-rbsec/Makefile 2016-06-28 08:35:03.817568419 +1200 -@@ -80,11 +80,6 @@ - .openssl.is.fresh: opensslpull - true - opensslpull: -- if [ -d openssl -a -d openssl/.git ]; then \ -- cd ./openssl && git checkout OpenSSL_1_0_2-stable && git pull | grep -q "Already up-to-date." && [ -e ../.openssl.is.fresh ] || touch ../.openssl.is.fresh ; \ -- else \ -- git clone --depth 1 -b OpenSSL_1_0_2-stable https://github.com/openssl/openssl ./openssl && cd ./openssl && touch ../.openssl.is.fresh ; \ -- fi - # Re-enable SSLv2 EXPORT ciphers - sed -i.bak 's/# if 0/# if 1/g' openssl/ssl/s2_lib.c - rm openssl/ssl/s2_lib.c.bak diff --git a/network/sslscan/sslscan.SlackBuild b/network/sslscan/sslscan.SlackBuild index a46dffe652..7d5a9f68da 100644 --- a/network/sslscan/sslscan.SlackBuild +++ b/network/sslscan/sslscan.SlackBuild @@ -33,7 +33,7 @@ # 2014-10-23 - changed to build rbsec's fork from github PRGNAM=sslscan -VERSION=${VERSION:-1.11.9} +VERSION=${VERSION:-1.11.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -73,16 +73,15 @@ rm -rf $PRGNAM-$VERSION-rbsec tar xvf $CWD/$PRGNAM-$VERSION-rbsec.tar.gz cd $PRGNAM-$VERSION-rbsec -patch -p1 < $CWD/Makefile.diff - +sed -i 's/^\(\.openssl.is.fresh:\).*$/\1/' Makefile sed -i "s/^GIT_VERSION = .*$/GIT_VERSION = $VERSION/" Makefile STATIC=${STATIC:-yes} if [ "$STATIC" = "yes" ] ; then - OPENSSLVERSION=${OPENSSLVERSION:-1.0.2k} - tar xf $CWD/openssl-OpenSSL_"$(echo "$OPENSSLVERSION" | tr '.' '_')".tar.gz - mv openssl-OpenSSL_"$(echo "$OPENSSLVERSION" | tr '.' '_')" openssl + OPENSSLVERSION=${OPENSSLVERSION:-83abb7af5cee7dd1c9ab500a10a776c586a18f1b} + tar xf "$CWD/openssl-$OPENSSLVERSION.tar.gz" + mv "openssl-$OPENSSLVERSION" openssl fi chown -R root:root . diff --git a/network/sslscan/sslscan.info b/network/sslscan/sslscan.info index 05d0c4864c..590367e505 100644 --- a/network/sslscan/sslscan.info +++ b/network/sslscan/sslscan.info @@ -1,10 +1,10 @@ PRGNAM="sslscan" -VERSION="1.11.9" +VERSION="1.11.10" HOMEPAGE="https://github.com/rbsec/sslscan" -DOWNLOAD="https://github.com/rbsec/sslscan/archive/1.11.9-rbsec/sslscan-1.11.9-rbsec.tar.gz \ - https://github.com/openssl/openssl/archive/OpenSSL_1_0_2k/openssl-OpenSSL_1_0_2k.tar.gz" -MD5SUM="827ff2cc70a7a86a880159f3a455daf7 \ - c9bfbe6848476fa920306e327f28ccf5" +DOWNLOAD="https://github.com/rbsec/sslscan/archive/1.11.10-rbsec/sslscan-1.11.10-rbsec.tar.gz \ + https://github.com/PeterMosmans/openssl/archive/83abb7af5cee7dd1c9ab500a10a776c586a18f1b/openssl-83abb7af5cee7dd1c9ab500a10a776c586a18f1b.tar.gz" +MD5SUM="a90977ad91315a68c3c41c7cb718dd5a \ + 7bc7d20f588c8467fdfcddd92a88e3d9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |