diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile index 926dfcfe08d..36696075925 100644 --- a/databases/sqlite3/Makefile +++ b/databases/sqlite3/Makefile @@ -1,16 +1,16 @@ -# $OpenBSD: Makefile,v 1.40 2009/01/26 14:44:37 bernd Exp $ +# $OpenBSD: Makefile,v 1.41 2009/01/31 15:49:34 simon Exp $ COMMENT-main= embedded SQL implementation COMMENT-tcl= TCL bindings for Sqlite3 COMMENT-lemon= LEMON LALR(1) parser generator -V= 3.6.4 +V= 3.6.10 DISTNAME= sqlite-${V} -PKGNAME-main= sqlite3-${V}p0 -PKGNAME-tcl= sqlite3-tcl-${V}p0 +PKGNAME-main= sqlite3-${V} +PKGNAME-tcl= sqlite3-tcl-${V} PKGNAME-lemon= lemon-${V} CATEGORIES= databases -SHARED_LIBS += sqlite3 12.1 # .8.6 -SHARED_LIBS += tclsqlite3 11.0 # .8.6 +SHARED_LIBS += sqlite3 13.0 # .8.6 +SHARED_LIBS += tclsqlite3 12.0 # .8.6 MASTER_SITES= ${HOMEPAGE} @@ -60,9 +60,6 @@ REGRESS_TARGET= test pre-configure: @perl -pi -e s,'tclsh',${MODTCL_BIN},g ${WRKSRC}/Makefile.in -# XXX libtool issue -pre-install: - @cp -p ${WRKSRC}/.libs/libtclsqlite3.so.$(LIBtclsqlite3_VERSION) ${WRKSRC}/.libs/libtclsqlite3.so .else CONFIGURE_ARGS+=--disable-tcl diff --git a/databases/sqlite3/distinfo b/databases/sqlite3/distinfo index ba6524b7682..3998fc1e8cd 100644 --- a/databases/sqlite3/distinfo +++ b/databases/sqlite3/distinfo @@ -1,5 +1,5 @@ -MD5 (sqlite-3.6.4.tar.gz) = uYMs2HNNRWjjhOHGC1DJLw== -RMD160 (sqlite-3.6.4.tar.gz) = tCC4oZaAf+tRYvKT6mTndBpjPpI= -SHA1 (sqlite-3.6.4.tar.gz) = rxCCwEVapnKp4cpwDrU9mG9qyEY= -SHA256 (sqlite-3.6.4.tar.gz) = Lkey9cQYSmvYPSdjFSHb7UHJkeLSL+rOUH5o05gS5yQ= -SIZE (sqlite-3.6.4.tar.gz) = 2246598 +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 diff --git a/databases/sqlite3/patches/patch-Makefile_in b/databases/sqlite3/patches/patch-Makefile_in index b10ac7e0b18..7eea11dadda 100644 --- a/databases/sqlite3/patches/patch-Makefile_in +++ b/databases/sqlite3/patches/patch-Makefile_in @@ -1,10 +1,10 @@ -$OpenBSD: patch-Makefile_in,v 1.10 2008/10/27 23:20:39 steven Exp $ ---- Makefile.in.orig Tue Oct 14 20:07:37 2008 -+++ Makefile.in Sun Oct 26 10:19:40 2008 -@@ -167,11 +167,11 @@ OBJS0 = alter.lo analyze.lo attach.lo auth.lo bitvec.l +$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 table.lo tokenize.lo trigger.lo update.lo \ util.lo vacuum.lo \ - vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbefifo.lo vdbemem.lo \ + vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo \ - walker.lo where.lo utf.lo vtab.lo + walker.lo where.lo utf.lo vtab.lo pthread_stub.lo @@ -15,7 +15,7 @@ $OpenBSD: patch-Makefile_in,v 1.10 2008/10/27 23:20:39 steven Exp $ # Determine the real value of LIBOBJ based on the 'configure' script # -@@ -262,7 +262,8 @@ SRC = \ +@@ -268,7 +268,8 @@ SRC = \ $(TOP)/src/vdbeInt.h \ $(TOP)/src/vtab.c \ $(TOP)/src/walker.c \ @@ -25,7 +25,7 @@ $OpenBSD: patch-Makefile_in,v 1.10 2008/10/27 23:20:39 steven Exp $ # Generated source code files # -@@ -419,7 +420,7 @@ HDR += \ +@@ -431,7 +432,7 @@ HDR += \ # hidden when the library is built via the amalgamation). # TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la @@ -34,16 +34,16 @@ $OpenBSD: patch-Makefile_in,v 1.10 2008/10/27 23:20:39 steven Exp $ TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c $(TESTFIXTURE_SRC$(USE_AMALGAMATION)) -@@ -444,7 +445,7 @@ libsqlite3.la: $(LIBOBJ) +@@ -456,7 +457,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" \ - -version-info "8:6:8" + -module -avoid-version -@@ -481,6 +482,9 @@ lemon$(BEXE): $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c +@@ -493,6 +494,9 @@ lemon$(BEXE): $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c sqlite3.lo: sqlite3.c $(LTCOMPILE) -c sqlite3.c @@ -53,7 +53,7 @@ $OpenBSD: patch-Makefile_in,v 1.10 2008/10/27 23:20:39 steven Exp $ # Rules to build individual files # alter.lo: $(TOP)/src/alter.c $(HDR) -@@ -768,6 +772,8 @@ clean: +@@ -783,6 +787,8 @@ clean: distclean: clean rm -f config.log config.status libtool Makefile sqlite3.pc diff --git a/databases/sqlite3/patches/patch-src_os_unix_c b/databases/sqlite3/patches/patch-src_os_unix_c index df8c43461f2..adda52ee6fd 100644 --- a/databases/sqlite3/patches/patch-src_os_unix_c +++ b/databases/sqlite3/patches/patch-src_os_unix_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_os_unix_c,v 1.4 2008/10/27 17:14:18 simon Exp $ ---- src/os_unix.c.orig Tue Oct 14 20:07:40 2008 -+++ src/os_unix.c Sat Oct 25 19:39:50 2008 -@@ -83,6 +83,9 @@ +$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 +@@ -141,6 +141,9 @@ #if SQLITE_THREADSAFE # include # define SQLITE_UNIX_THREADS 1 @@ -11,16 +11,16 @@ $OpenBSD: patch-src_os_unix_c,v 1.4 2008/10/27 17:14:18 simon Exp $ #endif /* -@@ -119,7 +122,7 @@ struct unixFile { - int h; /* The file descriptor */ - unsigned char locktype; /* The type of lock held on this fd */ - int dirfd; /* File descriptor for the directory */ --#if SQLITE_THREADSAFE +@@ -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 */ +-#if SQLITE_THREADSAFE && defined(__linux__) +#if SQLITE_NEED_TID_CHECKS - pthread_t tid; /* The thread that "owns" this unixFile */ + pthread_t tid; /* The thread that "owns" this unixFile */ #endif - int lastErrno; /* The unix errno from the last I/O error */ -@@ -161,7 +164,7 @@ struct unixFile { + #if OS_VXWORKS +@@ -247,7 +250,7 @@ struct unixFile { ** The threadid macro resolves to the thread-id or to 0. Used for ** testing and debugging only. */ @@ -29,56 +29,65 @@ $OpenBSD: patch-src_os_unix_c,v 1.4 2008/10/27 17:14:18 simon Exp $ #define threadid pthread_self() #else #define threadid 0 -@@ -183,7 +186,7 @@ struct unixFile { +@@ -657,7 +660,7 @@ static void vxworksReleaseFileId(struct vxworksFileId ** recomputed because its key includes the thread-id. See the ** transferOwnership() function below for additional information */ --#if SQLITE_THREADSAFE +-#if SQLITE_THREADSAFE && defined(__linux__) +#if SQLITE_NEED_TID_CHECKS # define SET_THREADID(X) (X)->tid = pthread_self() # define CHECK_THREADID(X) (threadsOverrideEachOthersLocks==0 && \ !pthread_equal((X)->tid, pthread_self())) -@@ -302,7 +305,7 @@ struct unixFile { - struct lockKey { - dev_t dev; /* Device number */ - ino_t ino; /* Inode number */ --#if SQLITE_THREADSAFE +@@ -692,7 +695,7 @@ struct unixFileId { + */ + struct unixLockKey { + struct unixFileId fid; /* Unique identifier for the file */ +-#if SQLITE_THREADSAFE && defined(__linux__) +#if SQLITE_NEED_TID_CHECKS - pthread_t tid; /* Thread ID or zero if threads can override each other */ + pthread_t tid; /* Thread ID of lock owner. Zero if not using LinuxThreads */ #endif }; -@@ -396,7 +399,7 @@ static void leaveMutex(void){ - sqlite3_mutex_leave(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER)); - } +@@ -767,7 +770,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. + */ +-#if SQLITE_THREADSAFE && defined(__linux__) ++#if SQLITE_NEED_TID_CHECKS + # ifndef SQLITE_THREAD_OVERRIDE_LOCK + # define SQLITE_THREAD_OVERRIDE_LOCK -1 + # endif +@@ -788,7 +791,7 @@ struct threadTestData { + int result; /* Result of the locking operation */ + }; --#if SQLITE_THREADSAFE +-#if SQLITE_THREADSAFE && defined(__linux__) +#if SQLITE_NEED_TID_CHECKS /* - ** This variable records whether or not threads can override each others - ** locks. -@@ -533,7 +536,7 @@ static void testThreadLockingBehavior(int fd_orig){ - close(fd); - threadsOverrideEachOthersLocks = d[0].result==0 && d[1].result==0; - } --#endif /* SQLITE_THREADSAFE */ -+#endif /* SQLITE_NEED_TID_CHECKS */ + ** 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){ + #endif /* SQLITE_THREADSAFE && defined(__linux__) */ + +-#if SQLITE_THREADSAFE && defined(__linux__) ++#if SQLITE_NEED_TID_CHECKS /* - ** Release a lockInfo structure previously allocated by findLockInfo(). -@@ -715,7 +718,7 @@ static int findLockInfo( - memset(&key1, 0, sizeof(key1)); - key1.dev = statbuf.st_dev; - key1.ino = statbuf.st_ino; --#if SQLITE_THREADSAFE + ** This procedure attempts to determine whether or not threads + ** can override each others locks then sets the +@@ -946,7 +949,7 @@ static int findLockInfo( + #else + lockKey.fid.ino = statbuf.st_ino; + #endif +-#if SQLITE_THREADSAFE && defined(__linux__) +#if SQLITE_NEED_TID_CHECKS if( threadsOverrideEachOthersLocks<0 ){ testThreadLockingBehavior(fd); } -@@ -808,7 +811,7 @@ static const char *locktypeName(int locktype){ +@@ -1023,7 +1026,7 @@ exit_findlockinfo: ** If the unixFile is locked and an ownership is wrong, then return ** SQLITE_MISUSE. SQLITE_OK is returned if everything works. */ --#if SQLITE_THREADSAFE +-#if SQLITE_THREADSAFE && defined(__linux__) +#if SQLITE_NEED_TID_CHECKS static int transferOwnership(unixFile *pFile){ int rc; diff --git a/databases/sqlite3/patches/patch-src_sqliteInt_h b/databases/sqlite3/patches/patch-src_sqliteInt_h index d21ed345830..a57636f87d3 100644 --- a/databases/sqlite3/patches/patch-src_sqliteInt_h +++ b/databases/sqlite3/patches/patch-src_sqliteInt_h @@ -1,8 +1,8 @@ -$OpenBSD: patch-src_sqliteInt_h,v 1.2 2008/10/27 17:14:18 simon Exp $ ---- src/sqliteInt.h.orig Sat Oct 25 19:43:37 2008 -+++ src/sqliteInt.h Sat Oct 25 19:45:37 2008 +$OpenBSD: patch-src_sqliteInt_h,v 1.3 2009/01/31 15:49:34 simon Exp $ +--- src/sqliteInt.h.orig Thu Jan 15 15:01:47 2009 ++++ src/sqliteInt.h Tue Jan 27 10:20:56 2009 @@ -35,11 +35,6 @@ - #pragma warn -spa /* Suspicous pointer arithmetic */ + #pragma warn -spa /* Suspicious pointer arithmetic */ #endif -/* Needed for various definitions... */ @@ -13,7 +13,7 @@ $OpenBSD: patch-src_sqliteInt_h,v 1.2 2008/10/27 17:14:18 simon Exp $ /* ** Include standard header files as necessary */ -@@ -378,33 +373,26 @@ typedef INT16_TYPE i16; /* 2-byte signed in +@@ -416,33 +411,26 @@ typedef INT16_TYPE i16; /* 2-byte signed in typedef UINT8_TYPE u8; /* 1-byte unsigned integer */ typedef INT8_TYPE i8; /* 1-byte signed integer */ @@ -22,7 +22,7 @@ $OpenBSD: patch-src_sqliteInt_h,v 1.2 2008/10/27 17:14:18 simon Exp $ -** evaluated at runtime. -*/ -#ifdef SQLITE_AMALGAMATION --const int sqlite3one; +-const int sqlite3one = 1; +#include +#if _BYTE_ORDER == _BIG_ENDIAN +#define SQLITE_BIGENDIAN 1 diff --git a/databases/sqlite3/patches/patch-src_test1_c b/databases/sqlite3/patches/patch-src_test1_c new file mode 100644 index 00000000000..74704092155 --- /dev/null +++ b/databases/sqlite3/patches/patch-src_test1_c @@ -0,0 +1,16 @@ +$OpenBSD: patch-src_test1_c,v 1.1 2009/01/31 15:49:34 simon Exp $ + +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( + int argc, /* Number of arguments */ + char **argv /* Text of each argument */ + ){ +- int a[3], i; ++ unsigned int a[3], i; + char *z; + if( argc!=5 ){ + Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], diff --git a/databases/sqlite3/patches/patch-src_utf_c b/databases/sqlite3/patches/patch-src_utf_c index 085a59d2242..5fa739d0cad 100644 --- a/databases/sqlite3/patches/patch-src_utf_c +++ b/databases/sqlite3/patches/patch-src_utf_c @@ -1,16 +1,18 @@ -$OpenBSD: patch-src_utf_c,v 1.1 2008/07/23 17:31:17 martynas Exp $ ---- src/utf.c.orig Tue May 13 15:52:22 2008 -+++ src/utf.c Sat Jul 19 15:10:45 2008 -@@ -40,12 +40,6 @@ +$OpenBSD: patch-src_utf_c,v 1.2 2009/01/31 15:49:34 simon Exp $ +--- src/utf.c.orig Tue Jan 27 10:24:52 2009 ++++ src/utf.c Tue Jan 27 10:25:02 2009 +@@ -39,14 +39,6 @@ + #include #include "vdbeInt.h" - /* +-#ifndef SQLITE_AMALGAMATION +-/* -** The following constant value is used by the SQLITE_BIGENDIAN and -** SQLITE_LITTLEENDIAN macros. -*/ -const int sqlite3one = 1; +-#endif /* SQLITE_AMALGAMATION */ - --/* + /* ** This lookup table is used to help decode the first byte of ** a multi-byte UTF8 character. - */ diff --git a/databases/sqlite3/patches/patch-src_util_c b/databases/sqlite3/patches/patch-src_util_c index 7638afe181d..f509bc1d1a4 100644 --- a/databases/sqlite3/patches/patch-src_util_c +++ b/databases/sqlite3/patches/patch-src_util_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_util_c,v 1.2 2008/10/27 17:14:18 simon Exp $ ---- src/util.c.orig Tue Oct 14 20:07:41 2008 -+++ src/util.c Sat Oct 25 19:51:35 2008 -@@ -19,35 +19,14 @@ +$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 @@ #include "sqliteInt.h" #include #include @@ -9,6 +9,7 @@ $OpenBSD: patch-src_util_c,v 1.2 2008/10/27 17:14:18 simon Exp $ /* +@@ -56,29 +57,7 @@ int sqlite3Assert(void){ ** Return true if the floating point value is Not a Number (NaN). */ int sqlite3IsNaN(double x){