summaryrefslogtreecommitdiff
path: root/data/sqlite3
diff options
context:
space:
mode:
authorJay Freeman <saurik@saurik.com>2008-08-02 06:10:29 +0000
committerJay Freeman <saurik@saurik.com>2008-08-02 06:10:29 +0000
commit9dc5582fea127dddd443efa44b8bed53ad575574 (patch)
tree2a17aa947aef0f722fcebdda359923cc6a787345 /data/sqlite3
parent4d7545a73268d1909469cb725d35b6fc84c64570 (diff)
Various fixes for AppStore compatibility and libsqlite3.
git-svn-id: http://svn.telesphoreo.org/trunk@412 514c082c-b64e-11dc-b46d-3d985efe055d
Diffstat (limited to 'data/sqlite3')
-rw-r--r--data/sqlite3/_metadata/role2
-rw-r--r--data/sqlite3/_metadata/version2
-rw-r--r--data/sqlite3/macosx.diff21
-rw-r--r--data/sqlite3/misuse.diff53
-rw-r--r--data/sqlite3/sqlite-3.5.4.tar.gzbin2092372 -> 0 bytes
-rw-r--r--data/sqlite3/sqlite-3.5.9.tar.gzbin0 -> 2201083 bytes
-rw-r--r--data/sqlite3/tempdir.diff67
7 files changed, 122 insertions, 23 deletions
diff --git a/data/sqlite3/_metadata/role b/data/sqlite3/_metadata/role
index 72856ae72..8d0320866 100644
--- a/data/sqlite3/_metadata/role
+++ b/data/sqlite3/_metadata/role
@@ -1 +1 @@
-role::developer
+developer
diff --git a/data/sqlite3/_metadata/version b/data/sqlite3/_metadata/version
index 65afb3b88..62841113a 100644
--- a/data/sqlite3/_metadata/version
+++ b/data/sqlite3/_metadata/version
@@ -1 +1 @@
-3.5.4
+3.5.9
diff --git a/data/sqlite3/macosx.diff b/data/sqlite3/macosx.diff
deleted file mode 100644
index 68fecfc54..000000000
--- a/data/sqlite3/macosx.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru sqlite-3.5.4/aclocal.m4 sqlite-3.5.4+iPhone/aclocal.m4
---- sqlite-3.5.4/aclocal.m4 2007-06-12 12:17:59.000000000 +0000
-+++ sqlite-3.5.4+iPhone/aclocal.m4 2008-04-18 19:20:01.000000000 +0000
-@@ -3116,7 +3116,7 @@
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[[012]])
-@@ -5891,7 +5891,7 @@
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[[012]])
diff --git a/data/sqlite3/misuse.diff b/data/sqlite3/misuse.diff
new file mode 100644
index 000000000..0e7b79255
--- /dev/null
+++ b/data/sqlite3/misuse.diff
@@ -0,0 +1,53 @@
+diff -ru sqlite-3.5.9/src/vdbeapi.c sqlite-3.5.9+iPhone/src/vdbeapi.c
+--- sqlite-3.5.9/src/vdbeapi.c 2008-05-13 12:52:46.000000000 +0000
++++ sqlite-3.5.9+iPhone/src/vdbeapi.c 2008-08-01 03:22:00.000000000 +0000
+@@ -1072,6 +1072,9 @@
+ int sqlite3_bind_double(sqlite3_stmt *pStmt, int i, double rValue){
+ int rc;
+ Vdbe *p = (Vdbe *)pStmt;
++ if( p==0 ){
++ return SQLITE_MISUSE;
++ }
+ sqlite3_mutex_enter(p->db->mutex);
+ rc = vdbeUnbind(p, i);
+ if( rc==SQLITE_OK ){
+@@ -1086,6 +1089,9 @@
+ int sqlite3_bind_int64(sqlite3_stmt *pStmt, int i, sqlite_int64 iValue){
+ int rc;
+ Vdbe *p = (Vdbe *)pStmt;
++ if( p==0 ){
++ return SQLITE_MISUSE;
++ }
+ sqlite3_mutex_enter(p->db->mutex);
+ rc = vdbeUnbind(p, i);
+ if( rc==SQLITE_OK ){
+@@ -1097,6 +1103,9 @@
+ int sqlite3_bind_null(sqlite3_stmt *pStmt, int i){
+ int rc;
+ Vdbe *p = (Vdbe*)pStmt;
++ if( p==0 ){
++ return SQLITE_MISUSE;
++ }
+ sqlite3_mutex_enter(p->db->mutex);
+ rc = vdbeUnbind(p, i);
+ sqlite3_mutex_leave(p->db->mutex);
+@@ -1125,6 +1134,9 @@
+ int sqlite3_bind_value(sqlite3_stmt *pStmt, int i, const sqlite3_value *pValue){
+ int rc;
+ Vdbe *p = (Vdbe *)pStmt;
++ if( p==0 ){
++ return SQLITE_MISUSE;
++ }
+ sqlite3_mutex_enter(p->db->mutex);
+ rc = vdbeUnbind(p, i);
+ if( rc==SQLITE_OK ){
+@@ -1137,6 +1149,9 @@
+ int sqlite3_bind_zeroblob(sqlite3_stmt *pStmt, int i, int n){
+ int rc;
+ Vdbe *p = (Vdbe *)pStmt;
++ if( p==0 ){
++ return SQLITE_MISUSE;
++ }
+ sqlite3_mutex_enter(p->db->mutex);
+ rc = vdbeUnbind(p, i);
+ if( rc==SQLITE_OK ){
diff --git a/data/sqlite3/sqlite-3.5.4.tar.gz b/data/sqlite3/sqlite-3.5.4.tar.gz
deleted file mode 100644
index e27f671e7..000000000
--- a/data/sqlite3/sqlite-3.5.4.tar.gz
+++ /dev/null
Binary files differ
diff --git a/data/sqlite3/sqlite-3.5.9.tar.gz b/data/sqlite3/sqlite-3.5.9.tar.gz
new file mode 100644
index 000000000..92bb8af07
--- /dev/null
+++ b/data/sqlite3/sqlite-3.5.9.tar.gz
Binary files differ
diff --git a/data/sqlite3/tempdir.diff b/data/sqlite3/tempdir.diff
new file mode 100644
index 000000000..b4762ac44
--- /dev/null
+++ b/data/sqlite3/tempdir.diff
@@ -0,0 +1,67 @@
+diff -ru sqlite-3.5.9/Makefile.in sqlite-3.5.9+iPhone/Makefile.in
+--- sqlite-3.5.9/Makefile.in 2008-05-12 17:10:26.000000000 +0000
++++ sqlite-3.5.9+iPhone/Makefile.in 2008-08-01 08:21:45.000000000 +0000
+@@ -413,10 +413,12 @@
+
+ libsqlite3.la: $(LIBOBJ)
+ $(LTLINK) -o $@ $(LIBOBJ) $(TLIBS) \
++ -framework CoreFoundation -framework Foundation \
+ ${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8"
+
+ libtclsqlite3.la: tclsqlite.lo libsqlite3.la
+ $(LTLINK) -o $@ tclsqlite.lo \
++ -framework CoreFoundation -framework Foundation \
+ $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(TLIBS) \
+ -rpath "$(libdir)/sqlite" \
+ -version-info "8:6:8"
+diff -ru sqlite-3.5.9/src/os_unix.c sqlite-3.5.9+iPhone/src/os_unix.c
+--- sqlite-3.5.9/src/os_unix.c 2008-05-13 12:51:29.000000000 +0000
++++ sqlite-3.5.9+iPhone/src/os_unix.c 2008-08-01 08:18:14.000000000 +0000
+@@ -75,6 +75,10 @@
+ */
+ #define MAX_PATHNAME 512
+
++#ifdef __APPLE__
++#import <CoreServices/CoreServices.h>
++#endif
++
+
+ /*
+ ** The unixFile structure is subclass of sqlite3_file specific for the unix
+@@ -2497,6 +2501,7 @@
+ static int unixGetTempname(sqlite3_vfs *pVfs, int nBuf, char *zBuf){
+ static const char *azDirs[] = {
+ 0,
++ 0,
+ "/var/tmp",
+ "/usr/tmp",
+ "/tmp",
+@@ -2509,6 +2514,11 @@
+ int i, j;
+ struct stat buf;
+ const char *zDir = ".";
++#ifdef __APPLE__
++ CFStringRef cfstr;
++ CFIndex maxsize;
++ char *cstr;
++#endif
+
+ /* It's odd to simulate an io-error here, but really this is just
+ ** using the io-error infrastructure to test that SQLite handles this
+@@ -2516,6 +2526,16 @@
+ */
+ SimulateIOError( return SQLITE_ERROR );
+
++#ifdef __APPLE__
++ if (azDirs[1] == NULL) {
++ cfstr = (CFStringRef) NSTemporaryDirectory();
++ maxsize = CFStringGetMaximumSizeForEncoding(CFStringGetLength(cfstr), kCFStringEncodingUTF8) + 1;
++ cstr = malloc(maxsize);
++ CFStringGetCString(cfstr, cstr, maxsize, kCFStringEncodingUTF8);
++ azDirs[1] = cstr;
++ }
++#endif
++
+ azDirs[0] = sqlite3_temp_directory;
+ for(i=0; i<sizeof(azDirs)/sizeof(azDirs[0]); i++){
+ if( azDirs[i]==0 ) continue;