Update to 0.10.6, which we'll call "0.999.10.6". From the changelog:

- Complete refurbish based on fehQlibs.
- Native handling of IPv4/IPv6 address for sslclient.
- Added experimental 'ecdhparam' file.
- Removed experimental 'ecdhparam' handling -- OpenSSL does not support it.
- Finished TLS 1.3 integration (based on OpenSSL 1.1.1).
- Removed compiler flags for ECDH -- now required.
- fehQlibs-09 based.

4 files changed, 19 insertions, 13 deletions

diff --git a/net/ucspi-ssl/Makefile b/net/ucspi-ssl/Makefile
index d197d272742..c3db0e91c30 100644
--- a/net/ucspi-ssl/Makefile
+++ b/net/ucspi-ssl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2018/08/22 09:46:08 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2018/10/14 12:21:11 schmonz Exp $
 #
 
-DISTNAME=		ucspi-ssl-0.99e
-PKGREVISION=		3
+DISTNAME=		ucspi-ssl-0.10.6
+PKGNAME=		${DISTNAME:S/-0./-0.999./}
 CATEGORIES=		net
 MASTER_SITES=		https://www.fehcom.de/ipnet/ucspi-ssl/
 EXTRACT_SUFX=		.tgz
@@ -11,7 +11,7 @@ MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		https://www.fehcom.de/ipnet/ucspi-ssl.html
 COMMENT=		Command-line tools for SSL client-server applications
 
-WRKSRC=			${WRKDIR}/host/superscript.com/net/${PKGNAME_NOREV}
+WRKSRC=			${WRKDIR}/host/superscript.com/net/${DISTNAME}
 DJB_SLASHPACKAGE=	YES
 DJB_RESTRICTED=		no
 
@@ -53,6 +53,9 @@ DJB_CONFIG_CMDS=							\
 
 .include "../../mk/bsd.prefs.mk"
 
+CFLAGS+=		-I${PREFIX}/include/qlibs
+LDFLAGS+=		-L${PREFIX}/lib/qlibs
+
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man2 share/doc/${PKGBASE} ${EGDIR}
 
 do-install: do-install-sslperl
@@ -76,11 +79,12 @@ do-install: do-install-sslperl
 	  ${INSTALL_DATA} ${WRKSRC}/etc/${i} ${DESTDIR}${EGDIR}
 .	endfor
 
-.	for i in CERTS CHAIN-SSL CHANGES TODO UCSPI-SSL
+.	for i in CERTS CHAIN-SSL CHANGES TLSVERSION_CIPHERSUITES TLS_1_3 TODO UCSPI-SSL
 	  ${INSTALL_DATA} ${WRKSRC}/doc/${i} \
 	    ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 .	endfor
 
+.include "../../net/fehqlibs/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/djbware.mk"
diff --git a/net/ucspi-ssl/PLIST b/net/ucspi-ssl/PLIST
index 83b8c67be45..861a82c21bc 100644
--- a/net/ucspi-ssl/PLIST
+++ b/net/ucspi-ssl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2018/06/18 11:00:21 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/10/14 12:21:11 schmonz Exp $
 bin/https@
 bin/sslcat
 bin/sslclient
@@ -14,6 +14,8 @@ man/man2/ucspi-tls.2
 share/doc/ucspi-ssl/CERTS
 share/doc/ucspi-ssl/CHAIN-SSL
 share/doc/ucspi-ssl/CHANGES
+share/doc/ucspi-ssl/TLSVERSION_CIPHERSUITES
+share/doc/ucspi-ssl/TLS_1_3
 share/doc/ucspi-ssl/TODO
 share/doc/ucspi-ssl/UCSPI-SSL
 share/examples/ucspi-ssl/dh1024.pem
diff --git a/net/ucspi-ssl/distinfo b/net/ucspi-ssl/distinfo
index 3f935cc1b0b..07f9f22ff6e 100644
--- a/net/ucspi-ssl/distinfo
+++ b/net/ucspi-ssl/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2018/07/11 22:42:51 schmonz Exp $
+$NetBSD: distinfo,v 1.10 2018/10/14 12:21:11 schmonz Exp $
 
-SHA1 (ucspi-ssl-0.99e.tgz) = 757c8142c325db95556c1a033d5c6ae6c13acb6e
-RMD160 (ucspi-ssl-0.99e.tgz) = ec01fa89cb8e3da096bd20cd207489745cb97d1b
-SHA512 (ucspi-ssl-0.99e.tgz) = 231ef75eedc4f52f46c1f7d6f44feac54069d859da206f9ea874d3a8082dead1be310cc4b7da1148564847b5b452b691718b7ba8076a03145e2002e9250182aa
-Size (ucspi-ssl-0.99e.tgz) = 112640 bytes
+SHA1 (ucspi-ssl-0.10.6.tgz) = 88cdb2cb370bd40086287baa449afe783bd81a0a
+RMD160 (ucspi-ssl-0.10.6.tgz) = 8a9b632bee5dcb96b88893161eff283d5ec52c5d
+SHA512 (ucspi-ssl-0.10.6.tgz) = 297f8bdaca881ba39883a1f36daa76456fc0e65b1fb2908c171b9c0e57bd6b088aebd44b0b9d952f2bffd4943ede890fe2495768c31a93f850539b78e94be409
+Size (ucspi-ssl-0.10.6.tgz) = 71680 bytes
 SHA1 (patch-src_print-dl.sh) = 456ae878c5116bbdfab1e9b4c049f6e4e80bc2b1
 SHA1 (patch-src_print-ld.sh) = f05f316eb6b95a3a9cb5726c9e7bb2d27dfc1b7b
diff --git a/net/ucspi-ssl/options.mk b/net/ucspi-ssl/options.mk
index 1c5728d4f50..852db3aafa2 100644
--- a/net/ucspi-ssl/options.mk
+++ b/net/ucspi-ssl/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2018/07/29 23:23:09 schmonz Exp $
+# $NetBSD: options.mk,v 1.7 2018/10/14 12:21:11 schmonz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ucspi-ssl
 PKG_SUPPORTED_OPTIONS+=	inet6 perl
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS+=	inet6 perl
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Minet6)
-DEPENDS+=		ucspi-tcp6-[0-9]*:../../net/ucspi-tcp6
+DEPENDS+=		ucspi-tcp6>=1.10:../../net/ucspi-tcp6
 .else
 DEPENDS+=		ucspi-tcp-[0-9]*:../../net/ucspi-tcp
 .endif