Fix alignment (bug #270867).

Package-Manager: portage-13625-svn/cvs/Linux x86_64

4 files changed, 41 insertions, 4 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/Manifest b/dev-db/sqlite/Manifest
index 8739b2f08aaf..e987f00577e8 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -5,6 +5,7 @@ AUX sqlite-2.8.15-alignement-fix.patch 538 RMD160 12407bbe5f1bcae243d4247b43bf63
 AUX sqlite-2.8.16-multilib.patch 4038 RMD160 0e074a3ebac7c188dbbf9b86be87a79e0c23390a SHA1 8d38fd5820fd1037b35194d33666be19dcce9e98 SHA256 4ccbef245ea50f317e34bad5ed07e6917fc08d718c6e57884255799980d6e765
 AUX sqlite-3-test-fix-3.3.4.patch 761 RMD160 5c1dc771d1dbe5dc0138145ddc169a8aa2305c3b SHA1 3e2c30622e387d002bfc5e49a49781ca9cc63c82 SHA256 f26cc9b97c6240f5e3f595b6be57309044be44e9f865f7596b4e85d77eef82d4
 AUX sqlite-3.3.3-tcl-fix.patch 955 RMD160 74965942daef0fe667bd866c9ebf5b2ff999c1d9 SHA1 c15e2a86f476dcab72b8a38ff89d6535ec0bbfd0 SHA256 b36bbb78a7c35a0c457e4cbdbc1b925fc4ffa07e0c60eb2230f1aff874a45403
+AUX sqlite-3.6.14.2-fix_alignment.patch 934 RMD160 910fa97bc164e616ccdcde76b3a0882a228e15cb SHA1 06897314d6401db4b38af269943d908634a7d528 SHA256 09744b5dcaa8a3ff33450e50fb5b5b0cd689857c82cd55e6fa289b2b8d2f95fc
 AUX sqlite-64bit-test-fix.patch 604 RMD160 58b1df9e9f6593d41fa17541eb3b429c70da384a SHA1 f20d6c33a0a26829e2c3eb14b5c21c259166938d SHA256 5310357cd2658333a5a76860dc87a5f98977878ffae6a9e11c5e1ec4c73ccc15
 AUX sqlite-64bit-test-fix2.patch 438 RMD160 83904019c277fdf24c8299b0e6aba7184cd8b56f SHA1 15512752ca2eefeab7daad22a76d767692dac3b5 SHA256 87c47559f891736006050f0a3a4e4393084cf314a7bc44cc0e09f57efc0de23b
 DIST sqlite-2.8.16.tar.gz 981834 RMD160 df60e84f16ccd8b6b8e86dabfe6bf40f6a3dc136 SHA1 7bef329f78628de252c289bda7cea6f86adcc42e SHA256 d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e
@@ -20,7 +21,7 @@ EBUILD sqlite-2.8.16-r4.ebuild 2691 RMD160 84aeeda2955daa547583a9d995b1baf0de601
 EBUILD sqlite-3.6.12.ebuild 2321 RMD160 6edffa464202fa8bfc396b01e72ec44fec1c56b0 SHA1 737d9eaa267ee909eb7973ea4408a6afe7e1984d SHA256 df4c7ad22f0b08d6d9fb50b4b7498aadb8f1310e3c28252254570535d6a76466
 EBUILD sqlite-3.6.13.ebuild 2402 RMD160 05a42171c46908601690ca27539faf4a686c8f1a SHA1 7a87bcb01ac267e936b2d5ac9c8fec36e28a28d2 SHA256 399324b1c79316a87a8cf3aa61e50e4fc736ba630cc2ede61a40012d0362b034
 EBUILD sqlite-3.6.14.1.ebuild 2262 RMD160 d646d5d6b3d09bd5a3fa9e6af74c25e3e710751e SHA1 36511a513b55038b39932d3286c477216f93e9e4 SHA256 7e4f24b50e467a8bf4e6a6f93b3c9d580aec809757f2a560869523446ee95a00
-EBUILD sqlite-3.6.14.2.ebuild 2263 RMD160 87f4a87b652b6882d5991f053bc463c7ce906315 SHA1 ddf85b338bab735cd7527fc3c14c8b912941bc3e SHA256 230f08bdb2af8f953e0b44b88ec1ef87d9a279bfd161c648df4877e3b447dda0
+EBUILD sqlite-3.6.14.2.ebuild 2311 RMD160 90e0cd9e52b95f8e2ebcffb6f47eb8e448a3e4f9 SHA1 c4081dbf731acd4181e08720e342d2d7b69047cf SHA256 7ddb2f6e5b1042575e74d343c2c8299c47ee8c4c295f4f8d5d69a042c2aef824
 EBUILD sqlite-3.6.14.ebuild 2285 RMD160 7bbae6c5930dc04aaca9a47baf3a4521871d8242 SHA1 03c7597ac4265649cb32fa19e4401545575842b7 SHA256 c54c2cda01175bdf4e1c6d7a42e6195e59e8d63f48109ef0bc8bf084c90fdce0
-MISC ChangeLog 34059 RMD160 596b20fa5f117c4cd03bf72bf4a8b702964bd4a7 SHA1 7449cfd1a2e655a5e0175e2997057b0a878ce282 SHA256 cb9b31bcda8a855376eeaed1521670b2fd70f209a59a9e8675b946580cd71b43
+MISC ChangeLog 34234 RMD160 209a27f5e8b546748a5df60250b737e38197609b SHA1 f2c25cea826187b446cb0a72bdedff55aa98139c SHA256 9e80b93879061796868ef0624f7105ab5e6e8a758742aeb2f645105c90702e3a
 MISC metadata.xml 577 RMD160 a745dafa141324b8328d6b154f31f1d01dfadd03 SHA1 bb56f3d690313b6fe5aacd5435cfe43cb98c9c7d SHA256 591c8bef421f7fae9a8a0ad17f23cfc44de90f113c39e143adb17ea84925492f
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
 }