svn commit: r411453 - head/sysutils/fusefs-libs/files

[Jan Beich]

Author: jbeich
Date: Sun Mar 20 15:19:35 2016
New Revision: 411453
URL: https://svnweb.freebsd.org/changeset/ports/411453

Log:
  sysutils/fusefs-libs: reconnect r404898 changes with old history

Added:
  head/sysutils/fusefs-libs/files/patch-lib_mount__bsd.c
     - copied, changed from r404897, head/sysutils/fusefs-libs/files/patch-lib_mount_bsd.c
  head/sysutils/fusefs-libs/files/patch-lib_mount__util.c
     - copied, changed from r404897, head/sysutils/fusefs-libs/files/patch-lib_mount_util.c
  head/sysutils/fusefs-libs/files/patch-lib_mount__util.h
     - copied, changed from r404897, head/sysutils/fusefs-libs/files/patch-lib_mount_util.h

Copied and modified: head/sysutils/fusefs-libs/files/patch-lib_mount__bsd.c (from r404897, head/sysutils/fusefs-libs/files/patch-lib_mount_bsd.c)
==============================================================================
--- head/sysutils/fusefs-libs/files/patch-lib_mount_bsd.c	Thu Dec 31 01:41:55 2015	(r404897, copy source)
+++ head/sysutils/fusefs-libs/files/patch-lib_mount__bsd.c	Sun Mar 20 15:19:35 2016	(r411453)
@@ -1,5 +1,5 @@
---- lib/mount_bsd.c.orig	2013-07-01 09:40:53.000000000 +0200
-+++ lib/mount_bsd.c	2013-07-24 16:20:34.533073286 +0200
+--- lib/mount_bsd.c.orig	2015-05-22 09:24:02 UTC
++++ lib/mount_bsd.c
 @@ -10,6 +10,8 @@
  #include "fuse_misc.h"
  #include "fuse_opt.h"
@@ -17,7 +17,7 @@
  	/* options supported under both Linux and FBSD */
  	FUSE_DUAL_OPT_KEY("allow_other",	KEY_KERN),
  	FUSE_DUAL_OPT_KEY("default_permissions",KEY_KERN),
-@@ -192,56 +194,12 @@
+@@ -192,56 +195,12 @@ void fuse_unmount_compat22(const char *m
  	free(umount_cmd);
  }
  

Copied and modified: head/sysutils/fusefs-libs/files/patch-lib_mount__util.c (from r404897, head/sysutils/fusefs-libs/files/patch-lib_mount_util.c)
==============================================================================
--- head/sysutils/fusefs-libs/files/patch-lib_mount_util.c	Thu Dec 31 01:41:55 2015	(r404897, copy source)
+++ head/sysutils/fusefs-libs/files/patch-lib_mount__util.c	Sun Mar 20 15:19:35 2016	(r411453)
@@ -1,6 +1,6 @@
---- lib/mount_util.c.orig	2008-02-04 00:23:30.000000000 -0500
-+++ lib/mount_util.c	2008-02-04 00:23:58.000000000 -0500
-@@ -224,20 +224,3 @@
+--- lib/mount_util.c.orig	2015-05-22 09:24:02 UTC
++++ lib/mount_util.c
+@@ -344,20 +344,3 @@ int fuse_mnt_check_empty(const char *pro
  	}
  	return 0;
  }

Copied and modified: head/sysutils/fusefs-libs/files/patch-lib_mount__util.h (from r404897, head/sysutils/fusefs-libs/files/patch-lib_mount_util.h)
==============================================================================
--- head/sysutils/fusefs-libs/files/patch-lib_mount_util.h	Thu Dec 31 01:41:55 2015	(r404897, copy source)
+++ head/sysutils/fusefs-libs/files/patch-lib_mount__util.h	Sun Mar 20 15:19:35 2016	(r411453)
@@ -1,6 +1,6 @@
---- lib/mount_util.h.orig	2008-02-04 00:24:07.000000000 -0500
-+++ lib/mount_util.h	2008-02-04 00:24:20.000000000 -0500
-@@ -14,4 +14,3 @@
+--- lib/mount_util.h.orig	2015-05-22 09:24:02 UTC
++++ lib/mount_util.h
+@@ -16,4 +16,3 @@ int fuse_mnt_umount(const char *progname
  char *fuse_mnt_resolve_path(const char *progname, const char *orig);
  int fuse_mnt_check_empty(const char *progname, const char *mnt,
  			 mode_t rootmode, off_t rootsize);