rebuild openconnect & fix test results

Andreas Wacknitz

2023-10-21 0c161d79299df30ec3708163ca346b2a42e57d99

rebuild openconnect & fix test results

 components/network/openconnect/Makefile

@@ -15,22 +15,24 @@
# Copyright 2020 Andreas Wacknitz
#

BUILD_BITS=        64
BUILD_BITS= 64
OPENSSL_VERSION= 1.1
USE_DEFAULT_TEST_TRANSFORMS= yes
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME=        openconnect
COMPONENT_VERSION=    8.10
COMPONENT_REVISION=    2
COMPONENT_REVISION=    3
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_FMRI=        network/$(COMPONENT_NAME)
COMPONENT_CLASSIFICATION=    Applications/Internet
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_FMRI=        network/$(COMPONENT_NAME)
COMPONENT_CLASSIFICATION=    Applications/Internet
COMPONENT_LICENSE=    LGPLv2.1
COMPONENT_LICENSE_FILE=    COPYING.LGPL
COMPONENT_SUMMARY=    An SSL VPN client (intended to be) compatible with Cisco AnyConnect and Juniper Pulse

include $(WS_MAKE_RULES)/common.mk

@@ -45,22 +47,12 @@
# To prevent "libtool_install_magic: unbound variable"
unexport SHELLOPTS

COMPONENT_TEST_TRANSFORMS= \
    '-n ' \
    '-e "/TOTAL/p" ' \
    '-e "/PASS/p" '  \
    '-e "/SKIP/p" '  \
    '-e "/XFAIL/p" ' \
    '-e "/FAIL/p" '  \
    '-e "/XPASS/p" ' \
    '-e "/ERROR/p" '

OPENSSL_VERSION = 1.1
# 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 +=    --libexecdir=/usr/lib/$(MACH64)
CONFIGURE_OPTIONS += --with-system-cafile=/etc/certs/ca-certificates.crt
CONFIGURE_OPTIONS += --without-gnutls
CONFIGURE_OPTIONS += --libexecdir=/usr/lib/$(MACH64)

# Manually added dependencies
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += network/vpnc-scripts
REQUIRED_PACKAGES += driver/network/header-tun

 components/network/openconnect/manifests/sample-manifest.p5m

@@ -10,10 +10,11 @@
#

#
# Copyright 2020 <contributor>
# Copyright 2023 <contributor>
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)

 components/network/openconnect/openconnect.p5m

@@ -15,6 +15,7 @@
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)

 components/network/openconnect/pkg5

@@ -8,7 +8,6 @@
        "library/security/openssl-11",
        "library/zlib",
        "network/vpnc-scripts",
        "shell/ksh93",
        "system/library",
        "system/library/security/gss"
    ],

 components/network/openconnect/test/results-all.master

File was renamed from components/network/openconnect/test/results-64.master
@@ -6,8 +6,6 @@
# PASS:  4
# SKIP:  0
# XFAIL: 0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# XPASS: 0
# ERROR: 0