[hal/f14/master] Fix a segfault in a probe (cherry picked from commit 0c09bb277d7cbe4b16e5ddb33e2a5af2db4ae2ff)

[Matthias Clasen]

commit 16bfb33684740b918832527392106ded4dfe5b16
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Tue Sep 7 18:24:21 2010 -0400

    Fix a segfault in a probe
    (cherry picked from commit 0c09bb277d7cbe4b16e5ddb33e2a5af2db4ae2ff)

 hal.spec                   |   10 ++++++++--
 probe-input-segfault.patch |   19 +++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)
---
diff --git a/hal.spec b/hal.spec
index 22fcee3..92109da 100644
--- a/hal.spec
+++ b/hal.spec
@@ -26,7 +26,7 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.14
-Release: 3%{?dist}
+Release: 4%{?dist}
 #Release: 1.%{?alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.bz2
@@ -49,11 +49,13 @@ Patch11: hal-HDAPS-blacklist.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=523914
 Patch13: hal-xen-unignore-axes.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=630859
+Patch14: probe-input-segfault.patch
+
 Patch100: hal-use-at-console.patch
 
 License: AFL or GPLv2
 Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(post): /sbin/ldconfig
@@ -157,6 +159,7 @@ Storage polling support for HAL
 %patch9 -p1 -b .kvm-evdev
 %patch11 -p1 -b .hdaps-blacklist
 %patch13 -p1 -b .xen-unignore
+%patch14 -p1 -b .probe-input-segfault
 %patch100 -p1 -b .drop-polkit
 
 autoreconf -i -f
@@ -310,6 +313,9 @@ fi
 %{_libexecdir}/hald-addon-storage
 
 %changelog
+* Tue Sep  7 2010 Matthias Clasen <mclasen at redhat.com> 0.5.14-4
+- Fix a segfault in probe-input (#630859)
+
 * Tue Mar 16 2010 Matthew Garrett <mjg at redhat.com> 0.5.14-3
 - Split out storage-related files in order to avoid unnecessary polling
 
diff --git a/probe-input-segfault.patch b/probe-input-segfault.patch
new file mode 100644
index 0000000..45b572d
--- /dev/null
+++ b/probe-input-segfault.patch
@@ -0,0 +1,19 @@
+--- hal-0.5.14/hald/linux/probing/probe-input.c	2009-08-24 08:42:30.000000000 -0400
++++ hacked/hald/linux/probing/probe-input.c	2010-09-07 15:55:52.271475007 -0400
+@@ -69,6 +69,8 @@
+ 	ret = 1;
+ 	fd = -1;
+ 
++	dbus_error_init (&error);
++
+ 	setup_logger ();
+ 
+ 	button_type = getenv ("HAL_PROP_BUTTON_TYPE");
+@@ -96,7 +98,6 @@
+ 	if (udi == NULL)
+ 		goto out;
+ 
+-	dbus_error_init (&error);
+ 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
+ 		goto out;
+