Stable update proposal: hal 0.5.8.1-9.0.edu.etch.3
Ref item 9 on <URL:http://wiki.debian.org/DebianEdu/Meeting/20070813>,
here is a update proposal for the stable release.
I propose to update the version of hal in the stable repository from
0.5.8.1-9.0.edu.etch.2 to 0.5.8.1-9.0.edu.etch.3.
This update fixes skolelinux bug #1273. With this update users are able
to mount filesystems that do not support the umask parameter. For
example if a users wants to mount an usb pendrive with an ext2
filesystem on it, the old version would fail, because the umask=007
option is always appended. With the new version umask=007 is only used
when the filesystem supports it (according to the mount manpage).
Here is the debdiff output between the two versions:
diff -Nru /tmp/WeRSJf1Ykr/hal-0.5.8.1/debian/changelog /tmp/k1rTERtayo/hal-0.5.8.1/debian/changelog
--- /tmp/WeRSJf1Ykr/hal-0.5.8.1/debian/changelog 2007-11-15 12:57:17.000000000 +0100
+++ /tmp/k1rTERtayo/hal-0.5.8.1/debian/changelog 2007-11-15 12:57:17.000000000 +0100
@@ -1,3 +1,12 @@
+hal (0.5.8.1-9.0.edu.etch.3) terra; urgency=low
+
+ * Non-maintainer upload to debian-edu.
+ * Rework debian/patches/81_hal-storage-mount_mount-options.patch
+ - Only use umask on filessystems that do support that option.
+ (Closes skolelinux bug #1273)
+
+ -- Daniel Hess <daniel@rio-grande.ping.de> Mon, 12 Nov 2007 12:09:13 +0100
+
hal (0.5.8.1-9.0.edu.etch.2) terra; urgency=low
* Non-maintainer upload to debian-edu.
diff -Nru /tmp/WeRSJf1Ykr/hal-0.5.8.1/debian/patches/81_hal-storage-mount_mount-options.patch /tmp/k1rTERtayo/hal-0.5.8.1/debian/patches/81_hal-storage-mount_mount-options.patch
--- /tmp/WeRSJf1Ykr/hal-0.5.8.1/debian/patches/81_hal-storage-mount_mount-options.patch 2007-11-15 12:57:17.000000000 +0100
+++ /tmp/k1rTERtayo/hal-0.5.8.1/debian/patches/81_hal-storage-mount_mount-options.patch 2007-11-15 12:57:17.000000000 +0100
@@ -1,12 +1,32 @@
-diff -aur hal-0.5.8.1.vanila/tools/hal-storage-mount.c hal-0.5.8.1/tools/hal-storage-mount.c
---- hal-0.5.8.1.vanila/tools/hal-storage-mount.c 2006-09-19 22:23:25.000000000 +0200
-+++ hal-0.5.8.1/tools/hal-storage-mount.c 2007-07-07 20:21:33.189101008 +0200
-@@ -67,7 +67,7 @@
- #define MOUNT_TYPE_OPT "-F"
+diff -Nur hal-0.5.8.1/build-tree/hal-0.5.8.1/tools/hal-storage-mount.c hal-0.5.8.1.new/build-tree/hal-0.5.8.1/tools/hal-storage-mount.c
+--- hal-0.5.8.1/tools/hal-storage-mount.c 2007-11-12 11:57:43.000000000 +0100
++++ hal-0.5.8.1/tools/hal-storage-mount.c 2007-11-12 12:08:13.000000000 +0100
+@@ -68,6 +68,7 @@
#else
#define MOUNT "/bin/mount"
--#define MOUNT_OPTIONS "noexec,nosuid,nodev"
-+#define MOUNT_OPTIONS "noexec,nosuid,nodev,umask=007"
+ #define MOUNT_OPTIONS "noexec,nosuid,nodev"
++#define MOUNT_OPTIONS_MASK "noexec,nosuid,nodev,umask=007"
#define MOUNT_TYPE_OPT "-t"
#endif
+@@ -821,7 +822,19 @@
+ args[na++] = mount_do_fstype;
+
+ args[na++] = "-o";
+- mount_option_str = g_string_new (MOUNT_OPTIONS);
++ /* Set umask option on filesystems that support that option */
++ if (! strcmp (mount_do_fstype, "vfat") ||
++ ! strcmp (mount_do_fstype, "ntfs") ||
++ ! strcmp (mount_do_fstype, "msdos") ||
++ ! strcmp (mount_do_fstype, "umsdos") ||
++ ! strcmp (mount_do_fstype, "hfs") ||
++ ! strcmp (mount_do_fstype, "hpfs") ||
++ ! strcmp (mount_do_fstype, "hfsplus") ||
++ ! strcmp (mount_do_fstype, "udf")) {
++ mount_option_str = g_string_new (MOUNT_OPTIONS_MASK);
++ } else {
++ mount_option_str = g_string_new (MOUNT_OPTIONS);
++ }
+ for (i = 0; given_options[i] != NULL; i++) {
+ g_string_append (mount_option_str, ",");
+ g_string_append (mount_option_str, given_options[i]);
Reply to: