summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Franzmann2011-06-28 23:45:45 +0200
committerFlorian Franzmann2011-06-28 23:45:45 +0200
commit826e35405c89bcb76c5444df4024ef4a7906da59 (patch)
treeb1de95a08c0e5050d5740e3a3185296267709bfd
parent5ab3257dd25411515e59c2b3dc4b6680ca67b9fa (diff)
database/sqlite: fixed bug #15997
-rw-r--r--database/sqlite/HISTORY4
-rwxr-xr-xdatabase/sqlite/PRE_BUILD3
-rw-r--r--database/sqlite/sqlite-3.7.7.patch10
3 files changed, 17 insertions, 0 deletions
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index 8000b1ab9c..01fb664267 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,7 @@
+2011-06-28 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * sqlite-3.7.7.patch, PRE_BUILD: added , fixed bug reported at
+ http://www.sqlite.org/src/info/25ee812710, fixes our bug #15997
+
2011-06-25 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 3.7.7
diff --git a/database/sqlite/PRE_BUILD b/database/sqlite/PRE_BUILD
new file mode 100755
index 0000000000..828dae656e
--- /dev/null
+++ b/database/sqlite/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/sqlite-3.7.7.patch
diff --git a/database/sqlite/sqlite-3.7.7.patch b/database/sqlite/sqlite-3.7.7.patch
new file mode 100644
index 0000000000..8d05658ab7
--- /dev/null
+++ b/database/sqlite/sqlite-3.7.7.patch
@@ -0,0 +1,10 @@
+--- sqlite-autoconf-3070700/sqlite3.c.orig 2011-06-28 23:38:46.279329010 +0200
++++ sqlite-autoconf-3070700/sqlite3.c 2011-06-28 23:38:59.258185385 +0200
+@@ -59049,6 +59049,7 @@
+ memset(zCsr, 0, zEnd-zCsr);
+ zCsr += (zCsr - (u8*)0)&7;
+ assert( EIGHT_BYTE_ALIGNMENT(zCsr) );
++ p->expired = 0;
+
+ /* Memory for registers, parameters, cursor, etc, is allocated in two
+ ** passes. On the first pass, we try to reuse unused space at the