summaryrefslogtreecommitdiff
path: root/filesystems/glusterfs
diff options
context:
space:
mode:
Diffstat (limited to 'filesystems/glusterfs')
-rw-r--r--filesystems/glusterfs/MESSAGE.ssl9
-rw-r--r--filesystems/glusterfs/Makefile9
-rw-r--r--filesystems/glusterfs/PLIST111
-rw-r--r--filesystems/glusterfs/distinfo16
-rw-r--r--filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.c19
-rw-r--r--filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.h48
-rw-r--r--filesystems/glusterfs/patches/patch-da26
-rw-r--r--filesystems/glusterfs/patches/patch-db39
-rw-r--r--filesystems/glusterfs/patches/patch-libglusterfs_src_glusterfs.h13
-rw-r--r--filesystems/glusterfs/patches/patch-libglusterfs_src_rbthash.c22
-rw-r--r--filesystems/glusterfs/patches/patch-rpc_rpc-lib_src_rpc-clnt.c13
-rw-r--r--filesystems/glusterfs/patches/patch-rpc_rpc-lib_src_rpcsvc.c85
12 files changed, 88 insertions, 322 deletions
diff --git a/filesystems/glusterfs/MESSAGE.ssl b/filesystems/glusterfs/MESSAGE.ssl
deleted file mode 100644
index b76d1644466..00000000000
--- a/filesystems/glusterfs/MESSAGE.ssl
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.ssl,v 1.1 2011/12/09 16:57:44 manu Exp $
-
-The following paths are used for SSL key, certificate and CA:
- ${PKG_SYSCONFDIR}/openssl/private/gluster.key
- ${PKG_SYSCONFDIR}/openssl/certs/gluster.crt
- ${PKG_SYSCONFDIR}/openssl/certs/gluster-ca.crt
-
-===========================================================================
diff --git a/filesystems/glusterfs/Makefile b/filesystems/glusterfs/Makefile
index 9c54d5cd045..3b07d3c24bd 100644
--- a/filesystems/glusterfs/Makefile
+++ b/filesystems/glusterfs/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.34 2013/02/26 10:27:09 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2013/09/08 03:38:52 manu Exp $
#
-DISTNAME= glusterfs-3.3.1
+DISTNAME= glusterfs-3.4.0
+#PKGREVISION= 1
CATEGORIES= filesystems
-MASTER_SITES= http://download.gluster.org/pub/gluster/glusterfs/3.3/3.3.1/
+MASTER_SITES= http://download.gluster.org/pub/gluster/glusterfs/3.4/3.4.0/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gluster.org/
@@ -14,6 +15,7 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= flex bison
+CONFIGURE_ARGS+= --disable-fusermount
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
CONFIGURE_ARGS+= CFLAGS=${CFLAGS:M*:Q}\ -DDEBUG
@@ -72,7 +74,6 @@ PLIST_SUBST+= VARBASE=${VARBASE}
PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
MESSAGE_SRC= ${PKGDIR}/MESSAGE.${OPSYS}
-CPPFLAGS.NetBSD+= -D_KMEMUSER
post-build:
cp ${WRKSRC}/doc/glusterd.vol ${WRKSRC}/doc/glusterd.vol.sample
diff --git a/filesystems/glusterfs/PLIST b/filesystems/glusterfs/PLIST
index 0e5a8def7f8..a4fb513175d 100644
--- a/filesystems/glusterfs/PLIST
+++ b/filesystems/glusterfs/PLIST
@@ -1,61 +1,80 @@
-@comment $NetBSD: PLIST,v 1.14 2013/04/06 04:03:36 rodent Exp $
+@comment $NetBSD: PLIST,v 1.15 2013/09/08 03:38:52 manu Exp $
etc/glusterfs/glusterd.vol.sample
-lib/libglusterfs.la
+etc/glusterfs/glusterfs-logrotate
+include/glusterfs/api/glfs.h
+lib/glusterfs/3.4.0/auth/addr.la
+lib/glusterfs/3.4.0/auth/login.la
+lib/glusterfs/3.4.0/rpc-transport/socket.la
+lib/glusterfs/3.4.0/xlator/cluster/afr.la
+lib/glusterfs/3.4.0/xlator/cluster/dht.la
+lib/glusterfs/3.4.0/xlator/cluster/distribute.so
+lib/glusterfs/3.4.0/xlator/cluster/nufa.la
+lib/glusterfs/3.4.0/xlator/cluster/pump.la
+lib/glusterfs/3.4.0/xlator/cluster/replicate.so
+lib/glusterfs/3.4.0/xlator/cluster/stripe.la
+lib/glusterfs/3.4.0/xlator/cluster/switch.la
+lib/glusterfs/3.4.0/xlator/debug/error-gen.la
+lib/glusterfs/3.4.0/xlator/debug/io-stats.la
+lib/glusterfs/3.4.0/xlator/debug/trace.la
+lib/glusterfs/3.4.0/xlator/encryption/rot-13.la
+lib/glusterfs/3.4.0/xlator/features/access-control.so
+lib/glusterfs/3.4.0/xlator/features/index.la
+lib/glusterfs/3.4.0/xlator/features/locks.la
+lib/glusterfs/3.4.0/xlator/features/mac-compat.la
+lib/glusterfs/3.4.0/xlator/features/marker.la
+lib/glusterfs/3.4.0/xlator/features/posix-locks.so
+lib/glusterfs/3.4.0/xlator/features/quiesce.la
+lib/glusterfs/3.4.0/xlator/features/quota.la
+lib/glusterfs/3.4.0/xlator/features/read-only.la
+lib/glusterfs/3.4.0/xlator/features/worm.la
+lib/glusterfs/3.4.0/xlator/mgmt/glusterd.la
+lib/glusterfs/3.4.0/xlator/mount/api.a
+lib/glusterfs/3.4.0/xlator/mount/api.la
+lib/glusterfs/3.4.0/xlator/mount/fuse.la
+lib/glusterfs/3.4.0/xlator/nfs/server.la
+lib/glusterfs/3.4.0/xlator/performance/io-cache.la
+lib/glusterfs/3.4.0/xlator/performance/io-threads.la
+lib/glusterfs/3.4.0/xlator/performance/md-cache.la
+lib/glusterfs/3.4.0/xlator/performance/open-behind.a
+lib/glusterfs/3.4.0/xlator/performance/open-behind.la
+lib/glusterfs/3.4.0/xlator/performance/open-behind.so
+lib/glusterfs/3.4.0/xlator/performance/quick-read.la
+lib/glusterfs/3.4.0/xlator/performance/read-ahead.la
+lib/glusterfs/3.4.0/xlator/performance/stat-prefetch.so
+lib/glusterfs/3.4.0/xlator/performance/write-behind.la
+lib/glusterfs/3.4.0/xlator/protocol/client.la
+lib/glusterfs/3.4.0/xlator/protocol/server.la
+lib/glusterfs/3.4.0/xlator/storage/posix.la
+lib/glusterfs/3.4.0/xlator/system/posix-acl.la
+lib/glusterfs/3.4.0/xlator/testing/performance/symlink-cache.la
+lib/libgfapi.a
+lib/libgfapi.la
+lib/libgfapi.so
+lib/libgfapi.so.0
+lib/libgfapi.so.0.0.0
lib/libgfrpc.la
lib/libgfxdr.la
-lib/glusterfs/3.3.1/auth/addr.la
-lib/glusterfs/3.3.1/auth/login.la
-lib/glusterfs/3.3.1/rpc-transport/socket.la
-lib/glusterfs/3.3.1/xlator/cluster/afr.la
-lib/glusterfs/3.3.1/xlator/cluster/dht.la
-lib/glusterfs/3.3.1/xlator/cluster/distribute.so
-lib/glusterfs/3.3.1/xlator/cluster/nufa.la
-lib/glusterfs/3.3.1/xlator/cluster/pump.la
-lib/glusterfs/3.3.1/xlator/cluster/replicate.so
-lib/glusterfs/3.3.1/xlator/cluster/stripe.la
-lib/glusterfs/3.3.1/xlator/cluster/switch.la
-lib/glusterfs/3.3.1/xlator/debug/error-gen.la
-lib/glusterfs/3.3.1/xlator/debug/io-stats.la
-lib/glusterfs/3.3.1/xlator/debug/trace.la
-lib/glusterfs/3.3.1/xlator/encryption/rot-13.la
-lib/glusterfs/3.3.1/xlator/features/access-control.so
-lib/glusterfs/3.3.1/xlator/features/index.la
-lib/glusterfs/3.3.1/xlator/features/locks.la
-lib/glusterfs/3.3.1/xlator/features/mac-compat.la
-lib/glusterfs/3.3.1/xlator/features/marker.la
-lib/glusterfs/3.3.1/xlator/features/posix-locks.so
-lib/glusterfs/3.3.1/xlator/features/quiesce.la
-lib/glusterfs/3.3.1/xlator/features/quota.la
-lib/glusterfs/3.3.1/xlator/features/read-only.la
-lib/glusterfs/3.3.1/xlator/features/worm.la
-lib/glusterfs/3.3.1/xlator/mgmt/glusterd.la
-lib/glusterfs/3.3.1/xlator/mount/fuse.la
-lib/glusterfs/3.3.1/xlator/nfs/server.la
-lib/glusterfs/3.3.1/xlator/performance/io-cache.la
-lib/glusterfs/3.3.1/xlator/performance/io-threads.la
-lib/glusterfs/3.3.1/xlator/performance/md-cache.la
-lib/glusterfs/3.3.1/xlator/performance/quick-read.la
-lib/glusterfs/3.3.1/xlator/performance/read-ahead.la
-lib/glusterfs/3.3.1/xlator/performance/stat-prefetch.so
-lib/glusterfs/3.3.1/xlator/performance/write-behind.la
-lib/glusterfs/3.3.1/xlator/protocol/client.la
-lib/glusterfs/3.3.1/xlator/protocol/server.la
-lib/glusterfs/3.3.1/xlator/storage/posix.la
-lib/glusterfs/3.3.1/xlator/system/posix-acl.la
-lib/glusterfs/3.3.1/xlator/testing/performance/symlink-cache.la
+lib/libglusterfs.la
+lib/ocf/resource.d/glusterfs/glusterd
+lib/ocf/resource.d/glusterfs/volume
+lib/pkgconfig/glusterfs-api.pc
man/man8/gluster.8
+man/man8/glusterd.8
+man/man8/glusterfs.8
+man/man8/glusterfsd.8
+man/man8/mount.glusterfs.8
+sbin/gluster
sbin/glusterd
sbin/glusterfs
sbin/glusterfsd
-sbin/gluster
sbin/mount.glusterfs
-share/doc/glusterfs/benchmarking/rdd.c
-share/doc/glusterfs/benchmarking/glfs-bm.c
share/doc/glusterfs/benchmarking/README
+share/doc/glusterfs/benchmarking/glfs-bm.c
share/doc/glusterfs/benchmarking/launch-script.sh
share/doc/glusterfs/benchmarking/local-script.sh
+share/doc/glusterfs/benchmarking/rdd.c
share/doc/glusterfs/glusterfs-mode.el
share/doc/glusterfs/glusterfs.vim
-share/examples/rc.d/glusterfsd
share/examples/rc.d/glusterd
+share/examples/rc.d/glusterfsd
@exec test -d ${PKG_SYSCONFDIR}/glusterd -a ! -d ${VARBASE}/lib/glusterd && ${MKDIR} -p ${VARBASE}/lib/ && mv ${PKG_SYSCONFDIR}/glusterd ${VARBASE}/lib/glusterd && ${LN} -s ${VARBASE}/lib/glusterd ${PKG_SYSCONFDIR}/glusterd
diff --git a/filesystems/glusterfs/distinfo b/filesystems/glusterfs/distinfo
index 9536769f9f5..aa8588dda4f 100644
--- a/filesystems/glusterfs/distinfo
+++ b/filesystems/glusterfs/distinfo
@@ -1,12 +1,6 @@
-$NetBSD: distinfo,v 1.27 2012/12/20 21:53:20 joerg Exp $
+$NetBSD: distinfo,v 1.28 2013/09/08 03:38:52 manu Exp $
-SHA1 (glusterfs-3.3.1.tar.gz) = c29632e4938533069c4c0206fb1c32de8443168d
-RMD160 (glusterfs-3.3.1.tar.gz) = 667bac9362aab01ab04f9119e399b8d955e01135
-Size (glusterfs-3.3.1.tar.gz) = 2636698 bytes
-SHA1 (patch-argp-standalone_argp-fmtstream.c) = 1a302c39cb8f09a56fc4b8d12589bbb69f92a0f3
-SHA1 (patch-argp-standalone_argp-fmtstream.h) = 896bee64bcf8966dede5e92ca9097db4c69e6aa4
-SHA1 (patch-da) = 312a8c73c1a22058dc43cf5f957380c42a5a23e4
-SHA1 (patch-db) = a97ac1bea9be2a9d7162eb495cb9b3c741d70e34
-SHA1 (patch-libglusterfs_src_rbthash.c) = 2e50cf8712e30cef5a4b30510fac65a6474b58b6
-SHA1 (patch-rpc_rpc-lib_src_rpc-clnt.c) = ad93375f38fce36437abae3ee499caa6b55e89e6
-SHA1 (patch-rpc_rpc-lib_src_rpcsvc.c) = 28b509411e421a1cd0e979a282786c28c59141e7
+SHA1 (glusterfs-3.4.0.tar.gz) = 8795bcb309730c173a226c8cb1e08587e56ea692
+RMD160 (glusterfs-3.4.0.tar.gz) = 15a290ad890541ec365134eb998e5f0ec48d3bbc
+Size (glusterfs-3.4.0.tar.gz) = 3774842 bytes
+SHA1 (patch-libglusterfs_src_glusterfs.h) = 59a0523652628ed24641d63a926f5e33b33bc802
diff --git a/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.c b/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.c
deleted file mode 100644
index f8ced213fcf..00000000000
--- a/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-argp-standalone_argp-fmtstream.c,v 1.1 2012/12/20 21:53:20 joerg Exp $
-
---- argp-standalone/argp-fmtstream.c.orig 2012-10-11 17:38:19.000000000 +0000
-+++ argp-standalone/argp-fmtstream.c
-@@ -389,6 +389,7 @@ __argp_fmtstream_printf (struct argp_fmt
- weak_alias (__argp_fmtstream_printf, argp_fmtstream_printf)
- #endif
-
-+#if __STDC_VERSION__ - 199900L < 1
- /* Duplicate the inline definitions in argp-fmtstream.h, for compilers
- * that don't do inlining. */
- size_t
-@@ -471,5 +472,6 @@ __argp_fmtstream_point (argp_fmtstream_t
- __argp_fmtstream_update (__fs);
- return __fs->point_col >= 0 ? __fs->point_col : 0;
- }
-+#endif
-
- #endif /* !ARGP_FMTSTREAM_USE_LINEWRAP */
diff --git a/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.h b/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.h
deleted file mode 100644
index 728e913791e..00000000000
--- a/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.h
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-argp-standalone_argp-fmtstream.h,v 1.1 2012/12/20 21:53:20 joerg Exp $
-
---- argp-standalone/argp-fmtstream.h.orig 2012-10-11 17:38:19.000000000 +0000
-+++ argp-standalone/argp-fmtstream.h
-@@ -153,6 +153,7 @@ extern ssize_t argp_fmtstream_printf (ar
- __const char *__fmt, ...)
- PRINTF_STYLE(2,3);
-
-+#if 0
- extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
- extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
-
-@@ -163,6 +164,7 @@ extern size_t __argp_fmtstream_write (ar
- __const char *__str, size_t __len);
- extern size_t argp_fmtstream_write (argp_fmtstream_t __fs,
- __const char *__str, size_t __len);
-+#endif
-
- /* Access macros for various bits of state. */
- #define argp_fmtstream_lmargin(__fs) ((__fs)->lmargin)
-@@ -172,6 +174,7 @@ extern size_t argp_fmtstream_write (argp
- #define __argp_fmtstream_rmargin argp_fmtstream_rmargin
- #define __argp_fmtstream_wmargin argp_fmtstream_wmargin
-
-+#if 0
- /* Set __FS's left margin to LMARGIN and return the old value. */
- extern size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs,
- size_t __lmargin);
-@@ -193,6 +196,7 @@ extern size_t __argp_fmtstream_set_wmarg
- /* Return the column number of the current output point in __FS. */
- extern size_t argp_fmtstream_point (argp_fmtstream_t __fs);
- extern size_t __argp_fmtstream_point (argp_fmtstream_t __fs);
-+#endif
-
- /* Internal routines. */
- extern void _argp_fmtstream_update (argp_fmtstream_t __fs);
-@@ -216,7 +220,11 @@ extern int __argp_fmtstream_ensure (argp
- #endif
-
- #ifndef ARGP_FS_EI
-+#if defined(__GNUC__) && !defined(__GNUC_STDC_INLINE__)
- #define ARGP_FS_EI extern inline
-+#else
-+#define ARGP_FS_EI inline
-+#endif
- #endif
-
- ARGP_FS_EI size_t
diff --git a/filesystems/glusterfs/patches/patch-da b/filesystems/glusterfs/patches/patch-da
deleted file mode 100644
index f8060e8ca97..00000000000
--- a/filesystems/glusterfs/patches/patch-da
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-da,v 1.1 2012/10/19 04:15:22 manu Exp $
-
-Avoid corner case where the client is unsable to reconnect to servers
-
-Backport of a bit from http://review.gluster.org/362
-
---- rpc/rpc-transport/socket/src/socket.c.orig 2012-09-30 06:42:07.000000000 +0200
-+++ rpc/rpc-transport/socket/src/socket.c 2012-09-30 09:41:50.000000000 +0200
-@@ -278,8 +278,17 @@
- gf_log (this->name, GF_LOG_DEBUG,
- "shutdown() returned %d. %s",
- ret, strerror (errno));
- }
-+
-+ /*
-+ * Without this, reconnect (= disconnect + connect)
-+ * won't work except by accident.
-+ */
-+ event_unregister (this->ctx->event_pool,
-+ priv->sock, priv->idx);
-+ close (priv->sock);
-+ priv->sock = -1;
- }
-
- out:
- return ret;
diff --git a/filesystems/glusterfs/patches/patch-db b/filesystems/glusterfs/patches/patch-db
deleted file mode 100644
index d1b20f733dd..00000000000
--- a/filesystems/glusterfs/patches/patch-db
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-db,v 1.1 2012/10/19 04:15:22 manu Exp $
-
-Always enable DHT so that scaling from 1 brick to more does not raise
-spurious EINVAL
-
-From upstream http://review.gluster.org/3838
-
---- xlators/mgmt/glusterd/src/glusterd-volgen.c.orig
-+++ xlators/mgmt/glusterd/src/glusterd-volgen.c
-@@ -2362,7 +2362,6 @@ volgen_graph_build_dht_cluster (volgen_graph_t *graph,
- char *decommissioned_children = NULL;
- xlator_t *dht = NULL;
-
-- GF_ASSERT (child_count > 1);
- clusters = volgen_graph_build_clusters (graph, volinfo,
- "cluster/distribute", "%s-dht",
- child_count, child_count);
-@@ -2455,12 +2454,16 @@ volume_volgen_graph_build_clusters (volgen_graph_t *graph,
-
- build_distribute:
- dist_count = volinfo->brick_count / volinfo->dist_leaf_count;
-- if (dist_count > 1) {
-- ret = volgen_graph_build_dht_cluster (graph, volinfo,
-- dist_count);
-- if (ret)
-- goto out;
-+ if (!dist_count) {
-+ ret = -1;
-+ goto out;
- }
-+
-+ ret = volgen_graph_build_dht_cluster (graph, volinfo,
-+ dist_count);
-+ if (ret)
-+ goto out;
-+
- ret = 0;
- out:
- return ret;
diff --git a/filesystems/glusterfs/patches/patch-libglusterfs_src_glusterfs.h b/filesystems/glusterfs/patches/patch-libglusterfs_src_glusterfs.h
new file mode 100644
index 00000000000..8a3da27b84c
--- /dev/null
+++ b/filesystems/glusterfs/patches/patch-libglusterfs_src_glusterfs.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-libglusterfs_src_glusterfs.h,v 1.1 2013/09/08 03:38:52 manu Exp $
+--- libglusterfs/src/glusterfs.h.orig 2013-07-18 04:31:33.000000000 +0200
++++ libglusterfs/src/glusterfs.h 2013-07-18 04:32:59.000000000 +0200
+@@ -31,8 +31,9 @@
+ #include <fcntl.h>
+ #include <arpa/inet.h>
+ #include <sys/poll.h>
+ #include <pthread.h>
++#include <limits.h> /* For PATH_MAX */
+
+ #include "list.h"
+ #include "logging.h"
+ #include "lkowner.h"
diff --git a/filesystems/glusterfs/patches/patch-libglusterfs_src_rbthash.c b/filesystems/glusterfs/patches/patch-libglusterfs_src_rbthash.c
deleted file mode 100644
index 1af05b78eed..00000000000
--- a/filesystems/glusterfs/patches/patch-libglusterfs_src_rbthash.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-libglusterfs_src_rbthash.c,v 1.1 2012/12/20 21:53:20 joerg Exp $
-
---- libglusterfs/src/rbthash.c.orig 2012-12-20 15:00:05.000000000 +0000
-+++ libglusterfs/src/rbthash.c
-@@ -228,7 +228,7 @@ rbthash_deinit_entry (rbthash_table_t *t
- }
-
-
--inline struct rbthash_bucket *
-+struct rbthash_bucket *
- rbthash_entry_bucket (rbthash_table_t *tbl, rbthash_entry_t * entry)
- {
- int nbucket = 0;
-@@ -302,7 +302,7 @@ err:
- return ret;
- }
-
--inline struct rbthash_bucket *
-+struct rbthash_bucket *
- rbthash_key_bucket (rbthash_table_t *tbl, void *key, int keylen)
- {
- uint32_t keyhash = 0;
diff --git a/filesystems/glusterfs/patches/patch-rpc_rpc-lib_src_rpc-clnt.c b/filesystems/glusterfs/patches/patch-rpc_rpc-lib_src_rpc-clnt.c
deleted file mode 100644
index 174618c4745..00000000000
--- a/filesystems/glusterfs/patches/patch-rpc_rpc-lib_src_rpc-clnt.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-rpc_rpc-lib_src_rpc-clnt.c,v 1.1 2012/12/20 21:53:20 joerg Exp $
-
---- rpc/rpc-lib/src/rpc-clnt.c.orig 2012-12-20 14:57:05.000000000 +0000
-+++ rpc/rpc-lib/src/rpc-clnt.c
-@@ -951,7 +951,7 @@ rpc_clnt_connection_deinit (rpc_clnt_con
- }
-
-
--inline int
-+int
- rpc_clnt_connection_init (struct rpc_clnt *clnt, glusterfs_ctx_t *ctx,
- dict_t *options, char *name)
- {
diff --git a/filesystems/glusterfs/patches/patch-rpc_rpc-lib_src_rpcsvc.c b/filesystems/glusterfs/patches/patch-rpc_rpc-lib_src_rpcsvc.c
deleted file mode 100644
index a8fcb859631..00000000000
--- a/filesystems/glusterfs/patches/patch-rpc_rpc-lib_src_rpcsvc.c
+++ /dev/null
@@ -1,85 +0,0 @@
-$NetBSD: patch-rpc_rpc-lib_src_rpcsvc.c,v 1.1 2012/12/20 21:53:20 joerg Exp $
-
---- rpc/rpc-lib/src/rpcsvc.c.orig 2012-12-20 14:55:50.000000000 +0000
-+++ rpc/rpc-lib/src/rpcsvc.c
-@@ -220,7 +220,7 @@ err:
- /* this procedure can only pass 4 arguments to registered notifyfn. To send more
- * arguments call wrapper->notify directly.
- */
--inline void
-+void
- rpcsvc_program_notify (rpcsvc_listener_t *listener, rpcsvc_event_t event,
- void *data)
- {
-@@ -243,7 +243,7 @@ out:
- }
-
-
--inline int
-+int
- rpcsvc_accept (rpcsvc_t *svc, rpc_transport_t *listen_trans,
- rpc_transport_t *new_trans)
- {
-@@ -687,7 +687,7 @@ err:
- return txrecord;
- }
-
--inline int
-+int
- rpcsvc_get_callid (rpcsvc_t *rpc)
- {
- return GF_UNIVERSAL_ANSWER;
-@@ -873,7 +873,7 @@ out:
- return ret;
- }
-
--inline int
-+int
- rpcsvc_transport_submit (rpc_transport_t *trans, struct iovec *hdrvec,
- int hdrcount, struct iovec *proghdr, int proghdrcount,
- struct iovec *progpayload, int progpayloadcount,
-@@ -1120,7 +1120,7 @@ rpcsvc_error_reply (rpcsvc_request_t *re
-
-
- /* Register the program with the local portmapper service. */
--inline int
-+int
- rpcsvc_program_register_portmap (rpcsvc_program_t *newprog, uint32_t port)
- {
- int ret = 0;
-@@ -1142,7 +1142,7 @@ out:
- }
-
-
--inline int
-+int
- rpcsvc_program_unregister_portmap (rpcsvc_program_t *prog)
- {
- int ret = 0;
-@@ -1320,7 +1320,7 @@ out:
- }
-
-
--inline int
-+int
- rpcsvc_transport_peername (rpc_transport_t *trans, char *hostname, int hostlen)
- {
- if (!trans) {
-@@ -1331,7 +1331,7 @@ rpcsvc_transport_peername (rpc_transport
- }
-
-
--inline int
-+int
- rpcsvc_transport_peeraddr (rpc_transport_t *trans, char *addrstr, int addrlen,
- struct sockaddr_storage *sa, socklen_t sasize)
- {
-@@ -1583,7 +1583,7 @@ out:
- }
-
-
--inline int
-+int
- rpcsvc_program_register (rpcsvc_t *svc, rpcsvc_program_t *program)
- {
- int ret = -1;
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-10 19:02:32 +0000