Attachment 186990 Details for Bug 222762 – svn diff for devel/apr1

[patch] svn diff for devel/apr1

patch-devel_apr1-1.6.0-LibreSSL (text/plain), 2.95 KB, created by Bernard Spil on 2017-10-07 21:47:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2017-10-07 21:47:16 UTC

Size: 2.95 KB

patch

obsolete

>Index: devel/apr1/Makefile
>===================================================================
>--- devel/apr1/Makefile	(revision 451468)
>+++ devel/apr1/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	apr
> PORTVERSION=	${APR_VERSION}.${APU_VERSION}
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	APACHE/apr
> DISTFILES=	apr-${APR_VERSION}.tar.gz \
>Index: devel/apr1/files/patch-apr-util-1.6.0_crypto_apr__crypto__openssl.c
>===================================================================
>--- devel/apr1/files/patch-apr-util-1.6.0_crypto_apr__crypto__openssl.c	(nonexistent)
>+++ devel/apr1/files/patch-apr-util-1.6.0_crypto_apr__crypto__openssl.c	(working copy)
>@@ -0,0 +1,47 @@
>+--- apr-util-1.6.0/crypto/apr_crypto_openssl.c.orig	2017-05-03 23:18:52 UTC
>++++ apr-util-1.6.0/crypto/apr_crypto_openssl.c
>+@@ -117,7 +117,7 @@ static apr_status_t crypto_shutdown_help
>+ static apr_status_t crypto_init(apr_pool_t *pool, const char *params,
>+         const apu_err_t **result)
>+ {
>+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
>++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
>+     CRYPTO_malloc_init();
>+ #else
>+     OPENSSL_malloc_init();
>+@@ -721,7 +721,7 @@ static apr_status_t crypto_block_encrypt
>+     if (!EVP_EncryptUpdate(ctx->cipherCtx, (*out), &outl,
>+             (unsigned char *) in, inlen)) {
>+ #endif
>+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
>++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
>+         EVP_CIPHER_CTX_cleanup(ctx->cipherCtx);
>+ #else
>+         EVP_CIPHER_CTX_reset(ctx->cipherCtx);
>+@@ -764,7 +764,7 @@ static apr_status_t crypto_block_encrypt
>+     else {
>+         *outlen = len;
>+     }
>+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
>++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
>+     EVP_CIPHER_CTX_cleanup(ctx->cipherCtx);
>+ #else
>+     EVP_CIPHER_CTX_reset(ctx->cipherCtx);
>+@@ -891,7 +891,7 @@ static apr_status_t crypto_block_decrypt
>+     if (!EVP_DecryptUpdate(ctx->cipherCtx, *out, &outl, (unsigned char *) in,
>+             inlen)) {
>+ #endif
>+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
>++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
>+         EVP_CIPHER_CTX_cleanup(ctx->cipherCtx);
>+ #else
>+         EVP_CIPHER_CTX_reset(ctx->cipherCtx);
>+@@ -934,7 +934,7 @@ static apr_status_t crypto_block_decrypt
>+     else {
>+         *outlen = len;
>+     }
>+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
>++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
>+     EVP_CIPHER_CTX_cleanup(ctx->cipherCtx);
>+ #else
>+     EVP_CIPHER_CTX_reset(ctx->cipherCtx);
>
>Property changes on: devel/apr1/files/patch-apr-util-1.6.0_crypto_apr__crypto__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

Actions: View | Diff

Attachments on bug 222762: 186892 | 186990 | 187839