Index: head/databases/sqlite3/files/patch-sqlite3.c =================================================================== --- head/databases/sqlite3/files/patch-sqlite3.c (revision 466837) +++ head/databases/sqlite3/files/patch-sqlite3.c (nonexistent) @@ -1,36 +0,0 @@ -Fix for CVE-2018-8740: https://nvd.nist.gov/vuln/detail/CVE-2018-8740 -Detect databases whose schema is corrupted using a CREATE TABLE AS statement and issue an appropriate error message. -Commit [d75e6765]: https://www.sqlite.org/src/info/d75e67654aa9620b -Description: https://bugs.launchpad.net/ubuntu/+source/sqlite3/+bug/1756349 - ---- sqlite3.c.orig 2018-03-22 07:08:21 UTC -+++ sqlite3.c -@@ -103474,8 +103474,6 @@ SQLITE_PRIVATE void sqlite3EndTable( - p = pParse->pNewTable; - if( p==0 ) return; - -- assert( !db->init.busy || !pSelect ); -- - /* If the db->init.busy is 1 it means we are reading the SQL off the - ** "sqlite_master" or "sqlite_temp_master" table on the disk. - ** So do not write to the disk again. Extract the root page number -@@ -103486,6 +103484,10 @@ SQLITE_PRIVATE void sqlite3EndTable( - ** table itself. So mark it read-only. - */ - if( db->init.busy ){ -+ if( pSelect ){ -+ sqlite3ErrorMsg(pParse, ""); -+ return; -+ } - p->tnum = db->init.newTnum; - if( p->tnum==1 ) p->tabFlags |= TF_Readonly; - } -@@ -117813,7 +117815,7 @@ static void corruptSchema( - char *z; - if( zObj==0 ) zObj = "?"; - z = sqlite3MPrintf(db, "malformed database schema (%s)", zObj); -- if( zExtra ) z = sqlite3MPrintf(db, "%z - %s", z, zExtra); -+ if( zExtra && zExtra[0] ) z = sqlite3MPrintf(db, "%z - %s", z, zExtra); - sqlite3DbFree(db, *pData->pzErrMsg); - *pData->pzErrMsg = z; - } Property changes on: head/databases/sqlite3/files/patch-sqlite3.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/sqlite3/Makefile =================================================================== --- head/databases/sqlite3/Makefile (revision 466837) +++ head/databases/sqlite3/Makefile (revision 466838) @@ -1,243 +1,247 @@ # Created by: Ying-Chieh Liao # $FreeBSD$ PORTNAME= sqlite3 -DISTVERSION= 3.22.0 -PORTREVISION= 2 +DISTVERSION= 3.23.0 CATEGORIES= databases MASTER_SITES= https://www.sqlite.org/2018/ http://www2.sqlite.org/2018/ http://www3.sqlite.org/2018/ DISTNAME= sqlite-autoconf-${PORTVERSION:C/\.([[:digit:]])[[:>:]]/0\1/g:S/.//g}00 MAINTAINER= pavelivolkov@gmail.com COMMENT= SQL database engine in a C library LICENSE= PD USES= libtool ncurses pathfix GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip MAKE_JOBS_UNSAFE= yes # Compilation Options For SQLite https://www.sqlite.org/compile.html OPTIONS_DEFINE= FTS4 UPD_DEL_LIMIT URI URI_AUTHORITY METADATA \ DIRECT_READ MEMMAN SECURE_DELETE UNLOCK_NOTIFY THREADS \ EXTENSION ARMOR STMT DBPAGE DBSTAT FTS5 RBU NULL_TRIM \ LIKENOTBLOB STSHELL FTS3_TOKEN UNKNOWN_SQL OPTIONS_SINGLE= RAMT OPTIONS_RADIO= STAT OPTIONS_GROUP= OPT_EXT OPT_FUNC UNICODE RTREEG RL OPTIONS_GROUP_OPT_EXT= JSON1 SESSION -OPTIONS_GROUP_OPT_FUNC= OFFSET SOUNDEX +OPTIONS_GROUP_OPT_FUNC= OFFSET SER1 SOUNDEX OPT_EXT_DESC= Optional extensions OPT_FUNC_DESC= Optional functions UPD_DEL_LIMIT_DESC= ORDER BY and LIMIT on UPDATE and DELETE URI_DESC= Enable use the URI filename URI_AUTHORITY_DESC= Allow convert URL into a UNC SOUNDEX_DESC= Enable the soundex() SQL function METADATA_DESC= Enable column metadata DIRECT_READ_DESC= File is read directly from disk MEMMAN_DESC= Allow it to release unused memory SECURE_DELETE_DESC= Overwrite deleted information with zeros UNLOCK_NOTIFY_DESC= Enable notification on unlocking EXTENSION_DESC= Allow loadable extensions STSHELL_DESC= Statically link libsqlite3 into shell # https://sqlite.org/compile.html#enable_null_trim NULL_TRIM_DESC= Omits NULL columns at the ends of rows # http://www.sqlite.org/compile.html#enable_offset_sql_func OFFSET_DESC= Enable sqlite_offset() returning record's file offset +# https://www.sqlite.org/compile.html#enable_deserialize +SER1_DESC= Enable the sqlite3_[de]serialize() interface + # https://www.sqlite.org/sessionintro.html SESSION_DESC= Enable the session extension # https://sqlite.org/compile.html#like_doesnt_match_blobs LIKENOTBLOB_DESC= LIKE does not match blobs # https://www.sqlite.org/compile.html#enable_api_armor ARMOR_DESC= Detect misuse of the API # http://sqlite.org/compile.html#enable_unknown_sql_function UNKNOWN_SQL_DESC= Suppress unknown function errors # https://www.sqlite.org/fts3.html # https://www.sqlite.org/compile.html#enable_fts3_parenthesis FTS4_DESC= Enable FTS3/4 (Full Text Search) module # https://www.sqlite.org/fts5.html FTS5_DESC= Enable version 5 full-text search engine # https://www.sqlite.org/compile.html#enable_fts3_tokenizer # https://www.sqlite.org/fts3.html#f3tknzr FTS3_TOKEN_DESC= Enable two-args version fts3_tokenizer # https://www.sqlite.org/json1.html JSON1_DESC= Enable the JSON1 extension # https://www.sqlite.org/rbu.html RBU_DESC= Enable the resumable bulk update # https://www.sqlite.org/c3ref/stmt_scanstatus.html STMT_DESC= Prepared statement scan status # https://www.sqlite.org/tempfiles.html#tempstore OPTIONS_SINGLE_RAMT= TS0 TS1 TS2 TS3 RAMT_DESC= Where to store temporary file TS0_DESC= Always use temporary file TS1_DESC= File by default, change allowed PRAGMA TS2_DESC= Memory by default, change allowed PRAGMA TS3_DESC= Always use memory # https://www.sqlite.org/queryplanner-ng.html#qpstab OPTIONS_RADIO_STAT= STAT3 STAT4 STAT_DESC= Which query planner to use, stability or ... STAT3_DESC= collect histogram data from leftmost column STAT4_DESC= collect histogram data from all columns # https://sqlite.org/compile.html#enable_dbpage_vtab DBPAGE_DESC= Enable DBPAGE Virtual Table # https://www.sqlite.org/dbstat.html DBSTAT_DESC= Enable DBSTAT Virtual Table # https://www.sqlite.org/fts3.html#tokenizer OPTIONS_GROUP_UNICODE= ICU UNICODE61 UNICODE_DESC= Unicode support UNICODE61_DESC= Unicode Version 6.1 tokenizer # https://www.sqlite.org/rtree.html OPTIONS_GROUP_RTREEG= RTREE RTREE_INT RTREEG_DESC= Index type for range queries RTREE_DESC= Enable R*Tree module RTREE_INT_DESC= Store 32-bit sig int (no float) coordinates OPTIONS_GROUP_RL= READLINES READLINEP EDITLINE RL_DESC= Which command line editing library to use: READLINES_DESC= the libreadline from system READLINEP_DESC= the GNU libreadline from ports EDITLINE_DESC= the BSD libedit from ports READLINES_PREVENTS= READLINEP EDITLINE READLINEP_PREVENTS= READLINES EDITLINE EDITLINE_PREVENTS= READLINES READLINEP OPTIONS_DEFAULT= FTS4 URI METADATA SECURE_DELETE UNLOCK_NOTIFY THREADS \ EXTENSION TS1 UNICODE61 RTREE DBSTAT STSHELL READLINES \ FTS3_TOKEN FTS5 # SECURE_DELETE, UNLOCK_NOTIFY, DBSTAT (since 41.0) used by www/firefox et al. # RTREE used by graphics/mapnik, databases/spatialite # FTS3_TOKEN used by audio/clementine-player # FTS5 used by sysutils/tracker PLIST_FILES= bin/sqlite3 include/sqlite3.h include/sqlite3ext.h \ lib/libsqlite3.a lib/libsqlite3.so lib/libsqlite3.so.0 \ lib/libsqlite3.so.0.8.6 libdata/pkgconfig/sqlite3.pc \ man/man1/sqlite3.1.gz # The default numeric file permissions for newly created database files under unix. # If not specified, the default is 0644 which means that the files is globally # readable but only writable by the creator. .ifdef DEFAULT_FILE_PERMISSIONS CPPFLAGS+= -DSQLITE_DEFAULT_FILE_PERMISSIONS=${DEFAULT_FILE_PERMISSIONS} .endif # Use an in-ram database for temporary tables (never,no,yes,always), TS0_CPPFLAGS= -DSQLITE_TEMP_STORE=0 TS1_CPPFLAGS= -DSQLITE_TEMP_STORE=1 TS2_CPPFLAGS= -DSQLITE_TEMP_STORE=2 TS3_CPPFLAGS= -DSQLITE_TEMP_STORE=3 RTREE_CPPFLAGS= -DSQLITE_ENABLE_RTREE=1 RTREE_INT_CPPFLAGS= -DSQLITE_RTREE_INT_ONLY=1 FTS4_CPPFLAGS= -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_FTS4=1 FTS5_CONFIGURE_ENABLE= fts5 FTS5_LIBS= -lm FTS3_TOKEN_CPPFLAGS= -DSQLITE_ENABLE_FTS3_TOKENIZER=1 SOUNDEX_CPPFLAGS= -DSQLITE_SOUNDEX=1 MEMMAN_CPPFLAGS= -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1 UPD_DEL_LIMIT_CPPFLAGS= -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1 UPD_DEL_LIMIT_PREVENTS= UPD_DEL_LIMIT UPD_DEL_LIMIT_PREVENTS_MSG= this option may only be used when the library is built from source, not from the amalgamation. Please, do not select it with this port. SECURE_DELETE_CPPFLAGS= -DSQLITE_SECURE_DELETE=1 UNLOCK_NOTIFY_CPPFLAGS= -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 METADATA_CPPFLAGS= -DSQLITE_ENABLE_COLUMN_METADATA=1 STAT3_CPPFLAGS= -DSQLITE_ENABLE_STAT3=1 STAT4_CPPFLAGS= -DSQLITE_ENABLE_STAT4=1 DBPAGE_CPPFLAGS= -DSQLITE_ENABLE_DBPAGE_VTAB=1 DBSTAT_CPPFLAGS= -DSQLITE_ENABLE_DBSTAT_VTAB=1 URI_CPPFLAGS= -DSQLITE_USE_URI=1 URI_AUTHORITY_CPPFLAGS= -DSQLITE_ALLOW_URI_AUTHORITY=1 DIRECT_READ_CPPFLAGS= -DSQLITE_DIRECT_OVERFLOW_READ=1 ARMOR_CPPFLAGS= -DSQLITE_ENABLE_API_ARMOR=1 STMT_CPPFLAGS= -DSQLITE_ENABLE_STMT_SCANSTATUS=1 EXTENSION_CONFIGURE_ENABLE= dynamic-extensions THREADS_CONFIGURE_ENABLE= threadsafe THREADS_LIBS= -lpthread ICU_BUILD_DEPENDS= ${LOCALBASE}/bin/icu-config:devel/icu ICU_LIB_DEPENDS= libicudata.so:devel/icu ICU_CPPFLAGS= `${LOCALBASE}/bin/icu-config --cppflags` -DSQLITE_ENABLE_ICU=1 ICU_LIBS= `${LOCALBASE}/bin/icu-config --ldflags` UNICODE61_CPPFLAGS= "" UNICODE61_CPPFLAGS_OFF= -DSQLITE_DISABLE_FTS3_UNICODE=1 READLINES_CONFIGURE_ON= --enable-readline READLINES_USES= readline READLINEP_CONFIGURE_ON= --enable-readline READLINEP_USES= readline:port EDITLINE_CONFIGURE_ENABLE= editline EDITLINE_USES= libedit JSON1_CONFIGURE_ENABLE= json1 RBU_CPPFLAGS= -DSQLITE_ENABLE_RBU=1 LIKENOTBLOB_CPPFLAGS= -DSQLITE_LIKE_DOESNT_MATCH_BLOBS=1 STSHELL_CONFIGURE_ENABLE= static-shell SESSION_CONFIGURE_ENABLE= session UNKNOWN_SQL_CPPFLAGS= -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION=1 NULL_TRIM_CPPFLAGS= -DSQLITE_ENABLE_NULL_TRIM=1 OFFSET_CPPFLAGS= -DSQLITE_ENABLE_OFFSET_SQL_FUNC=1 + +SER1_CPPFLAGS= -DSQLITE_ENABLE_DESERIALIZE=1 .include # Platform Configuration CPPFLAGS+= -DHAVE_ISNAN=1 -DHAVE_MALLOC_USABLE_SIZE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_USLEEP=1 -DHAVE_STRCHRNUL=1 post-configure: @${ECHO_MSG} "===> CONFIGURE_ARGS=${CONFIGURE_ARGS}" @${ECHO_MSG} "===> CPPFLAGS=${CPPFLAGS}" @${ECHO_MSG} "===> CFLAGS=${CFLAGS}" @${ECHO_MSG} "===> LDFLAGS=${LDFLAGS}" @${ECHO_MSG} "===> LIBS=${LIBS}" post-build: .if ${ARCH}=="i386" @${ECHO_MSG} "===> WARNING: on ${ARCH} don't pass atof1-* tests" .endif post-install: ${RM} ${STAGEDIR}${PREFIX}/include/msvc.h # for compares with checksum from of the site sha1: fetch .if defined(SHA1) && !empty(SHA1) @sha1 -c ${SHA1} ${DISTDIR}/${ALLFILES} .else @sha1 ${DISTDIR}/${ALLFILES} .endif .include Index: head/databases/sqlite3/distinfo =================================================================== --- head/databases/sqlite3/distinfo (revision 466837) +++ head/databases/sqlite3/distinfo (revision 466838) @@ -1,3 +1,3 @@ -TIMESTAMP = 1517654018 -SHA256 (sqlite-autoconf-3220000.tar.gz) = 2824ab1238b706bc66127320afbdffb096361130e23291f26928a027b885c612 -SIZE (sqlite-autoconf-3220000.tar.gz) = 2644649 +TIMESTAMP = 1523081283 +SHA256 (sqlite-autoconf-3230000.tar.gz) = b7711a1800a071674c2bf76898ae8584fc6c9643cfe933cfc1bc54361e3a6e49 +SIZE (sqlite-autoconf-3230000.tar.gz) = 2674030