jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

glusterfs: update to 6.0

Browse source
This commit is contained in:
Rich G 2019-04-01 12:54:26 -04:00 committed by maxice8
parent a8ed36516f
commit b515b33c00
3 changed files with 34 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
srcpkgs/glusterfs/patches/patch-xlators_cloudsync_ssl.patch Normal file
View file

@ -0,0 +1,29 @@
--- xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/libcloudsyncs3.c.orig 2019-04-01 11:59:35.934987018 -0400
+++ xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/libcloudsyncs3.c 2019-04-01 12:01:04.701774641 -0400
@@ -300,7 +300,7 @@
char *
aws_sign_request(char *const str, char *awssekey)
{
-#if (OPENSSL_VERSION_NUMBER < 0x1010002f)
+#if (OPENSSL_VERSION_NUMBER < 0x1010002f) || defined(LIBRESSL_VERSION_NUMBER)
HMAC_CTX ctx;
#endif
HMAC_CTX *pctx = NULL;
@@ -310,7 +310,7 @@
unsigned len;
char *base64 = NULL;
-#if (OPENSSL_VERSION_NUMBER < 0x1010002f)
+#if (OPENSSL_VERSION_NUMBER < 0x1010002f) || defined(LIBRESSL_VERSION_NUMBER)
HMAC_CTX_init(&ctx);
pctx = &ctx;
#else
@@ -320,7 +320,7 @@
HMAC_Update(pctx, (unsigned char *)str, strlen(str));
HMAC_Final(pctx, (unsigned char *)md, &len);
-#if (OPENSSL_VERSION_NUMBER < 0x1010002f)
+#if (OPENSSL_VERSION_NUMBER < 0x1010002f) || defined(LIBRESSL_VERSION_NUMBER)
HMAC_CTX_cleanup(pctx);
#else
HMAC_CTX_free(pctx);

30
srcpkgs/glusterfs/patches/patch-xlators_encryption_crypt_src_keys.patch
View file

@ -1,30 +0,0 @@
--- 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);

11
srcpkgs/glusterfs/template
View file

@ -1,16 +1,15 @@
# Template file for 'glusterfs'
pkgname=glusterfs
version=5.5
version=6.0
revision=1
build_style=gnu-configure
configure_args="--disable-glupy --enable-crypt-xlator
--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
ac_cv_file__etc_centos_release=no"
pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
hostmakedepends="automake flex libtool pkg-config python3"
makedepends="acl-devel fuse3-devel libaio-devel libtirpc-devel liblvm2app-devel
libressl-devel liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
# python is required by gsyncd.
depends="python3"
short_desc="Free and open source software scalable network filesystem (client)"
@ -18,7 +17,7 @@ maintainer="Juan RP <xtraeme@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-3.0-only"
homepage="https://www.gluster.org/"
distfiles="https://download.gluster.org/pub/gluster/glusterfs/${version%.*}/${version}/${pkgname}-${version}.tar.gz"
checksum=781da2e9e955eec6b411abd8df5851353936e5cc6f6aef9b8e6c8b970610cdf4
checksum=9892746c44e4ab85412f6f4948ef9731232238e4628454a1a74a55482ceaf0d5
case "$XBPS_TARGET_MACHINE" in
*-musl) broken="not yet supported";;