fix bug

(Portage version: 2.0.51.19)

6 files changed, 512 insertions, 9 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index e538f741e14f..a19970cc9463 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/sqlite
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.81 2005/04/18 16:56:56 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.82 2005/04/24 10:27:19 arj Exp $
+
+*sqlite-3.2.1-r2 (24 Apr 2005)
+
+  24 Apr 2005; Anders Rune Jensen <arj@gentoo.org> +sqlite-3.2.1-r2.ebuild:
+  Fix integer data corruption. Fixes #89504.
 
   18 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
   sqlite-3.2.1-r1.ebuild:
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 2b4ce001ba10..b2b575b8758f 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,17 +1,20 @@
-MD5 3d7ca04225a85699c3bdbd01927b7944 sqlite-3.2.1-r1.ebuild 1672
-MD5 99bf2a671c91f7499255003439d5eac0 sqlite-2.8.14.ebuild 862
 MD5 4d4bfa913883e6229573e79b6f02aa3b metadata.xml 275
-MD5 78d3fa35ae4558e4a5add1fd47fd814f sqlite-2.8.15.ebuild 969
 MD5 1dbd3dee8a51bfd7c6c1a26bccb848ca sqlite-2.8.16-r1.ebuild 1765
-MD5 6210468989e57c2cf42a8235fde81b70 ChangeLog 11390
-MD5 8cda692208b4f43344d30e5bfa2ee396 sqlite-2.8.16.ebuild 1402
+MD5 78d3fa35ae4558e4a5add1fd47fd814f sqlite-2.8.15.ebuild 969
 MD5 fdbecebdb331496cd81f02ea4487e430 sqlite-2.8.13.ebuild 843
+MD5 1b8667e2d215244986f8f194dfd7a8cf sqlite-3.2.1-r1.ebuild 1684
+MD5 8cda692208b4f43344d30e5bfa2ee396 sqlite-2.8.16.ebuild 1402
+MD5 c1a64b1533f668e7c9bff2cbfcda6ea0 ChangeLog 11544
+MD5 99bf2a671c91f7499255003439d5eac0 sqlite-2.8.14.ebuild 862
+MD5 c4fa2cc2f6e8dc27e0f56bce14b2f3ad sqlite-3.2.1-r2.ebuild 1751
 MD5 c9c200833c7c14eb4d750bb00455199e files/digest-sqlite-2.8.14 65
 MD5 c35f34620d18893001720951f8ea0c73 files/digest-sqlite-2.8.13 65
 MD5 60fec205107aa53f0cf83d62c2300183 files/sqlite-2.8.16-multilib.patch 4038
+MD5 9dce926cc47853cb563ab467d1c5ba28 files/digest-sqlite-3.2.1-r2 65
 MD5 217c8f27a3185a30858423e31e1aa4d9 files/sqlite-2.8.15-alignement-fix.patch 538
-MD5 9dce926cc47853cb563ab467d1c5ba28 files/digest-sqlite-3.2.1-r1 65
+MD5 9d99c9942a60e4c210a2c5cd53933a7d files/sqlite-3.2.1-data-corruption.patch 6824
 MD5 3f0417272ef2e01ef38d27021a93aeaf files/digest-sqlite-2.8.16-r1 65
-MD5 3f0417272ef2e01ef38d27021a93aeaf files/digest-sqlite-2.8.16 65
+MD5 9dce926cc47853cb563ab467d1c5ba28 files/digest-sqlite-3.2.1-r1 65
 MD5 b4031f19b8a32fa2b9dd4dfaf4b57ad0 files/digest-sqlite-2.8.15 65
+MD5 3f0417272ef2e01ef38d27021a93aeaf files/digest-sqlite-2.8.16 65
 MD5 d0fc4c53a61d386992d16680140548d0 files/maketcllib.sh 879
