rpms/dbus/F-9 dbus-alpha-unaligned.patch, NONE, 1.1 dbus.spec, 1.150, 1.151

[Oliver Falk]

Author: oliver

Update of /cvs/pkgs/rpms/dbus/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24148

Modified Files:
	dbus.spec 
Added Files:
	dbus-alpha-unaligned.patch 
Log Message:

* Mon Feb 16 2009 Oliver Falk <oliver at linux-kernel.at> - 1.2.4-3
- Fix UAAs on alpha. Credits to Jay Estabrook


dbus-alpha-unaligned.patch:

--- NEW FILE dbus-alpha-unaligned.patch ---
--- a/dbus/dbus-marshal-basic.c.ORIG	2008-04-23 17:54:58.000000000 -0400
+++ b/dbus/dbus-marshal-basic.c	2008-04-23 18:00:06.000000000 -0400
@@ -518,7 +518,7 @@ _dbus_marshal_read_basic (const DBusStri
   switch (type)
     {
     case DBUS_TYPE_BYTE:
-      vp->byt = _dbus_string_get_byte (str, pos);
+      *((volatile char *)&vp->byt) = _dbus_string_get_byte (str, pos);
       (pos)++;
       break;
     case DBUS_TYPE_INT16:


Index: dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus/F-9/dbus.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- dbus.spec	13 Dec 2008 02:31:06 -0000	1.150
+++ dbus.spec	26 Feb 2009 09:25:13 -0000	1.151
@@ -9,7 +9,7 @@
 Name: dbus
 Epoch: 1
 Version: 1.2.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
 Source1: doxygen_to_devhelp.xsl
@@ -41,6 +41,7 @@
 Patch0: start-early.patch
 Patch1: dbus-1.0.1-generate-xml-docs.patch
 Patch6: dbus-1.2.1-increase-timeout.patch
+Patch7: dbus-alpha-unaligned.patch
 
 %description
 D-BUS is a system for sending messages between applications. It is
@@ -96,6 +97,13 @@
 %patch1 -p1 -b .generate-xml-docs
 %patch6 -p1 -b .increase-timeout
 
+# At least on alpha the variable is volatile and produces
+# unaligned traps. The patch shouldn't hurt other archs (untested yet),
+# so please consider for inclusion.
+%ifarch alpha
+%patch7 -p1 -b .alpha-unaligned
+%endif
+
 autoreconf -f -i
 
 %build
@@ -226,6 +234,9 @@
 %{_includedir}/*
 
 %changelog
+* Mon Feb 16 2009 Oliver Falk <oliver at linux-kernel.at> - 1.2.4-3
+- Fix UAAs on alpha. Credits to Jay Estabrook
+
 * Fri Dec 12 2008 Colin Walters <walters at redhat.com> - 1.2.4-2
 - Revert to 1.2.4, add epoch
   Too many things broke with this, it looks like there's no way