diff --git a/srcpkgs/apr-util/patches/libressl.patch b/srcpkgs/apr-util/patches/libressl.patch deleted file mode 100644 index f8afdc94f06..00000000000 --- a/srcpkgs/apr-util/patches/libressl.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- 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 0166b76554e..316b4616648 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=3 +version=1.6.1 +revision=1 build_style=gnu-configure configure_args=" --with-apr=${XBPS_CROSS_BASE}/usr/bin/apr-1-config --with-pgsql --with-ldap @@ -18,7 +18,7 @@ maintainer="Juan RP " homepage="http://apr.apache.org/" license="Apache-2.0" distfiles="http://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2" -checksum=8474c93fa74b56ac6ca87449abe3e155723d5f534727f3f33283f6631a48ca4c +checksum=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b pre_configure() { sed -i configure \