From owner-svn-ports-head@freebsd.org Mon Feb 6 12:55:04 2017 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 0B364CCF70B; Mon, 6 Feb 2017 12:55:04 +0000 (UTC) (envelope-from brnrd@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 C074D6C4; Mon, 6 Feb 2017 12:55:03 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v16Ct29D067022; Mon, 6 Feb 2017 12:55:02 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v16Ct2xQ067018; Mon, 6 Feb 2017 12:55:02 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201702061255.v16Ct2xQ067018@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Mon, 6 Feb 2017 12:55:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433489 - 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.23 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: Mon, 06 Feb 2017 12:55:04 -0000 Author: brnrd Date: Mon Feb 6 12:55:02 2017 New Revision: 433489 URL: https://svnweb.freebsd.org/changeset/ports/433489 Log: security/sslscan: Update to 1.11.8 - Update to 1.11.8 - Add USES= ssl - Re-roll patches - Fix build with libressl-devel PR: 213652 Submitted by: Piotr Kubaj Approved by: maintainer time-out 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 Mon Feb 6 12:54:46 2017 (r433488) +++ head/security/sslscan/Makefile Mon Feb 6 12:55:02 2017 (r433489) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sslscan -PORTVERSION= 1.11.6 +PORTVERSION= 1.11.8 DISTVERSIONSUFFIX= -${GH_ACCOUNT} CATEGORIES= security @@ -11,8 +11,7 @@ COMMENT= SSLScan is a fast SSL port scan LICENSE= GPLv3 -USES= gmake -USE_OPENSSL= yes +USES= gmake ssl USE_GITHUB= yes GH_ACCOUNT= rbsec Modified: head/security/sslscan/distinfo ============================================================================== --- head/security/sslscan/distinfo Mon Feb 6 12:54:46 2017 (r433488) +++ head/security/sslscan/distinfo Mon Feb 6 12:55:02 2017 (r433489) @@ -1,3 +1,3 @@ -TIMESTAMP = 1464783619 -SHA256 (rbsec-sslscan-1.11.6-rbsec_GH0.tar.gz) = 18932a78ad968dc5859b8cc72c84e64a46367887eb9302eaf13069bb9da1e08d -SIZE (rbsec-sslscan-1.11.6-rbsec_GH0.tar.gz) = 50002 +TIMESTAMP = 1486214215 +SHA256 (rbsec-sslscan-1.11.8-rbsec_GH0.tar.gz) = 1449f8bb45d323b322cb070a74d8dcc57b43ca2dba0560e7a16151efc8b3d911 +SIZE (rbsec-sslscan-1.11.8-rbsec_GH0.tar.gz) = 51583 Modified: head/security/sslscan/files/patch-Makefile ============================================================================== --- head/security/sslscan/files/patch-Makefile Mon Feb 6 12:54:46 2017 (r433488) +++ head/security/sslscan/files/patch-Makefile Mon Feb 6 12:55:02 2017 (r433489) @@ -1,4 +1,4 @@ ---- Makefile.orig 2016-03-24 21:02:55 UTC +--- Makefile.orig 2016-11-06 13:27:11 UTC +++ Makefile @@ -3,7 +3,7 @@ ifndef CC CC=gcc @@ -21,9 +21,9 @@ MAN1DIR = $(MANDIR)/man1 WARNINGS = -Wall -Wformat=2 -@@ -68,6 +68,9 @@ install: - ifeq ($(OS), Darwin) +@@ -70,6 +70,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) Modified: head/security/sslscan/files/patch-sslscan.c ============================================================================== --- head/security/sslscan/files/patch-sslscan.c Mon Feb 6 12:54:46 2017 (r433488) +++ head/security/sslscan/files/patch-sslscan.c Mon Feb 6 12:55:02 2017 (r433489) @@ -1,6 +1,6 @@ ---- sslscan.c.orig 2016-03-24 21:02:55 UTC +--- sslscan.c.orig 2016-11-06 13:27:11 UTC +++ sslscan.c -@@ -788,7 +788,7 @@ int testCompression(struct sslCheckOptio +@@ -829,7 +829,7 @@ int testCompression(struct sslCheckOptio #endif { printf("%sOpenSSL version does not support compression%s\n", COL_RED, RESET); @@ -9,7 +9,24 @@ } // Disconnect SSL over socket -@@ -1291,7 +1291,11 @@ int testCipher(struct sslCheckOptions *o +@@ -1155,14 +1155,14 @@ int testRenegotiation(struct sslCheckOpt + printf_verbose("Attempting SSL_do_handshake(ssl)\n"); + SSL_do_handshake(ssl); // Send renegotiation request to server //TODO :: XXX hanging here + +- if (ssl->state == SSL_ST_OK) ++ if (SSL_get_state(ssl) == SSL_ST_OK) + { + res = SSL_do_handshake(ssl); // Send renegotiation request to server + if( res != 1 ) + { + printf_error("\n\nSSL_do_handshake() call failed\n"); + } +- if (ssl->state == SSL_ST_OK) ++ if (SSL_get_state(ssl) == SSL_ST_OK) + { + /* our renegotiation is complete */ + renOut->supported = true; +@@ -1504,7 +1504,11 @@ int testCipher(struct sslCheckOptions *o return false; }