Carsten Grzemba
2024-01-11 3cae8a15d79e9e22cc9758d5bcab1ba59ff0e4c7
openconnect: update 9.12

1 files added
4 files modified
61 ■■■■ changed files
components/network/openconnect/Makefile 15 ●●●●● patch | view | raw | blame | history
components/network/openconnect/manifests/sample-manifest.p5m 15 ●●●● patch | view | raw | blame | history
components/network/openconnect/openconnect.p5m 16 ●●●●● patch | view | raw | blame | history
components/network/openconnect/patches/01-include-sockio.patch 12 ●●●●● patch | view | raw | blame | history
components/network/openconnect/pkg5 3 ●●●● patch | view | raw | blame | history
components/network/openconnect/Makefile
@@ -16,19 +16,20 @@
#
BUILD_BITS= 64
OPENSSL_VERSION= 1.1
OPENSSL_VERSION= 3.1
USE_DEFAULT_TEST_TRANSFORMS= yes
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=        openconnect
COMPONENT_VERSION=    8.10
COMPONENT_REVISION=    3
COMPONENT_VERSION=    9.12
COMPONENT_REVISION=    0
COMPONENT_SUMMARY=    An SSL VPN client (intended to be) compatible with Cisco AnyConnect and Juniper Pulse
COMPONENT_ARCHIVE=    $(COMPONENT_NAME)-$(COMPONENT_VERSION).tar.gz
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_PROJECT_URL=    https://www.infradead.org/openconnect
COMPONENT_ARCHIVE_HASH=    sha256:ae99d87585388098510c837e3db5f0a9ad13998464a91bd30275de58c0c995f3
COMPONENT_ARCHIVE_URL=    https://github.com/openconnect/openconnect/archive/v$(COMPONENT_VERSION).tar.gz
COMPONENT_ARCHIVE_HASH=    sha256:a2bedce3aa4dfe75e36e407e48e8e8bc91d46def5335ac9564fbf91bd4b2413e
COMPONENT_ARCHIVE_URL=    https://www.infradead.org/openconnect/download/$(COMPONENT_ARCHIVE)
# COMPONENT_ARCHIVE_URL=    https://github.com/openconnect/openconnect/archive/v$(COMPONENT_VERSION).tar.gz
COMPONENT_FMRI=        network/$(COMPONENT_NAME)
COMPONENT_CLASSIFICATION=    Applications/Internet
COMPONENT_LICENSE=    LGPLv2.1
@@ -50,6 +51,7 @@
# Use OpenSSL, it allows more options on OI/Hipster that openconnect uses
CONFIGURE_OPTIONS += --with-system-cafile=/etc/certs/ca-certificates.crt
CONFIGURE_OPTIONS += --without-gnutls
CONFIGURE_OPTIONS += --without-libpcsclite
CONFIGURE_OPTIONS += --libexecdir=/usr/lib/$(MACH64)
# Manually added dependencies
@@ -61,7 +63,8 @@
REQUIRED_PACKAGES += library/libproxy
REQUIRED_PACKAGES += library/libxml2
REQUIRED_PACKAGES += library/lz4
REQUIRED_PACKAGES += library/security/openssl-11
REQUIRED_PACKAGES += library/security/openssl-31
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/math
REQUIRED_PACKAGES += system/library/security/gss
components/network/openconnect/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
#
#
# Copyright 2023 <contributor>
# Copyright 2024 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -24,9 +24,9 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
file path=usr/include/openconnect.h
link path=usr/lib/$(MACH64)/libopenconnect.so target=libopenconnect.so.5.6.0
link path=usr/lib/$(MACH64)/libopenconnect.so.5 target=libopenconnect.so.5.6.0
file path=usr/lib/$(MACH64)/libopenconnect.so.5.6.0
link path=usr/lib/$(MACH64)/libopenconnect.so target=libopenconnect.so.5.9.0
link path=usr/lib/$(MACH64)/libopenconnect.so.5 target=libopenconnect.so.5.9.0
file path=usr/lib/$(MACH64)/libopenconnect.so.5.9.0
file path=usr/lib/$(MACH64)/openconnect/csd-post.sh
file path=usr/lib/$(MACH64)/openconnect/csd-wrapper.sh
file path=usr/lib/$(MACH64)/openconnect/hipreport-android.sh
@@ -37,6 +37,7 @@
file path=usr/sbin/openconnect
file path=usr/share/bash-completion/completions/openconnect
file path=usr/share/doc/openconnect/anyconnect.html
file path=usr/share/doc/openconnect/array.html
file path=usr/share/doc/openconnect/building.html
file path=usr/share/doc/openconnect/changelog.html
file path=usr/share/doc/openconnect/charset.html
@@ -44,7 +45,9 @@
file path=usr/share/doc/openconnect/contribute.html
file path=usr/share/doc/openconnect/csd.html
file path=usr/share/doc/openconnect/download.html
file path=usr/share/doc/openconnect/f5.html
file path=usr/share/doc/openconnect/features.html
file path=usr/share/doc/openconnect/fortinet.html
file path=usr/share/doc/openconnect/globalprotect.html
file path=usr/share/doc/openconnect/gui.html
file path=usr/share/doc/openconnect/hip.html
@@ -66,10 +69,12 @@
file path=usr/share/doc/openconnect/licence.html
file path=usr/share/doc/openconnect/mail.html
file path=usr/share/doc/openconnect/manual.html
file path=usr/share/doc/openconnect/mitm.html
file path=usr/share/doc/openconnect/nonroot.html
file path=usr/share/doc/openconnect/packages.html
file path=usr/share/doc/openconnect/pkcs11.html
file path=usr/share/doc/openconnect/platforms.html
file path=usr/share/doc/openconnect/protocols.html
file path=usr/share/doc/openconnect/pulse.html
file path=usr/share/doc/openconnect/styles/main.css
file path=usr/share/doc/openconnect/tncc.html
@@ -90,9 +95,11 @@
file path=usr/share/locale/fi/LC_MESSAGES/openconnect.mo
file path=usr/share/locale/fr/LC_MESSAGES/openconnect.mo
file path=usr/share/locale/gl/LC_MESSAGES/openconnect.mo
file path=usr/share/locale/hr/LC_MESSAGES/openconnect.mo
file path=usr/share/locale/hu/LC_MESSAGES/openconnect.mo
file path=usr/share/locale/id/LC_MESSAGES/openconnect.mo
file path=usr/share/locale/it/LC_MESSAGES/openconnect.mo
file path=usr/share/locale/ka/LC_MESSAGES/openconnect.mo
file path=usr/share/locale/lt/LC_MESSAGES/openconnect.mo
file path=usr/share/locale/nl/LC_MESSAGES/openconnect.mo
file path=usr/share/locale/pa/LC_MESSAGES/openconnect.mo
components/network/openconnect/openconnect.p5m
@@ -10,7 +10,7 @@
#
#
# Copyright 2016 Jim Klimov
# Copyright 2016 Jim Klimov
# Copyright 2019 Michal Nowak
#
@@ -30,12 +30,11 @@
depend type=require fmri=driver/network/tap variant.opensolaris.zone=global
file path=usr/include/openconnect.h
link path=usr/lib/$(MACH64)/libopenconnect.so target=libopenconnect.so.5.6.0
link path=usr/lib/$(MACH64)/libopenconnect.so.5 target=libopenconnect.so.5.6.0
file path=usr/lib/$(MACH64)/libopenconnect.so.5.6.0
link path=usr/lib/$(MACH64)/libopenconnect.so target=libopenconnect.so.5.9.0
link path=usr/lib/$(MACH64)/libopenconnect.so.5 target=libopenconnect.so.5.9.0
file path=usr/lib/$(MACH64)/libopenconnect.so.5.9.0
file path=usr/lib/$(MACH64)/openconnect/csd-post.sh
file path=usr/lib/$(MACH64)/openconnect/csd-wrapper.sh
#file path=usr/lib/$(MACH64)/openconnect/hipreport-android.sh
file path=usr/lib/$(MACH64)/openconnect/hipreport.sh
file path=usr/lib/$(MACH64)/openconnect/tncc-emulate.py
file path=usr/lib/$(MACH64)/openconnect/tncc-wrapper.py
@@ -43,6 +42,7 @@
file path=usr/sbin/openconnect
file path=usr/share/bash-completion/completions/openconnect
file path=usr/share/doc/openconnect/anyconnect.html
file path=usr/share/doc/openconnect/array.html
file path=usr/share/doc/openconnect/building.html
file path=usr/share/doc/openconnect/changelog.html
file path=usr/share/doc/openconnect/charset.html
@@ -50,7 +50,9 @@
file path=usr/share/doc/openconnect/contribute.html
file path=usr/share/doc/openconnect/csd.html
file path=usr/share/doc/openconnect/download.html
file path=usr/share/doc/openconnect/f5.html
file path=usr/share/doc/openconnect/features.html
file path=usr/share/doc/openconnect/fortinet.html
file path=usr/share/doc/openconnect/globalprotect.html
file path=usr/share/doc/openconnect/gui.html
file path=usr/share/doc/openconnect/hip.html
@@ -72,10 +74,12 @@
file path=usr/share/doc/openconnect/licence.html
file path=usr/share/doc/openconnect/mail.html
file path=usr/share/doc/openconnect/manual.html
file path=usr/share/doc/openconnect/mitm.html
file path=usr/share/doc/openconnect/nonroot.html
file path=usr/share/doc/openconnect/packages.html
file path=usr/share/doc/openconnect/pkcs11.html
file path=usr/share/doc/openconnect/platforms.html
file path=usr/share/doc/openconnect/protocols.html
file path=usr/share/doc/openconnect/pulse.html
file path=usr/share/doc/openconnect/styles/main.css
file path=usr/share/doc/openconnect/tncc.html
@@ -96,9 +100,11 @@
file path=usr/share/locale/fi/LC_MESSAGES/openconnect.mo
file path=usr/share/locale/fr/LC_MESSAGES/openconnect.mo
file path=usr/share/locale/gl/LC_MESSAGES/openconnect.mo
file path=usr/share/locale/hr/LC_MESSAGES/openconnect.mo
file path=usr/share/locale/hu/LC_MESSAGES/openconnect.mo
file path=usr/share/locale/id/LC_MESSAGES/openconnect.mo
file path=usr/share/locale/it/LC_MESSAGES/openconnect.mo
file path=usr/share/locale/ka/LC_MESSAGES/openconnect.mo
file path=usr/share/locale/lt/LC_MESSAGES/openconnect.mo
file path=usr/share/locale/nl/LC_MESSAGES/openconnect.mo
file path=usr/share/locale/pa/LC_MESSAGES/openconnect.mo
components/network/openconnect/patches/01-include-sockio.patch
New file
@@ -0,0 +1,12 @@
diff --git a/os-tcp-mtu.c b/os-tcp-mtu.c
index af39e99..0126f44 100644
--- a/os-tcp-mtu.c
+++ b/os-tcp-mtu.c
@@ -30,6 +30,7 @@
 /* For TCP_INFO */
 # include <linux/tcp.h>
 #endif
+#include <sys/sockio.h>
 union sa_ip46 {
     struct sockaddr addr;
components/network/openconnect/pkg5
@@ -5,10 +5,11 @@
        "library/libproxy",
        "library/libxml2",
        "library/lz4",
        "library/security/openssl-11",
        "library/security/openssl-31",
        "library/zlib",
        "network/vpnc-scripts",
        "system/library",
        "system/library/math",
        "system/library/security/gss"
    ],
    "fmris": [