diff --git a/dev-db/sqlite/files/digest-sqlite-3.2.1-r2 b/dev-db/sqlite/files/digest-sqlite-3.2.1-r2
new file mode 100644
index 000000000000..8c837fc3ade7
--- /dev/null
+++ b/dev-db/sqlite/files/digest-sqlite-3.2.1-r2
@@ -0,0 +1 @@
+MD5 ccf3831c2f67452d444c5e5e2c7ca6f0 sqlite-3.2.1.tar.gz 1351842
diff --git a/dev-db/sqlite/files/sqlite-3.2.1-data-corruption.patch b/dev-db/sqlite/files/sqlite-3.2.1-data-corruption.patch
new file mode 100644
index 000000000000..36a6e9993411
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.2.1-data-corruption.patch
@@ -0,0 +1,424 @@
+diff -uNr sqlite-3.2.1/src/vdbeaux.c sqlite-3.2.1-data-fix/src/vdbeaux.c
+--- sqlite-3.2.1/src/vdbeaux.c	2005-03-29 15:14:03.000000000 +0200
++++ sqlite-3.2.1-data-fix/src/vdbeaux.c	2005-04-24 12:13:52.000000000 +0200
+@@ -1604,7 +1604,7 @@
+   }
+   if( flags&MEM_Int ){
+     /* Figure out whether to use 1, 2, 4, 6 or 8 bytes. */
+-#   define MAX_6BYTE ((((i64)0x00010000)<<32)-1)
++#   define MAX_6BYTE ((((i64)0x00001000)<<32)-1)
+     i64 i = pMem->i;
+     u64 u = i<0 ? -i : i;
+     if( u<=127 ) return 1;
+diff -uNr sqlite-3.2.1/test/misc5.test sqlite-3.2.1-data-fix/test/misc5.test
+--- sqlite-3.2.1/test/misc5.test	2005-03-17 04:15:40.000000000 +0100
++++ sqlite-3.2.1-data-fix/test/misc5.test	2005-04-24 12:15:06.000000000 +0200
+@@ -13,7 +13,7 @@
+ # This file implements tests for miscellanous features that were
+ # left out of other test files.
+ #
+-# $Id: sqlite-3.2.1-data-corruption.patch,v 1.1 2005/04/24 10:27:19 arj Exp $
++# $Id: sqlite-3.2.1-data-corruption.patch,v 1.1 2005/04/24 10:27:19 arj Exp $
+ 
+ set testdir [file dirname $argv0]
+ source $testdir/tester.tcl
+@@ -41,4 +41,399 @@
+   } {}
+ }
+ 
++# Make sure large integers are stored correctly.
++#
++do_test misc5-2.1 {
++  execsql {
++    create table t2(x unique);
++    insert into t2 values(1);
++    insert or ignore into t2 select x*2 from t2;
++    insert or ignore into t2 select x*4 from t2;
++    insert or ignore into t2 select x*16 from t2;
++    insert or ignore into t2 select x*256 from t2;
++    insert or ignore into t2 select x*65536 from t2;
++    insert or ignore into t2 select x*2147483648 from t2;
++    insert or ignore into t2 select x-1 from t2;
++    insert or ignore into t2 select x+1 from t2;
++    insert or ignore into t2 select -x from t2;
++    select count(*) from t2;
++  }
++} 371
++do_test misc5-2.2 {
++  execsql {
++    select x from t2 order by x;
++  }
++} \
++"-4611686018427387905\
++-4611686018427387904\
++-4611686018427387903\
++-2305843009213693953\
++-2305843009213693952\
++-2305843009213693951\
++-1152921504606846977\
++-1152921504606846976\
++-1152921504606846975\
++-576460752303423489\
++-576460752303423488\
++-576460752303423487\
++-288230376151711745\
++-288230376151711744\
++-288230376151711743\
++-144115188075855873\
++-144115188075855872\
++-144115188075855871\
++-72057594037927937\
++-72057594037927936\
++-72057594037927935\
++-36028797018963969\
++-36028797018963968\
++-36028797018963967\
++-18014398509481985\
++-18014398509481984\
++-18014398509481983\
++-9007199254740993\
++-9007199254740992\
++-9007199254740991\
++-4503599627370497\
++-4503599627370496\
++-4503599627370495\
++-2251799813685249\
++-2251799813685248\
++-2251799813685247\
++-1125899906842625\
++-1125899906842624\
++-1125899906842623\
++-562949953421313\
++-562949953421312\
++-562949953421311\
++-281474976710657\
++-281474976710656\
++-281474976710655\
++-140737488355329\
++-140737488355328\
++-140737488355327\
++-70368744177665\
++-70368744177664\
++-70368744177663\
++-35184372088833\
++-35184372088832\
++-35184372088831\
++-17592186044417\
++-17592186044416\
++-17592186044415\
++-8796093022209\
++-8796093022208\
++-8796093022207\
++-4398046511105\
++-4398046511104\
++-4398046511103\
++-2199023255553\
++-2199023255552\
++-2199023255551\
++-1099511627777\
++-1099511627776\
++-1099511627775\
++-549755813889\
++-549755813888\
++-549755813887\
++-274877906945\
++-274877906944\
++-274877906943\
++-137438953473\
++-137438953472\
++-137438953471\
++-68719476737\
++-68719476736\
++-68719476735\
++-34359738369\
++-34359738368\
++-34359738367\
++-17179869185\
++-17179869184\
++-17179869183\
++-8589934593\
++-8589934592\
++-8589934591\
++-4294967297\
++-4294967296\
++-4294967295\
++-2147483649\
++-2147483648\
++-2147483647\
++-1073741825\
++-1073741824\
++-1073741823\
++-536870913\
++-536870912\
++-536870911\
++-268435457\
++-268435456\
++-268435455\
++-134217729\
++-134217728\
++-134217727\
++-67108865\
++-67108864\
++-67108863\
++-33554433\
++-33554432\
++-33554431\
++-16777217\
++-16777216\
++-16777215\
++-8388609\
++-8388608\
++-8388607\
++-4194305\
++-4194304\
++-4194303\
++-2097153\
++-2097152\
++-2097151\
++-1048577\
++-1048576\
++-1048575\
++-524289\
++-524288\
++-524287\
++-262145\
++-262144\
++-262143\
++-131073\
++-131072\
++-131071\
++-65537\
++-65536\
++-65535\
++-32769\
++-32768\
++-32767\
++-16385\
++-16384\
++-16383\
++-8193\
++-8192\
++-8191\
++-4097\
++-4096\
++-4095\
++-2049\
++-2048\
++-2047\
++-1025\
++-1024\
++-1023\
++-513\
++-512\
++-511\
++-257\
++-256\
++-255\
++-129\
++-128\
++-127\
++-65\
++-64\
++-63\
++-33\
++-32\
++-31\
++-17\
++-16\
++-15\
++-9\
++-8\
++-7\
++-5\
++-4\
++-3\
++-2\
++-1\
++0\
++1\
++2\
++3\
++4\
++5\
++7\
++8\
++9\
++15\
++16\
++17\
++31\
++32\
++33\
++63\
++64\
++65\
++127\
++128\
++129\
++255\
++256\
++257\
++511\
++512\
++513\
++1023\
++1024\
++1025\
++2047\
++2048\
++2049\
++4095\
++4096\
++4097\
++8191\
++8192\
++8193\
++16383\
++16384\
++16385\
++32767\
++32768\
++32769\
++65535\
++65536\
++65537\
++131071\
++131072\
++131073\
++262143\
++262144\
++262145\
++524287\
++524288\
++524289\
++1048575\
++1048576\
++1048577\
++2097151\
++2097152\
++2097153\
++4194303\
++4194304\
++4194305\
++8388607\
++8388608\
++8388609\
++16777215\
++16777216\
++16777217\
++33554431\
++33554432\
++33554433\
++67108863\
++67108864\
++67108865\
++134217727\
++134217728\
++134217729\
++268435455\
++268435456\
++268435457\
++536870911\
++536870912\
++536870913\
++1073741823\
++1073741824\
++1073741825\
++2147483647\
++2147483648\
++2147483649\
++4294967295\
++4294967296\
++4294967297\
++8589934591\
++8589934592\
++8589934593\
++17179869183\
++17179869184\
++17179869185\
++34359738367\
++34359738368\
++34359738369\
++68719476735\
++68719476736\
++68719476737\
++137438953471\
++137438953472\
++137438953473\
++274877906943\
++274877906944\
++274877906945\
++549755813887\
++549755813888\
++549755813889\
++1099511627775\
++1099511627776\
++1099511627777\
++2199023255551\
++2199023255552\
++2199023255553\
++4398046511103\
++4398046511104\
++4398046511105\
++8796093022207\
++8796093022208\
++8796093022209\
++17592186044415\
++17592186044416\
++17592186044417\
++35184372088831\
++35184372088832\
++35184372088833\
++70368744177663\
++70368744177664\
++70368744177665\
++140737488355327\
++140737488355328\
++140737488355329\
++281474976710655\
++281474976710656\
++281474976710657\
++562949953421311\
++562949953421312\
++562949953421313\
++1125899906842623\
++1125899906842624\
++1125899906842625\
++2251799813685247\
++2251799813685248\
++2251799813685249\
++4503599627370495\
++4503599627370496\
++4503599627370497\
++9007199254740991\
++9007199254740992\
++9007199254740993\
++18014398509481983\
++18014398509481984\
++18014398509481985\
++36028797018963967\
++36028797018963968\
++36028797018963969\
++72057594037927935\
++72057594037927936\
++72057594037927937\
++144115188075855871\
++144115188075855872\
++144115188075855873\
++288230376151711743\
++288230376151711744\
++288230376151711745\
++576460752303423487\
++576460752303423488\
++576460752303423489\
++1152921504606846975\
++1152921504606846976\
++1152921504606846977\
++2305843009213693951\
++2305843009213693952\
++2305843009213693953\
++4611686018427387903\
++4611686018427387904\
++4611686018427387905"
++
+ finish_test
diff --git a/dev-db/sqlite/sqlite-3.2.1-r1.ebuild b/dev-db/sqlite/sqlite-3.2.1-r1.ebuild
index 8f4428b91c8d..9fb3c124bd10 100644
--- a/dev-db/sqlite/sqlite-3.2.1-r1.ebuild
+++ b/dev-db/sqlite/sqlite-3.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.2.1-r1.ebuild,v 1.6 2005/04/18 16:56:56 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.2.1-r1.ebuild,v 1.7 2005/04/24 10:27:19 arj Exp $
 
 inherit eutils
 
