diff --git a/security/sslscan/Makefile b/security/sslscan/Makefile index 89c14339ffa6..9a8f51f23f9c 100644 --- a/security/sslscan/Makefile +++ b/security/sslscan/Makefile @@ -1,37 +1,37 @@ # Created by: Matthieu BOUTHORS # $FreeBSD$ PORTNAME= sslscan -PORTVERSION= 1.11.10 -DISTVERSIONSUFFIX= -${GH_ACCOUNT} +PORTVERSION= 1.11.11 CATEGORIES= security MAINTAINER= gavin@FreeBSD.org COMMENT= SSLScan is a fast SSL port scanner LICENSE= GPLv3 OPTIONS_DEFINE= UNSAFESSL OPTIONS_DEFAULT_amd64= UNSAFESSL UNSAFESSL_DESC= Use openssl-unsafe as libssl provider (SSLv2 etc.) USES= gmake USE_GITHUB= yes GH_ACCOUNT= rbsec +GH_TAGNAME= 96ad4ff UNSAFESSL_USES_OFF= ssl UNSAFESSL_BUILD_DEPENDS= ${LOCALBASE}/openssl-unsafe/lib/libssl.so:security/openssl-unsafe UNSAFESSL_RUN_DEPENDS= ${UNSAFESSL_BUILD_DEPENDS} UNSAFESSL_CFLAGS= -I${LOCALBASE}/openssl-unsafe/include \ -Wl,-rpath,${LOCALBASE}/openssl-unsafe/lib UNSAFESSL_LDFLAGS= -L${LOCALBASE}/openssl-unsafe/lib \ -Wl,-rpath,${LOCALBASE}/openssl-unsafe/lib UNSAFESSL_ALL_TARGET= sslscan .include .if empty(PORT_OPTIONS:MUNSAFESSL) && ${SSL_DEFAULT:Mopenssl-devel} BROKEN= Does not build with openssl-devel .endif .include diff --git a/security/sslscan/distinfo b/security/sslscan/distinfo index 3c0eb896bb9a..a90ffdd53ff2 100644 --- a/security/sslscan/distinfo +++ b/security/sslscan/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1494430653 -SHA256 (rbsec-sslscan-1.11.10-rbsec_GH0.tar.gz) = fbb26fdbf2cf5b2f3f8c88782721b7875f206552cf83201981411e0af9521204 -SIZE (rbsec-sslscan-1.11.10-rbsec_GH0.tar.gz) = 52108 +TIMESTAMP = 1534266511 +SHA256 (rbsec-sslscan-1.11.11-96ad4ff_GH0.tar.gz) = 15aafcb24c06f01edce1bd317f0b6b5a6cbe32db8883b586c3644c072394f4d2 +SIZE (rbsec-sslscan-1.11.11-96ad4ff_GH0.tar.gz) = 56273 diff --git a/security/sslscan/files/patch-Makefile b/security/sslscan/files/patch-Makefile index 93f03df1b6d6..917527be75b5 100644 --- a/security/sslscan/files/patch-Makefile +++ b/security/sslscan/files/patch-Makefile @@ -1,33 +1,29 @@ ---- Makefile.orig 2016-11-06 13:27:11 UTC +--- Makefile.orig 2018-06-15 17:47:17 UTC +++ Makefile -@@ -3,7 +3,7 @@ ifndef CC - CC=gcc - endif +@@ -1,6 +1,6 @@ + # set gcc as default if CC is not set -GIT_VERSION = $(shell git describe --tags --always --dirty=-wip) +#GIT_VERSION = $(shell git describe --tags --always --dirty=-wip) # Ugly hack to get version if git isn't installed ifeq ($(GIT_VERSION),) -@@ -14,9 +14,9 @@ endif - OS := $(shell uname) +@@ -25,7 +25,7 @@ endif SRCS = sslscan.c --PREFIX = /usr -+#PREFIX = /usr BINDIR = $(PREFIX)/bin -MANDIR = $(PREFIX)/share/man +MANDIR = $(PREFIX)/man MAN1DIR = $(MANDIR)/man1 - WARNINGS = -Wall -Wformat=2 -@@ -70,6 +70,9 @@ ifeq ($(OS), Darwin) + WARNINGS = -Wall -Wformat=2 -Wformat-security +@@ -101,6 +101,9 @@ ifeq ($(OS), Darwin) install sslscan $(DESTDIR)$(BINDIR)/sslscan; install -d $(DESTDIR)$(MAN1DIR)/; install sslscan.1 $(DESTDIR)$(MAN1DIR)/sslscan.1; +else ifeq ($(OS), FreeBSD) + install -s -m 755 sslscan $(DESTDIR)$(BINDIR) + install -m 644 sslscan.1 $(DESTDIR)$(MAN1DIR) else install -D sslscan $(DESTDIR)$(BINDIR)/sslscan; install -D sslscan.1 $(DESTDIR)$(MAN1DIR)/sslscan.1; diff --git a/security/sslscan/files/patch-sslscan.c b/security/sslscan/files/patch-sslscan.c index 00bf0aa861a0..1ac573b1f0fd 100644 --- a/security/sslscan/files/patch-sslscan.c +++ b/security/sslscan/files/patch-sslscan.c @@ -1,11 +1,19 @@ ---- sslscan.c.orig 2016-11-06 13:27:11 UTC +--- sslscan.c.orig 2018-06-15 17:47:17 UTC +++ sslscan.c -@@ -829,7 +829,7 @@ int testCompression(struct sslCheckOptio +@@ -112,6 +112,7 @@ + + #if defined(__FreeBSD__) || defined(__OpenBSD__) + #include ++#include + #endif + + #include "sslscan.h" +@@ -896,7 +897,7 @@ int testCompression(struct sslCheckOptions *options, c #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); + printf("\n"); } // Disconnect SSL over socket diff --git a/security/sslscan/pkg-descr b/security/sslscan/pkg-descr index 458322a24ef2..433c5469c966 100644 --- a/security/sslscan/pkg-descr +++ b/security/sslscan/pkg-descr @@ -1,7 +1,7 @@ SSLScan is a fast SSL port scanner. SSLScan connects to SSL ports and determines what ciphers are supported, which are the servers prefered ciphers, which SSL protocols are supported and returns the SSL certificate. Client certificates and private key can be configured and output is to text / XML. -WWW: https://sourceforge.net/projects/sslscan/ +WWW: https://github.com/rbsec/sslscan/