summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-08-24 16:38:53 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-08-24 16:38:53 +0000
commite2beabf94bfbf907144539479e61c315aebc5ae4 (patch)
treeed5aebb8a2570bff23e2ac47d840bb273114642d
parentReleasing progress-linux version 2.9.8-1~dschinn1. (diff)
downloadfuse-e2beabf94bfbf907144539479e61c315aebc5ae4.zip
fuse-e2beabf94bfbf907144539479e61c315aebc5ae4.tar.xz
Merging debian version 2.9.8-2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/0007-Add_autofs_to_mountpoint_file_system_whitelist.patch35
-rw-r--r--debian/patches/0008-Add_FAT_to_mountpoint_file_system_whitelist.patch21
-rw-r--r--debian/patches/series2
4 files changed, 65 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 47bed82..ba27ca9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+fuse (2.9.8-2) unstable; urgency=medium
+
+ * Whitelist autofs as mountpoint file system.
+ * Whitelist FAT as mountpoint file system (closes: #905366).
+
+ -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sun, 05 Aug 2018 15:07:18 +0000
+
fuse (2.9.8-1~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/patches/0007-Add_autofs_to_mountpoint_file_system_whitelist.patch b/debian/patches/0007-Add_autofs_to_mountpoint_file_system_whitelist.patch
new file mode 100644
index 0000000..f290689
--- /dev/null
+++ b/debian/patches/0007-Add_autofs_to_mountpoint_file_system_whitelist.patch
@@ -0,0 +1,35 @@
+From 0ef031bfc08564e7c5920432e13373dcf18dbc63 Mon Sep 17 00:00:00 2001
+From: Robo Shimmer <roboshim@users.noreply.github.com>
+Date: Tue, 31 Jul 2018 16:20:56 +0200
+Subject: [PATCH] Add autofs to mountpoint file system whitelist
+
+---
+ ChangeLog | 2 ++
+ util/fusermount.c | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/ChangeLog b/ChangeLog
+index f5d24ca6..2a5168ce 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -8,6 +8,8 @@ Unreleased Changes
+ options must now match a hard-coded whitelist. It is expected that
+ this whitelist covers all regular use-cases.
+
++* Allow fuse to be mounted into autofs folder hierarchy
++
+ FUSE 2.9.8
+ ==========
+
+diff --git a/util/fusermount.c b/util/fusermount.c
+index b8c164dd..2ca75105 100644
+--- a/util/fusermount.c
++++ b/util/fusermount.c
+@@ -1050,6 +1050,7 @@ static int check_perm(const char **mntp, struct stat *stbuf, int *mountpoint_fd)
+ 0x24051905 /* UBIFS_SUPER_MAGIC */,
+ 0x58465342 /* XFS_SB_MAGIC */,
+ 0x2FC12FC1 /* ZFS_SUPER_MAGIC */,
++ 0x00000187 /* AUTOFS */,
+ };
+ for (i = 0; i < sizeof(f_type_whitelist)/sizeof(f_type_whitelist[0]); i++) {
+ if (f_type_whitelist[i] == fs_buf.f_type)
diff --git a/debian/patches/0008-Add_FAT_to_mountpoint_file_system_whitelist.patch b/debian/patches/0008-Add_FAT_to_mountpoint_file_system_whitelist.patch
new file mode 100644
index 0000000..5496354
--- /dev/null
+++ b/debian/patches/0008-Add_FAT_to_mountpoint_file_system_whitelist.patch
@@ -0,0 +1,21 @@
+From 9b287377343fd796d359e67de54d477d8084cfcd Mon Sep 17 00:00:00 2001
+From: Benjamin Barenblat <bbaren@google.com>
+Date: Fri, 3 Aug 2018 11:22:37 -0400
+Subject: [PATCH] Add FAT to mountpoint file system whitelist
+
+---
+ util/fusermount.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/util/fusermount.c b/util/fusermount.c
+index 8dce92f6..45b54e3a 100644
+--- a/util/fusermount.c
++++ b/util/fusermount.c
+@@ -1032,6 +1032,7 @@ static int check_perm(const char **mntp, struct stat *stbuf, int *mountpoint_fd)
+ 0x9123683E /* BTRFS_SUPER_MAGIC */,
+ 0x00C36400 /* CEPH_SUPER_MAGIC */,
+ 0xFF534D42 /* CIFS_MAGIC_NUMBER */,
++ 0X00004D44 /* MSDOS_SUPER_MAGIC */,
+ 0x0000F15F /* ECRYPTFS_SUPER_MAGIC */,
+ 0x0000EF53 /* EXT[234]_SUPER_MAGIC */,
+ 0xF2F52010 /* F2FS_SUPER_MAGIC */,
diff --git a/debian/patches/series b/debian/patches/series
index 22e440b..f076317 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,5 @@
0004-fusermount-manpage.patch
0005-dlsym.patch
0006-arm64.patch
+0007-Add_autofs_to_mountpoint_file_system_whitelist.patch
+0008-Add_FAT_to_mountpoint_file_system_whitelist.patch