CVS commit: pkgsrc/net/openconnect

["Jason Bacon" <bacon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bacon
Date:           Fri Jun  5 15:50:32 UTC 2020

Modified Files:
        pkgsrc/net/openconnect: DESCR Makefile PLIST distinfo
Added Files:
        pkgsrc/net/openconnect/patches: patch-configure
Removed Files:
        pkgsrc/net/openconnect: MESSAGE

Log Message:
net/openconnect: Upgrade to 8.10

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


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/openconnect/DESCR
cvs rdiff -u -r1.1 -r0 pkgsrc/net/openconnect/MESSAGE
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/openconnect/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/openconnect/PLIST
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/openconnect/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/openconnect/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/openconnect/DESCR
diff -u pkgsrc/net/openconnect/DESCR:1.1 pkgsrc/net/openconnect/DESCR:1.2
--- pkgsrc/net/openconnect/DESCR:1.1    Mon Mar  2 15:27:58 2015
+++ pkgsrc/net/openconnect/DESCR        Fri Jun  5 15:50:31 2020
@@ -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.

Index: pkgsrc/net/openconnect/Makefile
diff -u pkgsrc/net/openconnect/Makefile:1.15 pkgsrc/net/openconnect/Makefile:1.16
--- pkgsrc/net/openconnect/Makefile:1.15        Tue Jun  2 08:24:34 2020
+++ pkgsrc/net/openconnect/Makefile     Fri Jun  5 15:50:31 2020
@@ -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@localhost
 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_SYSC
 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"

Index: pkgsrc/net/openconnect/PLIST
diff -u pkgsrc/net/openconnect/PLIST:1.4 pkgsrc/net/openconnect/PLIST:1.5
--- pkgsrc/net/openconnect/PLIST:1.4    Sat Sep  7 19:30:21 2019
+++ pkgsrc/net/openconnect/PLIST        Fri Jun  5 15:50:31 2020
@@ -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

Index: pkgsrc/net/openconnect/distinfo
diff -u pkgsrc/net/openconnect/distinfo:1.10 pkgsrc/net/openconnect/distinfo:1.11
--- pkgsrc/net/openconnect/distinfo:1.10        Thu Sep 12 19:23:13 2019
+++ pkgsrc/net/openconnect/distinfo     Fri Jun  5 15:50:31 2020
@@ -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

Added files:

Index: pkgsrc/net/openconnect/patches/patch-configure
diff -u /dev/null pkgsrc/net/openconnect/patches/patch-configure:1.1
--- /dev/null   Fri Jun  5 15:50:32 2020
+++ pkgsrc/net/openconnect/patches/patch-configure      Fri Jun  5 15:50:31 2020
@@ -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.