CVS commit: pkgsrc/net/openconnect

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu May 18 13:55:54 UTC 2023

Modified Files:
        pkgsrc/net/openconnect: Makefile distinfo
Added Files:
        pkgsrc/net/openconnect/patches: patch-hpke.c
Removed Files:
        pkgsrc/net/openconnect/patches: patch-main.c

Log Message:
Update to 9.11. From the changelog:

- Rebuild test suite certificate chains (which had expired: #609)
- Fix stray (null) in URL path after Pulse authentication.
- Fix config XML parsing mistake that left GlobalProtect ESP non-working
  in v9.10 (!475).
- Fix case sensitivity in GPST header matching (!474).
- Add external browser support for Windows (#553).


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/net/openconnect/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/openconnect/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/openconnect/patches/patch-hpke.c
cvs rdiff -u -r1.1 -r0 pkgsrc/net/openconnect/patches/patch-main.c

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/Makefile
diff -u pkgsrc/net/openconnect/Makefile:1.27 pkgsrc/net/openconnect/Makefile:1.28
--- pkgsrc/net/openconnect/Makefile:1.27        Fri May  5 13:21:22 2023
+++ pkgsrc/net/openconnect/Makefile     Thu May 18 13:55:54 2023
@@ -1,32 +1,34 @@
-# $NetBSD: Makefile,v 1.27 2023/05/05 13:21:22 schmonz Exp $
+# $NetBSD: Makefile,v 1.28 2023/05/18 13:55:54 schmonz Exp $
 
-DISTNAME=      openconnect-9.10
-CATEGORIES=    net security
-MASTER_SITES=  https://www.infradead.org/openconnect/download/ \
-               ftp://ftp.infradead.org/pub/openconnect/
-
-MAINTAINER=    schmonz%NetBSD.org@localhost
-HOMEPAGE=      http://www.infradead.org/openconnect/
-COMMENT=       Open source VPN client
-LICENSE=       gnu-lgpl-v2.1
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL=   yes
-USE_TOOLS+=    gmake pkg-config bash
+DISTNAME=              openconnect-9.11
+CATEGORIES=            net security
+MASTER_SITES=          https://www.infradead.org/openconnect/download/ \
+                       ftp://ftp.infradead.org/pub/openconnect/
+
+MAINTAINER=            schmonz%NetBSD.org@localhost
+HOMEPAGE=              http://www.infradead.org/openconnect/
+COMMENT=               Open source VPN client
+LICENSE=               gnu-lgpl-v2.1
+
+GNU_CONFIGURE=         yes
+USE_LIBTOOL=           yes
+USE_TOOLS+=            gmake pkg-config bash
 
-DEPENDS+=      vpnc-script-[0-9]*:../../net/vpnc-script
+DEPENDS+=              vpnc-script-[0-9]*:../../net/vpnc-script
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-vpnc-script=${PKG_SYSCONFDIR}/vpnc-script
 CONFIGURE_ARGS+=       --disable-nls
 CONFIGURE_ARGS+=       --disable-docs
 
+MAKE_FLAGS+=           noinst_PROGRAMS=
+
 REPLACE_PYTHON=                trojans/*.py
 REPLACE_BASH=          trojans/*.sh
 
-.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../www/libproxy/buildlink3.mk"
-.include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/openconnect/distinfo
diff -u pkgsrc/net/openconnect/distinfo:1.16 pkgsrc/net/openconnect/distinfo:1.17
--- pkgsrc/net/openconnect/distinfo:1.16        Fri May  5 13:21:22 2023
+++ pkgsrc/net/openconnect/distinfo     Thu May 18 13:55:54 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.16 2023/05/05 13:21:22 schmonz Exp $
+$NetBSD: distinfo,v 1.17 2023/05/18 13:55:54 schmonz Exp $
 
-BLAKE2s (openconnect-9.10.tar.gz) = 25758264e1a11c1dee7da7130675b090f03f1de6eba8463164dc277ec9c6a899
-SHA512 (openconnect-9.10.tar.gz) = 64d10ad67fccd11d1aaae23a77c6cfd8200bbba0eae21a7d01c604688ec9c35b5f19eeb9a47de14d383780eba64a2f6c06daccd4c1fae6289efdb0dc2fb7c536
-Size (openconnect-9.10.tar.gz) = 2843858 bytes
-SHA1 (patch-main.c) = 040fb724052c5bf2e007b322f103d37f06a2bfb2
+BLAKE2s (openconnect-9.11.tar.gz) = 587988518f349fbd1251b15e74d80eedd390af88dd237f22d0adabada1cfa172
+SHA512 (openconnect-9.11.tar.gz) = fd1aa12597467102e7c94de9549f02f714736f997b050473d1e0f1a1abd9dc85186436209be9a8b24cafa9dc349329be7d583eb438ce06f14077a7c12598e55e
+Size (openconnect-9.11.tar.gz) = 2844135 bytes
+SHA1 (patch-hpke.c) = 294dd4e691bf9f20d0b7a41329b6912d6fca4284

Added files:

Index: pkgsrc/net/openconnect/patches/patch-hpke.c
diff -u /dev/null pkgsrc/net/openconnect/patches/patch-hpke.c:1.1
--- /dev/null   Thu May 18 13:55:54 2023
+++ pkgsrc/net/openconnect/patches/patch-hpke.c Thu May 18 13:55:54 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-hpke.c,v 1.1 2023/05/18 13:55:54 schmonz Exp $
+
+Define environ before it's used. Fixes build on at least NetBSD.
+
+--- hpke.c.orig        2023-05-17 11:27:35.000000000 +0000
++++ hpke.c
+@@ -53,6 +53,8 @@ static const char response_200[] =
+       "<html><title>Success</title><body>Success</body></html>\r\n";
+ 
+ #ifdef HAVE_POSIX_SPAWN
++extern char **environ;
++
+ static int spawn_browser(struct openconnect_info *vpninfo)
+ {
+       vpn_progress(vpninfo, PRG_TRACE, _("Spawning external browser '%s'\n"),