Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/filesystems/glusterfs Bugfixes from upstream
details: https://anonhg.NetBSD.org/pkgsrc/rev/cad8721da242
branches: trunk
changeset: 436124:cad8721da242
user: manu <manu%pkgsrc.org@localhost>
date: Mon Jul 27 16:06:08 2020 +0000
description:
Bugfixes from upstream
- Properly screen the .attribute directory where NetBSD UFS1 stores
extended attributes.
- Fix NULL pointer usage.
- Make FUSE notification optional at configure time since NetBSD does not
implement them.
And update comment in patches with references to commits upstream
diffstat:
filesystems/glusterfs/Makefile | 7 +-
filesystems/glusterfs/distinfo | 16 +-
filesystems/glusterfs/patches/patch-config.h.in | 19 ++
filesystems/glusterfs/patches/patch-configure | 59 +++++++-
filesystems/glusterfs/patches/patch-configure.ac | 28 +++-
filesystems/glusterfs/patches/patch-rpc_rpc_lib_rpcsvc.c | 5 +-
filesystems/glusterfs/patches/patch-tools_gfind__missing__files_gfind__missing__files.sh | 7 +-
filesystems/glusterfs/patches/patch-xlators_mgmt_glusterd_src_glusterd-utils.c | 19 ++
filesystems/glusterfs/patches/patch-xlators_mount_fuse_src_fuse-bridge.c | 62 ++++++++
filesystems/glusterfs/patches/patch-xlators_performance_write-behind_src_write-behind.c | 25 +--
filesystems/glusterfs/patches/patch-xlators_storage_posix_src_posix-entry-ops.c | 75 ++++++++++
11 files changed, 285 insertions(+), 37 deletions(-)
diffs (truncated from 423 to 300 lines):
diff -r c9ae73498374 -r cad8721da242 filesystems/glusterfs/Makefile
--- a/filesystems/glusterfs/Makefile Mon Jul 27 16:04:38 2020 +0000
+++ b/filesystems/glusterfs/Makefile Mon Jul 27 16:06:08 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.99 2020/07/07 01:01:27 manu Exp $
+# $NetBSD: Makefile,v 1.100 2020/07/27 16:06:08 manu Exp $
DISTNAME= glusterfs-8.0
-#PKGREVISION= 1
+PKGREVISION= 1
CATEGORIES= filesystems
MASTER_SITES= http://bits.gluster.org/pub/gluster/glusterfs/src/
@@ -15,6 +15,7 @@
USE_TOOLS+= flex bison pkg-config bash
CONFIGURE_ARGS+= --disable-fusermount
+CONFIGURE_ARGS+= --disable-fuse-notifications
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
# Make sure we do not attept to link with -lfl
@@ -118,7 +119,7 @@
${DESTDIR}/${PREFIX}/sbin/mount_glusterfs
# Debug
-CFLAGS+= -g
+CFLAGS+= -g
INSTALL_UNSTRIPPED= yes
CONFIGURE_ARGS+= --enable-debug
#.include "../../devel/boehm-gc/buildlink3.mk"
diff -r c9ae73498374 -r cad8721da242 filesystems/glusterfs/distinfo
--- a/filesystems/glusterfs/distinfo Mon Jul 27 16:04:38 2020 +0000
+++ b/filesystems/glusterfs/distinfo Mon Jul 27 16:06:08 2020 +0000
@@ -1,11 +1,15 @@
-$NetBSD: distinfo,v 1.69 2020/07/07 01:01:27 manu Exp $
+$NetBSD: distinfo,v 1.70 2020/07/27 16:06:08 manu Exp $
SHA1 (glusterfs-8.0.tar.gz) = 8b9c5d1abcec207b716bd4d6b05957872c3a0f6d
RMD160 (glusterfs-8.0.tar.gz) = 157db93505b4baad9f985ac45ff5283ae432352b
SHA512 (glusterfs-8.0.tar.gz) = 6af94f31e08e9ba9d1f3f674678553815933f8db58672d4225f855dc47f3290e1ad22f44dbe95856f82120bf195bc2df7dbd02c88e3a27d9363877891c619b58
Size (glusterfs-8.0.tar.gz) = 7800370 bytes
-SHA1 (patch-configure) = 8914f1434475faa7cbd419a3e31c44fdee872ed2
-SHA1 (patch-configure.ac) = 5c90938a02b6be460b733e88cd1932ed61fdb6fa
-SHA1 (patch-rpc_rpc_lib_rpcsvc.c) = d2d039b656327a43463d0819a1bcbfb3d99c5691
-SHA1 (patch-tools_gfind__missing__files_gfind__missing__files.sh) = 000cbc70acbb4645b9e55654698fade5605aa5b8
-SHA1 (patch-xlators_performance_write-behind_src_write-behind.c) = db2a72c3d061f3e6bbba51b48b613295b1ecdb0f
+SHA1 (patch-config.h.in) = 1560806ebd786139b404544461dcda0ec1d60b37
+SHA1 (patch-configure) = 07d7a61d7c24ab8b0e4bb00ab6ae2452e41d903f
+SHA1 (patch-configure.ac) = fcb7da30005e9a08e7a0f4ac2f5e55511580aa18
+SHA1 (patch-rpc_rpc_lib_rpcsvc.c) = 44d88cdb8f930d3e920618c9ea0cdc8e9f4ebf58
+SHA1 (patch-tools_gfind__missing__files_gfind__missing__files.sh) = 67d374d8dc3213bd3d159e7cb8479c14e8ba162d
+SHA1 (patch-xlators_mgmt_glusterd_src_glusterd-utils.c) = 3e8e6fa5e4baff94532f58a6509f7b5817ce02bf
+SHA1 (patch-xlators_mount_fuse_src_fuse-bridge.c) = 4706bc7264b7e4ec7f01cc143f3edce96213401e
+SHA1 (patch-xlators_performance_write-behind_src_write-behind.c) = cf3eea86ab4255a7714b25a35a98495eff0f772e
+SHA1 (patch-xlators_storage_posix_src_posix-entry-ops.c) = 2c1acf30097ca4ce7b6ec6e1212f989c86201553
diff -r c9ae73498374 -r cad8721da242 filesystems/glusterfs/patches/patch-config.h.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/filesystems/glusterfs/patches/patch-config.h.in Mon Jul 27 16:06:08 2020 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-config.h.in,v 1.1 2020/07/27 16:06:08 manu Exp $
+
+Make FUSE notification optional at configure time
+From upstream https://review.gluster.org/24731
+
+--- config.h.in.orig 2020-07-22 02:24:03.169608070 +0200
++++ config.h.in 2020-07-22 02:24:28.887999809 +0200
+@@ -47,8 +47,11 @@
+
+ /* define if fdatasync exists */
+ #undef HAVE_FDATASYNC
+
++/* Use FUSE notifications */
++#undef HAVE_FUSE_NOTIFICATIONS
++
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
+
+ /* have sys/ioctl.h */
diff -r c9ae73498374 -r cad8721da242 filesystems/glusterfs/patches/patch-configure
--- a/filesystems/glusterfs/patches/patch-configure Mon Jul 27 16:04:38 2020 +0000
+++ b/filesystems/glusterfs/patches/patch-configure Mon Jul 27 16:06:08 2020 +0000
@@ -1,8 +1,59 @@
-$NetBSD: patch-configure,v 1.3 2020/07/07 01:01:27 manu Exp $
+$NetBSD: patch-configure,v 1.4 2020/07/27 16:06:08 manu Exp $
+
+Make FUSE notification optional at configure time
+From upstream https://review.gluster.org/24731
+
+NetBSD build fixes
+From upstream https://review.gluster.org/24648
---- configure.orig 2020-06-28 22:54:09.920229276 +0000
-+++ configure 2020-06-28 22:53:47.595791666 +0000
-@@ -14973,8 +14973,11 @@
+--- configure.orig 2020-07-06 03:22:43.222722780 +0200
++++ configure 2020-07-22 02:28:26.017707376 +0200
+@@ -932,8 +932,9 @@
+ with_tmpfilesdir
+ with_ocf
+ with_server
+ enable_fuse_client
++enable_fuse_notifications
+ enable_fusermount
+ enable_epoll
+ enable_georeplication
+ enable_events
+@@ -1619,8 +1620,10 @@
+ Disable internal tracking of privileged ports.
+ --enable-valgrind Enable valgrind for resource leak debugging.
+ --disable-fuse-client Do not build the fuse client. NOTE: you cannot mount
+ glusterfs without the client
++ --disable-fuse-notifications
++ Disable FUSE notifications
+ --disable-fusermount Use system's fusermount
+ --disable-epoll Use poll instead of epoll.
+ --disable-georeplication
+ Do not install georeplication components
+@@ -14172,8 +14175,23 @@
+ if test "x$enable_fuse_client" != "xno"; then
+ FUSE_CLIENT_SUBDIR=fuse
+ BUILD_FUSE_CLIENT="yes"
+ fi
++
++
++
++# Check whether --enable-fuse-notifications was given.
++if test "${enable_fuse_notifications+set}" = set; then :
++ enableval=$enable_fuse_notifications;
++fi
++
++
++if test "x$enable_fuse_notifications" != "xno"; then :
++
++
++$as_echo "#define HAVE_FUSE_NOTIFICATIONS 1" >>confdefs.h
++
++fi
+
+
+ # end FUSE section
+
+@@ -14973,8 +14991,11 @@
*freebsd*)
CFLAGS="${CFLAGS} -isystem /usr/local/include"
ARGP_LDADD=-largp
diff -r c9ae73498374 -r cad8721da242 filesystems/glusterfs/patches/patch-configure.ac
--- a/filesystems/glusterfs/patches/patch-configure.ac Mon Jul 27 16:04:38 2020 +0000
+++ b/filesystems/glusterfs/patches/patch-configure.ac Mon Jul 27 16:06:08 2020 +0000
@@ -1,8 +1,28 @@
-$NetBSD: patch-configure.ac,v 1.1 2020/07/07 01:01:27 manu Exp $
+$NetBSD: patch-configure.ac,v 1.2 2020/07/27 16:06:08 manu Exp $
+
+Make FUSE notification optional at configure time
+From upstream https://review.gluster.org/24731
---- configure.ac.orig 2020-05-31 16:45:57.328537679 +0200
-+++ configure.ac 2020-06-28 03:10:02.906173087 +0200
-@@ -945,8 +945,11 @@
+--- configure.ac.orig 2020-07-06 03:22:37.734704915 +0200
++++ configure.ac 2020-07-22 02:26:32.903778538 +0200
+@@ -683,8 +683,16 @@
+ BUILD_FUSE_CLIENT="yes"
+ fi
+
+ AC_SUBST(FUSE_CLIENT_SUBDIR)
++
++AC_ARG_ENABLE([fuse-notifications],
++ AS_HELP_STRING([--disable-fuse-notifications], [Disable FUSE notifications]))
++
++AS_IF([test "x$enable_fuse_notifications" != "xno"], [
++ AC_DEFINE([HAVE_FUSE_NOTIFICATIONS], [1], [Use FUSE notifications])
++])
++
+ # end FUSE section
+
+
+ AC_CHECK_LIB([ssl], TLS_method, [HAVE_OPENSSL_1_1="yes"], [HAVE_OPENSSL_1_1="no"])
+@@ -945,8 +953,11 @@
*freebsd*)
CFLAGS="${CFLAGS} -isystem /usr/local/include"
ARGP_LDADD=-largp
diff -r c9ae73498374 -r cad8721da242 filesystems/glusterfs/patches/patch-rpc_rpc_lib_rpcsvc.c
--- a/filesystems/glusterfs/patches/patch-rpc_rpc_lib_rpcsvc.c Mon Jul 27 16:04:38 2020 +0000
+++ b/filesystems/glusterfs/patches/patch-rpc_rpc_lib_rpcsvc.c Mon Jul 27 16:06:08 2020 +0000
@@ -1,4 +1,7 @@
-$NetBSD: patch-rpc_rpc_lib_rpcsvc.c,v 1.1 2020/07/07 01:01:27 manu Exp $
+$NetBSD: patch-rpc_rpc_lib_rpcsvc.c,v 1.2 2020/07/27 16:06:08 manu Exp $
+
+NetBSD build fixes
+From upstream https://review.gluster.org/24648
--- ./rpc/rpc-lib/src/rpcsvc.c.orig 2020-06-28 02:37:34.988840145 +0200
+++ ./rpc/rpc-lib/src/rpcsvc.c 2020-06-28 02:38:41.302115459 +0200
diff -r c9ae73498374 -r cad8721da242 filesystems/glusterfs/patches/patch-tools_gfind__missing__files_gfind__missing__files.sh
--- a/filesystems/glusterfs/patches/patch-tools_gfind__missing__files_gfind__missing__files.sh Mon Jul 27 16:04:38 2020 +0000
+++ b/filesystems/glusterfs/patches/patch-tools_gfind__missing__files_gfind__missing__files.sh Mon Jul 27 16:06:08 2020 +0000
@@ -1,8 +1,7 @@
-$NetBSD: patch-tools_gfind__missing__files_gfind__missing__files.sh,v 1.1 2020/03/23 23:21:17 gdt Exp $
+$NetBSD: patch-tools_gfind__missing__files_gfind__missing__files.sh,v 1.2 2020/07/27 16:06:08 manu Exp $
-Remediate bashism.
-
-Not yet filed upstream.
+NetBSD build fixes
+From upstream https://review.gluster.org/24648
--- tools/gfind_missing_files/gfind_missing_files.sh.orig 2018-04-12 17:46:46.697237625 +0000
+++ tools/gfind_missing_files/gfind_missing_files.sh
diff -r c9ae73498374 -r cad8721da242 filesystems/glusterfs/patches/patch-xlators_mgmt_glusterd_src_glusterd-utils.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/filesystems/glusterfs/patches/patch-xlators_mgmt_glusterd_src_glusterd-utils.c Mon Jul 27 16:06:08 2020 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-xlators_mgmt_glusterd_src_glusterd-utils.c,v 1.1 2020/07/27 16:06:08 manu Exp $
+
+fix NULL pointer reference
+From upstream https://review.gluster.org/24726
+
+--- ./xlators/mgmt/glusterd/src/glusterd-utils.c.orig 2020-07-10 02:53:59.416898136 +0200
++++ ./xlators/mgmt/glusterd/src/glusterd-utils.c 2020-07-10 02:54:16.956178597 +0200
+@@ -6394,9 +6394,10 @@
+ }
+ }
+ }
+ out:
+- sys_closedir(dirp);
++ if (dirp)
++ sys_closedir(dirp);
+ return brick_path;
+ }
+
+ int
diff -r c9ae73498374 -r cad8721da242 filesystems/glusterfs/patches/patch-xlators_mount_fuse_src_fuse-bridge.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/filesystems/glusterfs/patches/patch-xlators_mount_fuse_src_fuse-bridge.c Mon Jul 27 16:06:08 2020 +0000
@@ -0,0 +1,62 @@
+$NetBSD: patch-xlators_mount_fuse_src_fuse-bridge.c,v 1.1 2020/07/27 16:06:08 manu Exp $
+
+Make FUSE notification optional at configure time
+From upstream https://review.gluster.org/24731
+
+--- xlators/mount/fuse/src/fuse-bridge.c.orig
++++ xlators/mount/fuse/src/fuse-bridge.c
+@@ -8,6 +8,8 @@
+ cases as published by the Free Software Foundation.
+ */
+
++#include <config.h>
++
+ #include <sys/wait.h>
+ #include "fuse-bridge.h"
+ #include <glusterfs/glusterfs.h>
+@@ -405,7 +407,7 @@ send_fuse_data(xlator_t *this, fuse_in_header_t *finh, void *data, size_t size)
+ static int32_t
+ fuse_invalidate_entry(xlator_t *this, uint64_t fuse_ino)
+ {
+-#if FUSE_KERNEL_MINOR_VERSION >= 11
++#if (FUSE_KERNEL_MINOR_VERSION >= 11 && defined(HAVE_FUSE_NOTIFICATIONS))
+ struct fuse_out_header *fouh = NULL;
+ struct fuse_notify_inval_entry_out *fnieo = NULL;
+ fuse_private_t *priv = NULL;
+@@ -496,7 +498,7 @@ fuse_invalidate_entry(xlator_t *this, uint64_t fuse_ino)
+ static int32_t
+ fuse_invalidate_inode(xlator_t *this, uint64_t fuse_ino)
+ {
+-#if FUSE_KERNEL_MINOR_VERSION >= 11
++#if (FUSE_KERNEL_MINOR_VERSION >= 11 && defined(HAVE_FUSE_NOTIFICATIONS))
+ struct fuse_out_header *fouh = NULL;
+ struct fuse_notify_inval_inode_out *fniio = NULL;
+ fuse_private_t *priv = NULL;
+@@ -4918,7 +4920,7 @@ fuse_setlk(xlator_t *this, fuse_in_header_t *finh, void *msg,
+ return;
+ }
+
+-#if FUSE_KERNEL_MINOR_VERSION >= 11
++#if FUSE_KERNEL_MINOR_VERSION >= 11 && defined(HAVE_FUSE_NOTIFICATIONS)
+ static void *
+ notify_kernel_loop(void *data)
+ {
+@@ -5165,6 +5167,7 @@ fuse_init(xlator_t *this, fuse_in_header_t *finh, void *msg,
+ priv->timed_response_fuse_thread_started = _gf_true;
+
+ /* Used for 'reverse invalidation of inode' */
++#ifdef HAVE_FUSE_NOTIFICATIONS
+ if (fini->minor >= 12) {
+ ret = gf_thread_create(&messenger, NULL, notify_kernel_loop, this,
+ "fusenoti");
+@@ -5176,7 +5179,9 @@ fuse_init(xlator_t *this, fuse_in_header_t *finh, void *msg,
+ goto out;
+ }
+ priv->reverse_fuse_thread_started = _gf_true;
+- } else {
++ } else
++#endif
++ {
+ /*
+ * FUSE minor < 12 does not implement invalidate notifications.
+ * This mechanism is required for fopen-keep-cache to operate
diff -r c9ae73498374 -r cad8721da242 filesystems/glusterfs/patches/patch-xlators_performance_write-behind_src_write-behind.c
--- a/filesystems/glusterfs/patches/patch-xlators_performance_write-behind_src_write-behind.c Mon Jul 27 16:04:38 2020 +0000
+++ b/filesystems/glusterfs/patches/patch-xlators_performance_write-behind_src_write-behind.c Mon Jul 27 16:06:08 2020 +0000
Home |
Main Index |
Thread Index |
Old Index