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

[Robert Millan]

Author: rmh
Date: 2011-09-20 19:15:59 +0000 (Tue, 20 Sep 2011)
New Revision: 3708

Added:
   trunk/fuse4bsd/debian/patches/005_squeeze_backport.diff
Modified:
   trunk/fuse4bsd/debian/changelog
   trunk/fuse4bsd/debian/control
   trunk/fuse4bsd/debian/patches/series
Log:
  * Make easier to backport:
    - Remove versioned build-dependency on libc.

Modified: trunk/fuse4bsd/debian/changelog
===================================================================
--- trunk/fuse4bsd/debian/changelog	2011-09-19 19:13:05 UTC (rev 3707)
+++ trunk/fuse4bsd/debian/changelog	2011-09-20 19:15:59 UTC (rev 3708)
@@ -1,3 +1,10 @@
+fuse4bsd (0.3.9~pre1.20080208-5) UNRELEASED; urgency=low
+
+  * Make easier to backport:
+    - Remove versioned build-dependency on libc.
+
+ -- Robert Millan <rmh at debian.org>  Tue, 20 Sep 2011 21:14:53 +0200
+
 fuse4bsd (0.3.9~pre1.20080208-4) unstable; urgency=low
 
   * Add init script to load/unload fuse module.

Modified: trunk/fuse4bsd/debian/control
===================================================================
--- trunk/fuse4bsd/debian/control	2011-09-19 19:13:05 UTC (rev 3707)
+++ trunk/fuse4bsd/debian/control	2011-09-20 19:15:59 UTC (rev 3708)
@@ -7,8 +7,6 @@
  freebsd-buildutils,
  libbsd-dev,
  dkms,
-# for MNT_NFS4ACLS
- libc0.1-dev (>= 2.13-6),
 Standards-Version: 3.9.2
 
 Package: fuse4bsd

Added: trunk/fuse4bsd/debian/patches/005_squeeze_backport.diff
===================================================================
--- trunk/fuse4bsd/debian/patches/005_squeeze_backport.diff	                        (rev 0)
+++ trunk/fuse4bsd/debian/patches/005_squeeze_backport.diff	2011-09-20 19:15:59 UTC (rev 3708)
@@ -0,0 +1,15 @@
+--- a/sbin/mount/mntopts.h
++++ b/sbin/mount/mntopts.h
+@@ -54,6 +54,12 @@
+ #define MOPT_SNAPSHOT		{ "snapshot",	0, MNT_SNAPSHOT, 0 }
+ #define MOPT_MULTILABEL		{ "multilabel",	0, MNT_MULTILABEL, 0 }
+ #define MOPT_ACLS		{ "acls",	0, MNT_ACLS, 0 }
++
++/* MNT_NFS4ACLS not available in libc0.1-dev << 2.13-6 */
++#ifndef MNT_NFS4ACLS
++#define MNT_NFS4ACLS 0x00000010
++#endif
++
+ #define MOPT_NFS4ACLS		{ "nfsv4acls",	0, MNT_NFS4ACLS, 0 }
+ 
+ /* Control flags. */

Modified: trunk/fuse4bsd/debian/patches/series
===================================================================
--- trunk/fuse4bsd/debian/patches/series	2011-09-19 19:13:05 UTC (rev 3707)
+++ trunk/fuse4bsd/debian/patches/series	2011-09-20 19:15:59 UTC (rev 3708)
@@ -3,3 +3,4 @@
 002_misc.diff
 003_kernel_api.diff
 004_freebsd_macro.diff
+005_squeeze_backport.diff