diff options
| author | manu <manu@pkgsrc.org> | 2011-09-18 01:36:06 +0000 |
|---|---|---|
| committer | manu <manu@pkgsrc.org> | 2011-09-18 01:36:06 +0000 |
| commit | 02865b208c45668af229ced7a59ff2c98a87ebde (patch) | |
| tree | 5c3aab22014f5f0585cc09934a7b1ccb160e73d1 /filesystems/glusterfs | |
| parent | 3a384df7c6286f2da53188599ee92921c9138dc6 (diff) | |
| download | pkgsrc-02865b208c45668af229ced7a59ff2c98a87ebde.tar.gz | |
Update glusterfs to 3.2.3
This maintenance release with no new features. Majot bug fixes are:
Bug 2464 Fixed all the issues caused by GFID mismatch during
distribute rename.
Bug 2988 Fixed the issue of high CPU usage when Directory Quota
is enabled.
Bug 3122 Enhanced the volume set interface to support io-threads
on the client.
Bug 3210 Fixed the issue of modified mtime/atime of the files after
rebalance operation.
Bug 3191 Fixed the issue with symlinks during rebalance operation.
Diffstat (limited to 'filesystems/glusterfs')
31 files changed, 175 insertions, 283 deletions
diff --git a/filesystems/glusterfs/PLIST.georeplication b/filesystems/glusterfs/PLIST.georeplication index ef9e4f08a96..f246432bcf5 100644 --- a/filesystems/glusterfs/PLIST.georeplication +++ b/filesystems/glusterfs/PLIST.georeplication @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.georeplication,v 1.2 2011/08/09 07:15:42 manu Exp $ +@comment $NetBSD: PLIST.georeplication,v 1.3 2011/09/18 01:36:06 manu Exp $ libexec/glusterfs/python/syncdaemon/README.md libexec/glusterfs/python/syncdaemon/__init__.py libexec/glusterfs/python/syncdaemon/__init__.pyc diff --git a/filesystems/glusterfs/distinfo b/filesystems/glusterfs/distinfo index 1efcc58b107..fb8baba8507 100644 --- a/filesystems/glusterfs/distinfo +++ b/filesystems/glusterfs/distinfo @@ -1,34 +1,33 @@ -$NetBSD: distinfo,v 1.10 2011/08/09 07:15:42 manu Exp $ +$NetBSD: distinfo,v 1.11 2011/09/18 01:36:06 manu Exp $ -SHA1 (glusterfs-3.2.2.tar.gz) = 6eb800edf49f99270490bff5e71078131efe4704 -RMD160 (glusterfs-3.2.2.tar.gz) = 35fc13580136ef702c8a3bebd3521822c7c24020 -Size (glusterfs-3.2.2.tar.gz) = 2341561 bytes -SHA1 (patch-aa) = d8a47d655866d766f39b567b03dd137a1c84b093 -SHA1 (patch-ab) = a0ea407cd7a6ef45669fe42fcfd5cd6310625193 -SHA1 (patch-ac) = fc73cc2605baf0d85a00e3127e2fbd1985a3e47d -SHA1 (patch-ae) = dfb3410ca20858955bc4ecf31046753690021e91 -SHA1 (patch-af) = 190862a357dcb584e18b8225a6969879319e6a34 -SHA1 (patch-an) = 356086c41ece146b7abd398a6a6aa3afcfd422ee -SHA1 (patch-ao) = adf946d40909457e1cdd10a3a08dfa5a9c471531 -SHA1 (patch-ar) = 60294ccb85e6c94d75c947287ff4d1a8ed723132 -SHA1 (patch-as) = 1aa447fa12baafe8e737337e969090fe3c0b8bee -SHA1 (patch-ax) = fdeecce5e1de7816d490cde7bfd284e0a2c63b76 -SHA1 (patch-ba) = 7e29d565083da2a8889687a2aa0145504d473d01 -SHA1 (patch-bb) = 004b3a75a25bcb51cb72e5bbb7ad4f8e5acb5ba8 -SHA1 (patch-bc) = eac0cf4a9ce6c6071d54d423f4407c77841794f5 +SHA1 (glusterfs-3.2.3.tar.gz) = 7a36e496d9ac3fbf11123bb42884445334d07f06 +RMD160 (glusterfs-3.2.3.tar.gz) = 89d6a5f9c1362e1fe4d88e69465311069552d319 +Size (glusterfs-3.2.3.tar.gz) = 2376000 bytes +SHA1 (patch-aa) = bfd1dbcb6945dd387d88bd96616e4bc29c3e0628 +SHA1 (patch-ab) = d240bfd8bd8e5994f612a3387cd75f30bb91c8d7 +SHA1 (patch-ac) = 21d86775c2174ea630404a1a329dfd49c7f493d9 +SHA1 (patch-ae) = 981ee73c7b389d21c173eb4318d09a41bd47a706 +SHA1 (patch-af) = ac9333cc55ad0cf42233e3c69b32e22c483c077a +SHA1 (patch-an) = 21f56d5379023bd2ea3432b4e3e3f9a0979c496f +SHA1 (patch-ao) = 26e350655e276c8cb3ecb3cc9b7c0a4e7ab2ff7b +SHA1 (patch-ar) = 27d0288083d06623a328e851a776095aa1f1d2df +SHA1 (patch-as) = a2c637bf52151e85969927f281e432693ac539ba +SHA1 (patch-ax) = 054942de06c3df60ffc0c190dd2702f77edd9ec6 +SHA1 (patch-ba) = dba2b6826b42c398fc590b91d1f58b88c7bcc7f2 +SHA1 (patch-bb) = 68d37d3b08a43fd98fac0e5492df1edc58cb5832 SHA1 (patch-be) = 72fd161c97ac384b93411e120c4f4b798e45d975 -SHA1 (patch-bf) = 2cc789497c6c48dbdb1b8e5481ef4c762dc2aac4 -SHA1 (patch-bh) = 80f36614f8b616c3551cc2a70a5355d347ada755 -SHA1 (patch-bj) = 45ff9aa609e0795edae7185485bf74a3f301de8f -SHA1 (patch-bk) = f5d346a2b1c8632b15008eda3227e5eba5ca71f5 -SHA1 (patch-bl) = c13fbbf16b86291b860fcab389319e67399d360b -SHA1 (patch-bm) = dea299751eebe17eecfcc1fc9ca66ccdc7513d1d -SHA1 (patch-bn) = 81860049e6c3effc797ab84c222b53091406323c -SHA1 (patch-bo) = 23a6858e97fb2f3ad82a0bf3d03a90adf884b5b2 -SHA1 (patch-bp) = 1e22539ff37ff3fdf90b15151b88139eb67d5f1c -SHA1 (patch-bq) = 4c3a174473ba15f510389ffa135bcbb68ee4c2bc -SHA1 (patch-br) = ba7a17469f4b9b964cd7b8ab2de46541a7238462 -SHA1 (patch-bs) = 3946d339e86c9d575a6f39880644cf8115f5f145 -SHA1 (patch-bt) = a0b4573dde307086caa6688d53cbfe9d81b2d910 -SHA1 (patch-bu) = 0859b3361018a08c26b44931c49cc8919c45f4a4 -SHA1 (patch-bv) = 52eea1b419b7169b1950ea6e5ec7ade9ce7529a2 +SHA1 (patch-bf) = 0f182ccd632b5e622237bd95c9978c113f8ce531 +SHA1 (patch-bh) = d88d4e8b863f36b2c27c4f5eff2fdc235ef76fd8 +SHA1 (patch-bj) = 9b8b2374d4c197e60a1990b09be1117bf0c0a552 +SHA1 (patch-bk) = 3464ae85a444f5dc8adf2262b3bc25d88a531bb8 +SHA1 (patch-bl) = db329b07d8587fc4ed16d64dc6a81903ad5e8cae +SHA1 (patch-bm) = 802bb652c4b149b9f634d1bf6e699dfa471ba2fb +SHA1 (patch-bn) = 0bf22d259c60a2251956b5a1c149c08f14c267ea +SHA1 (patch-bo) = 77a63de0f59c2a0ac7cd8c8fdeca576bda8b0e2d +SHA1 (patch-bp) = 3e6c0d064f3e584a3c722f89021ca218c728e110 +SHA1 (patch-bq) = 3c103cdd084143f320e404ca1ba91565ceba1444 +SHA1 (patch-br) = 5940714e43f8f41500839dfe28b5970e2e0eb298 +SHA1 (patch-bs) = 94a38a15595fe4824532cebf378a8cdaa55e9acd +SHA1 (patch-bt) = 0b6fb631c67fa6d0357de7cb7fcb1de8b7981b3c +SHA1 (patch-bu) = b9ad1f8af84c6d296fae54281a5301dca03b3053 +SHA1 (patch-bv) = 3dc3e144b532ede41c4271e7337167456d1ce006 diff --git a/filesystems/glusterfs/options.mk b/filesystems/glusterfs/options.mk index 6a92de51cf1..b67761d67d5 100644 --- a/filesystems/glusterfs/options.mk +++ b/filesystems/glusterfs/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2011/08/09 07:15:42 manu Exp $ +# $NetBSD: options.mk,v 1.3 2011/09/18 01:36:06 manu Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.glusterfs PKG_SUPPORTED_OPTIONS= georeplication diff --git a/filesystems/glusterfs/patches/patch-aa b/filesystems/glusterfs/patches/patch-aa index 1c0a9875ca7..04c3bff8380 100644 --- a/filesystems/glusterfs/patches/patch-aa +++ b/filesystems/glusterfs/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.6 2011/07/23 01:14:44 manu Exp $ +$NetBSD: patch-aa,v 1.7 2011/09/18 01:36:06 manu Exp $ The == operator is a non-standard bash extension. = should be used instead ---- xlators/mount/fuse/utils/mount_glusterfs.in.orig 2011-07-22 08:57:20.000000000 +0200 -+++ xlators/mount/fuse/utils/mount_glusterfs.in 2011-07-22 08:57:29.000000000 +0200 +--- xlators/mount/fuse/utils/mount_glusterfs.in.orig 2011-08-23 14:31:40.000000000 +0200 ++++ xlators/mount/fuse/utils/mount_glusterfs.in 2011-09-17 15:45:29.000000000 +0200 @@ -164,9 +164,9 @@ } diff --git a/filesystems/glusterfs/patches/patch-ab b/filesystems/glusterfs/patches/patch-ab index 70690bca022..ce6a35f2bae 100644 --- a/filesystems/glusterfs/patches/patch-ab +++ b/filesystems/glusterfs/patches/patch-ab @@ -1,11 +1,11 @@ -$NetBSD: patch-ab,v 1.6 2011/07/23 01:14:44 manu Exp $ +$NetBSD: patch-ab,v 1.7 2011/09/18 01:36:06 manu Exp $ NetBSD does not have AI_ADDRCONFIG. This patch has a side effect: glusterfsd listens on IPv6 adresses only by default. Option transport.socket.bind-address in volume server-tcp must be used to listen on an IPv4 address. ---- rpc/rpc-lib/src/rpc-transport.h.orig 2011-07-14 14:21:10.000000000 +0200 -+++ rpc/rpc-lib/src/rpc-transport.h 2011-07-22 08:58:11.000000000 +0200 +--- rpc/rpc-lib/src/rpc-transport.h.orig 2011-08-23 14:31:38.000000000 +0200 ++++ rpc/rpc-lib/src/rpc-transport.h 2011-09-17 15:45:29.000000000 +0200 @@ -39,8 +39,12 @@ #ifndef MAX_IOVEC #define MAX_IOVEC 16 @@ -19,8 +19,8 @@ in volume server-tcp must be used to listen on an IPv4 address. * is the last fragment for the RPC record being assemebled. * RPC Record marking standard defines a 32 bit value as the fragment * header with the MSB signifying whether the fragment is the last ---- xlators/nfs/lib/src/rpc-socket.c.orig 2011-07-14 14:21:10.000000000 +0200 -+++ xlators/nfs/lib/src/rpc-socket.c 2011-07-22 08:58:11.000000000 +0200 +--- xlators/nfs/lib/src/rpc-socket.c.orig 2011-08-23 14:31:40.000000000 +0200 ++++ xlators/nfs/lib/src/rpc-socket.c 2011-09-17 15:45:29.000000000 +0200 @@ -36,8 +36,12 @@ #include <netdb.h> #include <netinet/in.h> @@ -34,8 +34,8 @@ in volume server-tcp must be used to listen on an IPv4 address. nfs_rpcsvc_socket_server_get_local_socket (int addrfam, char *listenhost, uint16_t listenport, struct sockaddr *addr, ---- libglusterfs/src/common-utils.c.orig 2011-07-14 14:21:10.000000000 +0200 -+++ libglusterfs/src/common-utils.c 2011-07-22 08:58:11.000000000 +0200 +--- libglusterfs/src/common-utils.c.orig 2011-08-23 14:31:37.000000000 +0200 ++++ libglusterfs/src/common-utils.c 2011-09-17 15:45:29.000000000 +0200 @@ -48,8 +48,12 @@ #include "stack.h" #include "globals.h" diff --git a/filesystems/glusterfs/patches/patch-ac b/filesystems/glusterfs/patches/patch-ac index bf8e833fdf7..9618393a07c 100644 --- a/filesystems/glusterfs/patches/patch-ac +++ b/filesystems/glusterfs/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.3 2011/07/23 01:14:44 manu Exp $ +$NetBSD: patch-ac,v 1.4 2011/09/18 01:36:06 manu Exp $ NetBSD does not have EDOOFUS ---- libglusterfs/src/compat-errno.c.orig 2011-07-14 14:21:10.000000000 +0200 -+++ libglusterfs/src/compat-errno.c 2011-07-22 08:58:37.000000000 +0200 +--- libglusterfs/src/compat-errno.c.orig 2011-08-23 14:31:37.000000000 +0200 ++++ libglusterfs/src/compat-errno.c 2011-09-17 15:45:29.000000000 +0200 @@ -857,11 +857,13 @@ /* ENOATTR 87 / * Attribute not found */ gf_error_to_errno_array[GF_ERROR_CODE_NOATTR] = ENOATTR; diff --git a/filesystems/glusterfs/patches/patch-ae b/filesystems/glusterfs/patches/patch-ae index 987d6f2821e..dab51f84e3f 100644 --- a/filesystems/glusterfs/patches/patch-ae +++ b/filesystems/glusterfs/patches/patch-ae @@ -1,9 +1,9 @@ -$NetBSD: patch-ae,v 1.6 2011/07/23 01:14:44 manu Exp $ +$NetBSD: patch-ae,v 1.7 2011/09/18 01:36:06 manu Exp $ On NetBSD use libperfuse(3), rename umount2(2) as unmount(2), and skip inexistant /etc/mtab management. ---- contrib/fuse-lib/mount.c.orig 2011-07-14 14:21:10.000000000 +0200 -+++ contrib/fuse-lib/mount.c 2011-07-22 08:59:10.000000000 +0200 +--- contrib/fuse-lib/mount.c.orig 2011-08-23 14:31:36.000000000 +0200 ++++ contrib/fuse-lib/mount.c 2011-09-17 15:45:29.000000000 +0200 @@ -19,16 +19,23 @@ #include <limits.h> #include <fcntl.h> diff --git a/filesystems/glusterfs/patches/patch-af b/filesystems/glusterfs/patches/patch-af index eb2fe2781b7..ab15ab02dee 100644 --- a/filesystems/glusterfs/patches/patch-af +++ b/filesystems/glusterfs/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.6 2011/07/23 01:14:44 manu Exp $ +$NetBSD: patch-af,v 1.7 2011/09/18 01:36:06 manu Exp $ Works around "error: 'TCP_KEEPALIVE' undeclared" on NetBSD ---- rpc/rpc-transport/socket/src/socket.c.orig 2011-07-14 14:21:10.000000000 +0200 -+++ rpc/rpc-transport/socket/src/socket.c 2011-07-22 08:59:33.000000000 +0200 +--- rpc/rpc-transport/socket/src/socket.c.orig 2011-08-23 14:31:38.000000000 +0200 ++++ rpc/rpc-transport/socket/src/socket.c 2011-09-17 15:45:29.000000000 +0200 @@ -397,9 +397,9 @@ if (keepalive_intvl == GF_USE_DEFAULT_KEEPALIVE) diff --git a/filesystems/glusterfs/patches/patch-an b/filesystems/glusterfs/patches/patch-an index b717ac40ce3..ac2f9ad12e3 100644 --- a/filesystems/glusterfs/patches/patch-an +++ b/filesystems/glusterfs/patches/patch-an @@ -1,11 +1,10 @@ -$NetBSD: patch-an,v 1.7 2011/08/09 07:15:42 manu Exp $ +$NetBSD: patch-an,v 1.8 2011/09/18 01:36:06 manu Exp $ NetBSD uses libperfuse(3). Also enable debugging (-g) for now, and let it build georeplication. - ---- configure.ac.orig 2011-07-14 14:21:10.000000000 +0200 -+++ configure.ac 2011-08-02 11:17:51.000000000 +0200 -@@ -291,8 +291,11 @@ +--- configure.ac.orig 2011-08-23 14:31:42.000000000 +0200 ++++ configure.ac 2011-09-17 15:45:29.000000000 +0200 +@@ -305,8 +305,11 @@ case $host_os in linux*) #do nothing @@ -17,7 +16,7 @@ and let it build georeplication. #disabling geo replication for non-linux platforms enable_georeplication=no ;; -@@ -346,8 +349,13 @@ +@@ -369,8 +372,13 @@ dnl Linux, Solaris, Cygwin AC_CHECK_MEMBERS([struct stat.st_atim.tv_nsec]) dnl FreeBSD, NetBSD @@ -31,7 +30,7 @@ and let it build georeplication. dnl Check for argp AC_CHECK_HEADER([argp.h], AC_DEFINE(HAVE_ARGP, 1, [have argp])) AC_CONFIG_SUBDIRS(argp-standalone) -@@ -414,8 +422,19 @@ +@@ -437,8 +445,19 @@ GF_GLUSTERFS_LDFLAGS="-lnsl -lresolv -lsocket" BUILD_FUSE_CLIENT=no FUSE_CLIENT_SUBDIR="" @@ -51,7 +50,7 @@ and let it build georeplication. GF_HOST_OS="GF_BSD_HOST_OS" GF_CFLAGS="${ARGP_STANDALONE_CPPFLAGS} -O0" GF_GLUSTERFS_CFLAGS="${GF_CFLAGS}" -@@ -450,8 +469,9 @@ +@@ -473,8 +492,9 @@ AC_SUBST(GF_GLUSTERFS_CFLAGS) AC_SUBST(GF_CFLAGS) AC_SUBST(GF_LDFLAGS) @@ -59,5 +58,5 @@ and let it build georeplication. +AC_SUBST(GF_FUSE_LDADD) AC_SUBST(GF_FUSE_CFLAGS) AC_SUBST(RLLIBS) - - CONTRIBDIR='$(top_srcdir)/contrib' + AC_SUBST(AM_MAKEFLAGS) + AC_SUBST(AM_LIBTOOLFLAGS) diff --git a/filesystems/glusterfs/patches/patch-ao b/filesystems/glusterfs/patches/patch-ao index 320c0fe9e1f..fcea9ea5cbe 100644 --- a/filesystems/glusterfs/patches/patch-ao +++ b/filesystems/glusterfs/patches/patch-ao @@ -1,22 +1,21 @@ -$NetBSD: patch-ao,v 1.7 2011/08/09 07:15:42 manu Exp $ +$NetBSD: patch-ao,v 1.8 2011/09/18 01:36:06 manu Exp $ NetBSD uses libperfuse(3). Also enable debugging (-g) for now, and let it build georeplication - ---- configure.orig 2011-07-14 14:21:15.000000000 +0200 -+++ configure 2011-08-02 11:13:53.000000000 +0200 +--- configure.orig 2011-08-23 14:31:48.000000000 +0200 ++++ configure 2011-09-17 15:48:02.000000000 +0200 @@ -464,9 +464,9 @@ # include <unistd.h> #endif" ac_subdirs_all="$ac_subdirs_all argp-standalone" --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL mountutildir initdir launchddir LEX LEXLIB LEX_OUTPUT_ROOT YACC LD ac_ct_LD HAVE_SPINLOCK HAVE_STRNLEN FUSE_CLIENT_SUBDIR FUSERMOUNT_SUBDIR IBVERBS_SUBDIR RDMA_SUBDIR PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYNCDAEMON_COMPILE SYNCDAEMON_SUBDIR HAVE_BACKTRACE HAVE_MALLOC_STATS subdirs ARGP_STANDALONE_CPPFLAGS ARGP_STANDALONE_LDADD GF_DISTRIBUTION GF_HOST_OS GF_GLUSTERFS_LDFLAGS GF_GLUSTERFS_CFLAGS GF_CFLAGS GF_LDFLAGS GF_LDADD GF_FUSE_CFLAGS RLLIBS CONTRIBDIR INCLUDES GF_DARWIN_HOST_OS_TRUE GF_DARWIN_HOST_OS_FALSE LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL mountutildir initdir launchddir LEX LEXLIB LEX_OUTPUT_ROOT YACC LD ac_ct_LD HAVE_SPINLOCK HAVE_STRNLEN FUSE_CLIENT_SUBDIR FUSERMOUNT_SUBDIR IBVERBS_SUBDIR RDMA_SUBDIR PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYNCDAEMON_COMPILE SYNCDAEMON_SUBDIR HAVE_BACKTRACE HAVE_MALLOC_STATS HAVE_LINKAT subdirs ARGP_STANDALONE_CPPFLAGS ARGP_STANDALONE_LDADD GF_DISTRIBUTION GF_HOST_OS GF_GLUSTERFS_LDFLAGS GF_GLUSTERFS_CFLAGS GF_CFLAGS GF_LDFLAGS GF_LDADD GF_FUSE_LDADD GF_FUSE_CFLAGS RLLIBS CONTRIBDIR INCLUDES GF_DARWIN_HOST_OS_TRUE GF_DARWIN_HOST_OS_FALSE LIBOBJS LTLIBOBJS' +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL mountutildir initdir launchddir LEX LEXLIB LEX_OUTPUT_ROOT YACC LD ac_ct_LD HAVE_SPINLOCK HAVE_STRNLEN FUSE_CLIENT_SUBDIR FUSERMOUNT_SUBDIR IBVERBS_SUBDIR RDMA_SUBDIR PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYNCDAEMON_COMPILE SYNCDAEMON_SUBDIR PKG_CONFIG ac_pt_PKG_CONFIG LIBXML2_CFLAGS LIBXML2_LIBS HAVE_BACKTRACE HAVE_MALLOC_STATS subdirs ARGP_STANDALONE_CPPFLAGS ARGP_STANDALONE_LDADD GF_DISTRIBUTION GF_HOST_OS GF_GLUSTERFS_LDFLAGS GF_GLUSTERFS_CFLAGS GF_CFLAGS GF_LDFLAGS GF_LDADD GF_FUSE_CFLAGS RLLIBS AM_MAKEFLAGS AM_LIBTOOLFLAGS CONTRIBDIR INCLUDES GF_DARWIN_HOST_OS_TRUE GF_DARWIN_HOST_OS_FALSE LIBOBJS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL mountutildir initdir launchddir LEX LEXLIB LEX_OUTPUT_ROOT YACC LD ac_ct_LD HAVE_SPINLOCK HAVE_STRNLEN FUSE_CLIENT_SUBDIR FUSERMOUNT_SUBDIR IBVERBS_SUBDIR RDMA_SUBDIR PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYNCDAEMON_COMPILE SYNCDAEMON_SUBDIR PKG_CONFIG ac_pt_PKG_CONFIG LIBXML2_CFLAGS LIBXML2_LIBS HAVE_BACKTRACE HAVE_MALLOC_STATS subdirs ARGP_STANDALONE_CPPFLAGS ARGP_STANDALONE_LDADD GF_DISTRIBUTION GF_HOST_OS GF_GLUSTERFS_LDFLAGS GF_GLUSTERFS_CFLAGS GF_CFLAGS GF_LDFLAGS GF_LDADD GF_FUSE_LDADD GF_FUSE_CFLAGS RLLIBS AM_MAKEFLAGS AM_LIBTOOLFLAGS CONTRIBDIR INCLUDES GF_DARWIN_HOST_OS_TRUE GF_DARWIN_HOST_OS_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. ac_init_help= -@@ -20354,8 +20354,11 @@ +@@ -20385,8 +20385,11 @@ case $host_os in linux*) #do nothing @@ -28,7 +27,7 @@ and let it build georeplication #disabling geo replication for non-linux platforms enable_georeplication=no ;; -@@ -20907,8 +20910,110 @@ +@@ -21124,8 +21127,110 @@ fi @@ -139,7 +138,7 @@ and let it build georeplication echo $ECHO_N "checking for struct stat.st_atim.tv_nsec... $ECHO_C" >&6 if test "${ac_cv_member_struct_stat_st_atim_tv_nsec+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -21731,8 +21836,19 @@ +@@ -21948,8 +22053,19 @@ GF_GLUSTERFS_LDFLAGS="-lnsl -lresolv -lsocket" BUILD_FUSE_CLIENT=no FUSE_CLIENT_SUBDIR="" @@ -159,9 +158,9 @@ and let it build georeplication GF_HOST_OS="GF_BSD_HOST_OS" GF_CFLAGS="${ARGP_STANDALONE_CPPFLAGS} -O0" GF_GLUSTERFS_CFLAGS="${GF_CFLAGS}" -@@ -22844,8 +22960,9 @@ - s,@SYNCDAEMON_COMPILE@,$SYNCDAEMON_COMPILE,;t t - s,@SYNCDAEMON_SUBDIR@,$SYNCDAEMON_SUBDIR,;t t +@@ -23067,8 +23183,9 @@ + s,@LIBXML2_CFLAGS@,$LIBXML2_CFLAGS,;t t + s,@LIBXML2_LIBS@,$LIBXML2_LIBS,;t t s,@HAVE_BACKTRACE@,$HAVE_BACKTRACE,;t t s,@HAVE_MALLOC_STATS@,$HAVE_MALLOC_STATS,;t t +s,@HAVE_LINKAT@,$HAVE_LINKAT,;t t @@ -169,7 +168,7 @@ and let it build georeplication s,@ARGP_STANDALONE_CPPFLAGS@,$ARGP_STANDALONE_CPPFLAGS,;t t s,@ARGP_STANDALONE_LDADD@,$ARGP_STANDALONE_LDADD,;t t s,@GF_DISTRIBUTION@,$GF_DISTRIBUTION,;t t -@@ -22854,8 +22971,9 @@ +@@ -23077,8 +23194,9 @@ s,@GF_GLUSTERFS_CFLAGS@,$GF_GLUSTERFS_CFLAGS,;t t s,@GF_CFLAGS@,$GF_CFLAGS,;t t s,@GF_LDFLAGS@,$GF_LDFLAGS,;t t @@ -177,5 +176,5 @@ and let it build georeplication +s,@GF_FUSE_LDADD@,$GF_FUSE_LDADD,;t t s,@GF_FUSE_CFLAGS@,$GF_FUSE_CFLAGS,;t t s,@RLLIBS@,$RLLIBS,;t t - s,@CONTRIBDIR@,$CONTRIBDIR,;t t - s,@INCLUDES@,$INCLUDES,;t t + s,@AM_MAKEFLAGS@,$AM_MAKEFLAGS,;t t + s,@AM_LIBTOOLFLAGS@,$AM_LIBTOOLFLAGS,;t t diff --git a/filesystems/glusterfs/patches/patch-ar b/filesystems/glusterfs/patches/patch-ar index 479d38a23bc..59131ddca0a 100644 --- a/filesystems/glusterfs/patches/patch-ar +++ b/filesystems/glusterfs/patches/patch-ar @@ -1,9 +1,9 @@ -$NetBSD: patch-ar,v 1.6 2011/07/23 01:14:44 manu Exp $ +$NetBSD: patch-ar,v 1.7 2011/09/18 01:36:06 manu Exp $ Add @GF_FUSE_LDADD@ to fuse.so library dependecies so that -lperfuse is added at configure time for NetBSD. ---- xlators/mount/fuse/src/Makefile.am.orig 2011-07-14 14:21:10.000000000 +0200 -+++ xlators/mount/fuse/src/Makefile.am 2011-07-22 08:59:56.000000000 +0200 +--- xlators/mount/fuse/src/Makefile.am.orig 2011-08-23 14:31:40.000000000 +0200 ++++ xlators/mount/fuse/src/Makefile.am 2011-09-17 15:45:29.000000000 +0200 @@ -15,8 +15,9 @@ fuse_la_SOURCES = fuse-helpers.c fuse-resolve.c fuse-bridge.c \ $(CONTRIBDIR)/fuse-lib/misc.c $(mount_source) diff --git a/filesystems/glusterfs/patches/patch-as b/filesystems/glusterfs/patches/patch-as index 98ffd3af5c8..f2bb8e47458 100644 --- a/filesystems/glusterfs/patches/patch-as +++ b/filesystems/glusterfs/patches/patch-as @@ -1,9 +1,9 @@ -$NetBSD: patch-as,v 1.6 2011/07/23 01:14:44 manu Exp $ +$NetBSD: patch-as,v 1.7 2011/09/18 01:36:06 manu Exp $ Add @GF_FUSE_LDADD@ to fuse.so library dependecies so that -lperfuse is added at configure time for NetBSD. ---- xlators/mount/fuse/src/Makefile.in.orig 2011-07-14 14:21:24.000000000 +0200 -+++ xlators/mount/fuse/src/Makefile.in 2011-07-22 09:00:00.000000000 +0200 +--- xlators/mount/fuse/src/Makefile.in.orig 2011-08-23 14:31:57.000000000 +0200 ++++ xlators/mount/fuse/src/Makefile.in 2011-09-17 15:45:29.000000000 +0200 @@ -55,9 +55,9 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(xlatordir)" diff --git a/filesystems/glusterfs/patches/patch-ax b/filesystems/glusterfs/patches/patch-ax index 124cc7f2c81..c9f47094132 100644 --- a/filesystems/glusterfs/patches/patch-ax +++ b/filesystems/glusterfs/patches/patch-ax @@ -1,8 +1,8 @@ -$NetBSD: patch-ax,v 1.5 2011/07/23 01:14:44 manu Exp $ +$NetBSD: patch-ax,v 1.6 2011/09/18 01:36:06 manu Exp $ Do not strip binaries so that we have debug for now. ---- install-sh.orig 2011-07-14 14:21:18.000000000 +0200 -+++ install-sh 2011-07-22 09:00:03.000000000 +0200 +--- install-sh.orig 2011-08-23 14:31:51.000000000 +0200 ++++ install-sh 2011-09-17 15:45:29.000000000 +0200 @@ -120,9 +120,9 @@ shift shift diff --git a/filesystems/glusterfs/patches/patch-ba b/filesystems/glusterfs/patches/patch-ba index 3c7924c9242..99eff8c95e4 100644 --- a/filesystems/glusterfs/patches/patch-ba +++ b/filesystems/glusterfs/patches/patch-ba @@ -1,4 +1,4 @@ -$NetBSD: patch-ba,v 1.6 2011/07/23 01:14:44 manu Exp $ +$NetBSD: patch-ba,v 1.7 2011/09/18 01:36:06 manu Exp $ glibc dirname() modify the string it is given and returns it. glusterfs takes this behavior for granted, and assume that if it @@ -14,8 +14,8 @@ At least NetBSD returns a static storage. glusterfs will return it to a calling function that has the responsability to free it, causing a SIGSEGV. ---- xlators/performance/stat-prefetch/src/stat-prefetch.c.orig 2011-07-14 14:21:10.000000000 +0200 -+++ xlators/performance/stat-prefetch/src/stat-prefetch.c 2011-07-22 09:00:07.000000000 +0200 +--- xlators/performance/stat-prefetch/src/stat-prefetch.c.orig 2011-08-23 14:31:41.000000000 +0200 ++++ xlators/performance/stat-prefetch/src/stat-prefetch.c 2011-09-17 15:45:29.000000000 +0200 @@ -949,18 +949,24 @@ path = dirname (cpy); switch (i) diff --git a/filesystems/glusterfs/patches/patch-bb b/filesystems/glusterfs/patches/patch-bb index 94d93a26bc4..9fe08fd5c1f 100644 --- a/filesystems/glusterfs/patches/patch-bb +++ b/filesystems/glusterfs/patches/patch-bb @@ -1,18 +1,49 @@ -$NetBSD: patch-bb,v 1.7 2011/07/23 01:14:44 manu Exp $ +$NetBSD: patch-bb,v 1.8 2011/09/18 01:36:06 manu Exp $ O_DIRECTORY is defined as 0, therefore ((flags & O_DIRECTORY) == O_DIRECTORY) is always true even if the flag is not set. ---- xlators/performance/quick-read/src/quick-read.c.orig 2011-07-14 14:21:10.000000000 +0200 -+++ xlators/performance/quick-read/src/quick-read.c 2011-07-22 09:16:44.000000000 +0200 -@@ -727,9 +727,9 @@ - } +--- xlators/performance/quick-read/src/quick-read.c.orig 2011-09-17 15:45:29.000000000 +0200 ++++ xlators/performance/quick-read/src/quick-read.c 2011-09-17 15:45:29.000000000 +0200 +@@ -82,8 +82,9 @@ + qr_loc_fill (loc_t *loc, inode_t *inode, char *path) + { + int32_t ret = -1; + char *parent = NULL; ++ char *path_copy = NULL; + + GF_VALIDATE_OR_GOTO_WITH_ERROR ("quick-read", loc, out, errno, EINVAL); + GF_VALIDATE_OR_GOTO_WITH_ERROR ("quick-read", inode, out, errno, + EINVAL); +@@ -94,15 +95,15 @@ + loc->inode = inode_ref (inode); + loc->path = gf_strdup (path); + loc->ino = inode->ino; + +- parent = gf_strdup (path); +- if (parent == NULL) { ++ path_copy = gf_strdup (path); ++ if (path_copy == NULL) { + ret = -1; + goto out; + } + +- parent = dirname (parent); ++ parent = dirname (path_copy); + + loc->parent = inode_from_path (inode->table, parent); + if (loc->parent == NULL) { + ret = -1; +@@ -118,10 +119,10 @@ + if (ret == -1) { + qr_loc_wipe (loc); + } + +- if (parent) { +- GF_FREE (parent); ++ if (path_copy) { ++ GF_FREE (path_copy); } - UNLOCK (&table->lock); -- if (content_cached && ((flags & O_DIRECTORY) == O_DIRECTORY)) { -+ if (content_cached && (flags & O_DIRECTORY)) { - op_ret = -1; - op_errno = ENOTDIR; - gf_log (this->name, GF_LOG_WARNING, - "open with O_DIRECTORY flag received on non-directory"); + return ret; + } diff --git a/filesystems/glusterfs/patches/patch-bc b/filesystems/glusterfs/patches/patch-bc deleted file mode 100644 index 8531baf9791..00000000000 --- a/filesystems/glusterfs/patches/patch-bc +++ /dev/null @@ -1,60 +0,0 @@ -$NetBSD: patch-bc,v 1.6 2011/07/23 01:14:44 manu Exp $ - -glibc dirname() modify the string it is given and returns it. -glusterfs takes this behavior for granted, and assume that if it -gives a malloc'ed string to dirname(), then it can free()) the -return value. - -Here is what SUSv2 says: -http://opengroup.org/onlinepubs/007908799/xsh/dirname.html -"The dirname() function may modify the string pointed to by path, -and may return a pointer to static storage" - -At least NetBSD returns a static storage. glusterfs will return it to -a calling function that has the responsability to free it, causing -a SIGSEGV. - ---- xlators/performance/quick-read/src/quick-read.c.orig 2011-07-22 09:00:09.000000000 +0200 -+++ xlators/performance/quick-read/src/quick-read.c 2011-07-22 09:00:12.000000000 +0200 -@@ -80,8 +80,9 @@ - qr_loc_fill (loc_t *loc, inode_t *inode, char *path) - { - int32_t ret = -1; - char *parent = NULL; -+ char *path_copy = NULL; - - GF_VALIDATE_OR_GOTO_WITH_ERROR ("quick-read", loc, out, errno, EINVAL); - GF_VALIDATE_OR_GOTO_WITH_ERROR ("quick-read", inode, out, errno, - EINVAL); -@@ -92,15 +93,15 @@ - loc->inode = inode_ref (inode); - loc->path = gf_strdup (path); - loc->ino = inode->ino; - -- parent = gf_strdup (path); -- if (parent == NULL) { -+ path_copy = gf_strdup (path); -+ if (path_copy == NULL) { - ret = -1; - goto out; - } - -- parent = dirname (parent); -+ parent = dirname (path_copy); - - loc->parent = inode_from_path (inode->table, parent); - if (loc->parent == NULL) { - ret = -1; -@@ -116,10 +117,10 @@ - if (ret == -1) { - qr_loc_wipe (loc); - } - -- if (parent) { -- GF_FREE (parent); -+ if (path_copy) { -+ GF_FREE (path_copy); - } - - return ret; - } diff --git a/filesystems/glusterfs/patches/patch-bf b/filesystems/glusterfs/patches/patch-bf index 12e6bea3bff..a498cffc802 100644 --- a/filesystems/glusterfs/patches/patch-bf +++ b/filesystems/glusterfs/patches/patch-bf @@ -1,11 +1,11 @@ -$NetBSD: patch-bf,v 1.6 2011/07/23 01:14:44 manu Exp $ +$NetBSD: patch-bf,v 1.7 2011/09/18 01:36:06 manu Exp $ basename() and dirname() are not supposed to be thread-safe, and NetBSD's implementation is not. glusterfs assume the functions are thread-safe. Borrow basename() and rdirname() form glibc and make NetBSD use them. ---- libglusterfs/src/compat.h.orig 2011-07-14 14:21:10.000000000 +0200 -+++ libglusterfs/src/compat.h 2011-07-22 09:00:17.000000000 +0200 +--- libglusterfs/src/compat.h.orig 2011-08-23 14:31:37.000000000 +0200 ++++ libglusterfs/src/compat.h 2011-09-17 15:45:29.000000000 +0200 @@ -57,26 +57,31 @@ #endif /* HAVE_LLISTXATTR */ #endif /* GF_LINUX_HOST_OS */ diff --git a/filesystems/glusterfs/patches/patch-bh b/filesystems/glusterfs/patches/patch-bh index 05de590aab6..2aa9f38f5f3 100644 --- a/filesystems/glusterfs/patches/patch-bh +++ b/filesystems/glusterfs/patches/patch-bh @@ -1,12 +1,12 @@ -$NetBSD: patch-bh,v 1.5 2011/07/23 01:14:44 manu Exp $ +$NetBSD: patch-bh,v 1.6 2011/09/18 01:36:06 manu Exp $ NetBSD's <dirent.h> does a #defiine d_ino d_fileno. Since glusterfs declares structs with d_ino members, we must include <dirent.h> early so that d_ino get preprocessed into d_fileno conssitently. Also define proper xdr types for NetBSD. ---- rpc/rpc-lib/src/xdr-common.h.orig 2011-07-14 14:21:10.000000000 +0200 -+++ rpc/rpc-lib/src/xdr-common.h 2011-07-22 09:00:19.000000000 +0200 +--- rpc/rpc-lib/src/xdr-common.h.orig 2011-08-23 14:31:38.000000000 +0200 ++++ rpc/rpc-lib/src/xdr-common.h 2011-09-17 15:45:29.000000000 +0200 @@ -29,8 +29,13 @@ #include <sys/types.h> #include <rpc/xdr.h> diff --git a/filesystems/glusterfs/patches/patch-bj b/filesystems/glusterfs/patches/patch-bj index 7bff1d69cb6..9e799b8a547 100644 --- a/filesystems/glusterfs/patches/patch-bj +++ b/filesystems/glusterfs/patches/patch-bj @@ -1,7 +1,7 @@ -$NetBSD: patch-bj,v 1.5 2011/07/23 01:14:44 manu Exp $ +$NetBSD: patch-bj,v 1.6 2011/09/18 01:36:06 manu Exp $ Make sure NetBSD pulls proper FUSE header ---- xlators/mount/fuse/src/fuse-bridge.h.orig 2011-07-22 09:00:37.000000000 +0200 -+++ xlators/mount/fuse/src/fuse-bridge.h 2011-07-22 09:01:05.000000000 +0200 +--- xlators/mount/fuse/src/fuse-bridge.h.orig 2011-08-23 14:31:40.000000000 +0200 ++++ xlators/mount/fuse/src/fuse-bridge.h 2011-09-17 15:45:29.000000000 +0200 @@ -54,9 +54,9 @@ #include "list.h" diff --git a/filesystems/glusterfs/patches/patch-bk b/filesystems/glusterfs/patches/patch-bk index df8d40e4daa..1f973ba9790 100644 --- a/filesystems/glusterfs/patches/patch-bk +++ b/filesystems/glusterfs/patches/patch-bk @@ -1,9 +1,9 @@ -$NetBSD: patch-bk,v 1.5 2011/07/23 01:14:44 manu Exp $ +$NetBSD: patch-bk,v 1.6 2011/09/18 01:36:06 manu Exp $ Add missing xdr_sizeof() in NetBSD. Stollen from http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/xdr/xdr_sizeof.c?rev=1.1 ---- rpc/rpc-lib/src/xdr-sizeof.c.orig 2011-07-22 09:01:14.000000000 +0200 -+++ rpc/rpc-lib/src/xdr-sizeof.c 2011-07-22 09:01:14.000000000 +0200 +--- rpc/rpc-lib/src/xdr-sizeof.c.orig 2011-09-17 15:45:29.000000000 +0200 ++++ rpc/rpc-lib/src/xdr-sizeof.c 2011-09-17 15:45:29.000000000 +0200 @@ -0,0 +1,164 @@ +#ifdef __NetBSD__ +/* diff --git a/filesystems/glusterfs/patches/patch-bl b/filesystems/glusterfs/patches/patch-bl index 32fff1b79d7..085958a2546 100644 --- a/filesystems/glusterfs/patches/patch-bl +++ b/filesystems/glusterfs/patches/patch-bl @@ -1,9 +1,5 @@ -$NetBSD: patch-bl,v 1.5 2011/08/09 07:15:42 manu Exp $ - -#include <signal.h> for SIGTERM - ---- glusterfsd/src/glusterfsd-mgmt.c.orig 2011-07-14 14:21:10.000000000 +0200 -+++ glusterfsd/src/glusterfsd-mgmt.c 2011-07-22 09:01:16.000000000 +0200 +--- glusterfsd/src/glusterfsd-mgmt.c.orig 2011-08-23 14:31:37.000000000 +0200 ++++ glusterfsd/src/glusterfsd-mgmt.c 2011-09-17 15:45:29.000000000 +0200 @@ -20,8 +20,9 @@ #include <stdio.h> #include <sys/types.h> diff --git a/filesystems/glusterfs/patches/patch-bm b/filesystems/glusterfs/patches/patch-bm index 33b398a089a..757cb3bce2e 100644 --- a/filesystems/glusterfs/patches/patch-bm +++ b/filesystems/glusterfs/patches/patch-bm @@ -1,9 +1,5 @@ -$NetBSD: patch-bm,v 1.5 2011/08/09 07:15:42 manu Exp $ - -Add xdr-sizeof() to the build - ---- rpc/rpc-lib/src/Makefile.am.orig 2011-07-14 14:21:10.000000000 +0200 -+++ rpc/rpc-lib/src/Makefile.am 2011-07-22 09:01:18.000000000 +0200 +--- rpc/rpc-lib/src/Makefile.am.orig 2011-08-23 14:31:38.000000000 +0200 ++++ rpc/rpc-lib/src/Makefile.am 2011-09-17 15:45:29.000000000 +0200 @@ -1,9 +1,9 @@ lib_LTLIBRARIES = libgfrpc.la diff --git a/filesystems/glusterfs/patches/patch-bn b/filesystems/glusterfs/patches/patch-bn index 028d64c22b4..a31db02e6bc 100644 --- a/filesystems/glusterfs/patches/patch-bn +++ b/filesystems/glusterfs/patches/patch-bn @@ -1,9 +1,5 @@ -$NetBSD: patch-bn,v 1.5 2011/08/09 07:15:42 manu Exp $ - -Add xdr-sizeof() to the build - ---- rpc/rpc-lib/src/Makefile.in.orig 2011-07-14 14:21:20.000000000 +0200 -+++ rpc/rpc-lib/src/Makefile.in 2011-07-22 09:01:21.000000000 +0200 +--- rpc/rpc-lib/src/Makefile.in.orig 2011-08-23 14:31:53.000000000 +0200 ++++ rpc/rpc-lib/src/Makefile.in 2011-09-17 15:45:30.000000000 +0200 @@ -59,9 +59,9 @@ libgfrpc_la_DEPENDENCIES = \ $(top_builddir)/libglusterfs/src/libglusterfs.la @@ -15,7 +11,7 @@ Add xdr-sizeof() to the build DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles -@@ -222,9 +222,9 @@ +@@ -228,9 +228,9 @@ target_alias = @target_alias@ lib_LTLIBRARIES = libgfrpc.la libgfrpc_la_SOURCES = auth-unix.c rpcsvc-auth.c rpcsvc.c auth-null.c \ @@ -26,7 +22,7 @@ Add xdr-sizeof() to the build libgfrpc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = rpcsvc.h rpc-transport.h xdr-common.h xdr-rpc.h xdr-rpcclnt.h \ rpc-clnt.h rpcsvc-common.h protocol-common.h -@@ -308,8 +308,9 @@ +@@ -314,8 +314,9 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth-null.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth-unix.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpc-clnt.Plo@am__quote@ diff --git a/filesystems/glusterfs/patches/patch-bo b/filesystems/glusterfs/patches/patch-bo index 9e8681e6389..45a49bb18a8 100644 --- a/filesystems/glusterfs/patches/patch-bo +++ b/filesystems/glusterfs/patches/patch-bo @@ -1,9 +1,5 @@ -$NetBSD: patch-bo,v 1.3 2011/08/09 07:15:42 manu Exp $ - -Build fix - ---- rpc/xdr/src/cli1-xdr.c.orig 2011-07-14 14:21:10.000000000 +0200 -+++ rpc/xdr/src/cli1-xdr.c 2011-07-22 09:01:24.000000000 +0200 +--- rpc/xdr/src/cli1-xdr.c.orig 2011-08-23 14:31:38.000000000 +0200 ++++ rpc/xdr/src/cli1-xdr.c 2011-09-17 15:45:30.000000000 +0200 @@ -23,8 +23,9 @@ * It was generated using rpcgen. */ diff --git a/filesystems/glusterfs/patches/patch-bp b/filesystems/glusterfs/patches/patch-bp index 37022979662..60918794e35 100644 --- a/filesystems/glusterfs/patches/patch-bp +++ b/filesystems/glusterfs/patches/patch-bp @@ -1,9 +1,5 @@ -$NetBSD: patch-bp,v 1.5 2011/08/09 07:15:42 manu Exp $ - -NetBSD does not have umount(2), but unmount(2) - ---- xlators/mgmt/glusterd/src/glusterd-op-sm.c.orig 2011-07-14 14:21:10.000000000 +0200 -+++ xlators/mgmt/glusterd/src/glusterd-op-sm.c 2011-07-22 09:01:26.000000000 +0200 +--- xlators/mgmt/glusterd/src/glusterd-op-sm.c.orig 2011-08-23 14:31:40.000000000 +0200 ++++ xlators/mgmt/glusterd/src/glusterd-op-sm.c 2011-09-17 15:45:30.000000000 +0200 @@ -49,8 +49,12 @@ #include "syscall.h" #include "cli1.h" diff --git a/filesystems/glusterfs/patches/patch-bq b/filesystems/glusterfs/patches/patch-bq index 496317e4551..916fd813e38 100644 --- a/filesystems/glusterfs/patches/patch-bq +++ b/filesystems/glusterfs/patches/patch-bq @@ -1,10 +1,5 @@ -$NetBSD: patch-bq,v 1.5 2011/08/09 07:15:42 manu Exp $ - -Make sure glusterfsd listens on the same address family as glusterd: if -glusterd uses inet, glusterfsd should not use inet6 - ---- xlators/mgmt/glusterd/src/glusterd-utils.c.orig 2011-07-14 14:21:10.000000000 +0200 -+++ xlators/mgmt/glusterd/src/glusterd-utils.c 2011-07-22 09:01:28.000000000 +0200 +--- xlators/mgmt/glusterd/src/glusterd-utils.c.orig 2011-08-23 14:31:40.000000000 +0200 ++++ xlators/mgmt/glusterd/src/glusterd-utils.c 2011-09-17 15:45:30.000000000 +0200 @@ -88,8 +88,52 @@ //TODO: set timestamp return 0; @@ -58,7 +53,7 @@ glusterd uses inet, glusterfsd should not use inet6 glusterd_is_loopback_localhost (const struct sockaddr *sa, char *hostname) { GF_ASSERT (sa); -@@ -1027,8 +1071,10 @@ +@@ -1030,8 +1074,10 @@ int rdma_port = 0; FILE *file = NULL; gf_boolean_t is_locked = _gf_false; @@ -69,7 +64,7 @@ glusterd uses inet, glusterfsd should not use inet6 GF_ASSERT (volinfo); GF_ASSERT (brickinfo); -@@ -1107,14 +1153,19 @@ +@@ -1110,14 +1156,19 @@ port = brickinfo->port; if (!port) port = pmap_registry_alloc (THIS); diff --git a/filesystems/glusterfs/patches/patch-br b/filesystems/glusterfs/patches/patch-br index b5d2b575af9..8a97eee6136 100644 --- a/filesystems/glusterfs/patches/patch-br +++ b/filesystems/glusterfs/patches/patch-br @@ -1,15 +1,5 @@ -$NetBSD: patch-br,v 1.4 2011/08/09 07:15:42 manu Exp $ - -- Hide .attribute to glusterfs clients in order to make sure it will -not be distributed by the cluster/dht xlator - -- Use mkfifo for creating fifo, as it will fail with mknod. - -- Use linkat(2) when linking on object that can be symlinks to -directories and non existing paths. - ---- xlators/storage/posix/src/posix.c.orig 2011-07-14 14:21:10.000000000 +0200 -+++ xlators/storage/posix/src/posix.c 2011-08-03 10:05:22.000000000 +0200 +--- xlators/storage/posix/src/posix.c.orig 2011-08-23 14:31:42.000000000 +0200 ++++ xlators/storage/posix/src/posix.c 2011-09-17 15:45:30.000000000 +0200 @@ -36,8 +36,12 @@ #ifndef GF_BSD_HOST_OS #include <alloca.h> @@ -23,7 +13,7 @@ directories and non existing paths. #include "md5.h" #include "checksum.h" #include "dict.h" -@@ -1229,8 +1233,13 @@ +@@ -1232,8 +1236,13 @@ loc->path, strerror (op_errno)); goto out; } @@ -37,7 +27,7 @@ directories and non existing paths. if (op_ret == -1) { op_errno = errno; -@@ -2122,9 +2131,20 @@ +@@ -2125,9 +2134,20 @@ newparentpath, strerror (op_errno)); goto out; } @@ -58,25 +48,3 @@ directories and non existing paths. op_errno = errno; gf_log (this->name, GF_LOG_ERROR, "link %s to %s failed: %s", -@@ -4313,8 +4333,21 @@ - - if ((!strcmp(real_path, base_path)) - && (!strcmp(entry->d_name, GF_REPLICATE_TRASH_DIR))) - continue; -+#ifdef __NetBSD__ -+ /* -+ * NetBSD with UFS1 backend uses backing files for -+ * extended attributes. They can be found in a -+ * .attribute file located at the root of the filesystem -+ * We hide it to glusterfs clients, since chaos will occur -+ * when the cluster/dht xlator decides to distribute -+ * exended attribute backing file accross storage servers. -+ */ -+ if ((!strcmp(real_path, base_path)) -+ && (!strcmp(entry->d_name, ".attribute"))) -+ continue; -+#endif /* __NetBSD__ */ - - if ((!strcmp (real_path, base_path)) - && (!strncmp (GF_HIDDEN_PATH, entry->d_name, - strlen(GF_HIDDEN_PATH)))) { diff --git a/filesystems/glusterfs/patches/patch-bs b/filesystems/glusterfs/patches/patch-bs index d7396733d5c..6ecaa4dba51 100644 --- a/filesystems/glusterfs/patches/patch-bs +++ b/filesystems/glusterfs/patches/patch-bs @@ -1,10 +1,5 @@ -$NetBSD: patch-bs,v 1.4 2011/08/09 07:15:42 manu Exp $ - -Actually use the Linux [lf]?(set|get|list|remove)xattr reimplementation -we have in libglusterfs/src/compat.c - ---- libglusterfs/src/syscall.c.orig 2011-07-14 14:21:10.000000000 +0200 -+++ libglusterfs/src/syscall.c 2011-07-22 09:01:32.000000000 +0200 +--- libglusterfs/src/syscall.c.orig 2011-08-23 14:31:38.000000000 +0200 ++++ libglusterfs/src/syscall.c 2011-09-17 15:45:30.000000000 +0200 @@ -267,9 +267,9 @@ sys_lsetxattr (const char *path, const char *name, const void *value, size_t size, int flags) diff --git a/filesystems/glusterfs/patches/patch-bt b/filesystems/glusterfs/patches/patch-bt index 45eeea27d19..3289cda6157 100644 --- a/filesystems/glusterfs/patches/patch-bt +++ b/filesystems/glusterfs/patches/patch-bt @@ -1,12 +1,7 @@ -$NetBSD: patch-bt,v 1.4 2011/08/09 07:15:42 manu Exp $ - -Fix the io-threads xlator, which forgot to initialize its pthread -condition and mutex. - ---- xlators/performance/io-threads/src/io-threads.c.orig 2011-07-14 14:21:10.000000000 +0200 -+++ xlators/performance/io-threads/src/io-threads.c 2011-07-22 09:01:34.000000000 +0200 -@@ -2181,8 +2181,20 @@ - "out of memory"); +--- xlators/performance/io-threads/src/io-threads.c.orig 2011-08-23 14:31:41.000000000 +0200 ++++ xlators/performance/io-threads/src/io-threads.c 2011-09-17 15:45:30.000000000 +0200 +@@ -2194,8 +2194,20 @@ + "pthread_mutex_init failed (%d)", ret); goto out; } @@ -24,5 +19,5 @@ condition and mutex. + set_stack_size (conf); - thread_count = IOT_DEFAULT_THREADS; - + if (xlator_get_volopt_info (&this->volume_options, "thread-count", + &def_val, NULL)) { diff --git a/filesystems/glusterfs/patches/patch-bu b/filesystems/glusterfs/patches/patch-bu index f10d0200933..1e844caba53 100644 --- a/filesystems/glusterfs/patches/patch-bu +++ b/filesystems/glusterfs/patches/patch-bu @@ -1,10 +1,5 @@ -$NetBSD: patch-bu,v 1.1 2011/08/09 07:15:42 manu Exp $ - -Avoid fatal error if gfid changed. Patch not committed upstream yet, -but it helps. - ---- xlators/protocol/client/src/client3_1-fops.c.orig 2011-07-14 14:21:10.000000000 +0200 -+++ xlators/protocol/client/src/client3_1-fops.c 2011-07-22 09:38:35.000000000 +0200 +--- xlators/protocol/client/src/client3_1-fops.c.orig 2011-08-23 14:31:41.000000000 +0200 ++++ xlators/protocol/client/src/client3_1-fops.c 2011-09-17 15:45:30.000000000 +0200 @@ -2208,13 +2208,11 @@ } diff --git a/filesystems/glusterfs/patches/patch-bv b/filesystems/glusterfs/patches/patch-bv index af2181b7025..f2fdccae5a8 100644 --- a/filesystems/glusterfs/patches/patch-bv +++ b/filesystems/glusterfs/patches/patch-bv @@ -1,10 +1,6 @@ -$NetBSD: patch-bv,v 1.1 2011/08/09 07:15:42 manu Exp $ - -Check for linkat() - ---- config.h.in.orig 2011-08-03 09:18:25.000000000 +0200 -+++ config.h.in 2011-08-03 09:18:44.000000000 +0200 -@@ -35,8 +35,11 @@ +--- config.h.in.orig 2011-08-23 14:31:46.000000000 +0200 ++++ config.h.in 2011-09-17 15:45:30.000000000 +0200 +@@ -38,8 +38,11 @@ /* define if found malloc_stats */ #undef HAVE_MALLOC_STATS |