rpms/hal/devel hal-fix-unknown-rfkill-crash.patch, NONE, 1.1 hal.spec, 1.162, 1.163

[Richard Hughes]

Author: rhughes

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

Modified Files:
	hal.spec 
Added Files:
	hal-fix-unknown-rfkill-crash.patch 
Log Message:
* Mon Oct 08 2008 Richard Hughes <rhughes at redhat.com> - 0.5.12-2.20081001git
- Add a patch from the mailing list to fix rh#466150


hal-fix-unknown-rfkill-crash.patch:

--- NEW FILE hal-fix-unknown-rfkill-crash.patch ---
diff --git a/hald/linux/device.c b/hald/linux/device.c
index 89d0cdd..26f6c1b 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -3534,6 +3534,8 @@ rfkill_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent
 	}
 
 	type = hal_util_get_string_from_file (sysfs_path, "type");
+	if (type == NULL)
+		type = "unknown";
 
 	if (strcasecmp (type, "wimax") == 0) {
 		hal_device_property_set_string (d, "killswitch.type", "wwan");


Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/hal.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- hal.spec	6 Oct 2008 10:04:43 -0000	1.162
+++ hal.spec	8 Oct 2008 20:05:53 -0000	1.163
@@ -28,13 +28,19 @@
 Name: hal
 Version: 0.5.12
 #Release: 5%{?dist}
-Release: 1.%{?alphatag}%{?dist}
+Release: 2.%{?alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 #Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}-%{?alphatag}.tar.gz
 Patch1: hal-0.5.10-set-property-direct.patch
 Patch2: hal-change-priority.patch
+
+# on mailing list, awaiting review
 Patch3: hal-20080924-fix-replace_slash_in_end_of_udi.patch
+
+# upstream, 4870805ec7667efe8f64d9fd87703cef99931fd7
+Patch4: hal-fix-unknown-rfkill-crash.patch
+
 License: AFL or GPLv2
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -131,6 +137,7 @@
 %patch1 -p1 -b .direct
 %patch2 -p1 -b .priority
 %patch3 -p1 -b .udi-check
+%patch4 -p1 -b .rfkilltype
 
 %build
 autoreconf
@@ -275,6 +282,9 @@
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Mon Oct 08 2008 Richard Hughes <rhughes at redhat.com> - 0.5.12-2.20081001git
+- Add a patch from the mailing list to fix rh#466150
+
 * Mon Oct 06 2008 Richard Hughes <rhughes at redhat.com> - 0.5.12-1.20081001git
 - Add a patch from the mailing list to try and fix rh#442457