diff options
| author | Ryan Steinmetz <zi@FreeBSD.org> | 2017-01-19 13:54:54 +0000 |
|---|---|---|
| committer | Ryan Steinmetz <zi@FreeBSD.org> | 2017-01-19 13:54:54 +0000 |
| commit | f59ed8e50d9494e6a91efec2e63b7d6e8de6c98d (patch) | |
| tree | f20a274659d83f3f5112079d4678dc8229200ae6 /security/openconnect | |
| parent | 47fdca75df54b60e93b08a64b967f7bfd59f9ac8 (diff) | |
Notes
Diffstat (limited to 'security/openconnect')
| -rw-r--r-- | security/openconnect/Makefile | 7 | ||||
| -rw-r--r-- | security/openconnect/distinfo | 6 | ||||
| -rw-r--r-- | security/openconnect/files/patch-openssl-esp.c | 20 | ||||
| -rw-r--r-- | security/openconnect/files/patch-openssl.c | 25 | ||||
| -rw-r--r-- | security/openconnect/pkg-plist | 2 |
5 files changed, 9 insertions, 51 deletions
diff --git a/security/openconnect/Makefile b/security/openconnect/Makefile index b09e5a8f82bd..3063fec67e39 100644 --- a/security/openconnect/Makefile +++ b/security/openconnect/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openconnect -PORTVERSION= 7.07 +PORTVERSION= 7.08 CATEGORIES= security MASTER_SITES= ftp://ftp.infradead.org/pub/openconnect/ \ http://mirrors.rit.edu/zi/ @@ -26,7 +26,7 @@ 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 @@ -40,6 +40,9 @@ 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} diff --git a/security/openconnect/distinfo b/security/openconnect/distinfo index 0ffadca07f53..90dce7862bb6 100644 --- a/security/openconnect/distinfo +++ b/security/openconnect/distinfo @@ -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 diff --git a/security/openconnect/files/patch-openssl-esp.c b/security/openconnect/files/patch-openssl-esp.c deleted file mode 100644 index 17f0f593500c..000000000000 --- a/security/openconnect/files/patch-openssl-esp.c +++ /dev/null @@ -1,20 +0,0 @@ ---- openssl-esp.c.orig 2016-07-08 15:35:18 UTC -+++ openssl-esp.c -@@ -27,7 +27,7 @@ - #include <openssl/evp.h> - #include <openssl/rand.h> - --#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) { diff --git a/security/openconnect/files/patch-openssl.c b/security/openconnect/files/patch-openssl.c deleted file mode 100644 index 4c4ec9d1622f..000000000000 --- a/security/openconnect/files/patch-openssl.c +++ /dev/null @@ -1,25 +0,0 @@ ---- openssl.c.orig 2016-07-09 14:43:41 UTC -+++ openssl.c -@@ -36,11 +36,11 @@ - #include <openssl/ui.h> - #include <openssl/rsa.h> - --#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) - { diff --git a/security/openconnect/pkg-plist b/security/openconnect/pkg-plist index b20b86f42183..78f602e91e0f 100644 --- a/security/openconnect/pkg-plist +++ b/security/openconnect/pkg-plist @@ -2,6 +2,6 @@ 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 |