sqlite 3.6.10 breaks py-sqlite2/py-sqlobject (null pt deref sqlite3OsTruncate addColumn)
found with fgs@ while working on the py stuff thoughts? (also at http://www.altroot.org/py-stuff/sqlite-3.6.11.diff) Index: Makefile =================================================================== RCS file: /cvs/ports/databases/sqlite3/Makefile,v retrieving revision 1.41 diff -u -r1.41 Makefile --- Makefile 31 Jan 2009 15:49:34 -0000 1.41 +++ Makefile 22 Mar 2009 11:41:54 -0000 @@ -3,7 +3,7 @@ COMMENT-main= embedded SQL implementation COMMENT-tcl= TCL bindings for Sqlite3 COMMENT-lemon= LEMON LALR(1) parser generator -V= 3.6.10 +V= 3.6.11 DISTNAME= sqlite-${V} PKGNAME-main= sqlite3-${V} PKGNAME-tcl= sqlite3-tcl-${V} Index: distinfo =================================================================== RCS file: /cvs/ports/databases/sqlite3/distinfo,v retrieving revision 1.23 diff -u -r1.23 distinfo --- distinfo 31 Jan 2009 15:49:34 -0000 1.23 +++ distinfo 22 Mar 2009 11:41:54 -0000 @@ -1,5 +1,5 @@ -MD5 (sqlite-3.6.10.tar.gz) = oDvcht9AJbaIHVhVfktb0w== -RMD160 (sqlite-3.6.10.tar.gz) = Ux5yhTADteWofKYXuw8uy0FKrcQ= -SHA1 (sqlite-3.6.10.tar.gz) = da0OIzy72i58SH93cvV9FqyfP7c= -SHA256 (sqlite-3.6.10.tar.gz) = IVfbNKoKrOjVoaXHIygPKECzODSYoiXKs2AU8KRfqgE= -SIZE (sqlite-3.6.10.tar.gz) = 2763053 +MD5 (sqlite-3.6.11.tar.gz) = frsJlpardsxv9l3UltF4WA== +RMD160 (sqlite-3.6.11.tar.gz) = w42CyD9dZM+zAuMjLFB7r7C2TnQ= +SHA1 (sqlite-3.6.11.tar.gz) = vRw3F4TZkPe16ZyEHljeuH+/S24= +SHA256 (sqlite-3.6.11.tar.gz) = /Qe+ebTU6EU2deFCkHp3fQd3bsKz4qn03XZFon/NKKE= +SIZE (sqlite-3.6.11.tar.gz) = 2804714 Index: patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/databases/sqlite3/patches/patch-Makefile_in,v retrieving revision 1.11 diff -u -r1.11 patch-Makefile_in --- patches/patch-Makefile_in 31 Jan 2009 15:49:34 -0000 1.11 +++ patches/patch-Makefile_in 22 Mar 2009 11:41:54 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-Makefile_in,v 1.11 2009/01/31 15:49:34 simon Exp $ ---- Makefile.in.orig Thu Jan 15 15:01:45 2009 -+++ Makefile.in Tue Jan 27 10:23:37 2009 -@@ -172,11 +172,11 @@ OBJS0 = alter.lo analyze.lo attach.lo auth.lo bitvec.l +--- Makefile.in.orig Sun Feb 15 15:07:08 2009 ++++ Makefile.in Sun Mar 22 13:28:08 2009 +@@ -176,11 +176,11 @@ OBJS0 = alter.lo analyze.lo attach.lo auth.lo bitvec.l table.lo tokenize.lo trigger.lo update.lo \ util.lo vacuum.lo \ vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo \ @@ -15,7 +15,7 @@ # Determine the real value of LIBOBJ based on the 'configure' script # -@@ -268,7 +268,8 @@ SRC = \ +@@ -273,7 +273,8 @@ SRC = \ $(TOP)/src/vdbeInt.h \ $(TOP)/src/vtab.c \ $(TOP)/src/walker.c \ @@ -25,7 +25,7 @@ # Generated source code files # -@@ -431,7 +432,7 @@ HDR += \ +@@ -438,7 +439,7 @@ HDR += \ # hidden when the library is built via the amalgamation). # TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la @@ -34,18 +34,18 @@ TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c $(TESTFIXTURE_SRC$(USE_AMALGAMATION)) -@@ -456,7 +457,7 @@ libsqlite3.la: $(LIBOBJ) +@@ -466,7 +467,7 @@ libsqlite3.la: $(LIBOBJ) libtclsqlite3.la: tclsqlite.lo libsqlite3.la $(LTLINK) -o $@ tclsqlite.lo \ - libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \ + libsqlite3.la -L./.libs @TCL_STUB_LIB_SPEC@ $(TLIBS) \ - -rpath "$(libdir)/sqlite" \ - -module -avoid-version - -@@ -493,6 +494,9 @@ lemon$(BEXE): $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c + -rpath "$(TCLLIBDIR)" \ + -version-info "8:6:8" \ + -avoid-version +@@ -504,6 +505,9 @@ lemon$(BEXE): $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c sqlite3.lo: sqlite3.c - $(LTCOMPILE) -c sqlite3.c + $(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c +pthread_stub.lo: $(TOP)/src/pthread_stub.c + $(LTCOMPILE) -c $(TOP)/src/pthread_stub.c @@ -53,7 +53,7 @@ # Rules to build individual files # alter.lo: $(TOP)/src/alter.c $(HDR) -@@ -783,6 +787,8 @@ clean: +@@ -799,6 +803,8 @@ clean: distclean: clean rm -f config.log config.status libtool Makefile sqlite3.pc Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/databases/sqlite3/patches/patch-configure,v retrieving revision 1.5 diff -u -r1.5 patch-configure --- patches/patch-configure 27 Oct 2008 23:20:39 -0000 1.5 +++ patches/patch-configure 22 Mar 2009 11:41:54 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-configure,v 1.5 2008/10/27 23:20:39 steven Exp $ ---- configure.orig Tue Oct 14 20:07:39 2008 -+++ configure Mon Oct 27 18:30:05 2008 -@@ -10793,7 +10793,7 @@ USE_AMALGAMATION=1 +--- configure.orig Sun Feb 15 15:07:08 2009 ++++ configure Sun Mar 22 13:27:07 2009 +@@ -12216,7 +12216,7 @@ USE_AMALGAMATION=1 # if not, then we fall back to plain tclsh. # TODO: try other versions before falling back? # @@ -10,16 +10,18 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -@@ -11089,7 +11089,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_search_pthread_create="-l$ac_lib" -+ ac_cv_search_pthread_create="-$ac_lib" - break - else - echo "$as_me: failed program was:" >&5 -@@ -11432,7 +11432,7 @@ echo "${ECHO_T}file not found" >&6 +@@ -12455,8 +12455,8 @@ for ac_lib in '' pthread; do + if test -z "$ac_lib"; then + ac_res="none required" + else +- ac_res=-l$ac_lib +- LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ ac_res=-$ac_lib ++ LIBS="-$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext + if { (ac_try="$ac_link" +@@ -12877,7 +12877,7 @@ $as_echo "file not found" >&6; } eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\"" eval "TCL_STUB_LIB_FLAG=\"${TCL_STUB_LIB_FLAG}\"" Index: patches/patch-src_os_unix_c =================================================================== RCS file: /cvs/ports/databases/sqlite3/patches/patch-src_os_unix_c,v retrieving revision 1.5 diff -u -r1.5 patch-src_os_unix_c --- patches/patch-src_os_unix_c 31 Jan 2009 15:49:34 -0000 1.5 +++ patches/patch-src_os_unix_c 22 Mar 2009 11:41:54 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-src_os_unix_c,v 1.5 2009/01/31 15:49:34 simon Exp $ ---- src/os_unix.c.orig Thu Jan 15 15:01:46 2009 -+++ src/os_unix.c Tue Jan 27 10:18:24 2009 +--- src/os_unix.c.orig Sun Feb 15 15:07:09 2009 ++++ src/os_unix.c Sun Mar 22 13:25:19 2009 @@ -141,6 +141,9 @@ #if SQLITE_THREADSAFE # include <pthread.h> @@ -11,16 +11,16 @@ #endif /* -@@ -184,7 +187,7 @@ struct unixFile { - int lastErrno; /* The unix errno from the last I/O error */ - void *lockingContext; /* Locking style specific state */ - int openFlags; /* The flags specified at open */ +@@ -186,7 +189,7 @@ struct unixFile { + #if SQLITE_ENABLE_LOCKING_STYLE + int openFlags; /* The flags specified at open() */ + #endif -#if SQLITE_THREADSAFE && defined(__linux__) +#if SQLITE_NEED_TID_CHECKS pthread_t tid; /* The thread that "owns" this unixFile */ #endif #if OS_VXWORKS -@@ -247,7 +250,7 @@ struct unixFile { +@@ -254,7 +257,7 @@ struct unixFile { ** The threadid macro resolves to the thread-id or to 0. Used for ** testing and debugging only. */ @@ -29,7 +29,7 @@ #define threadid pthread_self() #else #define threadid 0 -@@ -657,7 +660,7 @@ static void vxworksReleaseFileId(struct vxworksFileId +@@ -664,7 +667,7 @@ static void vxworksReleaseFileId(struct vxworksFileId ** recomputed because its key includes the thread-id. See the ** transferOwnership() function below for additional information */ @@ -38,7 +38,7 @@ # define SET_THREADID(X) (X)->tid = pthread_self() # define CHECK_THREADID(X) (threadsOverrideEachOthersLocks==0 && \ !pthread_equal((X)->tid, pthread_self())) -@@ -692,7 +695,7 @@ struct unixFileId { +@@ -699,7 +702,7 @@ struct unixFileId { */ struct unixLockKey { struct unixFileId fid; /* Unique identifier for the file */ @@ -47,7 +47,7 @@ pthread_t tid; /* Thread ID of lock owner. Zero if not using LinuxThreads */ #endif }; -@@ -767,7 +770,7 @@ static struct unixOpenCnt *openList = 0; +@@ -774,7 +777,7 @@ static struct unixOpenCnt *openList = 0; ** it a global so that the test code can change its value in order to verify ** that the right stuff happens in either case. */ @@ -56,7 +56,7 @@ # ifndef SQLITE_THREAD_OVERRIDE_LOCK # define SQLITE_THREAD_OVERRIDE_LOCK -1 # endif -@@ -788,7 +791,7 @@ struct threadTestData { +@@ -795,7 +798,7 @@ struct threadTestData { int result; /* Result of the locking operation */ }; @@ -65,7 +65,7 @@ /* ** This function is used as the main routine for a thread launched by ** testThreadLockingBehavior(). It tests whether the shared-lock obtained -@@ -806,7 +809,7 @@ static void *threadLockingTest(void *pArg){ +@@ -813,7 +816,7 @@ static void *threadLockingTest(void *pArg){ #endif /* SQLITE_THREADSAFE && defined(__linux__) */ @@ -74,7 +74,7 @@ /* ** This procedure attempts to determine whether or not threads ** can override each others locks then sets the -@@ -946,7 +949,7 @@ static int findLockInfo( +@@ -958,7 +961,7 @@ static int findLockInfo( #else lockKey.fid.ino = statbuf.st_ino; #endif @@ -83,7 +83,7 @@ if( threadsOverrideEachOthersLocks<0 ){ testThreadLockingBehavior(fd); } -@@ -1023,7 +1026,7 @@ exit_findlockinfo: +@@ -1035,7 +1038,7 @@ exit_findlockinfo: ** If the unixFile is locked and an ownership is wrong, then return ** SQLITE_MISUSE. SQLITE_OK is returned if everything works. */ Index: patches/patch-src_test1_c =================================================================== RCS file: /cvs/ports/databases/sqlite3/patches/patch-src_test1_c,v retrieving revision 1.1 diff -u -r1.1 patch-src_test1_c --- patches/patch-src_test1_c 31 Jan 2009 15:49:34 -0000 1.1 +++ patches/patch-src_test1_c 22 Mar 2009 11:41:54 -0000 @@ -3,9 +3,9 @@ Fix test on big endian arches. Bug filed upstream at http://www.sqlite.org/cvstrac/tktview?tn=3621 ---- src/test1.c.orig Sat Jan 31 16:07:27 2009 -+++ src/test1.c Sat Jan 31 16:18:33 2009 -@@ -1199,7 +1199,7 @@ static int sqlite3_mprintf_int( +--- src/test1.c.orig Sun Feb 15 15:07:11 2009 ++++ src/test1.c Sun Mar 22 13:23:03 2009 +@@ -1200,7 +1200,7 @@ static int sqlite3_mprintf_int( int argc, /* Number of arguments */ char **argv /* Text of each argument */ ){ Index: patches/patch-src_util_c =================================================================== RCS file: /cvs/ports/databases/sqlite3/patches/patch-src_util_c,v retrieving revision 1.3 diff -u -r1.3 patch-src_util_c --- patches/patch-src_util_c 31 Jan 2009 15:49:34 -0000 1.3 +++ patches/patch-src_util_c 22 Mar 2009 11:41:54 -0000 @@ -1,15 +1,15 @@ $OpenBSD: patch-src_util_c,v 1.3 2009/01/31 15:49:34 simon Exp $ ---- src/util.c.orig Thu Jan 15 15:01:47 2009 -+++ src/util.c Tue Jan 27 10:22:58 2009 -@@ -19,6 +19,7 @@ +--- src/util.c.orig Sun Feb 15 15:07:11 2009 ++++ src/util.c Sun Mar 22 13:29:53 2009 +@@ -18,6 +18,7 @@ + */ #include "sqliteInt.h" #include <stdarg.h> - #include <ctype.h> +#include <math.h> - /* -@@ -56,29 +57,7 @@ int sqlite3Assert(void){ + ** Routine needed to support the testcase() macro. +@@ -54,29 +55,7 @@ int sqlite3Assert(void){ ** Return true if the floating point value is Not a Number (NaN). */ int sqlite3IsNaN(double x){
