diff options
Diffstat (limited to 'filesystems/glusterfs/patches/patch-bk')
| -rw-r--r-- | filesystems/glusterfs/patches/patch-bk | 223 |
1 files changed, 223 insertions, 0 deletions
diff --git a/filesystems/glusterfs/patches/patch-bk b/filesystems/glusterfs/patches/patch-bk new file mode 100644 index 00000000000..15b662d3f30 --- /dev/null +++ b/filesystems/glusterfs/patches/patch-bk @@ -0,0 +1,223 @@ +$NetBSD: patch-bk,v 1.1 2011/04/18 16:19:48 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/Makefile.am.orig 2011-04-09 10:09:02.000000000 +0200 ++++ rpc/rpc-lib/src/Makefile.am 2011-04-13 15:34:52.000000000 +0200 +@@ -1,9 +1,9 @@ + lib_LTLIBRARIES = libgfrpc.la + + libgfrpc_la_SOURCES = auth-unix.c rpcsvc-auth.c rpcsvc.c auth-null.c \ +- rpc-transport.c xdr-rpc.c xdr-rpcclnt.c rpc-clnt.c auth-glusterfs.c \ +- rpc-common.c ++ rpc-transport.c xdr-rpc.c xdr-rpcclnt.c xdr-sizeof.c \ ++ rpc-clnt.c auth-glusterfs.c rpc-common.c + 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 +--- rpc/rpc-lib/src/Makefile.in.orig 2011-04-09 10:09:13.000000000 +0200 ++++ rpc/rpc-lib/src/Makefile.in 2011-04-13 15:34:52.000000000 +0200 +@@ -58,10 +58,10 @@ + LTLIBRARIES = $(lib_LTLIBRARIES) + libgfrpc_la_DEPENDENCIES = \ + $(top_builddir)/libglusterfs/src/libglusterfs.la + am_libgfrpc_la_OBJECTS = auth-unix.lo rpcsvc-auth.lo rpcsvc.lo \ +- auth-null.lo rpc-transport.lo xdr-rpc.lo xdr-rpcclnt.lo \ +- rpc-clnt.lo auth-glusterfs.lo rpc-common.lo ++ auth-null.lo rpc-transport.lo xdr-rpc.lo xdr-sizeof.lo \ ++ xdr-rpcclnt.lo rpc-clnt.lo auth-glusterfs.lo rpc-common.lo + libgfrpc_la_OBJECTS = $(am_libgfrpc_la_OBJECTS) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -221,10 +221,10 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + lib_LTLIBRARIES = libgfrpc.la + libgfrpc_la_SOURCES = auth-unix.c rpcsvc-auth.c rpcsvc.c auth-null.c \ +- rpc-transport.c xdr-rpc.c xdr-rpcclnt.c rpc-clnt.c auth-glusterfs.c \ +- rpc-common.c ++ rpc-transport.c xdr-rpc.c xdr-rpcclnt.c xdr-sizeof.c \ ++ rpc-clnt.c auth-glusterfs.c rpc-common.c + + 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 +@@ -313,8 +313,9 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpcsvc-auth.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpcsvc.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdr-rpc.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdr-rpcclnt.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdr-sizeof.Plo@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +--- rpc/rpc-lib/src/xdr-sizeof.c.orig 2011-04-13 15:34:52.000000000 +0200 ++++ rpc/rpc-lib/src/xdr-sizeof.c 2011-04-13 15:46:04.000000000 +0200 +@@ -0,0 +1,164 @@ ++#ifdef __NetBSD__ ++/* ++ * Sun RPC is a product of Sun Microsystems, Inc. and is provided for ++ * unrestricted use provided that this legend is included on all tape ++ * media and as a part of the software program in whole or part. Users ++ * may copy or modify Sun RPC without charge, but are not authorized ++ * to license or distribute it to anyone else except as part of a product or ++ * program developed by the user. ++ * ++ * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE ++ * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. ++ * ++ * Sun RPC is provided with no support and without any obligation on the ++ * part of Sun Microsystems, Inc. to assist in its use, correction, ++ * modification or enhancement. ++ * ++ * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE ++ * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC ++ * OR ANY PART THEREOF. ++ * ++ * In no event will Sun Microsystems, Inc. be liable for any lost revenue ++ * or profits or other special, indirect and consequential damages, even if ++ * Sun has been advised of the possibility of such damages. ++ * ++ * Sun Microsystems, Inc. ++ * 2550 Garcia Avenue ++ * Mountain View, California 94043 ++ */ ++/* ++ * xdr_sizeof.c ++ * ++ * Copyright 1990 Sun Microsystems, Inc. ++ * ++ * General purpose routine to see how much space something will use ++ * when serialized using XDR. ++ */ ++ ++#include <sys/cdefs.h> ++/* __FBSDID("$FreeBSD: src/sys/xdr/xdr_sizeof.c,v 1.1 2008/03/26 15:23:11 dfr Exp $"); */ ++ ++#include "mem-pool.h" ++ ++#include <rpc/types.h> ++#include <rpc/xdr.h> ++ ++/* ARGSUSED */ ++static bool_t ++x_putlong(XDR *xdrs, const long *longp) ++{ ++ ++ xdrs->x_handy += BYTES_PER_XDR_UNIT; ++ return (TRUE); ++} ++ ++/* ARGSUSED */ ++static bool_t ++x_putbytes(XDR *xdrs, const char *bp, u_int len) ++{ ++ ++ xdrs->x_handy += len; ++ return (TRUE); ++} ++ ++static u_int ++x_getpostn(XDR *xdrs) ++{ ++ ++ return (xdrs->x_handy); ++} ++ ++/* ARGSUSED */ ++static bool_t ++x_setpostn(XDR *xdrs, u_int pos) ++{ ++ ++ /* This is not allowed */ ++ return (FALSE); ++} ++ ++static int32_t * ++x_inline(XDR *xdrs, u_int len) ++{ ++ ++ if (len == 0) { ++ return (NULL); ++ } ++ if (xdrs->x_op != XDR_ENCODE) { ++ return (NULL); ++ } ++ if (len < (u_int)(uintptr_t)xdrs->x_base) { ++ /* x_private was already allocated */ ++ xdrs->x_handy += len; ++ return ((int32_t *) xdrs->x_private); ++ } else { ++ /* Free the earlier space and allocate new area */ ++ if (xdrs->x_private) ++ FREE(xdrs->x_private); ++ if ((xdrs->x_private = (caddr_t) MALLOC(len)) == NULL) { ++ ++ xdrs->x_base = 0; ++ return (NULL); ++ } ++ xdrs->x_base = (caddr_t)(uintptr_t) len; ++ xdrs->x_handy += len; ++ return ((int32_t *) xdrs->x_private); ++ } ++} ++ ++static int ++harmless(void) ++{ ++ ++ /* Always return FALSE/NULL, as the case may be */ ++ return (0); ++} ++ ++static void ++x_destroy(XDR *xdrs) ++{ ++ ++ xdrs->x_handy = 0; ++ xdrs->x_base = 0; ++ if (xdrs->x_private) { ++ FREE(xdrs->x_private); ++ xdrs->x_private = NULL; ++ } ++ return; ++} ++ ++unsigned long ++xdr_sizeof(xdrproc_t func, void *data) ++{ ++ XDR x; ++ struct xdr_ops ops; ++ bool_t stat; ++ /* to stop ANSI-C compiler from complaining */ ++ typedef bool_t (* dummyfunc1)(XDR *, long *); ++ typedef bool_t (* dummyfunc2)(XDR *, caddr_t, u_int); ++ ++ ops.x_putlong = x_putlong; ++ ops.x_putbytes = x_putbytes; ++ ops.x_inline = x_inline; ++ ops.x_getpostn = x_getpostn; ++ ops.x_setpostn = x_setpostn; ++ ops.x_destroy = x_destroy; ++ ++ /* the other harmless ones */ ++ ops.x_getlong = (dummyfunc1) harmless; ++ ops.x_getbytes = (dummyfunc2) harmless; ++ ++ x.x_op = XDR_ENCODE; ++ x.x_ops = &ops; ++ x.x_handy = 0; ++ x.x_private = (caddr_t) NULL; ++ x.x_base = (caddr_t) 0; ++ ++ stat = func(&x, data); ++ if (x.x_private) ++ FREE(x.x_private); ++ return (stat == TRUE ? (unsigned) x.x_handy: 0); ++} ++ ++#endif /* __NetBSD__ */ |