svn commit: r477291 - in head/security/sslscan: . files

[Gavin Atkinson]

Author: gavin (src,doc committer)
Date: Wed Aug 15 21:26:19 2018
New Revision: 477291
URL: https://svnweb.freebsd.org/changeset/ports/477291

Log:
  Upgrade security/sslscan to just past the 1.11.11 release, pulling in
  a couple of bug fixes from upstream that have not yet made it into a
  release.
  
  Approved by:	zeising

Modified:
  head/security/sslscan/Makefile
  head/security/sslscan/distinfo
  head/security/sslscan/files/patch-Makefile
  head/security/sslscan/files/patch-sslscan.c
  head/security/sslscan/pkg-descr

Modified: head/security/sslscan/Makefile
==============================================================================
--- head/security/sslscan/Makefile	Wed Aug 15 21:22:14 2018	(r477290)
+++ head/security/sslscan/Makefile	Wed Aug 15 21:26:19 2018	(r477291)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sslscan
-PORTVERSION=	1.11.10
-DISTVERSIONSUFFIX=	-${GH_ACCOUNT}
+PORTVERSION=	1.11.11
 CATEGORIES=	security
 
 MAINTAINER=	gavin at FreeBSD.org
@@ -18,6 +17,7 @@ UNSAFESSL_DESC=	Use openssl-unsafe as libssl provider 
 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

Modified: head/security/sslscan/distinfo
==============================================================================
--- head/security/sslscan/distinfo	Wed Aug 15 21:22:14 2018	(r477290)
+++ head/security/sslscan/distinfo	Wed Aug 15 21:26:19 2018	(r477291)
@@ -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

Modified: head/security/sslscan/files/patch-Makefile
==============================================================================
--- head/security/sslscan/files/patch-Makefile	Wed Aug 15 21:22:14 2018	(r477290)
+++ head/security/sslscan/files/patch-Makefile	Wed Aug 15 21:26:19 2018	(r477291)
@@ -1,27 +1,23 @@
---- 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;

Modified: head/security/sslscan/files/patch-sslscan.c
==============================================================================
--- head/security/sslscan/files/patch-sslscan.c	Wed Aug 15 21:22:14 2018	(r477290)
+++ head/security/sslscan/files/patch-sslscan.c	Wed Aug 15 21:26:19 2018	(r477291)
@@ -1,6 +1,14 @@
---- 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 <netinet/in.h>
++#include <arpa/inet.h>
+ #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);

Modified: head/security/sslscan/pkg-descr
==============================================================================
--- head/security/sslscan/pkg-descr	Wed Aug 15 21:22:14 2018	(r477290)
+++ head/security/sslscan/pkg-descr	Wed Aug 15 21:26:19 2018	(r477291)
@@ -4,4 +4,4 @@ prefered ciphers, which SSL protocols are supported an
 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/