http://www.sqlite.org/releaselog/3_7_10.html
http://www.sqlite.org/releaselog/3_7_11.html
Mozilla ports (firefox 12) are going to need this.
Any comments, test reports ('make regress' on other arch would
be useful), OKs?
amd64:- 3 errors out of 131832 tests
Failures on these tests: oserror-1.1.1 oserror-1.1.2 oserror-1.1.3
("Test a failure in open() due to too many files" - I don't think
these are new failures).
macppc, sparc64:- will run these after updating machines.
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/sqlite3/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- Makefile 7 Jan 2012 14:50:18 -0000 1.62
+++ Makefile 26 Mar 2012 10:23:30 -0000
@@ -3,15 +3,14 @@
COMMENT-main= embedded SQL implementation
COMMENT-tcl= TCL bindings for Sqlite3
COMMENT-lemon= LEMON LALR(1) parser generator
-V= 3.7.9
-REVISION= 0
-DISTNAME= sqlite-src-3070900
+V= 3.7.11
+DISTNAME= sqlite-src-3071100
EXTRACT_SUFX = .zip
PKGNAME-main= sqlite3-${V}
PKGNAME-tcl= sqlite3-tcl-${V}
PKGNAME-lemon= lemon-${V}
CATEGORIES= databases
-SHARED_LIBS += sqlite3 16.0 # .8.6
+SHARED_LIBS += sqlite3 17.0 # .8.6
MASTER_SITES= ${HOMEPAGE}
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/sqlite3/distinfo,v
retrieving revision 1.31
diff -u -p -r1.31 distinfo
--- distinfo 21 Dec 2011 00:38:11 -0000 1.31
+++ distinfo 26 Mar 2012 10:23:30 -0000
@@ -1,5 +1,5 @@
-MD5 (sqlite-src-3070900.zip) = smRsWgwLW8a48LZ/wxi6sw==
-RMD160 (sqlite-src-3070900.zip) = gpFxRe1kPZwaIqPLu1ekFAtsZYw=
-SHA1 (sqlite-src-3070900.zip) = 0PdmHwbCRkKfdZc7YcfmIPXsQ80=
-SHA256 (sqlite-src-3070900.zip) = br/+FmJn+3gwVqQgDXUAKJzDZsoofJs0V9vUaibXBNA=
-SIZE (sqlite-src-3070900.zip) = 4639586
+MD5 (sqlite-src-3071100.zip) = c+I0DKJoKukUFo2ZwfJuZg==
+RMD160 (sqlite-src-3071100.zip) = TdOA738p+VflUEyp98XUiuxbC+o=
+SHA1 (sqlite-src-3071100.zip) = S8tgwKeeQv4BxkEI3qxmRzEj9Oc=
+SHA256 (sqlite-src-3071100.zip) = k5Ji/nC15NzQTynW8dgiFULyTnGt9y8NSoxnHYttlEE=
+SIZE (sqlite-src-3071100.zip) = 4705421
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/databases/sqlite3/patches/patch-Makefile_in,v
retrieving revision 1.18
diff -u -p -r1.18 patch-Makefile_in
--- patches/patch-Makefile_in 21 Dec 2011 00:38:11 -0000 1.18
+++ patches/patch-Makefile_in 26 Mar 2012 10:23:30 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.18 2011/12/21 00:38:11 nigel Exp $
---- Makefile.in.orig Tue Nov 1 12:31:18 2011
-+++ Makefile.in Sun Dec 18 11:47:35 2011
+--- Makefile.in.orig Tue Mar 20 14:20:13 2012
++++ Makefile.in Mon Mar 26 11:17:20 2012
@@ -186,7 +186,7 @@ LIBOBJS1 = sqlite3.lo
# Determine the real value of LIBOBJ based on the 'configure' script
@@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.18 2011/
# Source code for extensions
#
SRC += \
-@@ -772,6 +774,9 @@ tclsqlite3$(TEXE): tclsqlite-shell.lo libsqlite3.la
+@@ -778,6 +780,9 @@ tclsqlite3$(TEXE): tclsqlite-shell.lo libsqlite3.la
$(LTLINK) -o $@ tclsqlite-shell.lo \
libsqlite3.la $(LIBTCL)
@@ -29,7 +29,7 @@ $OpenBSD: patch-Makefile_in,v 1.18 2011/
# Rules to build opcodes.c and opcodes.h
#
opcodes.c: opcodes.h $(TOP)/mkopcodec.awk
-@@ -792,8 +797,12 @@ parse.c: $(TOP)/src/parse.y lemon$(BEXE) $(TOP)/addopc
+@@ -798,8 +803,12 @@ parse.c: $(TOP)/src/parse.y lemon$(BEXE) $(TOP)/addopc
$(NAWK) -f $(TOP)/addopcodes.awk parse.h.temp >parse.h
sqlite3.h: $(TOP)/src/sqlite.h.in $(TOP)/manifest.uuid $(TOP)/VERSION
@@ -44,7 +44,7 @@ $OpenBSD: patch-Makefile_in,v 1.18 2011/
keywordhash.h: $(TOP)/tool/mkkeywordhash.c
$(BCC) -o mkkeywordhash$(BEXE) $(OPT_FEATURE_FLAGS) $(OPTS)
$(TOP)/tool/mkkeywordhash.c
./mkkeywordhash$(BEXE) >keywordhash.h
-@@ -869,7 +878,7 @@ TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVAT
+@@ -875,7 +884,7 @@ TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVAT
TESTFIXTURE_FLAGS += -DBUILD_sqlite
TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
@@ -53,7 +53,7 @@ $OpenBSD: patch-Makefile_in,v 1.18 2011/
TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c
$(TESTFIXTURE_SRC$(USE_AMALGAMATION))
testfixture$(TEXE): $(TESTFIXTURE_SRC)
-@@ -937,6 +946,8 @@ clean:
+@@ -944,6 +953,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.13
diff -u -p -r1.13 patch-configure
--- patches/patch-configure 7 Jan 2012 13:47:52 -0000 1.13
+++ patches/patch-configure 26 Mar 2012 10:23:30 -0000
@@ -6,9 +6,9 @@ if updating, to include additional conte
use a hand-rolled patch or 'make update-patches DIFF_ARGS=-u6'.
---- configure.orig Tue Nov 1 12:31:18 2011
-+++ configure Fri Jan 6 22:20:01 2012
-@@ -10540,14 +10540,14 @@ return pthread_create ();
+--- configure.orig Tue Mar 20 14:20:13 2012
++++ configure Mon Mar 26 11:16:23 2012
+@@ -12494,14 +12494,14 @@ return pthread_create ();
}
_ACEOF
for ac_lib in '' pthread; do
@@ -20,8 +20,8 @@ use a hand-rolled patch or 'make update-
+ ac_res=-$ac_lib
+ LIBS="-$ac_lib $ac_func_search_save_LIBS"
fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_pthread_create=$ac_res
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
Index: patches/patch-src_build_c
===================================================================
RCS file: patches/patch-src_build_c
diff -N patches/patch-src_build_c
--- patches/patch-src_build_c 21 Dec 2011 00:38:11 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-$OpenBSD: patch-src_build_c,v 1.1 2011/12/21 00:38:11 nigel Exp $
-
-patch for sparc
-http://www.sqlite.org/src/info/54cc119811
-
---- src/build.c.orig Tue Nov 1 12:31:18 2011
-+++ src/build.c Mon Dec 19 15:09:48 2011
-@@ -2661,19 +2661,22 @@ Index *sqlite3CreateIndex(
- nName = sqlite3Strlen30(zName);
- nCol = pList->nExpr;
- pIndex = sqlite3DbMallocZero(db,
-- sizeof(Index) + /* Index structure */
-- sizeof(tRowcnt)*(nCol+1) + /* Index.aiRowEst */
-- sizeof(int)*nCol + /* Index.aiColumn */
-- sizeof(char *)*nCol + /* Index.azColl */
-- sizeof(u8)*nCol + /* Index.aSortOrder */
-- nName + 1 + /* Index.zName */
-- nExtra /* Collation sequence names */
-+ sizeof(Index) + /* Index structure */
-+ ROUND8(sizeof(tRowcnt)*(nCol+1)) + /* Index.aiRowEst */
-+ sizeof(char *)*nCol + /* Index.azColl */
-+ sizeof(int)*nCol + /* Index.aiColumn */
-+ sizeof(u8)*nCol + /* Index.aSortOrder */
-+ nName + 1 + /* Index.zName */
-+ nExtra /* Collation sequence names */
- );
- if( db->mallocFailed ){
- goto exit_create_index;
- }
- pIndex->aiRowEst = (tRowcnt*)(&pIndex[1]);
-- pIndex->azColl = (char**)(&pIndex->aiRowEst[nCol+1]);
-+ pIndex->azColl = (char**)
-+ ((char*)pIndex->aiRowEst + ROUND8(sizeof(tRowcnt)*nCol+1));
-+ assert( EIGHT_BYTE_ALIGNMENT(pIndex->aiRowEst) );
-+ assert( EIGHT_BYTE_ALIGNMENT(pIndex->azColl) );
- pIndex->aiColumn = (int *)(&pIndex->azColl[nCol]);
- pIndex->aSortOrder = (u8 *)(&pIndex->aiColumn[nCol]);
- pIndex->zName = (char *)(&pIndex->aSortOrder[nCol]);
Index: patches/patch-src_sqliteInt_h
===================================================================
RCS file: /cvs/ports/databases/sqlite3/patches/patch-src_sqliteInt_h,v
retrieving revision 1.9
diff -u -p -r1.9 patch-src_sqliteInt_h
--- patches/patch-src_sqliteInt_h 21 Dec 2011 00:38:11 -0000 1.9
+++ patches/patch-src_sqliteInt_h 26 Mar 2012 10:23:30 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_sqliteInt_h,v 1.9 2011/12/21 00:38:11 nigel Exp $
---- src/sqliteInt.h.orig Tue Nov 1 12:31:18 2011
-+++ src/sqliteInt.h Sun Dec 18 11:43:24 2011
+--- src/sqliteInt.h.orig Tue Mar 20 14:20:13 2012
++++ src/sqliteInt.h Mon Mar 26 11:17:20 2012
@@ -61,11 +61,6 @@
#pragma warn -spa /* Suspicious pointer arithmetic */
#endif
@@ -13,7 +13,7 @@ $OpenBSD: patch-src_sqliteInt_h,v 1.9 20
/*
** Include standard header files as necessary
*/
-@@ -456,33 +451,26 @@ typedef INT8_TYPE i8; /* 1-byte signed in
+@@ -464,33 +459,26 @@ typedef INT8_TYPE i8; /* 1-byte signed in
typedef u32 tRowcnt; /* 32-bit is the default */
#endif
