From 761884a9dc14099b55d42bf10b8c6299aeb63a91 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 5 Sep 2016 17:21:35 -0400
Subject: [PATCH] sslscan: Update to https://github.com/rbsec/sslscan

---
 packages/sslscan/Makefile.patch  | 29 ++++++++------------
 packages/sslscan/build.sh        | 11 ++++----
 packages/sslscan/sslscan.c.patch | 47 ++++++++++++++++++++++++--------
 3 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/packages/sslscan/Makefile.patch b/packages/sslscan/Makefile.patch
index 13a01d5e7..de7ee2695 100644
--- a/packages/sslscan/Makefile.patch
+++ b/packages/sslscan/Makefile.patch
@@ -1,17 +1,12 @@
-diff --git a/Makefile b/Makefile
-index cf2c92a..0f2db46 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,9 +1,9 @@
- SRCS = sslscan.c
--BINPATH = /usr/bin/
--MANPATH = /usr/share/man/
-+BINPATH = ${prefix}/bin/
-+MANPATH = ${prefix}/share/man/
-
- all:
--	gcc -g -Wall -lssl -o sslscan $(SRCS) $(LDFLAGS) $(CFLAGS)
-+	$(CC) -g -Wall -lssl -lcrypto -o sslscan $(SRCS) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS)
-
- install:
- 	cp sslscan $(BINPATH)
+diff -u -r ../sslscan-1.11.7-rbsec/Makefile ./Makefile
+--- ../sslscan-1.11.7-rbsec/Makefile	2016-06-13 08:42:11.000000000 -0400
++++ ./Makefile	2016-09-05 16:37:59.831058901 -0400
+@@ -14,7 +14,7 @@
+ OS := $(shell uname)
+ 
+ SRCS      = sslscan.c
+-PREFIX    = /usr
++PREFIX    ?= /usr
+ BINDIR    = $(PREFIX)/bin
+ MANDIR    = $(PREFIX)/share/man
+ MAN1DIR   = $(MANDIR)/man1
diff --git a/packages/sslscan/build.sh b/packages/sslscan/build.sh
index 10b0567db..9045ecd14 100644
--- a/packages/sslscan/build.sh
+++ b/packages/sslscan/build.sh
@@ -1,8 +1,9 @@
-TERMUX_PKG_HOMEPAGE=https://sourceforge.net/projects/sslscan/
+TERMUX_PKG_HOMEPAGE=https://github.com/rbsec/sslscan
 TERMUX_PKG_DESCRIPTION="Fast SSL scanner"
-TERMUX_PKG_VERSION=1.8.2
-TERMUX_PKG_SRCURL=https://sourceforge.net/projects/sslscan/files/sslscan/sslscan-${TERMUX_PKG_VERSION}.tgz/download
+TERMUX_PKG_VERSION=1.11.7
+TERMUX_PKG_SRCURL=https://github.com/rbsec/sslscan/archive/${TERMUX_PKG_VERSION}-rbsec.tar.gz
+TERMUX_PKG_SHA256=1a2787b427eabc3e61350c0692970e4ab679891f6310e2dd855bab549ff8cf73
+TERMUX_PKG_FOLDERNAME=sslscan-${TERMUX_PKG_VERSION}-rbsec
 TERMUX_PKG_BUILD_IN_SRC=yes
-TERMUX_PKG_FOLDERNAME=sslscan-${TERMUX_PKG_VERSION}
 TERMUX_PKG_DEPENDS="openssl"
-TERMUX_PKG_MAINTAINER="Pierre Rudloff <contact@rudloff.pro>"
+TERMUX_PKG_MAINTAINER="Pierre Rudloff @Rudloff"
diff --git a/packages/sslscan/sslscan.c.patch b/packages/sslscan/sslscan.c.patch
index 6e6955b7c..08bdba421 100644
--- a/packages/sslscan/sslscan.c.patch
+++ b/packages/sslscan/sslscan.c.patch
@@ -1,12 +1,35 @@
-diff --git a/sslscan.c b/sslscan.c
-index 50ee6cc..bb9071b 100644
---- a/sslscan.c
-+++ b/sslscan.c
-@@ -41,6 +41,7 @@
- #include <openssl/pkcs12.h>
- #include <openssl/x509.h>
- #include <openssl/x509v3.h>
-+#include <netinet/in.h>
-
- // Defines...
- #define false 0
+diff -u -r ../sslscan-1.11.7-rbsec/sslscan.c ./sslscan.c
+--- ../sslscan-1.11.7-rbsec/sslscan.c	2016-06-13 08:42:11.000000000 -0400
++++ ./sslscan.c	2016-09-05 16:51:08.751161131 -0400
+@@ -65,6 +65,7 @@
+   #endif
+ #else
+   #include <netdb.h>
++  #include <netinet/in.h>
+   #include <sys/socket.h>
+   #include <sys/select.h>
+ #endif
+@@ -794,11 +795,11 @@
+                             }
+                         }
+                         else
+-#endif
+                         {
+                             printf("%sOpenSSL version does not support compression%s\n", COL_RED, RESET);
+                             printf("%sRebuild with zlib1g-dev package for zlib support%s\n\n", COL_RED, RESET);
+                         }
++#endif
+ 
+                         // Disconnect SSL over socket
+                         SSL_shutdown(ssl);
+@@ -3762,10 +3763,6 @@
+         case mode_multiple:
+             printf("Version: %s%s%s\n%s\n%s\n", COL_GREEN, VERSION, RESET,
+                     SSLeay_version(SSLEAY_VERSION), RESET);
+-#ifdef OPENSSL_NO_SSL2
+-            printf("%sOpenSSL version does not support SSLv2%s\n", COL_RED, RESET);
+-            printf("%sSSLv2 ciphers will not be detected%s\n\n", COL_RED, RESET);
+-#endif
+ #ifdef OPENSSL_NO_SSL3
+             printf("%sOpenSSL version does not support SSLv3%s\n", COL_RED, RESET);
+             printf("%sSSLv3 ciphers will not be detected%s\n", COL_RED, RESET);