Index: head/security/openconnect/files/patch-openssl-dtls.c =================================================================== --- head/security/openconnect/files/patch-openssl-dtls.c (revision 489283) +++ head/security/openconnect/files/patch-openssl-dtls.c (nonexistent) @@ -1,30 +0,0 @@ -From 69793ae0c1b3b6cb2e4baecc224ea714707ac329 Mon Sep 17 00:00:00 2001 -From: Piotr Kubaj -Date: Fri, 12 May 2017 14:24:37 +0100 -Subject: [PATCH 1/1] Fix build with LibreSSL 2.5.1 and higher. - -We don't actually care if we use the read or write state; we're only -calculating the cipher/protocol overheads which are the same in both -directions. - -In LibreSSL they were all removed in -https://github.com/libressl-portable/openbsd/commit/122ecd906da7 -and the read side was restored in -https://github.com/libressl-portable/openbsd/commit/0d7a7d5f5a44 -so just use that. - -Signed-off-by: Piotr Kubaj -Signed-off-by: David Woodhouse ---- openssl-dtls.c.orig 2016-12-06 13:03:51 UTC -+++ openssl-dtls.c -@@ -100,8 +100,8 @@ static int dtls_get_data_mtu(struct open - } - #else - /* OpenSSL <= 1.0.2 only supports CBC ciphers with PSK */ -- ivlen = EVP_CIPHER_iv_length(EVP_CIPHER_CTX_cipher(vpninfo->dtls_ssl->enc_write_ctx)); -- maclen = EVP_MD_CTX_size(vpninfo->dtls_ssl->write_hash); -+ ivlen = EVP_CIPHER_iv_length(EVP_CIPHER_CTX_cipher(vpninfo->dtls_ssl->enc_read_ctx)); -+ maclen = EVP_MD_CTX_size(vpninfo->dtls_ssl->read_hash); - blocksize = ivlen; - pad = 1; - #endif Property changes on: head/security/openconnect/files/patch-openssl-dtls.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/openconnect/Makefile =================================================================== --- head/security/openconnect/Makefile (revision 489283) +++ head/security/openconnect/Makefile (revision 489284) @@ -1,59 +1,61 @@ # Created by: Damian Gerow # $FreeBSD$ PORTNAME= openconnect -PORTVERSION= 7.08 +PORTVERSION= 8.00 CATEGORIES= security MASTER_SITES= ftp://ftp.infradead.org/pub/openconnect/ \ ZI MAINTAINER= zi@FreeBSD.org COMMENT= Client for Cisco's AnyConnect SSL VPN LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING.LGPL LIB_DEPENDS= libxml2.so:textproc/libxml2 RUN_DEPENDS= vpnc-script:sysutils/vpnc-scripts GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-nls --with-vpnc-script=${LOCALBASE}/sbin/vpnc-script \ --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ --without-openssl-version-check --without-libpcsclite \ --without-libpskc -USES= cpe gmake iconv libtool pkgconfig python:build ssl +USES= cpe gmake iconv libtool pkgconfig python:build ssl shebangfix CPE_VENDOR= infradead INSTALL_TARGET= install-strip USE_LDCONFIG= yes +SHEBANG_FILES= trojans/csd-post.sh trojans/csd-wrapper.sh \ + trojans/tncc-wrapper.py PORTDOCS= * OPTIONS_DEFINE= DOCS PROXY GNUTLS GSSAPI LZ4 P11 STOKEN OPTIONS_DEFAULT=GSSAPI LZ4_DESC= LZ4-based compression LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 LZ4_CONFIGURE_WITH= lz4 PROXY_DESC= Automatic proxy configuration via libproxy PROXY_LIB_DEPENDS= libproxy.so:net/libproxy PROXY_CONFIGURE_WITH= libproxy GNUTLS_DESC= Use GnuTLS instead of OpenSSL (experimental) GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_WITH= gnutls GSSAPI_CONFIGURE_WITH= gssapi P11_DESC= PKCS#11 support via libp11 P11_LIB_DEPENDS= libp11.so:security/libp11 STOKEN_DESC= With RSA soft token support via libstoken STOKEN_LIB_DEPENDS= libstoken.so:security/stoken \ libtomcrypt.so:security/libtomcrypt STOKEN_CONFIGURE_WITH= stoken post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/TODO ${STAGEDIR}${DOCSDIR} .include Index: head/security/openconnect/distinfo =================================================================== --- head/security/openconnect/distinfo (revision 489283) +++ head/security/openconnect/distinfo (revision 489284) @@ -1,3 +1,3 @@ -TIMESTAMP = 1484833866 -SHA256 (openconnect-7.08.tar.gz) = 1c44ec1f37a6a025d1ca726b9555649417f1d31a46f747922b84099ace628a03 -SIZE (openconnect-7.08.tar.gz) = 1686133 +TIMESTAMP = 1546648351 +SHA256 (openconnect-8.00.tar.gz) = 560d8c79af1e83099b7e43970f2511c260af2843ad84179864f0528345fa6607 +SIZE (openconnect-8.00.tar.gz) = 1870534 Index: head/security/openconnect/pkg-plist =================================================================== --- head/security/openconnect/pkg-plist (revision 489283) +++ head/security/openconnect/pkg-plist (revision 489284) @@ -1,7 +1,11 @@ sbin/openconnect include/openconnect.h lib/libopenconnect.so lib/libopenconnect.so.5 -lib/libopenconnect.so.5.4.0 +lib/libopenconnect.so.5.5.0 libdata/pkgconfig/openconnect.pc +libexec/openconnect/csd-post.sh +libexec/openconnect/csd-wrapper.sh +libexec/openconnect/hipreport.sh +libexec/openconnect/tncc-wrapper.py man/man8/openconnect.8.gz