Index: head/security/openconnect/files/patch-openssl.c =================================================================== --- head/security/openconnect/files/patch-openssl.c (revision 431874) +++ head/security/openconnect/files/patch-openssl.c (nonexistent) @@ -1,25 +0,0 @@ ---- openssl.c.orig 2016-07-09 14:43:41 UTC -+++ openssl.c -@@ -36,11 +36,11 @@ - #include - #include - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) - #define X509_up_ref(x) CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_X509) - #endif - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) - #define EVP_MD_CTX_new EVP_MD_CTX_create - #define EVP_MD_CTX_free EVP_MD_CTX_destroy - #define X509_STORE_CTX_get0_chain(ctx) ((ctx)->chain) -@@ -991,7 +991,7 @@ static int set_peer_cert_hash(struct ope - return 0; - } - --#if OPENSSL_VERSION_NUMBER < 0x10002000L -+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined (LIBRESSL_VERSION_NUMBER) - static int match_hostname_elem(const char *hostname, int helem_len, - const char *match, int melem_len) - { Property changes on: head/security/openconnect/files/patch-openssl.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/files/patch-openssl-esp.c =================================================================== --- head/security/openconnect/files/patch-openssl-esp.c (revision 431874) +++ head/security/openconnect/files/patch-openssl-esp.c (nonexistent) @@ -1,20 +0,0 @@ ---- openssl-esp.c.orig 2016-07-08 15:35:18 UTC -+++ openssl-esp.c -@@ -27,7 +27,7 @@ - #include - #include - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - #define EVP_CIPHER_CTX_free(c) do { \ - EVP_CIPHER_CTX_cleanup(c); \ -@@ -85,7 +85,7 @@ static int init_esp_ciphers(struct openc - } - EVP_CIPHER_CTX_set_padding(esp->cipher, 0); - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) - esp->hmac = malloc(sizeof(*esp->hmac)); - esp->pkt_hmac = malloc(sizeof(*esp->pkt_hmac)); - if (!esp->hmac || &esp->pkt_hmac) { Property changes on: head/security/openconnect/files/patch-openssl-esp.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 431874) +++ head/security/openconnect/Makefile (revision 431875) @@ -1,47 +1,50 @@ # Created by: Damian Gerow # $FreeBSD$ PORTNAME= openconnect -PORTVERSION= 7.07 +PORTVERSION= 7.08 CATEGORIES= security MASTER_SITES= ftp://ftp.infradead.org/pub/openconnect/ \ http://mirrors.rit.edu/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-stoken --without-openssl-version-check USES= cpe gmake iconv libtool pkgconfig python:build ssl CPE_VENDOR= infradead INSTALL_TARGET= install-strip USE_LDCONFIG= yes PORTDOCS= * -OPTIONS_DEFINE= PROXY GNUTLS LZ4 +OPTIONS_DEFINE= PROXY GNUTLS LZ4 P11 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 + +P11_DESC= PKCS#11 support via libp11 +P11_LIB_DEPENDS= libp11.so:${PORTSDIR}/security/libp11 post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/TODO ${STAGEDIR}${DOCSDIR} .include Index: head/security/openconnect/distinfo =================================================================== --- head/security/openconnect/distinfo (revision 431874) +++ head/security/openconnect/distinfo (revision 431875) @@ -1,3 +1,3 @@ -TIMESTAMP = 1471559423 -SHA256 (openconnect-7.07.tar.gz) = f3ecfcd487dcd916748db38b4138c1e72c86347d6328b11dfe1d0af2821b8366 -SIZE (openconnect-7.07.tar.gz) = 1557283 +TIMESTAMP = 1484833866 +SHA256 (openconnect-7.08.tar.gz) = 1c44ec1f37a6a025d1ca726b9555649417f1d31a46f747922b84099ace628a03 +SIZE (openconnect-7.08.tar.gz) = 1686133 Index: head/security/openconnect/pkg-plist =================================================================== --- head/security/openconnect/pkg-plist (revision 431874) +++ head/security/openconnect/pkg-plist (revision 431875) @@ -1,7 +1,7 @@ sbin/openconnect include/openconnect.h lib/libopenconnect.so lib/libopenconnect.so.5 -lib/libopenconnect.so.5.3.0 +lib/libopenconnect.so.5.4.0 libdata/pkgconfig/openconnect.pc man/man8/openconnect.8.gz