rpms/hal/F-8 hal-0.5.10-fix_invalid_fdi_cache_on_empty_matches.patch, NONE, 1.1 hal.spec, 1.143, 1.144

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/hal/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10623

Modified Files:
	hal.spec 
Added Files:
	hal-0.5.10-fix_invalid_fdi_cache_on_empty_matches.patch 
Log Message:
* Wed Sep 24 2008 Orion Poplawski - 0.5.10-5
- Add patch to fix hal crash on Fujitsu laptops (#452701)


hal-0.5.10-fix_invalid_fdi_cache_on_empty_matches.patch:

--- NEW FILE hal-0.5.10-fix_invalid_fdi_cache_on_empty_matches.patch ---
commit 74ce4177ffecf8b455176cdf87e04a817e4c279a
Author: Sjoerd Simons <sjoerd at luon.net>
Date:   Sat Dec 22 15:42:54 2007 +0100

    ensure match rules are always stored before writing the jump_position in the cache
    
    When a match rule is empty the expat end callback is called while the match
    rule isn't saved yet. This patch ensures the match rule is saved _before_
    saving the jump_positions, if this is not done then the jump_position will be
    overwritten with 0.
    
    Fixes hal aborting on Fujitsu laptops because the fujitsu fdi contains an
    empty <match /> rule. Reported in
    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=456314 and its  dupes

diff --git a/hald/create_cache.c b/hald/create_cache.c
index 37e2d10..882de1b 100644
--- a/hald/create_cache.c
+++ b/hald/create_cache.c
@@ -432,6 +432,11 @@ end (void *data, const char *el){
 
 	if (rtype == RULE_UNKNOWN) return;
 	if (rtype == RULE_MATCH){
+		if (fdi_ctx->rule.rtype == RULE_MATCH) {
+			/* the match rule wasn't stored yet, store it now. So it's stored
+			* _before_ jump_position is written into the cache */
+			store_rule(fdi_ctx);
+		}
 		set_jump_position(fdi_ctx);
 		return;
 	}


Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/F-8/hal.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- hal.spec	18 Jul 2008 18:07:01 -0000	1.143
+++ hal.spec	24 Sep 2008 20:12:06 -0000	1.144
@@ -26,13 +26,14 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.10
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
 Patch0: hal-0.5.10-acltool-serialize.patch
 Patch1: hal-0.5.10-int_outof-fix.patch
 Patch2: hal-0.5.10-fix-memory-leaks.patch
 Patch3: hal-0.5.10-fix-input-spin.patch
+Patch4: hal-0.5.10-fix_invalid_fdi_cache_on_empty_matches.patch
 
 License: AFL/GPL
 Group: System Environment/Libraries
@@ -128,6 +129,7 @@
 %patch1 -p1 -b .int_outof-fix
 %patch2 -p1 -b .memory-leaks-fix
 %patch3 -p1 -b .input-spin
+%patch4 -p1 -b .invalid_fdi_cache_on_empty_matches
 
 %build
 %configure --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version} --with-os-type=redhat --enable-console-kit --enable-policy-kit --enable-acl-management --enable-umount-helper --enable-acpi-ibm --enable-acpi-toshiba --with-eject=/usr/sbin/eject
@@ -240,6 +242,9 @@
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Wed Sep 24 2008 Orion Poplawski - 0.5.10-5
+- Add patch to fix hal crash on Fujitsu laptops (#452701)
+
 * Fri Jul 18 2008 David Zeuthen <davidz at redhat.com> - 0.5.10-4
 - fix runaway input add-on (#452557)