[Glibc-bsd-commits] r5610 - in trunk/fuse4bsd/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-10-05 22:35:52 +0000 (Sun, 05 Oct 2014)
New Revision: 5610

Added:
   trunk/fuse4bsd/debian/patches/001_kfreebsd-10_api.diff
Modified:
   trunk/fuse4bsd/debian/changelog
Log:
Supply mount parameter "fd", required by kfreebsd-10 API:
- 001_kfreebsd-10_api.diff


Modified: trunk/fuse4bsd/debian/changelog
===================================================================
--- trunk/fuse4bsd/debian/changelog	2014-10-05 22:32:26 UTC (rev 5609)
+++ trunk/fuse4bsd/debian/changelog	2014-10-05 22:35:52 UTC (rev 5610)
@@ -2,6 +2,13 @@
 
   * Add myself to uploaders
   * Stop building fuse4bsd-dkms, obsoleted by kfreebsd-10 in-tree module
+  * Delete redundant patches:
+    - 001_ports.diff
+    - 003_kernel_api.diff
+    - 004_freebsd_macro.diff
+    - prevent_kfreebsd10_build.diff
+  * Supply mount parameter "fd", required by kfreebsd-10 API:
+    - 001_kfreebsd-10_api.diff
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Sun, 05 Oct 2014 23:21:28 +0100
 

Added: trunk/fuse4bsd/debian/patches/001_kfreebsd-10_api.diff
===================================================================
--- trunk/fuse4bsd/debian/patches/001_kfreebsd-10_api.diff	                        (rev 0)
+++ trunk/fuse4bsd/debian/patches/001_kfreebsd-10_api.diff	2014-10-05 22:35:52 UTC (rev 5610)
@@ -0,0 +1,23 @@
+--- a/mount_fusefs/mount_fusefs.c
++++ b/mount_fusefs/mount_fusefs.c
+@@ -104,7 +104,7 @@
+ 	int mntflags, iovlen, verbose = 0;
+ 	char *dev = NULL, *dir = NULL, mntpath[MAXPATHLEN];
+ 	char *devo = NULL, *diro = NULL;
+-	char ndev[128];
++	char ndev[128], fdstr[15];
+ 	int i, done = 0, reject_allow_other = 0, safe_level = 0;
+ 	int altflags = DEFAULT_MOUNT_FLAGS;
+ 	int __altflags = DEFAULT_MOUNT_FLAGS;
+@@ -405,9 +405,11 @@
+ 
+ 	/* Prepare the options vector for nmount(). build_iovec() is declared
+ 	 * in mntopts.h. */
++	sprintf(fdstr, "%d", fd);
+ 	build_iovec(&iov, &iovlen, "fstype", "fusefs", -1);
+ 	build_iovec(&iov, &iovlen, "fspath", mntpath, -1);
+ 	build_iovec(&iov, &iovlen, "from", dev, -1);
++	build_iovec(&iov, &iovlen, "fd", fdstr, -1);
+ 
+ 	if (verbose)
+ 		fprintf(stderr, "mounting fuse daemon on device %s\n", dev);