Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 utils/hal/DETAILS      |    2 +-
 utils/hal/HISTORY      |    6 ++++++
 utils/hal/PRE_BUILD    |    9 ++++++---
 utils/hal/fstype.patch |   23 +++++++++++++++++++++++
 4 files changed, 36 insertions(+), 4 deletions(-)

New commits:
commit 313ce53969b6abb82ca33e015cb4fa22d3062c88
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    hal: fixed segfault in hal-storage-mount and don't lose fstype in 
probe-volume.

diff --git a/utils/hal/DETAILS b/utils/hal/DETAILS
index f6d9272..0e88cce 100755
--- a/utils/hal/DETAILS
+++ b/utils/hal/DETAILS
@@ -7,7 +7,7 @@ if [[ $HAL_VER == devel ]]; then
   FORCE_DOWNLOAD=on
 else
          VERSION=0.5.12
-      PATCHLEVEL=2
+      PATCHLEVEL=3
      
SOURCE_HASH=sha512:d450bbcb6f9d8c2b2b6a29324af74cabf2992676c547abce366fe599eb2feb1f3ed65e7eb0b84ad02392ce3b31c5fca6f0b0c6bd0d3db1c0992a52878a5d307f
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://hal.freedesktop.org/releases/$SOURCE
diff --git a/utils/hal/HISTORY b/utils/hal/HISTORY
index 793e2f2..fdd2060 100644
--- a/utils/hal/HISTORY
+++ b/utils/hal/HISTORY
@@ -1,3 +1,9 @@
+2009-05-17 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: PATCHLEVEL+=1
+       * PRE_BUILD: fixed segfault in hal-storage-mount and don't lose fstype
+         in probe-volume; cleaned up
+       * fstype.patch: added
+
 2009-05-21 Treeve Jelbert <treeve AT sourcemage.org>
        * DEPENDS: remove 'force_depends glibc'
          no longer works with latest glibc
diff --git a/utils/hal/PRE_BUILD b/utils/hal/PRE_BUILD
index 3965c96..2d7455a 100755
--- a/utils/hal/PRE_BUILD
+++ b/utils/hal/PRE_BUILD
@@ -1,5 +1,8 @@
 default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-if [[ $HAL_VER = devel ]] ;then
-NOCONFIGURE=1 ./autogen.sh
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/fstype.patch" &&
+
+if [[ $HAL_VER == devel ]]; then
+  NOCONFIGURE=1 ./autogen.sh
 fi
diff --git a/utils/hal/fstype.patch b/utils/hal/fstype.patch
new file mode 100644
index 0000000..ff4c94c
--- /dev/null
+++ b/utils/hal/fstype.patch
@@ -0,0 +1,23 @@
+--- hald/linux/probing/probe-volume.c
++++ hald/linux/probing/probe-volume.c
+@@ -97,7 +97,7 @@ set_blkid_values (LibHalChangeSet *cs, blkid_probe pr)
+ 
+       if (blkid_probe_lookup_value(pr, "TYPE", &type, NULL))
+               type = "";
+-      if (libhal_changeset_set_property_string (cs, "volume.fstype", type))
++      if (!libhal_changeset_set_property_string (cs, "volume.fstype", type))
+               libhal_changeset_set_property_string (cs, "volume.fstype", 
"");
+       HAL_DEBUG(("volume.fstype = '%s'", type));
+ 
+--- tools/hal-storage-mount.c
++++ tools/hal-storage-mount.c
+@@ -786,7 +786,8 @@ handle_mount (LibHalContext *hal_ctx,
+               /* don't consider uid= on vfat, iso9660, hfs and udf 
change-uid for the purpose of policy
+                * (since these doesn't contain uid/gid bits) 
+                */
+-              if (strcmp (libhal_volume_get_fstype (volume), "vfat") != 0 &&
++              if (libhal_volume_get_fstype (volume) != NULL &&
++                  strcmp (libhal_volume_get_fstype (volume), "vfat") != 0 &&
+                   strcmp (libhal_volume_get_fstype (volume), "ntfs") != 0 &&
+                   strcmp (libhal_volume_get_fstype (volume), "ntfs-3g") != 
0 &&
+                   strcmp (libhal_volume_get_fstype (volume), "iso9660") != 
0 &&