Attachment 174209 Details for Bug 212254 – patch

[patch] patch

openconnect.patch (text/plain), 3.36 KB, created by Piotr Kubaj on 2016-08-30 07:41:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2016-08-30 07:41:38 UTC

Size: 3.36 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 421045)
>+++ Makefile	(working copy)
>@@ -26,7 +26,7 @@
> USE_LDCONFIG=	yes
> PORTDOCS=	*
> 
>-OPTIONS_DEFINE=	PROXY GNUTLS
>+OPTIONS_DEFINE=	PROXY GNUTLS LZ4
> 
> PROXY_DESC=		Automatic proxy configuration via libproxy
> PROXY_LIB_DEPENDS=	libproxy.so:net/libproxy
>@@ -36,6 +36,10 @@
> GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
> GNUTLS_CONFIGURE_WITH=	gnutls
> 
>+LZ4_DESC=               LZ4-based compression
>+LZ4_LIB_DEPENDS=        liblz4.so:archivers/liblz4
>+LZ4_CONFIGURE_WITH=     lz4
>+
> post-install:
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/TODO ${STAGEDIR}${DOCSDIR}
>Index: files/patch-openssl-esp.c
>===================================================================
>--- files/patch-openssl-esp.c	(revision 0)
>+++ files/patch-openssl-esp.c	(working copy)
>@@ -0,0 +1,20 @@
>+--- 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) {
>
>Property changes on: files/patch-openssl-esp.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-openssl.c
>===================================================================
>--- files/patch-openssl.c	(revision 0)
>+++ files/patch-openssl.c	(working copy)
>@@ -0,0 +1,25 @@
>+--- 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)
>+ {
>
>Property changes on: files/patch-openssl.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

pkubaj: maintainer-approval? (zi)

Actions: View | Diff

Attachments on bug 212254: 174209