Merge ~mig-christophe/ubuntu/+source/pmount:ubuntu/focal into ubuntu/+source/pmount:ubuntu/focal

[Christophe Migliorini]

add support for exFAT (#1524523)

fs.c: add exfat to supported_fs

[Lucas Kanashiro (lucaskanashiro)]

Hi Christophe,

Thanks for submitting this merge proposal. When we are applying changes to the upstream code in a debian package we cannot modify them directly as you did. Instead, we need to create a patch file inside the debian/patches directory so we can apply the patch during the package build without modifying directly the upstream source code. To create those patch files you can use a tool called quilt [1], the workflow would be:

$ export QUILT_PATCHES=debian/patches
$ quilt new add_support_for_exFAT.patch
$ quilt add src/fs.c
$ quilt edit src/fs.c
# apply your changes and save the file
$ quilt refresh

After those steps you will have the debian/patch/add_support_for_exFAT.patch file.

You also shouldn't add your changes to the upstream ChangeLog but to the debian package one, in debian/changelog. You can use a script called dch [2] to help you with that (you need to install the devscripts package). From the root of the source package do the following:

$ export DEBFULLNAME="Christophe Migliorini"
$ export DEBEMAIL="<your_email_address>"
$ dch -i
# open the debian/changelog file and add what you did. In this case you created the patch above to add support for exFAT. Save the file

With the changes explained above you would have something that is acceptable. I hope the steps above make sense to you.

I am marking this merge proposal as Needs Fixing, the current changes proposed does not work.

[1] https://manpages.ubuntu.com/manpages/noble/man1/quilt.1.html
[2] https://manpages.ubuntu.com/manpages/noble/man1/dch.1.html

review: Needs Fixing

[Lucas Kanashiro (lucaskanashiro)]

Once this is fixed, please, subscribe ~ubuntu-sponsors again.

[Christophe Migliorini (mig-christophe)]

Hi Lucas, this is very clear, but for one thing: Am I supposed to commit all `.*` quilt files, and `series` files as well ? Well, I did, it made sense at the time. Let me know...

40582a3... by Christophe Migliorini <email address hidden> on 2024-02-22

add support for exFAT

[Lucas Kanashiro (lucaskanashiro)]

No, the .pc directory created by quilt should not be commited, sorry. In the end, you need to commit debian/patches/{series,add_support_for_exFAT.patch} and debian/changelog.

Unmerged commits

40582a3... by Christophe Migliorini <email address hidden> on 2024-02-22

add support for exFAT

diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
new file mode 100644
index 0000000..6857a8d
--- /dev/null
+++ b/.pc/.quilt_patches
@@ -0,0 +1 @@
+debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
new file mode 100644
index 0000000..c206706
--- /dev/null
+++ b/.pc/.quilt_series
@@ -0,0 +1 @@
+series
diff --git a/.pc/.version b/.pc/.version
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/.pc/.version
@@ -0,0 +1 @@
+2
diff --git a/.pc/add_support_for_exFAT.patch/.timestamp b/.pc/add_support_for_exFAT.patch/.timestamp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.pc/add_support_for_exFAT.patch/.timestamp
diff --git a/.pc/add_support_for_exFAT.patch/src/fs.c b/.pc/add_support_for_exFAT.patch/src/fs.c
new file mode 100644
index 0000000..65ea0c7
--- /dev/null
+++ b/.pc/add_support_for_exFAT.patch/src/fs.c
@@ -0,0 +1,63 @@
+/**
+ * fs.c - data type and interface function for supported file systems
+ *
+ * Author: Martin Pitt <[e-mail]>
+ * (c) 2004 Canonical Ltd.
+ * 
+ * This software is distributed under the terms and conditions of the 
+ * GNU General Public License. See file GPL for the full text of the license.
+ */
+
+#include "fs.h"
+
+#include <string.h>
+
+/** 
+ * List of file systems supported by pmount; terminated with a struct with
+ * fsname == NULL;
+ * Do not specify the 'sync' option; this will be dynamically added according
+ * to command line options. It is anyway better not to use it...
+ */
+static struct FS supported_fs[] = {
+    { "udf", "nosuid,nodev,user", 1, "000", ",iocharset=%s" },
+    { "iso9660", "nosuid,nodev,user", 1, NULL, ",iocharset=%s" },
+    { "vfat", "nosuid,nodev,user,quiet,shortname=mixed", 1, "077", 
+      ",iocharset=%s",",fmask=%04o,dmask=%04o"},
+    { "hfsplus", "nosuid,nodev,user", 1, NULL, 0 },
+    { "hfs", "nosuid,nodev,user", 1, "077", NULL, 
+      ",file_umask=%04o,dir_umask=%04o"},
+    { "ext3", "nodev,noauto,nosuid,user,errors=remount-ro", 0, NULL, 0 },
+    { "ext2", "nodev,noauto,nosuid,user,errors=remount-ro", 0, NULL, 0 },
+    { "ext4", "nodev,noauto,nosuid,user,errors=remount-ro", 0, NULL, 0 },
+    { "reiserfs", "nodev,noauto,nosuid,user", 0, NULL, 0 },
+    { "reiser4", "nodev,noauto,nosuid,user", 0, NULL, 0 },
+    { "xfs", "nodev,noauto,nosuid,user", 0, NULL, 0 },
+    { "jfs", "nodev,noauto,nosuid,user,errors=remount-ro", 0, NULL, 
+      ",iocharset=%s"},
+    { "omfs", "nodev,noauto,nosuid,user", 0, NULL, 0 },
+    { "ntfs-fuse", "nosuid,nodev,user", 1, "077", 
+      NULL /* no nls support, it seems*/, ",fmask=%04o,dmask=%04o", 
+      1 /* skip detection */
+    },
+    { "ntfs-3g", "nosuid,nodev,user", 1, "077", 
+      NULL /* no nls support, it seems*/, ",fmask=%04o,dmask=%04o", 
+      1 /* skip detection */
+    },
+    { "ntfs", "nosuid,nodev,user", 1, "077", ",nls=%s" },
+    { NULL, NULL, 0, NULL, 0}
+};
+
+const struct FS*
+get_supported_fs() {
+    return supported_fs;
+}
+
+const struct FS*
+get_fs_info( const char* fsname ) {
+    struct FS* i;
+
+    for( i = supported_fs; i->fsname; ++i )
+        if( !strcmp( i->fsname, fsname ) )
+            return i;
+    return NULL;
+}
diff --git a/.pc/applied-patches b/.pc/applied-patches
new file mode 100644
index 0000000..59b2c54
--- /dev/null
+++ b/.pc/applied-patches
@@ -0,0 +1 @@
+add_support_for_exFAT.patch
diff --git a/debian/patches/add_support_for_exFAT.patch b/debian/patches/add_support_for_exFAT.patch
new file mode 100644
index 0000000..baeab90
--- /dev/null
+++ b/debian/patches/add_support_for_exFAT.patch
@@ -0,0 +1,12 @@
+Index: pmount/src/fs.c
+===================================================================
+--- pmount.orig/src/fs.c
++++ pmount/src/fs.c
+@@ -23,6 +23,7 @@ static struct FS supported_fs[] = {
+     { "iso9660", "nosuid,nodev,user", 1, NULL, ",iocharset=%s" },
+     { "vfat", "nosuid,nodev,user,quiet,shortname=mixed", 1, "077", 
+       ",iocharset=%s",",fmask=%04o,dmask=%04o"},
++    { "exfat", "nosuid,user,noexec", 1, "077", ",iocharset=%s",",fmask=%04o,dmask=%04o"},
+     { "hfsplus", "nosuid,nodev,user", 1, NULL, 0 },
+     { "hfs", "nosuid,nodev,user", 1, "077", NULL, 
+       ",file_umask=%04o,dir_umask=%04o"},
diff --git a/debian/patches/series b/debian/patches/series
index e706419..59a5777 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+add_support_for_exFAT.patch
 01-man-plugdev.diff