Author: patrys Date: Sun May 24 14:31:30 2009 GMT Module: packages Tag: HEAD ---- Log message: - fix segfault during mount regression - rel 2
---- Files affected: packages/hal: hal.spec (1.170 -> 1.171) , hal-fstype.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/hal/hal.spec diff -u packages/hal/hal.spec:1.170 packages/hal/hal.spec:1.171 --- packages/hal/hal.spec:1.170 Thu May 21 00:20:40 2009 +++ packages/hal/hal.spec Sun May 24 16:31:24 2009 @@ -7,7 +7,7 @@ Summary(pl.UTF-8): HAL - abstrakcyjna warstwa dostępu do sprzętu Name: hal Version: 0.5.12 -Release: 1 +Release: 2 License: AFL v2.0 or GPL v2 Group: Libraries Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz @@ -18,6 +18,7 @@ Patch0: %{name}-tools.patch Patch1: %{name}-ac.patch Patch2: %{name}-link.patch +Patch3: %{name}-fstype.patch Patch6: %{name}-rethink.patch URL: http://freedesktop.org/Software/hal BuildRequires: PolicyKit-devel >= 0.7 @@ -137,6 +138,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch6 -p1 %build @@ -291,6 +293,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.171 2009/05/24 14:31:24 patrys +- fix segfault during mount regression +- rel 2 + Revision 1.170 2009/05/20 22:20:40 patrys - 0.5.12 ================================================================ Index: packages/hal/hal-fstype.patch diff -u /dev/null packages/hal/hal-fstype.patch:1.1 --- /dev/null Sun May 24 16:31:30 2009 +++ packages/hal/hal-fstype.patch Sun May 24 16:31:24 2009 @@ -0,0 +1,23 @@ +--- hal-0.5.12/hald/linux/probing/probe-volume.c.orig 2009-05-10 20:11:44.000000000 +0100 ++++ hal-0.5.12/hald/linux/probing/probe-volume.c 2009-05-24 09:47:11.000000000 +0100 +@@ -97,7 +97,7 @@ + + 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)); + +--- hal-0.5.12/tools/hal-storage-mount.c.orig 2009-05-10 20:11:44.000000000 +0100 ++++ hal-0.5.12/tools/hal-storage-mount.c 2009-05-24 09:36:51.000000000 +0100 +@@ -786,7 +786,8 @@ + /* 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 && ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hal/hal.spec?r1=1.170&r2=1.171&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
