diff options
| author | Ryan Steinmetz <zi@FreeBSD.org> | 2019-01-05 00:38:38 +0000 |
|---|---|---|
| committer | Ryan Steinmetz <zi@FreeBSD.org> | 2019-01-05 00:38:38 +0000 |
| commit | 83a19b590c6fc8d5f38cfaf0623294334c6b63bb (patch) | |
| tree | 5d088aab3d84ec3335a2b1017ea72fecef4e6dd9 /security/openconnect | |
| parent | fc076f39be245080f723cfd60d32ca42ac6c79ad (diff) | |
- Update to 8.00
Notes
svn path=/head/; revision=489284
Diffstat (limited to 'security/openconnect')
| -rw-r--r-- | security/openconnect/Makefile | 6 | ||||
| -rw-r--r-- | security/openconnect/distinfo | 6 | ||||
| -rw-r--r-- | security/openconnect/files/patch-openssl-dtls.c | 30 | ||||
| -rw-r--r-- | security/openconnect/pkg-plist | 6 |
4 files changed, 12 insertions, 36 deletions
diff --git a/security/openconnect/Makefile b/security/openconnect/Makefile index 84c00d2ed7f0..c75c6a37c775 100644 --- a/security/openconnect/Makefile +++ b/security/openconnect/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openconnect -PORTVERSION= 7.08 +PORTVERSION= 8.00 CATEGORIES= security MASTER_SITES= ftp://ftp.infradead.org/pub/openconnect/ \ ZI @@ -21,10 +21,12 @@ 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 diff --git a/security/openconnect/distinfo b/security/openconnect/distinfo index 90dce7862bb6..0be074159e73 100644 --- a/security/openconnect/distinfo +++ b/security/openconnect/distinfo @@ -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 diff --git a/security/openconnect/files/patch-openssl-dtls.c b/security/openconnect/files/patch-openssl-dtls.c deleted file mode 100644 index e0a2ff4aa4b9..000000000000 --- a/security/openconnect/files/patch-openssl-dtls.c +++ /dev/null @@ -1,30 +0,0 @@ -From 69793ae0c1b3b6cb2e4baecc224ea714707ac329 Mon Sep 17 00:00:00 2001 -From: Piotr Kubaj <pkubaj@anongoth.pl> -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 <pkubaj@anongoth.pl> -Signed-off-by: David Woodhouse <dwmw2@infradead.org> ---- 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 diff --git a/security/openconnect/pkg-plist b/security/openconnect/pkg-plist index 78f602e91e0f..a1bcf35e9950 100644 --- a/security/openconnect/pkg-plist +++ b/security/openconnect/pkg-plist @@ -2,6 +2,10 @@ 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 |