From owner-svn-ports-head@freebsd.org Thu May 26 19:55:13 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E8EB6B4B692; Thu, 26 May 2016 19:55:13 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A6AE710DD; Thu, 26 May 2016 19:55:13 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4QJtCKC095153; Thu, 26 May 2016 19:55:12 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4QJtCnv095149; Thu, 26 May 2016 19:55:12 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201605261955.u4QJtCnv095149@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Thu, 26 May 2016 19:55:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415911 - in head/security/sslscan: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 May 2016 19:55:14 -0000 Author: pi Date: Thu May 26 19:55:12 2016 New Revision: 415911 URL: https://svnweb.freebsd.org/changeset/ports/415911 Log: security/sslscan: 1.8.2 -> 1.11.6 - lots of changes since 2010 PR: 208577 Submitted by: gavin Approved by: Matthieu BOUTHORS (maintainer timeout) Modified: head/security/sslscan/Makefile head/security/sslscan/distinfo head/security/sslscan/files/patch-Makefile head/security/sslscan/files/patch-sslscan.c Modified: head/security/sslscan/Makefile ============================================================================== --- head/security/sslscan/Makefile Thu May 26 19:48:07 2016 (r415910) +++ head/security/sslscan/Makefile Thu May 26 19:55:12 2016 (r415911) @@ -2,20 +2,18 @@ # $FreeBSD$ PORTNAME= sslscan -PORTVERSION= 1.8.2 -PORTREVISION= 1 +PORTVERSION= 1.11.6 CATEGORIES= security -MASTER_SITES= SF/${PORTNAME}/${PORTNAME} -EXTRACT_SUFX= .tgz +USE_GITHUB= yes +GH_ACCOUNT= rbsec +GH_TAGNAME= ${PORTVERSION}-${GH_ACCOUNT} MAINTAINER= matthieu@labs.fr COMMENT= SSLScan is a fast SSL port scanner LICENSE= GPLv3 -CFLAGS+= -I${LOCALBASE}/include ${CPPFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${LIBS} -MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +USES= gmake USE_OPENSSL= yes .include Modified: head/security/sslscan/distinfo ============================================================================== --- head/security/sslscan/distinfo Thu May 26 19:48:07 2016 (r415910) +++ head/security/sslscan/distinfo Thu May 26 19:55:12 2016 (r415911) @@ -1,2 +1,2 @@ -SHA256 (sslscan-1.8.2.tgz) = 3b728804456042d96d5c8ccd42326f8e5719d091986793bb7b852a36b50d2b3e -SIZE (sslscan-1.8.2.tgz) = 22176 +SHA256 (rbsec-sslscan-1.11.6-1.11.6-rbsec_GH0.tar.gz) = 18932a78ad968dc5859b8cc72c84e64a46367887eb9302eaf13069bb9da1e08d +SIZE (rbsec-sslscan-1.11.6-1.11.6-rbsec_GH0.tar.gz) = 50002 Modified: head/security/sslscan/files/patch-Makefile ============================================================================== --- head/security/sslscan/files/patch-Makefile Thu May 26 19:48:07 2016 (r415910) +++ head/security/sslscan/files/patch-Makefile Thu May 26 19:55:12 2016 (r415911) @@ -1,22 +1,33 @@ ---- ./Makefile.orig 2009-09-01 14:35:59.000000000 +0200 -+++ ./Makefile 2011-06-21 17:37:30.000000000 +0200 -@@ -1,13 +1,14 @@ - SRCS = sslscan.c --BINPATH = /usr/bin/ --MANPATH = /usr/share/man/ -+BINPATH = ${PREFIX}/bin/ -+MANPATH = ${PREFIX}/man -+CC = ${CC} +--- Makefile.orig 2016-03-24 21:02:55 UTC ++++ Makefile +@@ -3,7 +3,7 @@ ifndef CC + CC=gcc + endif - all: -- gcc -g -Wall -lssl -o sslscan $(SRCS) $(LDFLAGS) $(CFLAGS) -+ ${CC} -g -Wall -lssl -lcrypto -o sslscan $(SRCS) $(LDFLAGS) $(CFLAGS) +-GIT_VERSION = $(shell git describe --tags --always --dirty=-wip) ++#GIT_VERSION = $(shell git describe --tags --always --dirty=-wip) - install: -- cp sslscan $(BINPATH) -- cp sslscan.1 $(MANPATH)man1 -+ install -s -m 755 sslscan $(DESTDIR)$(BINPATH) -+ install -m 644 sslscan.1 $(DESTDIR)$(MANPATH)/man1 + # Ugly hack to get version if git isn't installed + ifeq ($(GIT_VERSION),) +@@ -14,9 +14,9 @@ endif + OS := $(shell uname) - uninstall: - rm -f $(BINPATH)sslscan + SRCS = sslscan.c +-PREFIX = /usr ++#PREFIX = /usr + BINDIR = $(PREFIX)/bin +-MANDIR = $(PREFIX)/share/man ++MANDIR = $(PREFIX)/man + MAN1DIR = $(MANDIR)/man1 + + WARNINGS = -Wall -Wformat=2 +@@ -68,6 +68,9 @@ install: + ifeq ($(OS), Darwin) + install sslscan $(DESTDIR)$(BINDIR)/sslscan; + 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; Modified: head/security/sslscan/files/patch-sslscan.c ============================================================================== --- head/security/sslscan/files/patch-sslscan.c Thu May 26 19:48:07 2016 (r415910) +++ head/security/sslscan/files/patch-sslscan.c Thu May 26 19:55:12 2016 (r415911) @@ -1,120 +1,23 @@ ---- sslscan.c.orig 2009-09-01 14:35:59.000000000 +0200 -+++ sslscan.c 2015-03-07 23:26:34.286277205 +0100 -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include +--- sslscan.c.orig 2016-03-24 21:02:55 UTC ++++ sslscan.c +@@ -788,7 +788,7 @@ int testCompression(struct sslCheckOptio + #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"); + } - // Defines... - #define false 0 -@@ -563,6 +564,7 @@ - } - if (options->xmlOutput != 0) - fprintf(options->xmlOutput, " sslversion=\""); -+#ifndef OPENSSL_NO_SSL2 - if (sslCipherPointer->sslMethod == SSLv2_client_method()) - { - if (options->xmlOutput != 0) -@@ -571,8 +573,11 @@ - printf("SSLv2 || "); - else - printf("SSLv2 "); -- } -- else if (sslCipherPointer->sslMethod == SSLv3_client_method()) -+ } -+ else -+#endif -+#ifndef OPENSSL_NO_SSL3 -+ if (sslCipherPointer->sslMethod == SSLv3_client_method()) - { - if (options->xmlOutput != 0) - fprintf(options->xmlOutput, "SSLv3\" bits=\""); -@@ -582,6 +587,7 @@ - printf("SSLv3 "); - } - else -+#endif - { - if (options->xmlOutput != 0) - fprintf(options->xmlOutput, "TLSv1\" bits=\""); -@@ -688,6 +694,7 @@ - cipherStatus = SSL_connect(ssl); - if (cipherStatus == 1) - { -+#ifndef OPENSSL_NO_SSL2 - if (sslMethod == SSLv2_client_method()) - { - if (options->xmlOutput != 0) -@@ -697,7 +704,10 @@ - else - printf(" SSLv2 "); - } -- else if (sslMethod == SSLv3_client_method()) -+ else -+#endif -+#ifndef OPENSSL_NO_SSL3 -+ if (sslMethod == SSLv3_client_method()) - { - if (options->xmlOutput != 0) - fprintf(options->xmlOutput, " xmlOutput != 0) - fprintf(options->xmlOutput, " sslVersion) - { - case ssl_all: -+#ifndef OPENSSL_NO_SSL2 - status = defaultCipher(options, SSLv2_client_method()); - if (status != false) -+#endif -+#ifndef OPENSSL_NO_SSL3 - status = defaultCipher(options, SSLv3_client_method()); - if (status != false) -+#endif - status = defaultCipher(options, TLSv1_client_method()); - break; -+#ifndef OPENSSL_NO_SSL2 - case ssl_v2: - status = defaultCipher(options, SSLv2_client_method()); - break; -+#endif -+#ifndef OPENSSL_NO_SSL3 - case ssl_v3: - status = defaultCipher(options, SSLv3_client_method()); - break; -+#endif - case tls_v1: - status = defaultCipher(options, TLSv1_client_method()); - break; -@@ -1415,16 +1434,24 @@ - switch (options.sslVersion) - { - case ssl_all: -+#ifndef OPENSSL_NO_SSL2 - populateCipherList(&options, SSLv2_client_method()); -+#endif -+#ifndef OPENSSL_NO_SSL3 - populateCipherList(&options, SSLv3_client_method()); -+#endif - populateCipherList(&options, TLSv1_client_method()); - break; -+#ifndef OPENSSL_NO_SSL2 - case ssl_v2: - populateCipherList(&options, SSLv2_client_method()); - break; -+#endif -+#ifndef OPENSSL_NO_SSL3 - case ssl_v3: - populateCipherList(&options, SSLv3_client_method()); - break; + // Disconnect SSL over socket +@@ -1291,7 +1291,11 @@ int testCipher(struct sslCheckOptions *o + return false; + } + ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L + cipherid = SSL_CIPHER_get_id(sslCipherPointer); ++#else ++ cipherid = sslCipherPointer->id; +#endif - case tls_v1: - populateCipherList(&options, TLSv1_client_method()); - break; + cipherid = cipherid & 0x00ffffff; // remove first byte which is the version (0x03 for TLSv1/SSLv3) + + // Show Cipher Status