diff --git a/srcpkgs/apr-util/patches/libressl.patch b/srcpkgs/apr-util/patches/libressl.patch new file mode 100644 index 00000000000..f8afdc94f06 --- /dev/null +++ b/srcpkgs/apr-util/patches/libressl.patch @@ -0,0 +1,47 @@ +--- crypto/apr_crypto_openssl.c.orig 2017-05-03 23:18:52.000000000 +0000 ++++ crypto/apr_crypto_openssl.c 2017-07-30 10:21:22.592591988 +0000 +@@ -117,7 +117,7 @@ + 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 @@ + 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 @@ + 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 @@ + 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 @@ + 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); diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template index f29cd2760c6..266316325b5 100644 --- a/srcpkgs/apr-util/template +++ b/srcpkgs/apr-util/template @@ -1,7 +1,7 @@ # Template file for 'apr-util' pkgname=apr-util version=1.6.0 -revision=1 +revision=2 build_style=gnu-configure configure_args=" --with-apr=${XBPS_CROSS_BASE}/usr/bin/apr-1-config --with-pgsql --with-ldap