Fix alignment (bug #270867).

(Portage version: 13625-svn/cvs/Linux x86_64)

3 files changed, 38 insertions, 2 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index bba1ac61baa0..18c607e71858 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/sqlite
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.250 2009/05/26 10:55:03 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.251 2009/05/28 17:53:24 arfrever Exp $
+
+  28 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  sqlite-3.6.14.2.ebuild, +files/sqlite-3.6.14.2-fix_alignment.patch:
+  Fix alignment (bug #270867).
 
 *sqlite-3.6.14.2 (26 May 2009)
 
diff --git a/dev-db/sqlite/files/sqlite-3.6.14.2-fix_alignment.patch b/dev-db/sqlite/files/sqlite-3.6.14.2-fix_alignment.patch
new file mode 100644
index 000000000000..fe7ee13bc7a4
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.6.14.2-fix_alignment.patch
@@ -0,0 +1,30 @@
+--- src/rowset.c
++++ src/rowset.c
+@@ -60,7 +60,7 @@
+ ** There is an added cost of O(N) when switching between TEST and
+ ** SMALLEST primitives.
+ **
+-** $Id: rowset.c,v 1.6 2009/04/22 15:32:59 drh Exp $
++** $Id: rowset.c,v 1.7 2009/05/22 01:00:13 drh Exp $
+ */
+ #include "sqliteInt.h"
+ 
+@@ -127,15 +127,15 @@
+ */
+ RowSet *sqlite3RowSetInit(sqlite3 *db, void *pSpace, unsigned int N){
+   RowSet *p;
+-  assert( N >= sizeof(*p) );
++  assert( N >= ROUND8(sizeof(*p)) );
+   p = pSpace;
+   p->pChunk = 0;
+   p->db = db;
+   p->pEntry = 0;
+   p->pLast = 0;
+   p->pTree = 0;
+-  p->pFresh = (struct RowSetEntry*)&p[1];
+-  p->nFresh = (u16)((N - sizeof(*p))/sizeof(struct RowSetEntry));
++  p->pFresh = (struct RowSetEntry*)(ROUND8(sizeof(*p)) + (char*)p);
++  p->nFresh = (u16)((N - ROUND8(sizeof(*p)))/sizeof(struct RowSetEntry));
+   p->isSorted = 1;
+   p->iBatch = 0;
+   return p;
diff --git a/dev-db/sqlite/sqlite-3.6.14.2.ebuild b/dev-db/sqlite/sqlite-3.6.14.2.ebuild
index 314a9bb12583..7174e16a92f9 100644
--- a/dev-db/sqlite/sqlite-3.6.14.2.ebuild
+++ b/dev-db/sqlite/sqlite-3.6.14.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.14.2.ebuild,v 1.1 2009/05/26 10:55:03 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.14.2.ebuild,v 1.2 2009/05/28 17:53:24 arfrever Exp $
 
 EAPI="1"
 
@@ -43,6 +43,8 @@ src_unpack() {
 	# note: this sandbox fix is no longer needed with sandbox-1.3+
 	epatch "${FILESDIR}"/sandbox-fix2.patch
 
+	epatch "${FILESDIR}/${P}-fix_alignment.patch"
+
 	epunt_cxx
 }