grab all relevant patches from sqlite3 3.7.15.2-1

4 files changed, 82 insertions, 1 deletions

diff --git a/debian/patches/10-665363-disable-malloc-usable-size.patch b/debian/patches/10-665363-disable-malloc-usable-size.patch
new file mode 100644
index 0000000..6d6f49d
--- /dev/null
+++ b/debian/patches/10-665363-disable-malloc-usable-size.patch
@@ -0,0 +1,17 @@
+Description: Disable malloc_usable_size
+ Disable code introduced in sqlite 3.7.10 using malloc_usable_size, as it caused
+ a regression on 64-bit platforms.
+Author: Steven Chamberlain <steven@pyro.eu.org>
+Bug-Debian: http://bugs.debian.org/665363
+
+--- sqlite3-3.7.11.orig/configure.ac
++++ sqlite3-3.7.11/configure.ac
+@@ -127,7 +127,7 @@
+ #########
+ # Figure out whether or not we have these functions
+ #
+-AC_CHECK_FUNCS([usleep fdatasync localtime_r gmtime_r localtime_s utime malloc_usable_size])
++AC_CHECK_FUNCS([usleep fdatasync localtime_r gmtime_r localtime_s utime])
+ 
+ #########
+ # By default, we use the amalgamation (this may be changed below...)
diff --git a/debian/patches/20-hurd-locking-style.patch b/debian/patches/20-hurd-locking-style.patch
new file mode 100644
index 0000000..cfb3fde
--- /dev/null
+++ b/debian/patches/20-hurd-locking-style.patch
@@ -0,0 +1,38 @@
+--- a/src/os_unix.c
++++ b/src/os_unix.c
+@@ -131,7 +131,7 @@
+ #endif
+
+ 
+-#if SQLITE_ENABLE_LOCKING_STYLE
++#if SQLITE_ENABLE_LOCKING_STYLE || defined(__GNU__)
+ # include <sys/ioctl.h>
+ # if OS_VXWORKS
+ #  include <semaphore.h>
+@@ -2124,7 +2124,7 @@
+ ** Omit this section if SQLITE_ENABLE_LOCKING_STYLE is turned off or if
+ ** compiling for VXWORKS.
+ */
+-#if SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS
++#if (SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS) || defined(__GNU__)
+ 
+ /*
+ ** Retry flock() calls that fail with EINTR
+@@ -4531,7 +4531,7 @@
+   dotlockCheckReservedLock  /* xCheckReservedLock method */
+ )
+ 
+-#if SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS
++#if (SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS) || defined(__GNU__)
+ IOMETHODS(
+   flockIoFinder,            /* Finder function name */
+   flockIoMethods,           /* sqlite3_io_methods object name */
+@@ -6969,6 +6969,8 @@
+   static sqlite3_vfs aVfs[] = {
+ #if SQLITE_ENABLE_LOCKING_STYLE && (OS_VXWORKS || defined(__APPLE__))
+     UNIXVFS("unix",          autolockIoFinder ),
++#elif defined(__GNU__)
++    UNIXVFS("unix",          flockIoFinder ),
+ #else
+     UNIXVFS("unix",          posixIoFinder ),
+ #endif
diff --git a/debian/patches/31-increase_SQLITE_MAX_DEFAULT_PAGE_SIZE_to_32k.patch b/debian/patches/31-increase_SQLITE_MAX_DEFAULT_PAGE_SIZE_to_32k.patch
new file mode 100644
index 0000000..bd0360e
--- /dev/null
+++ b/debian/patches/31-increase_SQLITE_MAX_DEFAULT_PAGE_SIZE_to_32k.patch
@@ -0,0 +1,23 @@
+Description: increase the maximum possible value of the page size
+ Firefox/Iceweasel uses a page size of 32k, but sqlite won't allow it
+ because the maximum it allows by default is 8k (through the
+ SQLITE_MAX_DEFAULT_PAGE_SIZE define). This patch increases this limit.
+ .
+Author: Laszlo Boszormenyi (GCS) <gcs@debian.hu>
+Bug-Debian: http://bugs.debian.org/672573
+
+---
+Forwarded: <not-needed>
+Last-Update: <2012-05-16>
+
+--- sqlite3-3.7.12.orig/src/sqliteLimit.h
++++ sqlite3-3.7.12/src/sqliteLimit.h
+@@ -169,7 +169,7 @@
+ ** SQLite will choose on its own.
+ */
+ #ifndef SQLITE_MAX_DEFAULT_PAGE_SIZE
+-# define SQLITE_MAX_DEFAULT_PAGE_SIZE 8192
++# define SQLITE_MAX_DEFAULT_PAGE_SIZE 32768
+ #endif
+ #if SQLITE_MAX_DEFAULT_PAGE_SIZE>SQLITE_MAX_PAGE_SIZE
+ # undef SQLITE_MAX_DEFAULT_PAGE_SIZE
diff --git a/debian/patches/series b/debian/patches/series
index db259fd..1a059d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,7 @@
 10-520466-libsqlite3-depends-on-libdl.patch
 10-520478-squash-bad-deps.patch
-20-change-name-to-sqlcipher.patch
+10-665363-disable-malloc-usable-size.patch
 10-sqlcipher-man-page.patch
+20-change-name-to-sqlcipher.patch
+20-hurd-locking-style.patch
+31-increase_SQLITE_MAX_DEFAULT_PAGE_SIZE_to_32k.patch