diff options
Diffstat (limited to 'filesystems/fuse/patches')
| -rw-r--r-- | filesystems/fuse/patches/patch-aa | 19 | ||||
| -rw-r--r-- | filesystems/fuse/patches/patch-ab | 71 | ||||
| -rw-r--r-- | filesystems/fuse/patches/patch-ac | 49 | ||||
| -rw-r--r-- | filesystems/fuse/patches/patch-ad | 27 | ||||
| -rw-r--r-- | filesystems/fuse/patches/patch-ae | 69 | ||||
| -rw-r--r-- | filesystems/fuse/patches/patch-af | 42 | ||||
| -rw-r--r-- | filesystems/fuse/patches/patch-ag | 23 | ||||
| -rw-r--r-- | filesystems/fuse/patches/patch-ai | 27 | ||||
| -rw-r--r-- | filesystems/fuse/patches/patch-ak | 25 | ||||
| -rw-r--r-- | filesystems/fuse/patches/patch-al | 59 | ||||
| -rw-r--r-- | filesystems/fuse/patches/patch-am | 18 | ||||
| -rw-r--r-- | filesystems/fuse/patches/patch-an | 16 | ||||
| -rw-r--r-- | filesystems/fuse/patches/patch-util_fusermount.c | 14 |
13 files changed, 9 insertions, 450 deletions
diff --git a/filesystems/fuse/patches/patch-aa b/filesystems/fuse/patches/patch-aa index 4a0dcf951d3..ff244161f0f 100644 --- a/filesystems/fuse/patches/patch-aa +++ b/filesystems/fuse/patches/patch-aa @@ -1,16 +1,15 @@ -$NetBSD: patch-aa,v 1.2 2010/08/25 08:02:21 manu Exp $ +$NetBSD: patch-aa,v 1.3 2014/11/24 13:19:12 mef Exp $ mount.fuse is a script, not a binary ---- util/Makefile.in.orig 2010-08-24 10:08:52.000000000 +0200 -+++ util/Makefile.in 2010-08-24 10:08:59.000000000 +0200 -@@ -591,9 +591,9 @@ - fi + +--- util/Makefile.in~ 2014-11-24 22:04:40.000000000 +0900 ++++ util/Makefile.in 2014-11-24 22:05:24.000000000 +0900 +@@ -684,7 +684,7 @@ install-exec-hook: install-exec-local: - $(mkdir_p) $(DESTDIR)$(MOUNT_FUSE_PATH) -- $(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse -+ $(INSTALL_SCRIPT) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse - $(mkdir_p) $(DESTDIR)$(INIT_D_PATH) + $(MKDIR_P) $(DESTDIR)$(MOUNT_FUSE_PATH) +- $(INSTALL_PROGRAM) $(builddir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse ++ $(INSTALL_SCRIPT) $(builddir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse + $(MKDIR_P) $(DESTDIR)$(INIT_D_PATH) $(INSTALL_SCRIPT) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse @if test -x /usr/sbin/update-rc.d; then \ - echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \ diff --git a/filesystems/fuse/patches/patch-ab b/filesystems/fuse/patches/patch-ab deleted file mode 100644 index 80ef1cf8d9a..00000000000 --- a/filesystems/fuse/patches/patch-ab +++ /dev/null @@ -1,71 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2010/08/25 08:02:21 manu Exp $ - -NetBSD has the same build oddities af FreeBSD. ---- ./lib/fuse.c.orig 2010-07-25 15:16:03.000000000 +0200 -+++ ./lib/fuse.c 2010-08-07 03:25:21.000000000 +0200 -@@ -953,9 +953,9 @@ - if (f->conf.intr) - fuse_do_prepare_interrupt(req, d); - } - --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) - - static int fuse_compat_open(struct fuse_fs *fs, const char *path, - struct fuse_file_info *fi) - { -@@ -1048,9 +1048,9 @@ - } - return err; - } - --#else /* __FreeBSD__ */ -+#else /* __FreeBSD__ || __NetBSD__ */ - - static inline int fuse_compat_open(struct fuse_fs *fs, char *path, - struct fuse_file_info *fi) - { -@@ -1074,9 +1074,9 @@ - { - return fs->op.statfs(fs->compat == 25 ? "/" : path, buf); - } - --#endif /* __FreeBSD__ */ -+#endif /* __FreeBSD__ || __NetBSD__ */ - - int fuse_fs_getattr(struct fuse_fs *fs, const char *path, struct stat *buf) - { - fuse_get_context()->private_data = fs->user_data; -@@ -3720,9 +3720,9 @@ - - if (!f->conf.ac_attr_timeout_set) - f->conf.ac_attr_timeout = f->conf.attr_timeout; - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__NetBSD__) - /* - * In FreeBSD, we always use these settings as inode numbers - * are needed to make getcwd(3) work. - */ -@@ -3896,9 +3896,9 @@ - mod->next = fuse_modules; - fuse_modules = mod; - } - --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) - - static struct fuse *fuse_new_common_compat(int fd, const char *opts, - const struct fuse_operations *op, - size_t op_size, int compat) -@@ -3953,9 +3953,9 @@ - FUSE_SYMVER(".symver fuse_set_getcontext_func,__fuse_set_getcontext_func@"); - FUSE_SYMVER(".symver fuse_new_compat2,fuse_new@"); - FUSE_SYMVER(".symver fuse_new_compat22,fuse_new@FUSE_2.2"); - --#endif /* __FreeBSD__ */ -+#endif /* __FreeBSD__ || __NetBSD__ */ - - struct fuse *fuse_new_compat25(int fd, struct fuse_args *args, - const struct fuse_operations_compat25 *op, - size_t op_size) diff --git a/filesystems/fuse/patches/patch-ac b/filesystems/fuse/patches/patch-ac deleted file mode 100644 index ad31204480d..00000000000 --- a/filesystems/fuse/patches/patch-ac +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2010/08/25 08:02:21 manu Exp $ - -NetBSD has the same build oddities af FreeBSD. We also have this strange -problem with fuse_req_ctx_compat24 ---- ./lib/fuse_lowlevel.c.orig 2010-07-25 15:18:20.000000000 +0200 -+++ ./lib/fuse_lowlevel.c 2010-08-04 03:53:16.000000000 +0200 -@@ -1366,9 +1366,11 @@ - const struct fuse_ctx *fuse_req_ctx_compat24(fuse_req_t req) - { - return fuse_req_ctx(req); - } -+#ifndef __NetBSD__ - FUSE_SYMVER(".symver fuse_req_ctx_compat24,fuse_req_ctx@FUSE_2.4"); -+#endif - - - void fuse_req_interrupt_func(fuse_req_t req, fuse_interrupt_func_t func, - void *data) -@@ -1735,9 +1733,9 @@ - return -ENOSYS; - } - #endif - --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) - - static void fill_open_compat(struct fuse_open_out *arg, - const struct fuse_file_info_compat *f) - { -@@ -1837,17 +1835,17 @@ - FUSE_SYMVER(".symver fuse_reply_statfs_compat,fuse_reply_statfs@FUSE_2.4"); - FUSE_SYMVER(".symver fuse_reply_open_compat,fuse_reply_open@FUSE_2.4"); - FUSE_SYMVER(".symver fuse_lowlevel_new_compat,fuse_lowlevel_new@FUSE_2.4"); - --#else /* __FreeBSD__ */ -+#else /* __FreeBSD__ || __NetBSD__ */ - - int fuse_sync_compat_args(struct fuse_args *args) - { - (void) args; - return 0; - } - --#endif /* __FreeBSD__ */ -+#endif /* __FreeBSD__ || __NetBSD__ */ - - struct fuse_session *fuse_lowlevel_new_compat25(struct fuse_args *args, - const struct fuse_lowlevel_ops_compat25 *op, - size_t op_size, void *userdata) diff --git a/filesystems/fuse/patches/patch-ad b/filesystems/fuse/patches/patch-ad deleted file mode 100644 index d510e5a19fa..00000000000 --- a/filesystems/fuse/patches/patch-ad +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2010/08/25 08:02:21 manu Exp $ - -NetBSD has the same build oddities af FreeBSD. ---- ./lib/helper.c.orig 2010-07-25 15:25:28.000000000 +0200 -+++ ./lib/helper.c 2010-07-29 18:05:33.000000000 +0200 -@@ -356,9 +356,9 @@ - } - - #include "fuse_compat.h" - --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) - - struct fuse *fuse_setup_compat22(int argc, char *argv[], - const struct fuse_operations_compat22 *op, - size_t op_size, char **mountpoint, -@@ -414,9 +414,9 @@ - FUSE_SYMVER(".symver fuse_teardown,__fuse_teardown@"); - FUSE_SYMVER(".symver fuse_main_compat2,fuse_main@"); - FUSE_SYMVER(".symver fuse_main_real_compat22,fuse_main_real@FUSE_2.2"); - --#endif /* __FreeBSD__ */ -+#endif /* __FreeBSD__ || __NetBSD__ */ - - - struct fuse *fuse_setup_compat25(int argc, char *argv[], - const struct fuse_operations_compat25 *op, diff --git a/filesystems/fuse/patches/patch-ae b/filesystems/fuse/patches/patch-ae deleted file mode 100644 index 2e761137ab5..00000000000 --- a/filesystems/fuse/patches/patch-ae +++ /dev/null @@ -1,69 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2010/08/25 08:02:21 manu Exp $ - -NetBSD uses libperfuse(3). Also remap MNT_* flags to Linux MS_*, and -unmount(2) to umount2(2) ---- lib/mount.c.orig 2010-04-26 14:11:30.000000000 +0200 -+++ lib/mount.c 2010-08-24 09:20:25.000000000 +0200 -@@ -16,16 +16,30 @@ - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> - #include <stddef.h> -+#include <string.h> - #include <fcntl.h> - #include <errno.h> - #include <sys/poll.h> - #include <sys/socket.h> - #include <sys/un.h> - #include <sys/wait.h> - #include <sys/mount.h> - -+#ifdef __NetBSD__ -+#include <perfuse.h> -+ -+#define MS_RDONLY MNT_RDONLY -+#define MS_NOSUID MNT_NOSUID -+#define MS_NODEV MNT_NODEV -+#define MS_NOEXEC MNT_NOEXEC -+#define MS_SYNCHRONOUS MNT_SYNCHRONOUS -+#define MS_NOATIME MNT_NOATIME -+ -+#define umount2(mnt, flags) unmount(mnt, (flags == 2) ? MNT_FORCE : 0) -+#endif -+ - #define FUSERMOUNT_PROG "fusermount" - #define FUSE_COMMFD_ENV "_FUSE_COMMFD" - - #ifndef HAVE_FORK -@@ -154,9 +168,11 @@ - {"async", MS_SYNCHRONOUS, 0}, - {"sync", MS_SYNCHRONOUS, 1}, - {"atime", MS_NOATIME, 0}, - {"noatime", MS_NOATIME, 1}, -+#ifndef __NetBSD__ - {"dirsync", MS_DIRSYNC, 1}, -+#endif - {NULL, 0, 0} - }; - - static void set_mount_flag(const char *s, int *flags) -@@ -483,8 +499,9 @@ - - goto out_close; - } - -+#ifndef __NetBSD__ - if (geteuid() == 0) { - char *newmnt = fuse_mnt_resolve_path("fuse", mnt); - res = -1; - if (!newmnt) -@@ -495,8 +512,9 @@ - free(newmnt); - if (res == -1) - goto out_umount; - } -+#endif /* __NetBSD__ */ - free(type); - free(source); - - return fd; diff --git a/filesystems/fuse/patches/patch-af b/filesystems/fuse/patches/patch-af deleted file mode 100644 index 8dd53b5a16d..00000000000 --- a/filesystems/fuse/patches/patch-af +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-af,v 1.1 2010/08/25 08:02:21 manu Exp $ - -Do not check for inexistant /etc/mtab on NetBSD. Also remap umount2() to -unmount(2). ---- lib/mount_util.c.orig 2010-08-24 09:44:43.000000000 +0200 -+++ lib/mount_util.c 2010-08-24 09:48:40.000000000 +0200 -@@ -10,18 +10,25 @@ - #include <stdio.h> - #include <unistd.h> - #include <stdlib.h> - #include <string.h> -+#include <signal.h> - #include <dirent.h> - #include <errno.h> - #include <fcntl.h> - #include <limits.h> -+#ifndef __NetBSD__ - #include <mntent.h> -+#endif - #include <sys/stat.h> - #include <sys/wait.h> - #include <sys/mount.h> - #include <sys/param.h> - -+#ifdef __NetBSD__ -+#define umount2(mnt, flags) unmount(mnt, (flags == 2) ? MNT_FORCE : 0) -+#define mtab_needs_update(mnt) 0 -+#else - static int mtab_needs_update(const char *mnt) - { - int res; - struct stat stbuf; -@@ -52,8 +59,9 @@ - } - - return 1; - } -+#endif /* __NetBSD__ */ - - static int add_mount_legacy(const char *progname, const char *fsname, - const char *mnt, const char *type, const char *opts) - { diff --git a/filesystems/fuse/patches/patch-ag b/filesystems/fuse/patches/patch-ag deleted file mode 100644 index 40b7cf073a0..00000000000 --- a/filesystems/fuse/patches/patch-ag +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2010/08/25 08:02:21 manu Exp $ - -NetBSD has the same build oddities af FreeBSD. ---- ./include/fuse_compat.h 2010-07-25 15:16:35.000000000 +0200 -+++ ./include/fuse_compat.h.orig 2010-07-25 15:14:11.000000000 +0200 -@@ -64,9 +64,9 @@ - int *multithreaded, int *fd); - - void fuse_teardown_compat22(struct fuse *fuse, int fd, char *mountpoint); - --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) - #include <sys/statfs.h> - - struct fuse_operations_compat22 { - int (*getattr) (const char *, struct stat *); -@@ -197,5 +197,5 @@ - - void fuse_main_compat1(int argc, char *argv[], - const struct fuse_operations_compat1 *op); - --#endif /* __FreeBSD__ */ -+#endif /* __FreeBSD__ || __NetBSD__ */ diff --git a/filesystems/fuse/patches/patch-ai b/filesystems/fuse/patches/patch-ai deleted file mode 100644 index d5e31c3ee63..00000000000 --- a/filesystems/fuse/patches/patch-ai +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2010/08/25 08:02:21 manu Exp $ - -NetBSD has the same build oddities af FreeBSD. ---- ./include/fuse_lowlevel_compat.h.orig 2010-07-25 15:21:50.000000000 +0200 -+++ ./include/fuse_lowlevel_compat.h 2010-07-25 15:22:20.000000000 +0200 -@@ -71,9 +71,9 @@ - - char *fuse_add_dirent(char *buf, const char *name, const struct stat *stbuf, - off_t off); - --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) - - #include <sys/statfs.h> - - struct fuse_lowlevel_ops_compat { -@@ -138,9 +138,9 @@ - struct fuse_session *fuse_lowlevel_new_compat(const char *opts, - const struct fuse_lowlevel_ops_compat *op, - size_t op_size, void *userdata); - --#endif /* __FreeBSD__ */ -+#endif /* __FreeBSD__ || __NetBSD__ */ - - struct fuse_chan_ops_compat24 { - int (*receive)(struct fuse_chan *ch, char *buf, size_t size); - int (*send)(struct fuse_chan *ch, const struct iovec iov[], diff --git a/filesystems/fuse/patches/patch-ak b/filesystems/fuse/patches/patch-ak deleted file mode 100644 index 837f78738d8..00000000000 --- a/filesystems/fuse/patches/patch-ak +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2010/08/25 08:02:21 manu Exp $ - -Take care of NetBSD so that we can link with -lperfuse in makefile. ---- configure.in.orig 2010-08-24 09:26:08.000000000 +0200 -+++ configure.in 2010-08-24 09:27:01.000000000 +0200 -@@ -15,8 +15,9 @@ - fi - - case $target_os in - *linux*) arch=linux;; -+ *netbsd*) arch=netbsd;; - *bsd*) arch=bsd;; - *) arch=unknown;; - esac - -@@ -90,8 +91,9 @@ - - AC_SUBST(subdirs2) - - AM_CONDITIONAL(LINUX, test "$arch" = linux) -+AM_CONDITIONAL(NETBSD, test "$arch" = netbsd) - AM_CONDITIONAL(BSD, test "$arch" = bsd) - - AC_CONFIG_FILES([fuse.pc Makefile lib/Makefile util/Makefile example/Makefile include/Makefile]) - AC_OUTPUT diff --git a/filesystems/fuse/patches/patch-al b/filesystems/fuse/patches/patch-al deleted file mode 100644 index e86157ebfdf..00000000000 --- a/filesystems/fuse/patches/patch-al +++ /dev/null @@ -1,59 +0,0 @@ -$NetBSD: patch-al,v 1.1 2010/08/25 08:02:21 manu Exp $ - -Take care of NetBSD so that we can link with -lperfuse in makefile. ---- configure.orig 2010-08-24 09:28:13.000000000 +0200 -+++ configure 2010-08-24 09:31:20.000000000 +0200 -@@ -788,8 +788,10 @@ - LTLIBOBJS - LIBOBJS - BSD_FALSE - BSD_TRUE -+NETBSD_FALSE -+NETBSD_TRUE - LINUX_FALSE - LINUX_TRUE - subdirs2 - INIT_D_PATH -@@ -12082,8 +12084,9 @@ - fi - - case $target_os in - *linux*) arch=linux;; -+ *netbsd*) arch=netbsd;; - *bsd*) arch=bsd;; - *) arch=unknown;; - esac - -@@ -13671,8 +13674,16 @@ - LINUX_TRUE='#' - LINUX_FALSE= - fi - -+ if test "$arch" = netbsd; then -+ NETBSD_TRUE= -+ NETBSD_FALSE='#' -+else -+ NETBSD_TRUE='#' -+ NETBSD_FALSE= -+fi -+ - if test "$arch" = bsd; then - BSD_TRUE= - BSD_FALSE='#' - else -@@ -13822,8 +13833,15 @@ - $as_echo "$as_me: error: conditional \"LINUX\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi -+if test -z "${NETBSD_TRUE}" && test -z "${NETBSD_FALSE}"; then -+ { { $as_echo "$as_me:$LINENO: error: conditional \"NETBSD\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"NETBSD\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi - if test -z "${BSD_TRUE}" && test -z "${BSD_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"BSD\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 - $as_echo "$as_me: error: conditional \"BSD\" was never defined. diff --git a/filesystems/fuse/patches/patch-am b/filesystems/fuse/patches/patch-am deleted file mode 100644 index d5bd9da3d17..00000000000 --- a/filesystems/fuse/patches/patch-am +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-am,v 1.1 2010/08/25 08:02:21 manu Exp $ - -Link with -lperfuse on NetBSD ---- lib/Makefile.am.orig 2010-08-24 09:32:59.000000000 +0200 -+++ lib/Makefile.am 2010-08-24 09:33:09.000000000 +0200 -@@ -37,8 +37,12 @@ - - libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:8:4 \ - -Wl,--version-script,$(srcdir)/fuse_versionscript - -+if NETBSD -+libfuse_la_LIBADD = -lperfuse -lpuffs -+endif -+ - libulockmgr_la_SOURCES = ulockmgr.c - libulockmgr_la_LDFLAGS = -pthread -version-number 1:0:1 - - EXTRA_DIST = fuse_versionscript diff --git a/filesystems/fuse/patches/patch-an b/filesystems/fuse/patches/patch-an deleted file mode 100644 index c31f687e6cf..00000000000 --- a/filesystems/fuse/patches/patch-an +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-an,v 1.1 2010/08/25 08:02:21 manu Exp $ - -Link with -lperfuse on NetBSD ---- lib/Makefile.in.orig 2010-08-24 09:33:40.000000000 +0200 -+++ lib/Makefile.in 2010-08-24 09:35:20.000000000 +0200 -@@ -263,8 +263,10 @@ - - libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:8:4 \ - -Wl,--version-script,$(srcdir)/fuse_versionscript - -+@NETBSD_TRUE@libfuse_la_LIBADD = -lperfuse -lpuffs -+ - libulockmgr_la_SOURCES = ulockmgr.c - libulockmgr_la_LDFLAGS = -pthread -version-number 1:0:1 - EXTRA_DIST = fuse_versionscript - all: all-am diff --git a/filesystems/fuse/patches/patch-util_fusermount.c b/filesystems/fuse/patches/patch-util_fusermount.c deleted file mode 100644 index 2d41172bf1b..00000000000 --- a/filesystems/fuse/patches/patch-util_fusermount.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-util_fusermount.c,v 1.1 2012/03/10 20:59:52 markd Exp $ - -Fix error 'CLONE_NEWNS' undeclared on recent linux. From git. - ---- util/fusermount.c.orig 2010-04-26 12:15:36.000000000 +0000 -+++ util/fusermount.c -@@ -7,6 +7,7 @@ - */ - /* This program does the mounting and unmounting of FUSE filesystems */ - -+#define _GNU_SOURCE /* for clone */ - #include <config.h> - - #include "mount_util.h" |