rpms/hal/devel hal-0.5.8.1-remove-link-not-remove.patch, NONE, 1.1 hal-alignment.patch, NONE, 1.1 hal.spec, 1.110, 1.111

[fedora-cvs-commits at redhat.com]

Author: davidz

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9145

Modified Files:
	hal.spec 
Added Files:
	hal-0.5.8.1-remove-link-not-remove.patch hal-alignment.patch 
Log Message:
* Tue Nov 14 2006 David Zeuthen <davidz at redhat.com> - 0.5.8.1-5%{?dist}
- Alignment fixes on ia64; Add patch fixing to work with D-Bus 1.0



hal-0.5.8.1-remove-link-not-remove.patch:
 hald_dbus.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hal-0.5.8.1-remove-link-not-remove.patch ---
From: John (J5) Palmieri <johnp at redhat.com>
Date: Mon, 6 Nov 2006 16:48:55 +0000 (-0500)
Subject: use g_slist_remove_link instead of g_slist_remove
X-Git-Tag: HAL_0_2
X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=e40fe849334ba6c59eb928528d965215baa3e0c6

use g_slist_remove_link instead of g_slist_remove

Data would be freed and then g_slist_remove would be called on the
link which would leave the link in the list, any subsequent iteration
over the list would cause us to access freed memory.
(cherry picked from a56a15b90177734c70a8b03d961a7bcabdea2af8 commit)
---

--- a/hald/hald_dbus.c
+++ b/hald/hald_dbus.c
@@ -3977,7 +3977,7 @@ local_server_message_handler (DBusConnec
 				g_free (hih->introspection_xml);
 				g_free (hih->udi);
 				g_free (hih);
-				helper_interface_handlers = g_slist_remove (helper_interface_handlers, i);
+				helper_interface_handlers = g_slist_remove_link (helper_interface_handlers, i);
 			}
 		}
 

hal-alignment.patch:
 hald-runner/main.c  |    2 +-
 partutil/partutil.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE hal-alignment.patch ---
--- hal-0.5.8.1/hald-runner/main.c.orig	2006-10-09 16:28:45.000000000 -0400
+++ hal-0.5.8.1/hald-runner/main.c	2006-10-09 16:28:39.000000000 -0400
@@ -111,7 +111,7 @@
 	DBusMessage *reply;
 	DBusMessageIter iter;
 	run_request *r;
-	GPid pid;
+	GPid pid __attribute__ ((aligned));
 
 	r = new_run_request();
 	g_assert(dbus_message_iter_init(msg, &iter));
--- hal-0.5.8.1/partutil/partutil.c.orig	2006-10-09 17:04:31.000000000 -0400
+++ hal-0.5.8.1/partutil/partutil.c	2006-10-09 17:05:01.000000000 -0400
@@ -491,7 +491,7 @@
 part_table_parse_msdos (int fd, guint64 offset, guint64 size, gboolean *found_gpt)
 {
 	int n;
-	const guint8 mbr[512];
+	const guint8 mbr[512] __attribute__ ((aligned));
 	PartitionTable *p;
 
 	//HAL_INFO (("Entering MS-DOS parser"));


Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- hal.spec	4 Oct 2006 20:45:50 -0000	1.110
+++ hal.spec	14 Nov 2006 22:45:43 -0000	1.111
@@ -22,7 +22,7 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.8.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: %{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
@@ -32,6 +32,9 @@
 Patch2: hal-0.5.8.1-fixppc.patch
 Patch3: hal-0.5.8.1-fedora-eject.patch
 Patch4: hal-0.5.8.1-partutil-fix.patch
+Patch5: hal-alignment.patch
+Patch6: hal-0.5.8.1-remove-link-not-remove.patch
+
 License: AFL/GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
@@ -107,8 +110,10 @@
 %patch2 -p1 -b .ppc-fixes
 %patch3 -p0 -b .fedora-eject
 %patch4 -p1 -b .partutil-fix
-%build
+%patch5 -p1 -b .alignment
+%patch6 -p1 -b .link
 
+%build
 %configure --disable-docbook-docs --with-os-type=redhat --disable-policy-kit
 
 %install
@@ -220,6 +225,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Tue Nov 14 2006 David Zeuthen <davidz at redhat.com> - 0.5.8.1-5%{?dist}
+- Alignment fixes on ia64; Add patch fixing to work with D-Bus 1.0
+
 * Wed Oct 04 2006 David Zeuthen <davidz at redhat.com> - 0.5.8.1-4%{?dist}
 - Make a patch actually apply