rpms/hal/devel hal-mdfind.patch,NONE,1.1 hal.spec,1.202,1.203

[Richard Hughes]

Author: rhughes

Update of /cvs/pkgs/rpms/hal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25555

Modified Files:
	hal.spec 
Added Files:
	hal-mdfind.patch 
Log Message:
* Tue Jul 28 2009 Richard Hughes <rhughes at redhat.com> - 0.5.13-5
- Apply a patch to fix mdraid devices.
- Fixes #507782


hal-mdfind.patch:
 blockdev.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE hal-mdfind.patch ---
diff -up hal-0.5.12/hald/linux/blockdev.c.mdfind hal-0.5.12/hald/linux/blockdev.c
--- hal-0.5.12/hald/linux/blockdev.c.mdfind	2009-02-26 10:53:02.000000000 +0000
+++ hal-0.5.12/hald/linux/blockdev.c	2009-07-22 15:16:39.000000000 +0100
@@ -878,7 +878,7 @@ error:
 }
 
 
-void
+
 hotplug_event_begin_add_blockdev (const gchar *sysfs_path, const gchar *device_file, gboolean is_partition,
 				  HalDevice *parent, void *end_token)
 {
@@ -893,6 +893,7 @@ hotplug_event_begin_add_blockdev (const 
         gboolean is_md_device;
 	gboolean is_cciss_device;
         int md_number;
+	char tc;
 
 	is_device_mapper = FALSE;
         is_fakevolume = FALSE;
@@ -911,7 +912,7 @@ hotplug_event_begin_add_blockdev (const 
 		HAL_INFO (("Handling %s as fakevolume - sysfs_path_real=%s", device_file, sysfs_path_real));
 		is_fakevolume = TRUE;
 		sysfs_path_real = hal_util_get_parent_path (sysfs_path);
-        } else if (sscanf (hal_util_get_last_element (sysfs_path), "md%d", &md_number) == 1) {
+        } else if (sscanf (hal_util_get_last_element (sysfs_path), "md%d%c", &md_number, &tc) == 1) {
 		HAL_INFO (("Handling %s as MD device", device_file));
                 is_md_device = TRUE;
 		sysfs_path_real = g_strdup (sysfs_path);


Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/hal.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -r1.202 -r1.203
--- hal.spec	28 Jul 2009 12:54:54 -0000	1.202
+++ hal.spec	28 Jul 2009 14:01:28 -0000	1.203
@@ -26,7 +26,7 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.13
-Release: 4%{?dist}
+Release: 5%{?dist}
 #Release: 1.%{?alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
@@ -46,6 +46,9 @@ Patch9: hal-KVM-evdev.patch
 # http://bugs.freedesktop.org/show_bug.cgi?id=22442
 Patch11: hal-HDAPS-blacklist.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=507782
+Patch12: hal-mdfind.patch
+
 Patch100: hal-0.5.12-use-at-console.patch
 
 License: AFL or GPLv2
@@ -137,6 +140,7 @@ API docs for HAL.
 %patch4 -p1 -b .dell-killswitch
 %patch9 -p1 -b .kvm-evdev
 %patch11 -p1 -b .hdaps-blacklist
+%patch12 -p1 -b .mdfind
 %patch100 -p1 -b .drop-polkit
 
 autoreconf -i -f
@@ -276,6 +280,10 @@ fi
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Tue Jul 28 2009 Richard Hughes <rhughes at redhat.com> - 0.5.13-5
+- Apply a patch to fix mdraid devices.
+- Fixes #507782
+
 * Tue Jul 28 2009 Richard Hughes <rhughes at redhat.com> - 0.5.13-4
 - Fix build harder