diff --git a/srcpkgs/glusterfs/patches/patch-xlators_encryption_crypt_src_keys.patch b/srcpkgs/glusterfs/patches/patch-xlators_encryption_crypt_src_keys.patch new file mode 100644 index 00000000000..049c5ccc876 --- /dev/null +++ b/srcpkgs/glusterfs/patches/patch-xlators_encryption_crypt_src_keys.patch @@ -0,0 +1,30 @@ +--- xlators/encryption/crypt/src/keys.c.orig 2017-02-25 14:37:16 UTC ++++ xlators/encryption/crypt/src/keys.c +@@ -113,7 +113,7 @@ static int32_t kderive_init(struct kderi + static void kderive_update(struct kderive_context *ctx) + { + uint32_t i; +-#if (OPENSSL_VERSION_NUMBER < 0x1010002f) ++#if (OPENSSL_VERSION_NUMBER < 0x1010002f) || defined(LIBRESSL_VERSION_NUMBER) + HMAC_CTX hctx; + #endif + HMAC_CTX *phctx = NULL; +@@ -123,7 +123,7 @@ static void kderive_update(struct kderiv + + check_prf_iters(num_iters); + +-#if (OPENSSL_VERSION_NUMBER < 0x1010002f) ++#if (OPENSSL_VERSION_NUMBER < 0x1010002f) || defined(LIBRESSL_VERSION_NUMBER) + HMAC_CTX_init(&hctx); + phctx = &hctx; + #else +@@ -144,7 +144,7 @@ static void kderive_update(struct kderiv + + pos += PRF_OUTPUT_SIZE; + } +-#if (OPENSSL_VERSION_NUMBER < 0x1010002f) ++#if (OPENSSL_VERSION_NUMBER < 0x1010002f) || defined(LIBRESSL_VERSION_NUMBER) + HMAC_CTX_cleanup(phctx); + #else + HMAC_CTX_free(phctx); + diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template index 3971f1cbe35..213620ff7f3 100644 --- a/srcpkgs/glusterfs/template +++ b/srcpkgs/glusterfs/template @@ -1,7 +1,7 @@ # Template file for 'glusterfs' pkgname=glusterfs -version=3.8.5 -revision=3 +version=3.8.15 +revision=1 build_style=gnu-configure configure_args="--disable-glupy --enable-crypt-xlator --sbindir=/usr/bin --with-mountutildir=/usr/bin @@ -17,9 +17,8 @@ maintainer="Juan RP " license="GPL-2, LGPL-3" homepage="http://www.gluster.org/" distfiles="http://download.gluster.org/pub/gluster/glusterfs/${version%.*}/${version}/${pkgname}-${version}.tar.gz" -checksum=476527c7bc7403128d6cafe54b81bf4896cc6cd96505f42e85380f2588cc3846 +checksum=22c293cb5d7bb9106dccb0a8e4c446c19f014af0b2c6b37396525819288206bb -nocross=yes case "$XBPS_TARGET_MACHINE" in *-musl) broken="not yet supported";; esac