@@ -21,6 +21,8 @@ LICENSE="as-is"
 
 KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc-macos sparc x86 ~ppc64"
 
+src_unpack
+
 src_compile() {
 	local myconf
 	myconf="--enable-incore-db --enable-tempdb-in-ram"
diff --git a/dev-db/sqlite/sqlite-3.2.1-r2.ebuild b/dev-db/sqlite/sqlite-3.2.1-r2.ebuild
new file mode 100644
index 000000000000..d83d9b1e9d5b
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.2.1-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.2.1-r2.ebuild,v 1.1 2005/04/24 10:27:19 arj Exp $
+
+inherit eutils
+
+IUSE="nothreadsafe doc"
+
+DESCRIPTION="SQLite: An SQL Database Engine in a C Library."
+SRC_URI="http://www.sqlite.org/${P}.tar.gz"
+HOMEPAGE="http://www.sqlite.org"
+
+# Adding glibc as dependency for USE !nothreadsafe until someone can tell me
+#   if all virtual/libc's provide POSIX threads (pthread.h)
+#   - 20041203, Armando Di Cianno <fafhrd@gentoo.org>
+DEPEND="virtual/libc
+	!nothreadsafe? ( !ppc-macos? ( sys-libs/glibc ) )
+	doc? (dev-lang/tcl)"
+SLOT="3"
+LICENSE="as-is"
+
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc-macos sparc x86 ~ppc64"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/${P}-data-corruption.patch
+}
+
+src_compile() {
+	local myconf
+	myconf="--enable-incore-db --enable-tempdb-in-ram"
+	# Yes, this is ridiculous, but I'm not the maintainer for this ebuild,
+	#   and yet it's broken w/o thread support, so this has to do for now
+	#   - 20041203, Armando Di Cianno <fafhrd@gentoo.org>
+	if ! use nothreadsafe; then
+		myconf="${myconf} --enable-threadsafe"
+	else
+		myconf="${myconf} --disable-threadsafe"
+	fi
+	econf ${myconf} || die
+	emake all || die
+
+	if use doc; then
+	emake doc
+	fi
+}
+
+# In case we ever want testing support; note: this needs more work, as
+#   as it causes some sandbox issues.
+#   - 20041203, Armando Di Cianno <fafhrd@gentoo.org>
+#src_test() {
+#	cd ${S}
+#	emake fulltest || die "some test failed"
+#}
+
+src_install () {
+	make DESTDIR="${D}" install || die
+
+	dobin lemon
+	dodoc README VERSION
+	doman sqlite3.1
+
+	if use doc; then
+	docinto html
+	dohtml doc/*.html doc/*.txt doc/*.png
+	fi
+}