--- a/components/sqlite-3/Makefile Tue Jul 05 11:43:57 2016 -0700
+++ b/components/sqlite-3/Makefile Tue Jul 05 13:55:03 2016 -0700
@@ -26,13 +26,13 @@
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= sqlite
-TARBALL_VERSION= 3090200
-COMPONENT_VERSION= 3.9.2
+TARBALL_VERSION= 3120200
+COMPONENT_VERSION= 3.12.2
COMPONENT_PROJECT_URL= http://www.sqlite.org/
COMPONENT_SRC= $(COMPONENT_NAME)-autoconf-$(TARBALL_VERSION)
COMPONENT_ARCHIVE_HASH= \
- sha256:064c0abe9c9177534d4c770bca7a5902f9924b629ac886b4c08956be6dfbc36b
-COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)2015/$(COMPONENT_ARCHIVE)
+ sha256:fd00770c9afd39db555c78400e52f55e8bd6568c78be23561abb472a22d09abb
+COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)2016/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= database/sqlite3
# Documentation
@@ -40,11 +40,11 @@
COMPONENT_SRC_1= $(COMPONENT_NAME)-doc-$(DOC_VERSION)
COMPONENT_ARCHIVE_1= $(COMPONENT_SRC_1).zip
COMPONENT_ARCHIVE_HASH_1= \
- sha256:4b9ecb9d2b0424ca2a288184ee36fa16a11033400638117dd7c669ad2d39177c
-COMPONENT_ARCHIVE_URL_1= $(COMPONENT_PROJECT_URL)2015/$(COMPONENT_ARCHIVE_1)
+ sha256:67c640c4b01b961016717db61e3e43c63c33248c78ce0de9f10b88ea7ce97670
+COMPONENT_ARCHIVE_URL_1= $(COMPONENT_PROJECT_URL)2016/$(COMPONENT_ARCHIVE_1)
PKG_PROTO_DIRS += $(COMPONENT_SRC_1)
-TPNO= 26531
+TPNO= 27892
TEST_TARGET= $(NO_TESTS)
include $(WS_MAKE_RULES)/common.mk
@@ -77,6 +77,7 @@
CFLAGS += -DHAVE_USLEEP
CFLAGS += -DHAVE_FDATASYNC
CFLAGS += -DHAVE_STATVFS
+CFLAGS += -DSQLITE_ENABLE_DBSTAT_VTAB
CFLAGS += -DSQLITE_ENABLE_UNLOCK_NOTIFY
CFLAGS += -DSQLITE_ENABLE_STAT2
CFLAGS += -DSQLITE_MAX_SCHEMA_RETRY=25
@@ -90,4 +91,5 @@
CONFIGURE_OPTIONS += --enable-shared
CONFIGURE_OPTIONS += --disable-static
+REQUIRED_PACKAGES += library/libedit
REQUIRED_PACKAGES += library/readline
--- a/components/sqlite-3/patches/sqlite3-01-using-mapfile.patch Tue Jul 05 11:43:57 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# Fix needed for Firefox
-# Need to determine if these changes are still applicable to the latest version,
-# and if so, then submit them upstream.
---- sqlite-autoconf-3090200/Makefile.am.orig 2015-12-21 15:29:12.245364514 +0530
-+++ sqlite-autoconf-3090200/Makefile.am 2015-12-21 15:29:36.374953130 +0530
-@@ -3,7 +3,7 @@ AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_
-
- lib_LTLIBRARIES = libsqlite3.la
- libsqlite3_la_SOURCES = sqlite3.c
--libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
-+libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8 -Wl,-M,mapfile-libsqlite3
-
- bin_PROGRAMS = sqlite3
- sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h
--- a/components/sqlite-3/patches/sqlite3-02-zrecord.patch Tue Jul 05 11:43:57 2016 -0700
+++ b/components/sqlite-3/patches/sqlite3-02-zrecord.patch Tue Jul 05 13:55:03 2016 -0700
@@ -2,13 +2,13 @@
# Bug 15705787 for details.
# Need to determine if these changes are still applicable to the latest version,
# and if so, then submit them upstream.
---- sqlite-autoconf-3090200/Makefile.am.orig 2015-12-21 15:35:19.261166407 +0530
-+++ sqlite-autoconf-3090200/Makefile.am 2015-12-21 15:36:15.587286651 +0530
-@@ -8,6 +8,7 @@ libsqlite3_la_LDFLAGS = -no-undefined -v
- bin_PROGRAMS = sqlite3
- sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h
- sqlite3_LDADD = @READLINE_LIBS@
+--- a/Makefile.am.orig 2015-12-21 15:35:19.261166407 +0530
++++ b/Makefile.am 2015-12-21 15:36:15.587286651 +0530
+@@ -9,6 +9,7 @@ bin_PROGRAMS = sqlite3
+ sqlite3_SOURCES = shell.c sqlite3.h
+ EXTRA_sqlite3_SOURCES = sqlite3.c
+ sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
+sqlite3_LDFLAGS = -Wl,-zrecord
- sqlite3_CFLAGS = $(AM_CFLAGS)
+ sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
+ sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS
- include_HEADERS = sqlite3.h sqlite3ext.h
--- a/components/sqlite-3/patches/sqlite3-04-tcl-cc.patch Tue Jul 05 11:43:57 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-The value of TCL_CC in /usr/lib/tclConfig.sh is currently incorrect.
-For now, just use the normal CC value that was passed into the
-configure script.
-
-This change will not be sent upstream and this patch can be removed
-when the fix for CR #22378457 is integrated.
-
---- a/tea/configure.orig 2015-12-16 10:21:08.098424591 -0800
-+++ b/tea/configure 2015-12-16 10:21:33.697578818 -0800
-@@ -3386,7 +3386,7 @@
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking platform" >&5
- $as_echo_n "checking platform... " >&6; }
-- hold_cc=$CC; CC="$TCL_CC"
-+ hold_cc=$CC; CC="$CC"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
--- a/components/sqlite-3/sqlite.license Tue Jul 05 11:43:57 2016 -0700
+++ b/components/sqlite-3/sqlite.license Tue Jul 05 13:55:03 2016 -0700
@@ -1,24 +1,15 @@
-SQLite is in the Public Domain
+http://www.sqlite.org/copyright.html
+
+SQLite Copyright
-The person or persons who have associated work with this document (the
-"Dedicator" or "Certifier") hereby either (a) certifies that, to the best of
-his knowledge, the work of authorship identified is in the public domain of the
-country from which the work is published, or (b) hereby dedicates whatever
-copyright the dedicators holds in the work of authorship identified below (the
-"Work") to the public domain. A certifier, moreover, dedicates any copyright
-interest he may have in the associated work, and for these purposes, is
-described as a "dedicator" below. A certifier has taken reasonable steps to
-verify the copyright status of this work. Certifier recognizes that his good
-faith efforts may not shield him from liability if in fact the work certified
-is not in the public domain. Dedicator makes this dedication for the benefit
-of the public at large and to the detriment of the Dedicator's heirs and
-successors. Dedicator intends this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights under copyright
-law, whether vested or contingent, in the Work. Dedicator understands that such
-relinquishment of all rights includes the relinquishment of all rights to
-enforce (by lawsuit or otherwise) those copyrights in the Work. Dedicator
-recognizes that, once placed in the public domain, the Work may be freely
-reproduced, distributed, transmitted, used, modified, built upon, or otherwise
-exploited by anyone for any purpose, commercial or non-commercial, and in any
-way, including by methods that have not yet been invented or conceived.
+All of the code and documentation in SQLite has been dedicated to the public domain by the authors. All code authors, and representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means.
+The previous paragraph applies to the deliverable code and documentation in SQLite - those parts of the SQLite library that you actually bundle and ship with a larger application. Some scripts used as part of the build process (for example the "configure" scripts generated by autoconf) might fall under other open-source licenses. Nothing from these build scripts ever reaches the final deliverable SQLite library, however, and so the licenses associated with those scripts should not be a factor in assessing your rights to copy and use the SQLite library.
+All of the deliverable code in SQLite has been written from scratch. No code has been taken from other projects or from the open internet. Every line of code can be traced back to its original author, and all of those authors have public domain dedications on file. So the SQLite code base is clean and is uncontaminated with licensed code from other projects.
+Obtaining An Explicit License To Use SQLite
+Even though SQLite is in the public domain and does not require a license, some users want to obtain a license anyway. Some reasons for obtaining a license include:
+• You are using SQLite in a jurisdiction that does not recognize the public domain.
+• You are using SQLite in a jurisdiction that does not recognize the right of an author to dedicate their work to the public domain.
+• You want to hold a tangible legal document as evidence that you have the legal right to use and distribute SQLite.
+• Your legal department tells you that you have to purchase a license.
+If you feel like you really have to purchase a license for SQLite, Hwaci, the company that employs the architect and principal developers of SQLite, will sell you one.