net/openconnect: Upgrade to 8.10

Fixes build for Darwin
Based on wip/openconnect with help from Louis Guillaume

6 files changed, 32 insertions, 26 deletions

diff --git a/net/openconnect/DESCR b/net/openconnect/DESCR
index 67249593739..72497a5ca30 100644
--- a/net/openconnect/DESCR
+++ b/net/openconnect/DESCR
@@ -1,2 +1,4 @@
-OpenConnect is a client for Cisco's AnyConnect SSL VPN
-released under LGPL v2.1.
+OpenConnect is an SSL VPN client initially created to support Cisco's
+AnyConnect SSL VPN. It has since been ported to support the Juniper SSL VPN
+(which is now known as Pulse Connect Secure), and the Palo Alto Networks
+GlobalProtect SSL VPN.
diff --git a/net/openconnect/MESSAGE b/net/openconnect/MESSAGE
deleted file mode 100644
index cc0ddef32bf..00000000000
--- a/net/openconnect/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2015/03/02 15:27:58 wiz Exp $
-
-The ${PKG_SYSCONFDIR}/vpnc-config script included in the vpnc-script
-package is needed to set up DNS and routing.
-
-More information can be found in the man page.
-
-===========================================================================
diff --git a/net/openconnect/Makefile b/net/openconnect/Makefile
index 1330a0aaaa9..1af61af9b6b 100644
--- a/net/openconnect/Makefile
+++ b/net/openconnect/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.15 2020/06/02 08:24:34 adam Exp $
+# $NetBSD: Makefile,v 1.16 2020/06/05 15:50:31 bacon Exp $
 
-DISTNAME=	openconnect-8.05
-PKGREVISION=	2
+DISTNAME=	openconnect-8.10
 CATEGORIES=	net security
 MASTER_SITES=	ftp://ftp.infradead.org/pub/openconnect/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.infradead.org/openconnect/
-COMMENT=	Client for Cisco AnyConnect VPN
+COMMENT=	Open source VPN client
 LICENSE=	gnu-lgpl-v2.1
 
 GNU_CONFIGURE=	yes
@@ -20,13 +19,9 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-vpnc-script=${PKG_SYSCONFDIR}/vpnc-script
 CONFIGURE_ARGS+=	--disable-nls
 
-REPLACE_PYTHON=		trojans/tncc-wrapper.py
+REPLACE_PYTHON=		trojans/*.py
 REPLACE_BASH=		trojans/*.sh
 
-PYTHON_VERSIONS_ACCEPTED=	27
-
-INSTALLATION_DIRS=	sbin include lib ${PKGMANDIR}/man8
-
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/net/openconnect/PLIST b/net/openconnect/PLIST
index 8b6e3483261..8fde4183066 100644
--- a/net/openconnect/PLIST
+++ b/net/openconnect/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2019/09/07 19:30:21 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.5 2020/06/05 15:50:31 bacon Exp $
 include/openconnect.h
 lib/libopenconnect.la
 lib/pkgconfig/openconnect.pc
@@ -6,6 +6,8 @@ libexec/openconnect/csd-post.sh
 libexec/openconnect/csd-wrapper.sh
 libexec/openconnect/hipreport-android.sh
 libexec/openconnect/hipreport.sh
+libexec/openconnect/tncc-emulate.py
 libexec/openconnect/tncc-wrapper.py
 man/man8/openconnect.8
 sbin/openconnect
+share/bash-completion/completions/openconnect
diff --git a/net/openconnect/distinfo b/net/openconnect/distinfo
index b439da79840..179667c54ec 100644
--- a/net/openconnect/distinfo
+++ b/net/openconnect/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.10 2019/09/12 19:23:13 schmonz Exp $
+$NetBSD: distinfo,v 1.11 2020/06/05 15:50:31 bacon Exp $
 
-SHA1 (openconnect-8.05.tar.gz) = 7fc0ed9cb34b401740100f36695036d3333256c0
-RMD160 (openconnect-8.05.tar.gz) = 68aec09309f9988da227d82d844c39a620cce13c
-SHA512 (openconnect-8.05.tar.gz) = 3ac9f1fa5a87b06d45c316897c69470264f2fde7525b5b3ef1352041dd0c8ae5eaf5dd325de1bdcf1e5b82e688fec9c36d531da1b75ac3f49896d4186d83aa15
-Size (openconnect-8.05.tar.gz) = 1922100 bytes
+SHA1 (openconnect-8.10.tar.gz) = 2829320cfd7801baf4ceccc8d4f650a10994cd51
+RMD160 (openconnect-8.10.tar.gz) = 775b1d6e16605c5437d5d52db08720f6634704f5
+SHA512 (openconnect-8.10.tar.gz) = a36a106cf5c637602fc5bd3cd12df8f6dfe55217c1aae93c66ca33208507f3f8cda15e3a46d75615c7fcea1859d1a04017a07674ad0246876154467305477356
+Size (openconnect-8.10.tar.gz) = 2084534 bytes
+SHA1 (patch-configure) = d9ecd9e7f726dc6982f401871f5c67ffc0ca7a15
diff --git a/net/openconnect/patches/patch-configure b/net/openconnect/patches/patch-configure
new file mode 100644
index 00000000000..3246ef87454
--- /dev/null
+++ b/net/openconnect/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2020/06/05 15:50:31 bacon Exp $
+
+# Disable HTML docs
+
+--- configure.orig	2020-05-26 02:45:24.000000000 +0000
++++ configure
+@@ -18210,7 +18210,7 @@ fi
+ 
+ 
+ 
+-build_www=yes
++build_www=no
+ for ac_prog in python3 python2 python
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.