added patch to fix bug 46674 and hopefully 47594 on amd64, alpha, and a few other archs where this is seen. to quote from the gnome bug: "The alignment of the structures and their data members are correct when they are constructed (demarshalled), however when the list is passed to CORBA_free() to free the memory used by the list, the code that frees each structure fails to take into account the proper alignment of each structure (8 bytes on AMD64). The result is that after the second item in the list, a point goes far enough astray to cause it to free() some bogus chunks of memory."

4 files changed, 46 insertions, 3 deletions

diff --git a/gnome-base/ORBit2/ChangeLog b/gnome-base/ORBit2/ChangeLog
index 2e3f1453fdfa..fdade467cd83 100644
--- a/gnome-base/ORBit2/ChangeLog
+++ b/gnome-base/ORBit2/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for gnome-base/ORBit2
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/ORBit2/ChangeLog,v 1.54 2004/06/15 23:35:53 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/ORBit2/ChangeLog,v 1.55 2004/06/16 09:32:08 lv Exp $
+
+  16 Jun 2004; Travis Tilley <lv@gentoo.org>
+  +files/orbit2-alignment-fix.patch, ORBit2-2.10.1.ebuild,
+  ORBit2-2.10.2.ebuild:
+  added patch to fix bug 46674 and hopefully 47594 on amd64, alpha, and a few
+  other archs where this is seen. to quote from the gnome bug: "The alignment of
+  the structures and their data members are correct when they are constructed
+  (demarshalled), however when the list is passed to CORBA_free() to free the
+  memory used by the list, the code that frees each structure fails to take into
+  account the proper alignment of each structure (8 bytes on AMD64). The result
+  is that after the second item in the list, a point goes far enough astray to
+  cause it to free() some bogus chunks of memory."
 
   16 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> ORBit2-2.10.0.ebuild:
   Stable on alpha.
diff --git a/gnome-base/ORBit2/ORBit2-2.10.1.ebuild b/gnome-base/ORBit2/ORBit2-2.10.1.ebuild
index 933ef988167f..96e092bd29b7 100644
--- a/gnome-base/ORBit2/ORBit2-2.10.1.ebuild
+++ b/gnome-base/ORBit2/ORBit2-2.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/ORBit2/ORBit2-2.10.1.ebuild,v 1.2 2004/06/06 10:54:34 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/ORBit2/ORBit2-2.10.1.ebuild,v 1.3 2004/06/16 09:32:08 lv Exp $
 
 inherit gnome2
 
@@ -27,3 +27,13 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-util/gtk-doc-1 )"
 
 DOCS="AUTHORS ChangeLog COPYING* README* HACKING INSTALL NEWS TODO MAINTAINERS"
+
+src_unpack() {
+	unpack ${A}
+
+	# this patch fixes a bug in CORBA_free() where it doesnt take proper
+	# structure alignment into account. the nautilus bug on amd64, alpha, and
+	# various other non-x86 archs that caused it to segfault with more than
+	# two fstab entries with the user option is now fixed.
+	cd ${S} ; epatch ${FILESDIR}/orbit2-alignment-fix.patch
+}
diff --git a/gnome-base/ORBit2/ORBit2-2.10.2.ebuild b/gnome-base/ORBit2/ORBit2-2.10.2.ebuild
index 376a63f84985..2a84d63c25b2 100644
--- a/gnome-base/ORBit2/ORBit2-2.10.2.ebuild
+++ b/gnome-base/ORBit2/ORBit2-2.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/ORBit2/ORBit2-2.10.2.ebuild,v 1.1 2004/05/30 18:32:23 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/ORBit2/ORBit2-2.10.2.ebuild,v 1.2 2004/06/16 09:32:08 lv Exp $
 
 inherit gnome2
 
@@ -29,3 +29,13 @@ DEPEND="${RDEPEND}
 MAKEOPTS="${MAKEOPTS} -j1"
 
 DOCS="AUTHORS ChangeLog COPYING* README* HACKING INSTALL NEWS TODO MAINTAINERS"
+
+src_unpack() {
+	unpack ${A}
+
+	# this patch fixes a bug in CORBA_free() where it doesnt take proper
+	# structure alignment into account. the nautilus bug on amd64, alpha, and
+	# various other non-x86 archs that caused it to segfault with more than
+	# two fstab entries with the user option is now fixed.
+	cd ${S} ; epatch ${FILESDIR}/orbit2-alignment-fix.patch
+}
diff --git a/gnome-base/ORBit2/files/orbit2-alignment-fix.patch b/gnome-base/ORBit2/files/orbit2-alignment-fix.patch
new file mode 100644
index 000000000000..5a62f9fb0ca6
--- /dev/null
+++ b/gnome-base/ORBit2/files/orbit2-alignment-fix.patch
@@ -0,0 +1,11 @@
+diff -Naur ORBit2-2.10.0/src/orb/orb-core/allocators.c ORBit2-2.10.0.1-cbl/src/orb/orb-core/allocators.c
+--- ORBit2-2.10.0/src/orb/orb-core/allocators.c	2003-07-07 13:11:31.000000000 +0000
++++ ORBit2-2.10.0.1-cbl/src/orb/orb-core/allocators.c	2004-06-16 04:11:27.642691407 +0000
+@@ -59,6 +59,7 @@
+ 	}
+ 	case CORBA_tk_except:
+ 	case CORBA_tk_struct:
++		mem = ALIGN_ADDRESS (mem, tc->c_align);
+ 		for (i = 0; i < tc->sub_parts; i++) {
+ 			subtc = tc->subtypes [i];
+ 			mem = ALIGN_ADDRESS (mem, subtc->c_align);