CVS commit: src/external/public-domain/sqlite
Module Name:src Committed By: joerg Date: Fri Feb 5 21:48:52 UTC 2021 Modified Files: src/external/public-domain/sqlite: Makefile.inc Log Message: Reenable threadsafe sqlite. Do it properly and only enable thread-safety, but not the worker thread support. The latter is what requires the whole libpthread dependency. A potential compromis would be to use a weak pthread_create and only enable worker threads if it is provided, but given that it is only really used for large sorts, don't bother for now. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/public-domain/sqlite/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/Makefile.inc diff -u src/external/public-domain/sqlite/Makefile.inc:1.10 src/external/public-domain/sqlite/Makefile.inc:1.11 --- src/external/public-domain/sqlite/Makefile.inc:1.10 Thu Nov 12 17:53:43 2020 +++ src/external/public-domain/sqlite/Makefile.inc Fri Feb 5 21:48:52 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.10 2020/11/12 17:53:43 nia Exp $ +# $NetBSD: Makefile.inc,v 1.11 2021/02/05 21:48:52 joerg Exp $ WARNS= 2 @@ -15,6 +15,7 @@ CPPFLAGS+= \ -DHAVE_STRERROR_R=1 \ -DHAVE_USLEEP=1 \ -DHAVE_SYS_ENDIAN_H=1 \ + -DSQLITE_THREADSAFE \ -DSQLITE_MAX_WORKER_THREADS=0 \ -DSQLITE_ENABLE_COLUMN_METADATA \ -DSQLITE_ENABLE_FTS3_PARENTHESIS \
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: maya Date: Fri Oct 30 12:32:04 UTC 2020 Modified Files: src/external/public-domain/sqlite/dist: sqlite3.c Log Message: Use the same macro used before for avoiding too large floats on vax. This has the advantage of not changing the number for non-vax, so is a safer change for those architectures. (Might not actually matter). To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/external/public-domain/sqlite/dist/sqlite3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/dist/sqlite3.c diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.19 src/external/public-domain/sqlite/dist/sqlite3.c:1.20 --- src/external/public-domain/sqlite/dist/sqlite3.c:1.19 Fri Oct 30 06:02:05 2020 +++ src/external/public-domain/sqlite/dist/sqlite3.c Fri Oct 30 12:32:04 2020 @@ -185409,7 +185409,7 @@ SQLITE_API int sqlite3_rtree_init( **May you share freely, never taking more than you give. ** * -** $Id: sqlite3.c,v 1.19 2020/10/30 06:02:05 martin Exp $ +** $Id: sqlite3.c,v 1.20 2020/10/30 12:32:04 maya Exp $ ** ** This file implements an integration between the ICU library ** ("International Components for Unicode", an open-source library @@ -213756,7 +213756,7 @@ static int fts5BestIndexMethod(sqlite3_v }else{ /* As there exists an unusable MATCH constraint this is an ** unusable plan. Set a prohibitively high cost. */ -pInfo->estimatedCost = DBL_MAX; +pInfo->estimatedCost = SQLITE_HUGE_COST; return SQLITE_OK; } }else if( p->op<=SQLITE_INDEX_CONSTRAINT_MATCH ){
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: martin Date: Fri Oct 30 06:02:06 UTC 2020 Modified Files: src/external/public-domain/sqlite/dist: sqlite3.c Log Message: Instead of a random 'prohibitively high' value, use DBL_MAX so it builds on VAX To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/external/public-domain/sqlite/dist/sqlite3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/dist/sqlite3.c diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.18 src/external/public-domain/sqlite/dist/sqlite3.c:1.19 --- src/external/public-domain/sqlite/dist/sqlite3.c:1.18 Sat Dec 22 03:22:19 2018 +++ src/external/public-domain/sqlite/dist/sqlite3.c Fri Oct 30 06:02:05 2020 @@ -185409,7 +185409,7 @@ SQLITE_API int sqlite3_rtree_init( **May you share freely, never taking more than you give. ** * -** $Id: sqlite3.c,v 1.18 2018/12/22 03:22:19 christos Exp $ +** $Id: sqlite3.c,v 1.19 2020/10/30 06:02:05 martin Exp $ ** ** This file implements an integration between the ICU library ** ("International Components for Unicode", an open-source library @@ -213756,7 +213756,7 @@ static int fts5BestIndexMethod(sqlite3_v }else{ /* As there exists an unusable MATCH constraint this is an ** unusable plan. Set a prohibitively high cost. */ -pInfo->estimatedCost = 1e50; +pInfo->estimatedCost = DBL_MAX; return SQLITE_OK; } }else if( p->op<=SQLITE_INDEX_CONSTRAINT_MATCH ){
CVS commit: src/external/public-domain/sqlite/lib
Module Name:src Committed By: nia Date: Thu Oct 29 16:35:33 UTC 2020 Modified Files: src/external/public-domain/sqlite/lib: Makefile sqlite3.pc.in Log Message: sqlite: fts5 extension requires we link with -lm To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/public-domain/sqlite/lib/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/public-domain/sqlite/lib/sqlite3.pc.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/lib/Makefile diff -u src/external/public-domain/sqlite/lib/Makefile:1.10 src/external/public-domain/sqlite/lib/Makefile:1.11 --- src/external/public-domain/sqlite/lib/Makefile:1.10 Mon Nov 11 22:45:26 2019 +++ src/external/public-domain/sqlite/lib/Makefile Thu Oct 29 16:35:33 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2019/11/11 22:45:26 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2020/10/29 16:35:33 nia Exp $ LIB= sqlite3 INCS= sqlite3.h sqlite3ext.h @@ -8,6 +8,9 @@ SRCS= sqlite3.c CFLAGS+= -DNDEBUG +LDADD+= -lm +DPADD+= ${LIBM} + FILES+= sqlite3.pc FILESOWN_sqlite3.pc= ${BINOWN} FILESGRP_sqlite3.pc= ${BINGRP} Index: src/external/public-domain/sqlite/lib/sqlite3.pc.in diff -u src/external/public-domain/sqlite/lib/sqlite3.pc.in:1.1 src/external/public-domain/sqlite/lib/sqlite3.pc.in:1.2 --- src/external/public-domain/sqlite/lib/sqlite3.pc.in:1.1 Mon Feb 17 20:08:53 2014 +++ src/external/public-domain/sqlite/lib/sqlite3.pc.in Thu Oct 29 16:35:33 2020 @@ -2,3 +2,4 @@ Name: SQLite Description: SQL database engine Version: @VERSION@ Libs: -lsqlite3 +Libs.private: -lm
CVS commit: src/external/public-domain/sqlite
Module Name:src Committed By: nia Date: Thu Oct 29 12:38:06 UTC 2020 Modified Files: src/external/public-domain/sqlite: Makefile.inc Log Message: sqlite3: Turn on extensions that default-on using the configure script Includes json1 and fts5, which are both needed by various things in pkgsrc To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/public-domain/sqlite/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/Makefile.inc diff -u src/external/public-domain/sqlite/Makefile.inc:1.7 src/external/public-domain/sqlite/Makefile.inc:1.8 --- src/external/public-domain/sqlite/Makefile.inc:1.7 Thu Oct 13 18:11:19 2016 +++ src/external/public-domain/sqlite/Makefile.inc Thu Oct 29 12:38:06 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.7 2016/10/13 18:11:19 martin Exp $ +# $NetBSD: Makefile.inc,v 1.8 2020/10/29 12:38:06 nia Exp $ WARNS= 2 @@ -18,6 +18,10 @@ CPPFLAGS+= \ -DSQLITE_ENABLE_COLUMN_METADATA \ -DSQLITE_ENABLE_FTS3_PARENTHESIS \ -DSQLITE_ENABLE_FTS4 \ + -DSQLITE_ENABLE_FTS5 \ + -DSQLITE_ENABLE_JSON1 \ + -DSQLITE_ENABLE_RTREE \ + -DSQLITE_ENABLE_GEOPOLY \ -DSQLITE_ENABLE_LOAD_EXTENSION \ -DSQLITE_ENABLE_UNLOCK_NOTIFY \ -DSQLITE_HAVE_ISNAN \
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: christos Date: Sat Dec 22 03:22:19 UTC 2018 Modified Files: src/external/public-domain/sqlite/dist: sqlite3.c Log Message: remove stray line To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/external/public-domain/sqlite/dist/sqlite3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/dist/sqlite3.c diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.17 src/external/public-domain/sqlite/dist/sqlite3.c:1.18 --- src/external/public-domain/sqlite/dist/sqlite3.c:1.17 Wed Dec 19 17:21:13 2018 +++ src/external/public-domain/sqlite/dist/sqlite3.c Fri Dec 21 22:22:19 2018 @@ -30570,7 +30570,6 @@ do_atof_calc: LONGDOUBLE_TYPE scale = 1; /* 1.0e+22 is the largest power of 10 than can be ** represented exactly. */ - LONGDOUBLE_TYPE scale = sqlite3Pow10(e-308); while( e%22 ) { scale *= 1.0e+1; e -= 1; } while( e>0 ) { scale *= 1.0e+22; e -= 22; } if( esign<0 ){ @@ -185410,7 +185409,7 @@ SQLITE_API int sqlite3_rtree_init( **May you share freely, never taking more than you give. ** * -** $Id: sqlite3.c,v 1.17 2018/12/19 22:21:13 christos Exp $ +** $Id: sqlite3.c,v 1.18 2018/12/22 03:22:19 christos Exp $ ** ** This file implements an integration between the ICU library ** ("International Components for Unicode", an open-source library
CVS commit: src/external/public-domain/sqlite
Module Name:src Committed By: christos Date: Wed Dec 19 22:21:14 UTC 2018 Modified Files: src/external/public-domain/sqlite/dist: shell.c sqlite3.c src/external/public-domain/sqlite/lib: shlib_version src/external/public-domain/sqlite/man: Makefile SQLITE_ACCESS_EXISTS.3 SQLITE_CHANGESET_DATA.3 SQLITE_CHANGESET_OMIT.3 SQLITE_CHECKPOINT_PASSIVE.3 SQLITE_CONFIG_SINGLETHREAD.3 SQLITE_CREATE_INDEX.3 SQLITE_DBCONFIG_MAINDBNAME.3 SQLITE_DBSTATUS_LOOKASIDE_USED.3 SQLITE_DENY.3 SQLITE_DETERMINISTIC.3 SQLITE_FCNTL_LOCKSTATE.3 SQLITE_INDEX_CONSTRAINT_EQ.3 SQLITE_INDEX_SCAN_UNIQUE.3 SQLITE_INTEGER.3 SQLITE_IOCAP_ATOMIC.3 SQLITE_LIMIT_LENGTH.3 SQLITE_LOCK_NONE.3 SQLITE_MUTEX_FAST.3 SQLITE_OK.3 SQLITE_OPEN_READONLY.3 SQLITE_ROLLBACK.3 SQLITE_SCANSTAT_NLOOP.3 SQLITE_SHM_NLOCK.3 SQLITE_SHM_UNLOCK.3 SQLITE_STATUS_MEMORY_USED.3 SQLITE_STMTSTATUS_FULLSCAN_STEP.3 SQLITE_SYNC_NORMAL.3 SQLITE_TESTCTRL_FIRST.3 SQLITE_TRACE_STMT.3 SQLITE_UTF8.3 SQLITE_VERSION.3 SQLITE_VTAB_CONSTRAINT_SUPPORT.3 sqlite3.3 sqlite3_aggregate_context.3 sqlite3_aggregate_count.3 sqlite3_api_routines.3 sqlite3_auto_extension.3 sqlite3_backup.3 sqlite3_backup_init.3 sqlite3_bind_blob.3 sqlite3_bind_parameter_count.3 sqlite3_bind_parameter_index.3 sqlite3_bind_parameter_name.3 sqlite3_blob.3 sqlite3_blob_bytes.3 sqlite3_blob_close.3 sqlite3_blob_open.3 sqlite3_blob_read.3 sqlite3_blob_reopen.3 sqlite3_blob_write.3 sqlite3_busy_handler.3 sqlite3_busy_timeout.3 sqlite3_cancel_auto_extension.3 sqlite3_changegroup.3 sqlite3_changes.3 sqlite3_changeset_iter.3 sqlite3_clear_bindings.3 sqlite3_close.3 sqlite3_collation_needed.3 sqlite3_column_blob.3 sqlite3_column_count.3 sqlite3_column_database_name.3 sqlite3_column_decltype.3 sqlite3_column_name.3 sqlite3_commit_hook.3 sqlite3_compileoption_used.3 sqlite3_complete.3 sqlite3_config.3 sqlite3_context.3 sqlite3_context_db_handle.3 sqlite3_create_collation.3 sqlite3_create_function.3 sqlite3_create_module.3 sqlite3_data_count.3 sqlite3_data_directory.3 sqlite3_db_cacheflush.3 sqlite3_db_config.3 sqlite3_db_filename.3 sqlite3_db_handle.3 sqlite3_db_mutex.3 sqlite3_db_readonly.3 sqlite3_db_release_memory.3 sqlite3_db_status.3 sqlite3_declare_vtab.3 sqlite3_destructor_type.3 sqlite3_enable_load_extension.3 sqlite3_enable_shared_cache.3 sqlite3_errcode.3 sqlite3_exec.3 sqlite3_extended_result_codes.3 sqlite3_file.3 sqlite3_file_control.3 sqlite3_finalize.3 sqlite3_get_autocommit.3 sqlite3_get_auxdata.3 sqlite3_get_table.3 sqlite3_index_info.3 sqlite3_initialize.3 sqlite3_interrupt.3 sqlite3_io_methods.3 sqlite3_last_insert_rowid.3 sqlite3_limit.3 sqlite3_load_extension.3 sqlite3_log.3 sqlite3_malloc.3 sqlite3_mem_methods.3 sqlite3_memory_used.3 sqlite3_module.3 sqlite3_mprintf.3 sqlite3_mutex.3 sqlite3_mutex_alloc.3 sqlite3_mutex_held.3 sqlite3_mutex_methods.3 sqlite3_next_stmt.3 sqlite3_open.3 sqlite3_overload_function.3 sqlite3_pcache.3 sqlite3_pcache_methods2.3 sqlite3_pcache_page.3 sqlite3_prepare.3 sqlite3_preupdate_hook.3 sqlite3_progress_handler.3 sqlite3_randomness.3 sqlite3_release_memory.3 sqlite3_reset.3 sqlite3_reset_auto_extension.3 sqlite3_result_blob.3 sqlite3_result_subtype.3 sqlite3_session.3 sqlite3_set_authorizer.3 sqlite3_sleep.3 sqlite3_snapshot.3 sqlite3_snapshot_cmp.3 sqlite3_snapshot_free.3 sqlite3_snapshot_get.3 sqlite3_snapshot_open.3 sqlite3_snapshot_recover.3 sqlite3_soft_heap_limit.3 sqlite3_soft_heap_limit64.3 sqlite3_sql.3 sqlite3_status.3 sqlite3_step.3 sqlite3_stmt.3 sqlite3_stmt_busy.3 sqlite3_stmt_readonly.3 sqlite3_stmt_scanstatus.3 sqlite3_stmt_scanstatus_reset.3 sqlite3_stmt_status.3 sqlite3_strglob.3 sqlite3_stricmp.3 sqlite3_strlike.3 sqlite3_system_errno.3 sqlite3_table_column_metadata.3 sqlite3_temp_directory.3 sqlite3_test_control.3 sqlite3_threadsafe.3 sqlite3_total_changes.3 sqlite3_trace.3 sqlite3_trace_v2.3 sqlite3_unlock_notify.3 sqlite3_update_hook.3 sqlite3_uri_parameter.3 sqlite3_user_data.3 sqlite3_value.3 sqlite3_value_blob.3 sqlite3_value_dup.3 sqlite3_value_subtype.3 sqlite3_version.3 sqlite3_vfs.3 sqlite3_vfs_find.3 sqlite3_vtab.3 sqlite3_vtab_config.3 sqlite3_vtab_cursor.3 sqlite3_vtab_on_conflict.3
CVS commit: src/external/public-domain/sqlite
Module Name:src Committed By: christos Date: Sat Mar 11 16:29:52 UTC 2017 Modified Files: src/external/public-domain/sqlite/dist: shell.c sqlite3.c src/external/public-domain/sqlite/lib: shlib_version src/external/public-domain/sqlite/man: Makefile SQLITE_ACCESS_EXISTS.3 SQLITE_CHANGESET_DATA.3 SQLITE_CHANGESET_OMIT.3 SQLITE_CHECKPOINT_PASSIVE.3 SQLITE_CONFIG_SINGLETHREAD.3 SQLITE_CREATE_INDEX.3 SQLITE_DBSTATUS_LOOKASIDE_USED.3 SQLITE_DENY.3 SQLITE_DETERMINISTIC.3 SQLITE_FCNTL_LOCKSTATE.3 SQLITE_INDEX_CONSTRAINT_EQ.3 SQLITE_INDEX_SCAN_UNIQUE.3 SQLITE_INTEGER.3 SQLITE_IOCAP_ATOMIC.3 SQLITE_IOERR_READ.3 SQLITE_LIMIT_LENGTH.3 SQLITE_LOCK_NONE.3 SQLITE_MUTEX_FAST.3 SQLITE_OK.3 SQLITE_OPEN_READONLY.3 SQLITE_ROLLBACK.3 SQLITE_SCANSTAT_NLOOP.3 SQLITE_SHM_NLOCK.3 SQLITE_SHM_UNLOCK.3 SQLITE_STATUS_MEMORY_USED.3 SQLITE_STMTSTATUS_FULLSCAN_STEP.3 SQLITE_SYNC_NORMAL.3 SQLITE_TESTCTRL_FIRST.3 SQLITE_UTF8.3 SQLITE_VERSION.3 SQLITE_VTAB_CONSTRAINT_SUPPORT.3 sqlite3.3 sqlite3_aggregate_context.3 sqlite3_aggregate_count.3 sqlite3_auto_extension.3 sqlite3_backup.3 sqlite3_backup_init.3 sqlite3_bind_blob.3 sqlite3_bind_parameter_count.3 sqlite3_bind_parameter_index.3 sqlite3_bind_parameter_name.3 sqlite3_blob.3 sqlite3_blob_bytes.3 sqlite3_blob_close.3 sqlite3_blob_open.3 sqlite3_blob_read.3 sqlite3_blob_reopen.3 sqlite3_blob_write.3 sqlite3_busy_handler.3 sqlite3_busy_timeout.3 sqlite3_cancel_auto_extension.3 sqlite3_changes.3 sqlite3_changeset_iter.3 sqlite3_clear_bindings.3 sqlite3_close.3 sqlite3_collation_needed.3 sqlite3_column_blob.3 sqlite3_column_count.3 sqlite3_column_database_name.3 sqlite3_column_decltype.3 sqlite3_column_name.3 sqlite3_commit_hook.3 sqlite3_compileoption_used.3 sqlite3_complete.3 sqlite3_config.3 sqlite3_context.3 sqlite3_context_db_handle.3 sqlite3_create_collation.3 sqlite3_create_function.3 sqlite3_create_module.3 sqlite3_data_count.3 sqlite3_data_directory.3 sqlite3_db_cacheflush.3 sqlite3_db_config.3 sqlite3_db_filename.3 sqlite3_db_handle.3 sqlite3_db_mutex.3 sqlite3_db_readonly.3 sqlite3_db_release_memory.3 sqlite3_db_status.3 sqlite3_declare_vtab.3 sqlite3_destructor_type.3 sqlite3_enable_load_extension.3 sqlite3_enable_shared_cache.3 sqlite3_errcode.3 sqlite3_exec.3 sqlite3_extended_result_codes.3 sqlite3_file.3 sqlite3_file_control.3 sqlite3_finalize.3 sqlite3_get_autocommit.3 sqlite3_get_auxdata.3 sqlite3_get_table.3 sqlite3_index_info.3 sqlite3_initialize.3 sqlite3_interrupt.3 sqlite3_io_methods.3 sqlite3_last_insert_rowid.3 sqlite3_limit.3 sqlite3_load_extension.3 sqlite3_log.3 sqlite3_malloc.3 sqlite3_mem_methods.3 sqlite3_memory_used.3 sqlite3_module.3 sqlite3_mprintf.3 sqlite3_mutex.3 sqlite3_mutex_alloc.3 sqlite3_mutex_held.3 sqlite3_mutex_methods.3 sqlite3_next_stmt.3 sqlite3_open.3 sqlite3_overload_function.3 sqlite3_pcache.3 sqlite3_pcache_methods2.3 sqlite3_pcache_page.3 sqlite3_prepare.3 sqlite3_preupdate_hook.3 sqlite3_progress_handler.3 sqlite3_randomness.3 sqlite3_release_memory.3 sqlite3_reset.3 sqlite3_reset_auto_extension.3 sqlite3_result_blob.3 sqlite3_result_subtype.3 sqlite3_session.3 sqlite3_set_authorizer.3 sqlite3_sleep.3 sqlite3_snapshot.3 sqlite3_snapshot_cmp.3 sqlite3_snapshot_free.3 sqlite3_snapshot_get.3 sqlite3_snapshot_open.3 sqlite3_soft_heap_limit.3 sqlite3_soft_heap_limit64.3 sqlite3_sql.3 sqlite3_status.3 sqlite3_step.3 sqlite3_stmt.3 sqlite3_stmt_busy.3 sqlite3_stmt_readonly.3 sqlite3_stmt_scanstatus.3 sqlite3_stmt_scanstatus_reset.3 sqlite3_stmt_status.3 sqlite3_strglob.3 sqlite3_stricmp.3 sqlite3_strlike.3 sqlite3_system_errno.3 sqlite3_table_column_metadata.3 sqlite3_temp_directory.3 sqlite3_test_control.3 sqlite3_threadsafe.3 sqlite3_total_changes.3 sqlite3_trace.3 sqlite3_unlock_notify.3 sqlite3_update_hook.3 sqlite3_uri_parameter.3 sqlite3_user_data.3 sqlite3_value.3 sqlite3_value_blob.3 sqlite3_value_dup.3 sqlite3_value_subtype.3 sqlite3_version.3 sqlite3_vfs.3 sqlite3_vfs_find.3 sqlite3_vtab.3 sqlite3_vtab_config.3 sqlite3_vtab_cursor.3 sqlite3_vtab_on_conflict.3 sqlite3_wal_autocheckpoint.3 sqlite3_wal_checkpoint.3 sqlite3_wal_checkpoint_v2.3 sqlite3_wal_hook.3 sqlite3changegroup_new.3
CVS commit: src/external/public-domain/sqlite/man
Module Name:src Committed By: christos Date: Sun Dec 18 16:58:17 UTC 2016 Modified Files: src/external/public-domain/sqlite/man: SQLITE_ACCESS_EXISTS.3 SQLITE_CHANGESET_DATA.3 SQLITE_CHANGESET_OMIT.3 SQLITE_CHECKPOINT_PASSIVE.3 SQLITE_CONFIG_SINGLETHREAD.3 SQLITE_CREATE_INDEX.3 SQLITE_DBCONFIG_LOOKASIDE.3 SQLITE_DBSTATUS_LOOKASIDE_USED.3 SQLITE_DENY.3 SQLITE_DETERMINISTIC.3 SQLITE_FCNTL_LOCKSTATE.3 SQLITE_INDEX_CONSTRAINT_EQ.3 SQLITE_INDEX_SCAN_UNIQUE.3 SQLITE_INTEGER.3 SQLITE_IOCAP_ATOMIC.3 SQLITE_IOERR_READ.3 SQLITE_LIMIT_LENGTH.3 SQLITE_LOCK_NONE.3 SQLITE_MUTEX_FAST.3 SQLITE_OK.3 SQLITE_OPEN_READONLY.3 SQLITE_ROLLBACK.3 SQLITE_SCANSTAT_NLOOP.3 SQLITE_SHM_NLOCK.3 SQLITE_SHM_UNLOCK.3 SQLITE_STATUS_MEMORY_USED.3 SQLITE_STMTSTATUS_FULLSCAN_STEP.3 SQLITE_SYNC_NORMAL.3 SQLITE_TESTCTRL_FIRST.3 SQLITE_UTF8.3 SQLITE_VERSION.3 SQLITE_VTAB_CONSTRAINT_SUPPORT.3 sqlite3.3 sqlite3_aggregate_context.3 sqlite3_aggregate_count.3 sqlite3_auto_extension.3 sqlite3_backup.3 sqlite3_backup_init.3 sqlite3_bind_blob.3 sqlite3_bind_parameter_count.3 sqlite3_bind_parameter_index.3 sqlite3_bind_parameter_name.3 sqlite3_blob.3 sqlite3_blob_bytes.3 sqlite3_blob_close.3 sqlite3_blob_open.3 sqlite3_blob_read.3 sqlite3_blob_reopen.3 sqlite3_blob_write.3 sqlite3_busy_handler.3 sqlite3_busy_timeout.3 sqlite3_cancel_auto_extension.3 sqlite3_changes.3 sqlite3_changeset_iter.3 sqlite3_clear_bindings.3 sqlite3_close.3 sqlite3_collation_needed.3 sqlite3_column_blob.3 sqlite3_column_count.3 sqlite3_column_database_name.3 sqlite3_column_decltype.3 sqlite3_column_name.3 sqlite3_commit_hook.3 sqlite3_compileoption_used.3 sqlite3_complete.3 sqlite3_config.3 sqlite3_context.3 sqlite3_context_db_handle.3 sqlite3_create_collation.3 sqlite3_create_function.3 sqlite3_create_module.3 sqlite3_data_count.3 sqlite3_data_directory.3 sqlite3_db_cacheflush.3 sqlite3_db_config.3 sqlite3_db_filename.3 sqlite3_db_handle.3 sqlite3_db_mutex.3 sqlite3_db_readonly.3 sqlite3_db_release_memory.3 sqlite3_db_status.3 sqlite3_declare_vtab.3 sqlite3_destructor_type.3 sqlite3_enable_load_extension.3 sqlite3_enable_shared_cache.3 sqlite3_errcode.3 sqlite3_exec.3 sqlite3_extended_result_codes.3 sqlite3_file.3 sqlite3_file_control.3 sqlite3_finalize.3 sqlite3_get_autocommit.3 sqlite3_get_auxdata.3 sqlite3_get_table.3 sqlite3_index_info.3 sqlite3_initialize.3 sqlite3_interrupt.3 sqlite3_io_methods.3 sqlite3_last_insert_rowid.3 sqlite3_limit.3 sqlite3_load_extension.3 sqlite3_log.3 sqlite3_malloc.3 sqlite3_mem_methods.3 sqlite3_memory_used.3 sqlite3_module.3 sqlite3_mprintf.3 sqlite3_mutex.3 sqlite3_mutex_alloc.3 sqlite3_mutex_held.3 sqlite3_mutex_methods.3 sqlite3_next_stmt.3 sqlite3_open.3 sqlite3_overload_function.3 sqlite3_pcache.3 sqlite3_pcache_methods2.3 sqlite3_pcache_page.3 sqlite3_prepare.3 sqlite3_preupdate_hook.3 sqlite3_progress_handler.3 sqlite3_randomness.3 sqlite3_release_memory.3 sqlite3_reset.3 sqlite3_reset_auto_extension.3 sqlite3_result_blob.3 sqlite3_result_subtype.3 sqlite3_session.3 sqlite3_set_authorizer.3 sqlite3_sleep.3 sqlite3_snapshot.3 sqlite3_snapshot_cmp.3 sqlite3_snapshot_free.3 sqlite3_snapshot_get.3 sqlite3_snapshot_open.3 sqlite3_soft_heap_limit.3 sqlite3_soft_heap_limit64.3 sqlite3_sql.3 sqlite3_status.3 sqlite3_step.3 sqlite3_stmt.3 sqlite3_stmt_busy.3 sqlite3_stmt_readonly.3 sqlite3_stmt_scanstatus.3 sqlite3_stmt_scanstatus_reset.3 sqlite3_stmt_status.3 sqlite3_strglob.3 sqlite3_stricmp.3 sqlite3_strlike.3 sqlite3_system_errno.3 sqlite3_table_column_metadata.3 sqlite3_temp_directory.3 sqlite3_test_control.3 sqlite3_threadsafe.3 sqlite3_total_changes.3 sqlite3_trace.3 sqlite3_unlock_notify.3 sqlite3_update_hook.3 sqlite3_uri_parameter.3 sqlite3_user_data.3 sqlite3_value.3 sqlite3_value_blob.3 sqlite3_value_dup.3 sqlite3_value_subtype.3 sqlite3_version.3 sqlite3_vfs.3 sqlite3_vfs_find.3 sqlite3_vtab.3 sqlite3_vtab_config.3 sqlite3_vtab_cursor.3 sqlite3_vtab_on_conflict.3 sqlite3_wal_autocheckpoint.3 sqlite3_wal_checkpoint.3 sqlite3_wal_checkpoint_v2.3 sqlite3_wal_hook.3 sqlite3changegroup_new.3 sqlite3changeset_apply.3 sqlite3changeset_apply_strm.3 sqlite3changeset_concat.3
CVS commit: src/external/public-domain/sqlite/sqlite2mdoc
Module Name:src Committed By: christos Date: Sun Dec 18 16:56:32 UTC 2016 Modified Files: src/external/public-domain/sqlite/sqlite2mdoc: main.c Log Message: Don't emit $Mdocdate$ in the next regeneration. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/public-domain/sqlite/sqlite2mdoc/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/sqlite2mdoc/main.c diff -u src/external/public-domain/sqlite/sqlite2mdoc/main.c:1.1 src/external/public-domain/sqlite/sqlite2mdoc/main.c:1.2 --- src/external/public-domain/sqlite/sqlite2mdoc/main.c:1.1 Wed Mar 30 17:30:20 2016 +++ src/external/public-domain/sqlite/sqlite2mdoc/main.c Sun Dec 18 11:56:32 2016 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.1 2016/03/30 21:30:20 christos Exp $ */ +/* $Id: main.c,v 1.2 2016/12/18 16:56:32 christos Exp $ */ /* * Copyright (c) 2016 Kristaps Dzonsons* @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -1014,7 +1015,7 @@ lookup(char *key) * Emit a valid mdoc(7) document within the given prefix. */ static void -emit(const struct defn *d) +emit(const struct defn *d, const char *mdocdate) { struct decl *first; size_t sz, i, col, last, ns; @@ -1039,7 +1040,11 @@ emit(const struct defn *d) f = stdout; /* Begin by outputting the mdoc(7) header. */ +#if 0 fputs(".Dd $" "Mdocdate$\n", f); +#else + fprintf(f, ".Dd %s\n", mdocdate); +#endif fprintf(f, ".Dt %s 3\n", d->dt); fputs(".Os\n", f); fputs(".Sh NAME\n", f); @@ -1485,6 +1490,12 @@ main(int argc, char *argv[]) goto usage; } + time_t now = time(NULL); + struct tm tm; + char mdocdate[256]; + if (gmtime_r(, ) == NULL) + err(EXIT_FAILURE, "gmtime"); + strftime(mdocdate, sizeof(mdocdate), "%B %d, %Y", ); /* * Read in line-by-line and process in the phase dictated by our * finite state automaton. @@ -1533,7 +1544,7 @@ main(int argc, char *argv[]) TAILQ_FOREACH(d, , entries) postprocess(prefix, d); TAILQ_FOREACH(d, , entries) -emit(d); +emit(d, mdocdate); rc = 1; } else if (PHASE_DECL != p.phase) warnx("%s:%zu: exit when not in "
CVS commit: src/external/public-domain/sqlite
Module Name:src Committed By: martin Date: Thu Oct 13 18:11:20 UTC 2016 Modified Files: src/external/public-domain/sqlite: Makefile.inc src/external/public-domain/sqlite/dist: sqlite3.c Log Message: PR lib/51533: make big endian arm support work again, patch from Rin Okuyama. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/public-domain/sqlite/Makefile.inc cvs rdiff -u -r1.14 -r1.15 src/external/public-domain/sqlite/dist/sqlite3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/Makefile.inc diff -u src/external/public-domain/sqlite/Makefile.inc:1.6 src/external/public-domain/sqlite/Makefile.inc:1.7 --- src/external/public-domain/sqlite/Makefile.inc:1.6 Sun Jul 3 10:27:00 2016 +++ src/external/public-domain/sqlite/Makefile.inc Thu Oct 13 18:11:19 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.6 2016/07/03 10:27:00 abhinav Exp $ +# $NetBSD: Makefile.inc,v 1.7 2016/10/13 18:11:19 martin Exp $ WARNS= 2 @@ -14,6 +14,7 @@ CPPFLAGS+= \ -DHAVE_STDINT_H=1 \ -DHAVE_STRERROR_R=1 \ -DHAVE_USLEEP=1 \ + -DHAVE_SYS_ENDIAN_H=1 \ -DSQLITE_ENABLE_COLUMN_METADATA \ -DSQLITE_ENABLE_FTS3_PARENTHESIS \ -DSQLITE_ENABLE_FTS4 \ Index: src/external/public-domain/sqlite/dist/sqlite3.c diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.14 src/external/public-domain/sqlite/dist/sqlite3.c:1.15 --- src/external/public-domain/sqlite/dist/sqlite3.c:1.14 Mon Jul 4 03:04:25 2016 +++ src/external/public-domain/sqlite/dist/sqlite3.c Thu Oct 13 18:11:19 2016 @@ -11567,23 +11567,31 @@ typedef INT16_TYPE LogEst; ** -DSQLITE_RUNTIME_BYTEORDER=1 is set, then byte-order is determined ** at run-time. */ -#if (defined(i386) || defined(__i386__) || defined(_M_IX86) ||\ +#if defined(HAVE_SYS_ENDIAN_H) && !defined(SQLITE_RUNTIME_BYTEORDER) +# include +# define SQLITE_BYTEORDER _BYTE_ORDER +#elif (defined(i386) || defined(__i386__) || defined(_M_IX86) ||\ defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) ||\ defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) ||\ defined(__arm__)) && !defined(SQLITE_RUNTIME_BYTEORDER) # define SQLITE_BYTEORDER1234 -# define SQLITE_BIGENDIAN0 -# define SQLITE_LITTLEENDIAN 1 -# define SQLITE_UTF16NATIVE SQLITE_UTF16LE -#endif -#if (defined(sparc)|| defined(__ppc__)) \ +#elif (defined(sparc) || defined(__ppc__)) \ && !defined(SQLITE_RUNTIME_BYTEORDER) # define SQLITE_BYTEORDER4321 -# define SQLITE_BIGENDIAN1 -# define SQLITE_LITTLEENDIAN 0 -# define SQLITE_UTF16NATIVE SQLITE_UTF16BE #endif -#if !defined(SQLITE_BYTEORDER) +#ifdef SQLITE_BYTEORDER +# if SQLITE_BYTEORDER == 1234 +# define SQLITE_BIGENDIAN0 +# define SQLITE_LITTLEENDIAN 1 +# define SQLITE_UTF16NATIVE SQLITE_UTF16LE +# elif SQLITE_BYTEORDER == 4321 +# define SQLITE_BIGENDIAN1 +# define SQLITE_LITTLEENDIAN 0 +# define SQLITE_UTF16NATIVE SQLITE_UTF16BE +# else +# error "Unknown byte order." +# endif +#else # ifdef SQLITE_AMALGAMATION const int sqlite3one = 1; # else
CVS commit: src/external/public-domain/sqlite/lib
Module Name:src Committed By: christos Date: Tue Oct 4 14:25:02 UTC 2016 Modified Files: src/external/public-domain/sqlite/lib: Makefile Log Message: Hack around ppc64. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/public-domain/sqlite/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/lib/Makefile diff -u src/external/public-domain/sqlite/lib/Makefile:1.7 src/external/public-domain/sqlite/lib/Makefile:1.8 --- src/external/public-domain/sqlite/lib/Makefile:1.7 Wed Jul 6 04:01:30 2016 +++ src/external/public-domain/sqlite/lib/Makefile Tue Oct 4 10:25:02 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2016/07/06 08:01:30 mrg Exp $ +# $NetBSD: Makefile,v 1.8 2016/10/04 14:25:02 christos Exp $ LIB= sqlite3 INCS= sqlite3.h sqlite3ext.h @@ -22,6 +22,11 @@ CLEANFILES+=sqlite3.pc CWARNFLAGS+= -Wa,--warn .endif +.if ${MACHINE_ARCH} == "powerpc64" +# call to `' lacks nop, can't restore toc; recompile with -fPIC +COPTS.sqlite3.c += -O0 +.endif + .include all: sqlite3.pc
CVS commit: src/external/public-domain/sqlite/lib
Module Name:src Committed By: mrg Date: Wed Jul 6 08:01:30 UTC 2016 Modified Files: src/external/public-domain/sqlite/lib: Makefile Log Message: use -Wa,--warn on m68k. new sqlite generates a large jump table that generates warnings (but should work). To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/public-domain/sqlite/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/lib/Makefile diff -u src/external/public-domain/sqlite/lib/Makefile:1.6 src/external/public-domain/sqlite/lib/Makefile:1.7 --- src/external/public-domain/sqlite/lib/Makefile:1.6 Fri Mar 7 18:37:48 2014 +++ src/external/public-domain/sqlite/lib/Makefile Wed Jul 6 08:01:30 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2014/03/07 18:37:48 christos Exp $ +# $NetBSD: Makefile,v 1.7 2016/07/06 08:01:30 mrg Exp $ LIB= sqlite3 INCS= sqlite3.h sqlite3ext.h @@ -16,6 +16,12 @@ FILESDIR_sqlite3.pc= /usr/lib/pkgconfig CLEANFILES+=sqlite3.pc +.include + +.if ${MACHINE_CPU} == "m68k" +CWARNFLAGS+= -Wa,--warn +.endif + .include all: sqlite3.pc
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: abhinav Date: Mon Jul 4 03:04:25 UTC 2016 Modified Files: src/external/public-domain/sqlite/dist: sqlite3.c Log Message: Use constant. This change was lost while resolving merge conflict as the lines had moved around too much. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/public-domain/sqlite/dist/sqlite3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/dist/sqlite3.c diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.13 src/external/public-domain/sqlite/dist/sqlite3.c:1.14 --- src/external/public-domain/sqlite/dist/sqlite3.c:1.13 Sun Jul 3 10:23:30 2016 +++ src/external/public-domain/sqlite/dist/sqlite3.c Mon Jul 4 03:04:25 2016 @@ -142475,7 +142475,7 @@ static int fts3BestIndexMethod(sqlite3_v ** function MATCH in the requested context" error. To discourage ** this, return a very high cost here. */ pInfo->idxNum = FTS3_FULLSCAN_SEARCH; -pInfo->estimatedCost = 1e50; +pInfo->estimatedCost = SQLITE_HUGE_COST; fts3SetEstimatedRows(pInfo, ((sqlite3_int64)1) << 50); return SQLITE_OK; } @@ -190961,7 +190961,7 @@ static int fts5BestIndexMethod(sqlite3_v }else if( j==0 ){ /* As there exists an unusable MATCH constraint this is an ** unusable plan. Set a prohibitively high cost. */ - pInfo->estimatedCost = 1e50; + pInfo->estimatedCost = SQLITE_HUGE_COST; return SQLITE_OK; } }
CVS commit: src/external/public-domain/sqlite/man
Module Name:src Committed By: abhinav Date: Sun Jul 3 17:07:39 UTC 2016 Modified Files: src/external/public-domain/sqlite/man: Makefile Added Files: src/external/public-domain/sqlite/man: SQLITE_CHANGESET_DATA.3 SQLITE_CHANGESET_OMIT.3 SQLITE_INDEX_SCAN_UNIQUE.3 SQLITE_SCANSTAT_NLOOP.3 sqlite3_changeset_iter.3 sqlite3_db_cacheflush.3 sqlite3_preupdate_hook.3 sqlite3_result_subtype.3 sqlite3_session.3 sqlite3_snapshot.3 sqlite3_snapshot_cmp.3 sqlite3_snapshot_free.3 sqlite3_snapshot_get.3 sqlite3_snapshot_open.3 sqlite3_stmt_scanstatus.3 sqlite3_stmt_scanstatus_reset.3 sqlite3_strlike.3 sqlite3_system_errno.3 sqlite3_value_dup.3 sqlite3_value_subtype.3 sqlite3changegroup_new.3 sqlite3changeset_apply.3 sqlite3changeset_apply_strm.3 sqlite3changeset_concat.3 sqlite3changeset_conflict.3 sqlite3changeset_finalize.3 sqlite3changeset_fk_conflicts.3 sqlite3changeset_invert.3 sqlite3changeset_new.3 sqlite3changeset_next.3 sqlite3changeset_old.3 sqlite3changeset_op.3 sqlite3changeset_pk.3 sqlite3changeset_start.3 sqlite3session_attach.3 sqlite3session_changeset.3 sqlite3session_create.3 sqlite3session_delete.3 sqlite3session_diff.3 sqlite3session_enable.3 sqlite3session_indirect.3 sqlite3session_isempty.3 sqlite3session_patchset.3 sqlite3session_table_filter.3 Log Message: Add newly generated man pages To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/public-domain/sqlite/man/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/public-domain/sqlite/man/SQLITE_CHANGESET_DATA.3 \ src/external/public-domain/sqlite/man/SQLITE_CHANGESET_OMIT.3 \ src/external/public-domain/sqlite/man/SQLITE_INDEX_SCAN_UNIQUE.3 \ src/external/public-domain/sqlite/man/SQLITE_SCANSTAT_NLOOP.3 \ src/external/public-domain/sqlite/man/sqlite3_changeset_iter.3 \ src/external/public-domain/sqlite/man/sqlite3_db_cacheflush.3 \ src/external/public-domain/sqlite/man/sqlite3_preupdate_hook.3 \ src/external/public-domain/sqlite/man/sqlite3_result_subtype.3 \ src/external/public-domain/sqlite/man/sqlite3_session.3 \ src/external/public-domain/sqlite/man/sqlite3_snapshot.3 \ src/external/public-domain/sqlite/man/sqlite3_snapshot_cmp.3 \ src/external/public-domain/sqlite/man/sqlite3_snapshot_free.3 \ src/external/public-domain/sqlite/man/sqlite3_snapshot_get.3 \ src/external/public-domain/sqlite/man/sqlite3_snapshot_open.3 \ src/external/public-domain/sqlite/man/sqlite3_stmt_scanstatus.3 \ src/external/public-domain/sqlite/man/sqlite3_stmt_scanstatus_reset.3 \ src/external/public-domain/sqlite/man/sqlite3_strlike.3 \ src/external/public-domain/sqlite/man/sqlite3_system_errno.3 \ src/external/public-domain/sqlite/man/sqlite3_value_dup.3 \ src/external/public-domain/sqlite/man/sqlite3_value_subtype.3 \ src/external/public-domain/sqlite/man/sqlite3changegroup_new.3 \ src/external/public-domain/sqlite/man/sqlite3changeset_apply.3 \ src/external/public-domain/sqlite/man/sqlite3changeset_apply_strm.3 \ src/external/public-domain/sqlite/man/sqlite3changeset_concat.3 \ src/external/public-domain/sqlite/man/sqlite3changeset_conflict.3 \ src/external/public-domain/sqlite/man/sqlite3changeset_finalize.3 \ src/external/public-domain/sqlite/man/sqlite3changeset_fk_conflicts.3 \ src/external/public-domain/sqlite/man/sqlite3changeset_invert.3 \ src/external/public-domain/sqlite/man/sqlite3changeset_new.3 \ src/external/public-domain/sqlite/man/sqlite3changeset_next.3 \ src/external/public-domain/sqlite/man/sqlite3changeset_old.3 \ src/external/public-domain/sqlite/man/sqlite3changeset_op.3 \ src/external/public-domain/sqlite/man/sqlite3changeset_pk.3 \ src/external/public-domain/sqlite/man/sqlite3changeset_start.3 \ src/external/public-domain/sqlite/man/sqlite3session_attach.3 \ src/external/public-domain/sqlite/man/sqlite3session_changeset.3 \ src/external/public-domain/sqlite/man/sqlite3session_create.3 \ src/external/public-domain/sqlite/man/sqlite3session_delete.3 \ src/external/public-domain/sqlite/man/sqlite3session_diff.3 \ src/external/public-domain/sqlite/man/sqlite3session_enable.3 \ src/external/public-domain/sqlite/man/sqlite3session_indirect.3 \ src/external/public-domain/sqlite/man/sqlite3session_isempty.3 \ src/external/public-domain/sqlite/man/sqlite3session_patchset.3 \ src/external/public-domain/sqlite/man/sqlite3session_table_filter.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/man/Makefile diff -u src/external/public-domain/sqlite/man/Makefile:1.1
CVS commit: src/external/public-domain/sqlite
Module Name:src Committed By: abhinav Date: Sun Jul 3 10:27:00 UTC 2016 Modified Files: src/external/public-domain/sqlite: Makefile.inc Log Message: Don't use threads. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/public-domain/sqlite/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/Makefile.inc diff -u src/external/public-domain/sqlite/Makefile.inc:1.5 src/external/public-domain/sqlite/Makefile.inc:1.6 --- src/external/public-domain/sqlite/Makefile.inc:1.5 Fri Jun 1 20:28:02 2012 +++ src/external/public-domain/sqlite/Makefile.inc Sun Jul 3 10:27:00 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.5 2012/06/01 20:28:02 wiz Exp $ +# $NetBSD: Makefile.inc,v 1.6 2016/07/03 10:27:00 abhinav Exp $ WARNS= 2 @@ -19,6 +19,7 @@ CPPFLAGS+= \ -DSQLITE_ENABLE_FTS4 \ -DSQLITE_ENABLE_LOAD_EXTENSION \ -DSQLITE_ENABLE_UNLOCK_NOTIFY \ - -DSQLITE_HAVE_ISNAN + -DSQLITE_HAVE_ISNAN \ +-DSQLITE_MAX_WORKER_THREADS=0 CWARNFLAGS+= -Wno-shadow -Wno-unused
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: abhinav Date: Sun Jul 3 10:23:31 UTC 2016 Modified Files: src/external/public-domain/sqlite/dist: sqlite3.c Log Message: Merge conflicts for sqlite-3.13.0 To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/public-domain/sqlite/dist/sqlite3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: abhinav Date: Sun Jul 3 09:27:25 UTC 2016 Modified Files: src/external/public-domain/sqlite/dist: shell.c Log Message: Mark the functions get2byteInt and get4byteInt as static to avoid -Werror=missing-prototypes problems. To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 src/external/public-domain/sqlite/dist/shell.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/dist/shell.c diff -u src/external/public-domain/sqlite/dist/shell.c:1.1.1.4 src/external/public-domain/sqlite/dist/shell.c:1.2 --- src/external/public-domain/sqlite/dist/shell.c:1.1.1.4 Sun Jul 3 09:24:29 2016 +++ src/external/public-domain/sqlite/dist/shell.c Sun Jul 3 09:27:25 2016 @@ -2946,10 +2946,10 @@ static int db_int(ShellState *p, const c /* ** Convert a 2-byte or 4-byte big-endian integer into a native integer */ -unsigned int get2byteInt(unsigned char *a){ +static unsigned int get2byteInt(unsigned char *a){ return (a[0]<<8) + a[1]; } -unsigned int get4byteInt(unsigned char *a){ +static unsigned int get4byteInt(unsigned char *a){ return (a[0]<<24) + (a[1]<<16) + (a[2]<<8) + a[3]; }
CVS commit: src/external/public-domain/sqlite/sqlite2mdoc
Module Name:src Committed By: christos Date: Wed Mar 30 21:30:21 UTC 2016 Added Files: src/external/public-domain/sqlite/sqlite2mdoc: LICENSE.md Makefile README.md main.c sqlite2mdoc.1 Log Message: From: https://github.com/kristapsdz/sqlite2mdoc To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/external/public-domain/sqlite/sqlite2mdoc/LICENSE.md \ src/external/public-domain/sqlite/sqlite2mdoc/Makefile \ src/external/public-domain/sqlite/sqlite2mdoc/README.md \ src/external/public-domain/sqlite/sqlite2mdoc/main.c \ src/external/public-domain/sqlite/sqlite2mdoc/sqlite2mdoc.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/external/public-domain/sqlite/sqlite2mdoc/LICENSE.md diff -u /dev/null src/external/public-domain/sqlite/sqlite2mdoc/LICENSE.md:1.1 --- /dev/null Wed Mar 30 17:30:21 2016 +++ src/external/public-domain/sqlite/sqlite2mdoc/LICENSE.md Wed Mar 30 17:30:20 2016 @@ -0,0 +1,14 @@ +Copyright (c) 2012--2016, Kristaps Dzonsons+ +Permission to use, copy, modify, and/or distribute this software for any purpose +with or without fee is hereby granted, provided that the above copyright notice +and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS +OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF +THIS SOFTWARE. + Index: src/external/public-domain/sqlite/sqlite2mdoc/Makefile diff -u /dev/null src/external/public-domain/sqlite/sqlite2mdoc/Makefile:1.1 --- /dev/null Wed Mar 30 17:30:21 2016 +++ src/external/public-domain/sqlite/sqlite2mdoc/Makefile Wed Mar 30 17:30:20 2016 @@ -0,0 +1,22 @@ +# If you're on Linux, un-comment the following. +#LDADD = -lbsd + +# +# You probably don't want to change anything beneath here. +# + +CFLAGS += -g -W -Wall +PREFIX = /usr/local + +sqlite2mdoc: main.o + $(CC) -o $@ main.o $(LDADD) + +install: + mkdir -p $(DESTDIR)$(PREFIX)/bin + mkdir -p $(DESTDIR)$(PREFIX)/man/man1 + install -m 0755 sqlite2mdoc $(DESTDIR)$(PREFIX)/bin + install -m 0444 sqlite2mdoc.1 $(DESTDIR)$(PREFIX)/man/man1 + +clean: + rm -f sqlite2mdoc main.o + rm -rf sqlite2mdoc.dSYM Index: src/external/public-domain/sqlite/sqlite2mdoc/README.md diff -u /dev/null src/external/public-domain/sqlite/sqlite2mdoc/README.md:1.1 --- /dev/null Wed Mar 30 17:30:21 2016 +++ src/external/public-domain/sqlite/sqlite2mdoc/README.md Wed Mar 30 17:30:20 2016 @@ -0,0 +1,35 @@ +## Synopsis + +This utility accepts an [SQLite](https://www.sqlite.org) header file +`sqlite.h` and produces a set of decently well-formed +[mdoc(7)](http://man.openbsd.org/OpenBSD-current/man7/mdoc.7) files +documenting the C API. +These will be roughly equivalent to the [C-language Interface +Specification for SQLite](https://www.sqlite.org/c3ref/intro.html). + +You can also use it for any file(s) using the documentation standards of +SQLite. +See the [sqlite2mdoc.1](sqlite2mdoc.1) manpage for syntax details. + +This [GitHub](https://www.github.com) repository is a read-only mirror +of the project's CVS repository. + +## Installation + +Simply run `make`: this utility isn't meant for installation, but for +integration into your SQLite deployment phase. +You can run `make install`, however, if you plan on using it for other +documentation. +There are no compile-time or run-time dependencies unless you're on +Linux, in which case you'll need +[libbsd](https://libbsd.freedesktop.org). +You'll also need to uncomment the `LDADD` line in the +[Makefile](Makefile), in this case. + + +This software has been used on OpenBSD, Mac OS X, and Linux machines. + +## License + +All sources use the ISC (like OpenBSD) license. +See the [LICENSE.md](LICENSE.md) file for details. Index: src/external/public-domain/sqlite/sqlite2mdoc/main.c diff -u /dev/null src/external/public-domain/sqlite/sqlite2mdoc/main.c:1.1 --- /dev/null Wed Mar 30 17:30:21 2016 +++ src/external/public-domain/sqlite/sqlite2mdoc/main.c Wed Mar 30 17:30:20 2016 @@ -0,0 +1,1574 @@ +/* $Id: main.c,v 1.1 2016/03/30 21:30:20 christos Exp $ */ +/* + * Copyright (c) 2016 Kristaps Dzonsons + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: martin Date: Wed Mar 12 20:00:22 UTC 2014 Modified Files: src/external/public-domain/sqlite/dist: sqlite3.c Log Message: Try to avoid using float constants out of range To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/public-domain/sqlite/dist/sqlite3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/dist/sqlite3.c diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.11 src/external/public-domain/sqlite/dist/sqlite3.c:1.12 --- src/external/public-domain/sqlite/dist/sqlite3.c:1.11 Mon Feb 17 19:30:12 2014 +++ src/external/public-domain/sqlite/dist/sqlite3.c Wed Mar 12 20:00:22 2014 @@ -7538,6 +7538,7 @@ struct sqlite3_rtree_geometry { # include float.h # define SQLITE_BIG_DBL DBL_MAX # define SQLITE_HUGE_DBL DBL_MAX +# define SQLITE_HUGE_COST 1e38 # endif #endif #ifndef SQLITE_BIG_DBL @@ -7549,6 +7550,9 @@ struct sqlite3_rtree_geometry { #ifndef SQLITE_MAX_SQL_LENGTH # define SQLITE_MAX_SQL_LENGTH 10 #endif +#ifndef SQLITE_HUGE_COST +# define SQLITE_HUGE_COST 1e50 +#endif /* ** The maximum depth of an expression tree. This is limited to @@ -20406,8 +20410,12 @@ SQLITE_PRIVATE void sqlite3VXPrintf( } if( realvalue0.0 ){ LONGDOUBLE_TYPE scale = 1.0; +#if __DBL_MAX_10_EXP__ 100 while( realvalue=1e100*scale exp=350 ){ scale *= 1e100;exp+=100;} +#endif +#if __DBL_MAX_10_EXP__ 64 while( realvalue=1e64*scale exp=350 ){ scale *= 1e64; exp+=64; } +#endif while( realvalue=1e8*scale exp=350 ){ scale *= 1e8; exp+=8; } while( realvalue=10.0*scale exp=350 ){ scale *= 10.0; exp++; } realvalue /= scale; @@ -125559,7 +125567,7 @@ static int fts3BestIndexMethod(sqlite3_v ** function MATCH in the requested context error. To discourage ** this, return a very high cost here. */ pInfo-idxNum = FTS3_FULLSCAN_SEARCH; -pInfo-estimatedCost = 1e50; +pInfo-estimatedCost = SQLITE_HUGE_COST; fts3SetEstimatedRows(pInfo, ((sqlite3_int64)1) 50); return SQLITE_OK; }
CVS commit: src/external/public-domain/sqlite/lib
Module Name:src Committed By: christos Date: Fri Mar 7 18:37:48 UTC 2014 Modified Files: src/external/public-domain/sqlite/lib: Makefile Log Message: change CC to HOST_CC to avoid trying to find stdarg.h in an unpopulated DSTDIR. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/public-domain/sqlite/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/lib/Makefile diff -u src/external/public-domain/sqlite/lib/Makefile:1.5 src/external/public-domain/sqlite/lib/Makefile:1.6 --- src/external/public-domain/sqlite/lib/Makefile:1.5 Wed Feb 19 14:29:33 2014 +++ src/external/public-domain/sqlite/lib/Makefile Fri Mar 7 13:37:48 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2014/02/19 19:29:33 dsl Exp $ +# $NetBSD: Makefile,v 1.6 2014/03/07 18:37:48 christos Exp $ LIB= sqlite3 INCS= sqlite3.h sqlite3ext.h @@ -23,6 +23,6 @@ dependall: all sqlite3.pc: ${SRCDIR}/sqlite3.h sqlite3.pc.in @(V=$$( (echo '#include sqlite3.h'; echo SQLITE_VERSION) | \ - ${CC} -E -I${SRCDIR} - | tail -1 | tr -d '') \ + ${HOST_CC} -E -I${SRCDIR} - | tail -1 | tr -d '') \ ${TOOL_SED} -e s/@VERSION@/$$V/ ${.CURDIR}/sqlite3.pc.in \ ${.TARGET})
CVS commit: src/external/public-domain/sqlite/lib
Module Name:src Committed By: dsl Date: Wed Feb 19 19:29:33 UTC 2014 Modified Files: src/external/public-domain/sqlite/lib: Makefile Log Message: Add all: and dependall: tatgets so that sqlite3.pc actually gets built. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/public-domain/sqlite/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/lib/Makefile diff -u src/external/public-domain/sqlite/lib/Makefile:1.4 src/external/public-domain/sqlite/lib/Makefile:1.5 --- src/external/public-domain/sqlite/lib/Makefile:1.4 Mon Feb 17 20:08:53 2014 +++ src/external/public-domain/sqlite/lib/Makefile Wed Feb 19 19:29:33 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2014/02/17 20:08:53 christos Exp $ +# $NetBSD: Makefile,v 1.5 2014/02/19 19:29:33 dsl Exp $ LIB= sqlite3 INCS= sqlite3.h sqlite3ext.h @@ -18,6 +18,9 @@ CLEANFILES+=sqlite3.pc .include bsd.lib.mk +all: sqlite3.pc +dependall: all + sqlite3.pc: ${SRCDIR}/sqlite3.h sqlite3.pc.in @(V=$$( (echo '#include sqlite3.h'; echo SQLITE_VERSION) | \ ${CC} -E -I${SRCDIR} - | tail -1 | tr -d '') \
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: martin Date: Mon Feb 17 12:06:15 UTC 2014 Modified Files: src/external/public-domain/sqlite/dist: sqlite3.c Log Message: Fix bogus #ifdef __vax__ To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/public-domain/sqlite/dist/sqlite3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/dist/sqlite3.c diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.9 src/external/public-domain/sqlite/dist/sqlite3.c:1.10 --- src/external/public-domain/sqlite/dist/sqlite3.c:1.9 Sun Feb 16 18:09:43 2014 +++ src/external/public-domain/sqlite/dist/sqlite3.c Mon Feb 17 12:06:15 2014 @@ -22014,8 +22014,8 @@ do_atof_calc: /* if exponent, scale significand as appropriate ** and store in result. */ if( e ){ -#ifndef __vax__ LONGDOUBLE_TYPE scale = 1.0; +#ifndef __vax__ /* attempt to handle extremely small/large numbers better */ if( e307 e342 ){ while( e%308 ) { scale *= 1.0e+1; e -= 1; }
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: christos Date: Mon Feb 17 19:30:12 UTC 2014 Modified Files: src/external/public-domain/sqlite/dist: sqlite3.c Log Message: use the constant definition To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/public-domain/sqlite/dist/sqlite3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/dist/sqlite3.c diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.10 src/external/public-domain/sqlite/dist/sqlite3.c:1.11 --- src/external/public-domain/sqlite/dist/sqlite3.c:1.10 Mon Feb 17 07:06:15 2014 +++ src/external/public-domain/sqlite/dist/sqlite3.c Mon Feb 17 14:30:12 2014 @@ -22030,7 +22030,7 @@ do_atof_calc: if( esign0 ){ result = 0.0*s; }else{ - result = 1e308*1e308*s; /* Infinity */ + result = SQLITE_HUGE_DBL*SQLITE_HUGE_DBL*s; /* Infinity */ } }else #endif
CVS commit: src/external/public-domain/sqlite/lib
Module Name:src Committed By: christos Date: Mon Feb 17 20:08:53 UTC 2014 Modified Files: src/external/public-domain/sqlite/lib: Makefile Added Files: src/external/public-domain/sqlite/lib: sqlite3.pc.in Removed Files: src/external/public-domain/sqlite/lib: sqlite3.pc Log Message: auto-generate so that it does not get out of sync again. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/public-domain/sqlite/lib/Makefile cvs rdiff -u -r1.2 -r0 src/external/public-domain/sqlite/lib/sqlite3.pc cvs rdiff -u -r0 -r1.1 src/external/public-domain/sqlite/lib/sqlite3.pc.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/lib/Makefile diff -u src/external/public-domain/sqlite/lib/Makefile:1.3 src/external/public-domain/sqlite/lib/Makefile:1.4 --- src/external/public-domain/sqlite/lib/Makefile:1.3 Fri Feb 15 02:59:36 2013 +++ src/external/public-domain/sqlite/lib/Makefile Mon Feb 17 15:08:53 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2013/02/15 07:59:36 martin Exp $ +# $NetBSD: Makefile,v 1.4 2014/02/17 20:08:53 christos Exp $ LIB= sqlite3 INCS= sqlite3.h sqlite3ext.h @@ -14,4 +14,12 @@ FILESGRP_sqlite3.pc= ${BINGRP} FILESMODE_sqlite3.pc= ${NONBINMODE} FILESDIR_sqlite3.pc= /usr/lib/pkgconfig +CLEANFILES+=sqlite3.pc + .include bsd.lib.mk + +sqlite3.pc: ${SRCDIR}/sqlite3.h sqlite3.pc.in + @(V=$$( (echo '#include sqlite3.h'; echo SQLITE_VERSION) | \ + ${CC} -E -I${SRCDIR} - | tail -1 | tr -d '') \ + ${TOOL_SED} -e s/@VERSION@/$$V/ ${.CURDIR}/sqlite3.pc.in \ + ${.TARGET}) Added files: Index: src/external/public-domain/sqlite/lib/sqlite3.pc.in diff -u /dev/null src/external/public-domain/sqlite/lib/sqlite3.pc.in:1.1 --- /dev/null Mon Feb 17 15:08:53 2014 +++ src/external/public-domain/sqlite/lib/sqlite3.pc.in Mon Feb 17 15:08:53 2014 @@ -0,0 +1,4 @@ +Name: SQLite +Description: SQL database engine +Version: @VERSION@ +Libs: -lsqlite3
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: christos Date: Sun Feb 16 18:09:44 UTC 2014 Modified Files: src/external/public-domain/sqlite/dist: sqlite3.c Log Message: merge conflicts. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/public-domain/sqlite/dist/sqlite3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: src/external/public-domain/sqlite/lib
Module Name:src Committed By: christos Date: Sun Feb 16 18:16:35 UTC 2014 Modified Files: src/external/public-domain/sqlite/lib: shlib_version Log Message: bump To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/sqlite/lib/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/lib/shlib_version diff -u src/external/public-domain/sqlite/lib/shlib_version:1.2 src/external/public-domain/sqlite/lib/shlib_version:1.3 --- src/external/public-domain/sqlite/lib/shlib_version:1.2 Sun Jan 29 18:29:01 2012 +++ src/external/public-domain/sqlite/lib/shlib_version Sun Feb 16 13:16:35 2014 @@ -1,4 +1,4 @@ -# $NetBSD: shlib_version,v 1.2 2012/01/29 23:29:01 joerg Exp $ +# $NetBSD: shlib_version,v 1.3 2014/02/16 18:16:35 christos Exp $ # major=1 -minor=1 +minor=2
CVS commit: src/external/public-domain/sqlite
Module Name:src Committed By: martin Date: Thu Feb 14 17:12:24 UTC 2013 Modified Files: src/external/public-domain/sqlite/bin: Makefile src/external/public-domain/sqlite/dist: sqlite3.c Log Message: When converting long double values to decimal, convert to int via a call to floor(), so the conversion does not depend on current rounding mode. Fixes PR port-sparc64/47535. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/public-domain/sqlite/bin/Makefile cvs rdiff -u -r1.6 -r1.7 src/external/public-domain/sqlite/dist/sqlite3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/bin/Makefile diff -u src/external/public-domain/sqlite/bin/Makefile:1.3 src/external/public-domain/sqlite/bin/Makefile:1.4 --- src/external/public-domain/sqlite/bin/Makefile:1.3 Sun Dec 16 20:31:07 2012 +++ src/external/public-domain/sqlite/bin/Makefile Thu Feb 14 17:12:23 2013 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.3 2012/12/16 20:31:07 christos Exp $ +# $NetBSD: Makefile,v 1.4 2013/02/14 17:12:23 martin Exp $ PROG= sqlite3 SRCS= shell.c DPADD+= ${LIBSQLITE3} ${LIBEDIT} ${LIBTERIMINFO} -LDADD+= -lsqlite3 -ledit -lterminfo +LDADD+= -lsqlite3 -ledit -lterminfo -lm BINDIR= /usr/bin Index: src/external/public-domain/sqlite/dist/sqlite3.c diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.6 src/external/public-domain/sqlite/dist/sqlite3.c:1.7 --- src/external/public-domain/sqlite/dist/sqlite3.c:1.6 Mon Feb 6 17:24:49 2012 +++ src/external/public-domain/sqlite/dist/sqlite3.c Thu Feb 14 17:12:23 2013 @@ -19422,11 +19422,14 @@ static const et_info fmtinfo[] = { ** 16 (the number of significant digits in a 64-bit float) '0' is ** always returned. */ +#ifdef SQLITE_HAVE_ISNAN +# include math.h +#endif static char et_getdigit(LONGDOUBLE_TYPE *val, int *cnt){ int digit; LONGDOUBLE_TYPE d; if( (*cnt)++ = 16 ) return '0'; - digit = (int)*val; + digit = (int)floor(*val); d = digit; digit += '0'; *val = (*val - d)*10.0; @@ -20998,9 +21001,6 @@ SQLITE_PRIVATE void sqlite3UtfSelfTest(v ** */ /* #include stdarg.h */ -#ifdef SQLITE_HAVE_ISNAN -# include math.h -#endif /* ** Routine needed to support the testcase() macro. @@ -132872,7 +132872,7 @@ SQLITE_API int sqlite3_extension_init( **May you share freely, never taking more than you give. ** * -** $Id: sqlite3.c,v 1.6 2012/02/06 17:24:49 matt Exp $ +** $Id: sqlite3.c,v 1.7 2013/02/14 17:12:23 martin Exp $ ** ** This file implements an integration between the ICU library ** (International Components for Unicode, an open-source library
CVS commit: src/external/public-domain/sqlite/lib
Module Name:src Committed By: matt Date: Thu Feb 14 19:18:38 UTC 2013 Modified Files: src/external/public-domain/sqlite/lib: Makefile Log Message: Link against libm To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/public-domain/sqlite/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/lib/Makefile diff -u src/external/public-domain/sqlite/lib/Makefile:1.1 src/external/public-domain/sqlite/lib/Makefile:1.2 --- src/external/public-domain/sqlite/lib/Makefile:1.1 Thu Oct 13 21:40:28 2011 +++ src/external/public-domain/sqlite/lib/Makefile Thu Feb 14 19:18:38 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2011/10/13 21:40:28 joerg Exp $ +# $NetBSD: Makefile,v 1.2 2013/02/14 19:18:38 matt Exp $ LIB= sqlite3 INCS= sqlite3.h sqlite3ext.h @@ -8,6 +8,8 @@ SRCS= sqlite3.c CFLAGS+= -DNDEBUG +LIBDPLIBS+= m ${NETBSDSRCDIR}/lib/libm + FILES+= sqlite3.pc FILESOWN_sqlite3.pc= ${BINOWN} FILESGRP_sqlite3.pc= ${BINGRP}
CVS commit: src/external/public-domain/sqlite/lib
Module Name:src Committed By: martin Date: Fri Feb 15 07:59:37 UTC 2013 Modified Files: src/external/public-domain/sqlite/lib: Makefile Log Message: Backout libm dependency here as well (assuming it was meant for the backed-out use of floor() I added/removed yesterday) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/sqlite/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/lib/Makefile diff -u src/external/public-domain/sqlite/lib/Makefile:1.2 src/external/public-domain/sqlite/lib/Makefile:1.3 --- src/external/public-domain/sqlite/lib/Makefile:1.2 Thu Feb 14 19:18:38 2013 +++ src/external/public-domain/sqlite/lib/Makefile Fri Feb 15 07:59:36 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/02/14 19:18:38 matt Exp $ +# $NetBSD: Makefile,v 1.3 2013/02/15 07:59:36 martin Exp $ LIB= sqlite3 INCS= sqlite3.h sqlite3ext.h @@ -8,8 +8,6 @@ SRCS= sqlite3.c CFLAGS+= -DNDEBUG -LIBDPLIBS+= m ${NETBSDSRCDIR}/lib/libm - FILES+= sqlite3.pc FILESOWN_sqlite3.pc= ${BINOWN} FILESGRP_sqlite3.pc= ${BINGRP}
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: njoly Date: Fri Dec 21 19:26:40 UTC 2012 Modified Files: src/external/public-domain/sqlite/dist: sqlite3.1 Log Message: Fix unknown Fi macro. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/public-domain/sqlite/dist/sqlite3.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/dist/sqlite3.1 diff -u src/external/public-domain/sqlite/dist/sqlite3.1:1.4 src/external/public-domain/sqlite/dist/sqlite3.1:1.5 --- src/external/public-domain/sqlite/dist/sqlite3.1:1.4 Mon Dec 17 16:26:38 2012 +++ src/external/public-domain/sqlite/dist/sqlite3.1 Fri Dec 21 19:26:39 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: sqlite3.1,v 1.4 2012/12/17 16:26:38 christos Exp $ +.\ $NetBSD: sqlite3.1,v 1.5 2012/12/21 19:26:39 njoly Exp $ .Dd December 16, 2012 .Dt SQLITE3 1 .Os @@ -168,7 +168,7 @@ continue prompt =... .Ed .It If the file -.Fi ~/.sqliterc +.Pa ~/.sqliterc exists, it is processed first. can be found in the user's home directory, it is read and processed.
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: christos Date: Mon Dec 17 16:26:38 UTC 2012 Modified Files: src/external/public-domain/sqlite/dist: sqlite3.1 Log Message: now that I know how to escape a period, nothing can stop me :-) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/public-domain/sqlite/dist/sqlite3.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/dist/sqlite3.1 diff -u src/external/public-domain/sqlite/dist/sqlite3.1:1.3 src/external/public-domain/sqlite/dist/sqlite3.1:1.4 --- src/external/public-domain/sqlite/dist/sqlite3.1:1.3 Sun Dec 16 18:37:34 2012 +++ src/external/public-domain/sqlite/dist/sqlite3.1 Mon Dec 17 11:26:38 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: sqlite3.1,v 1.3 2012/12/16 23:37:34 wiz Exp $ +.\ $NetBSD: sqlite3.1,v 1.4 2012/12/17 16:26:38 christos Exp $ .Dd December 16, 2012 .Dt SQLITE3 1 .Os @@ -67,7 +67,7 @@ used to control the output format, exami database files, or perform administrative operations upon the attached databases (such as rebuilding indices). Meta-commands are always prefixed with a dot -.Dq \. . +.Dq \. . .Pp A list of available meta-commands can be viewed at any time by issuing the '.help' command.
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: christos Date: Sun Dec 16 20:04:19 UTC 2012 Update of /cvsroot/src/external/public-domain/sqlite/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25378 Log Message: from ubuntu-9.10 Status: Vendor Tag: SQLITE Release Tags: ubuntu-9-10 N src/external/public-domain/sqlite/dist/sqlite3.1 No conflicts created by this import
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: christos Date: Sun Dec 16 20:25:40 UTC 2012 Modified Files: src/external/public-domain/sqlite/dist: sqlite3.1 Log Message: convert to mdoc To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/public-domain/sqlite/dist/sqlite3.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/dist/sqlite3.1 diff -u src/external/public-domain/sqlite/dist/sqlite3.1:1.1.1.1 src/external/public-domain/sqlite/dist/sqlite3.1:1.2 --- src/external/public-domain/sqlite/dist/sqlite3.1:1.1.1.1 Sun Dec 16 15:04:19 2012 +++ src/external/public-domain/sqlite/dist/sqlite3.1 Sun Dec 16 15:25:40 2012 @@ -1,112 +1,79 @@ -.\ Hey, EMACS: -*- nroff -*- -.\ First parameter, NAME, should be all caps -.\ Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\ other parameters are allowed: see man(7), man(1) -.TH SQLITE3 1 Mon Apr 15 23:49:17 2002 -.\ Please adjust this date whenever revising the manpage. -.\ -.\ Some roff macros, for reference: -.\ .nhdisable hyphenation -.\ .hyenable hyphenation -.\ .ad l left justify -.\ .ad b justify to both left and right margins -.\ .nfdisable filling -.\ .fienable filling -.\ .brinsert line break -.\ .sp ninsert n+1 empty lines -.\ for manpage-specific macros, see man(7) -.SH NAME -.B sqlite3 -\- A command line interface for SQLite version 3 - -.SH SYNOPSIS -.B sqlite3 -.RI [ options ] -.RI [ databasefile ] -.RI [ SQL ] - -.SH SUMMARY -.PP -.B sqlite3 +.\ $NetBSD: sqlite3.1,v 1.2 2012/12/16 20:25:40 christos Exp $ +.Dd December 16, 2012 +.Dt SQLITE3 1 +.Os +.Sh NAME +.Nm sqlite3 +.Nd A command line interface for SQLite version 3 +.Sh SYNOPSIS +.Nm +.Op Ar options +.Op Ar databasefile +.Op Ar SQL +.Sh DESCRIPTION +.Nm is a terminal-based front-end to the SQLite library that can evaluate queries interactively and display the results in multiple formats. -.B sqlite3 +.Nm can also be used within shell scripts and other applications to provide batch processing features. - -.SH DESCRIPTION +.Pp To start a -.B sqlite3 +.Nm interactive session, invoke the -.B sqlite3 -command and optionally provide the name of a database file. If the -database file does not exist, it will be created. If the database file -does exist, it will be opened. +.Nm +command and optionally provide the name of a database file. +If the database file does not exist, it will be created. +If the database file does exist, it will be opened. For example, to create a new database file named mydata.db, create a table named memos and insert a couple of records into that table: -.sp -$ -.B sqlite3 mydata.db -.br +.Bd -literal -offset indent +$ sqlite3 mydata.db SQLite version 3.1.3 -.br Enter .help for instructions -.br -sqlite -.B create table memos(text, priority INTEGER); -.br -sqlite -.B insert into memos values('deliver project description', 10); -.br -sqlite -.B insert into memos values('lunch with Christine', 100); -.br -sqlite -.B select * from memos; -.br +sqlite create table memos(text, priority INTEGER); +sqlite insert into memos values('deliver project description', 10); +sqlite insert into memos values('lunch with Christine', 100); +sqlite select * from memos; deliver project description|10 -.br lunch with Christine|100 -.br sqlite -.sp - -If no database name is supplied, the ATTACH sql command can be used -to attach to existing or create new database files. ATTACH can also -be used to attach to multiple databases within the same interactive -session. This is useful for migrating data between databases, +.Ed +.Pp +If no database name is supplied, the +.Em ATTACH +sql command can be used +to attach to existing or create new database files. +.Em ATTACH +can also be used to attach to multiple databases within the same +interactive session. +This is useful for migrating data between databases, possibly changing the schema along the way. - +.Pp Optionally, a SQL statement or set of SQL statements can be supplied as -a single argument. Multiple statements should be separated by -semi-colons. - +a single argument. +Multiple statements should be separated by semi-colons. +.Pp For example: -.sp -$ -.B sqlite3 -line mydata.db 'select * from memos where priority 20;' -.br +.Bd -literal -offset indent +$ sqlite3 -line mydata.db 'select * from memos where priority 20;' text = lunch with Christine -.br -priority = 100 -.br -.sp - -.SS SQLITE META-COMMANDS -.PP +priority = 100 +.Ed +.Ss SQLITE META-COMMANDS The interactive interpreter offers a set of meta-commands that can be used to control the output format, examine the currently attached database files, or perform administrative operations upon the -attached databases (such as rebuilding indices). Meta-commands are -always prefixed with a dot (.). -
CVS commit: src/external/public-domain/sqlite/bin
Module Name:src Committed By: christos Date: Sun Dec 16 20:31:07 UTC 2012 Modified Files: src/external/public-domain/sqlite/bin: Makefile Log Message: noman is no more To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/sqlite/bin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/bin/Makefile diff -u src/external/public-domain/sqlite/bin/Makefile:1.2 src/external/public-domain/sqlite/bin/Makefile:1.3 --- src/external/public-domain/sqlite/bin/Makefile:1.2 Sun Oct 16 17:31:15 2011 +++ src/external/public-domain/sqlite/bin/Makefile Sun Dec 16 15:31:07 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2011/10/16 21:31:15 he Exp $ +# $NetBSD: Makefile,v 1.3 2012/12/16 20:31:07 christos Exp $ PROG= sqlite3 @@ -7,8 +7,6 @@ SRCS= shell.c DPADD+= ${LIBSQLITE3} ${LIBEDIT} ${LIBTERIMINFO} LDADD+= -lsqlite3 -ledit -lterminfo -NOMAN= - BINDIR= /usr/bin .include bsd.prog.mk
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: wiz Date: Sun Dec 16 22:46:45 UTC 2012 Update of /cvsroot/src/external/public-domain/sqlite/dist In directory ivanova.netbsd.org:/tmp/cvs-serv7706 Log Message: Import sqlite3 man page from 3.7.15, in particular sqlite-autoconf-3071500.tar.gz (using the pkgsrc distfile). Status: Vendor Tag: SQLITE Release Tags: sqlite-3-7-15-manpage-only U src/external/public-domain/sqlite/dist/sqlite3.1 No conflicts created by this import
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: wiz Date: Sun Dec 16 23:37:35 UTC 2012 Modified Files: src/external/public-domain/sqlite/dist: sqlite3.1 Log Message: Fix some obvious problems and remove trailing whitespace. Use more markup. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/sqlite/dist/sqlite3.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/dist/sqlite3.1 diff -u src/external/public-domain/sqlite/dist/sqlite3.1:1.2 src/external/public-domain/sqlite/dist/sqlite3.1:1.3 --- src/external/public-domain/sqlite/dist/sqlite3.1:1.2 Sun Dec 16 20:25:40 2012 +++ src/external/public-domain/sqlite/dist/sqlite3.1 Sun Dec 16 23:37:34 2012 @@ -1,12 +1,12 @@ -.\ $NetBSD: sqlite3.1,v 1.2 2012/12/16 20:25:40 christos Exp $ +.\ $NetBSD: sqlite3.1,v 1.3 2012/12/16 23:37:34 wiz Exp $ .Dd December 16, 2012 .Dt SQLITE3 1 .Os .Sh NAME -.Nm sqlite3 +.Nm sqlite3 .Nd A command line interface for SQLite version 3 .Sh SYNOPSIS -.Nm +.Nm .Op Ar options .Op Ar databasefile .Op Ar SQL @@ -19,13 +19,13 @@ can also be used within shell scripts an batch processing features. .Pp To start a -.Nm +.Nm interactive session, invoke the .Nm command and optionally provide the name of a database file. If the database file does not exist, it will be created. If the database file does exist, it will be opened. - +.Pp For example, to create a new database file named mydata.db, create a table named memos and insert a couple of records into that table: .Bd -literal -offset indent @@ -41,7 +41,7 @@ lunch with Christine|100 sqlite .Ed .Pp -If no database name is supplied, the +If no database name is supplied, the .Em ATTACH sql command can be used to attach to existing or create new database files. @@ -66,7 +66,7 @@ The interactive interpreter offers a set used to control the output format, examine the currently attached database files, or perform administrative operations upon the attached databases (such as rebuilding indices). -Meta-commands are always prefixed with a dot +Meta-commands are always prefixed with a dot .Dq \. . .Pp A list of available meta-commands can be viewed at any time by issuing @@ -74,17 +74,16 @@ the '.help' command. For example: .Bd -literal -offset indent sqlite .help -.cc | -.databases List names and files of attached databases -.dump ?TABLE? ... Dump the database in an SQL text format -.echo ON|OFF Turn command echo on or off -.exit Exit this program -.explain ON|OFFTurn output mode suitable for EXPLAIN on or off. -.header(s) ON|OFF Turn display of headers on or off -.help Show this message -.import FILE TABLE Import data from FILE into TABLE -.indices TABLE Show names of all indices on TABLE -.mode MODE ?TABLE? Set output mode where MODE is one of: +\.databases List names and files of attached databases +\.dump ?TABLE? ... Dump the database in an SQL text format +\.echo ON|OFF Turn command echo on or off +\.exit Exit this program +\.explain ON|OFFTurn output mode suitable for EXPLAIN on or off. +\.header(s) ON|OFF Turn display of headers on or off +\.help Show this message +\.import FILE TABLE Import data from FILE into TABLE +\.indices TABLE Show names of all indices on TABLE +\.mode MODE ?TABLE? Set output mode where MODE is one of: csv Comma-separated values column Left-aligned columns. (See .width) html HTML table code @@ -93,23 +92,22 @@ sqlite .help list Values delimited by .separator string tabs Tab-separated values tcl TCL list elements -.nullvalue STRING Print STRING in place of NULL values -.output FILENAME Send output to FILENAME -.output stdout Send output to the screen -.prompt MAIN CONTINUE Replace the standard prompts -.quit Exit this program -.read FILENAME Execute SQL in FILENAME -.schema ?TABLE?Show the CREATE statements -.separator STRING Change separator used by output mode and .import -.show Show the current values for various settings -.tables ?PATTERN? List names of tables matching a LIKE pattern -.timeout MSTry opening locked tables for MS milliseconds -.width NUM NUM ... Set column widths for column mode +\.nullvalue STRING Print STRING in place of NULL values +\.output FILENAME Send output to FILENAME +\.output stdout Send output to the screen +\.prompt MAIN CONTINUE Replace the standard prompts +\.quit Exit this program +\.read FILENAME Execute SQL in FILENAME +\.schema ?TABLE?
CVS commit: src/external/public-domain/sqlite
Module Name:src Committed By: wiz Date: Fri Jun 1 20:28:02 UTC 2012 Modified Files: src/external/public-domain/sqlite: Makefile.inc Log Message: Make HAVE_* define match what configure finds. In particular, this enables usleep(3) (compared to using sleep(3) before). ok joerg@ To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/public-domain/sqlite/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/Makefile.inc diff -u src/external/public-domain/sqlite/Makefile.inc:1.4 src/external/public-domain/sqlite/Makefile.inc:1.5 --- src/external/public-domain/sqlite/Makefile.inc:1.4 Wed Apr 11 00:41:41 2012 +++ src/external/public-domain/sqlite/Makefile.inc Fri Jun 1 20:28:02 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.4 2012/04/11 00:41:41 christos Exp $ +# $NetBSD: Makefile.inc,v 1.5 2012/06/01 20:28:02 wiz Exp $ WARNS= 2 @@ -6,11 +6,19 @@ SRCDIR:= ${.PARSEDIR}/dist .PATH: ${SRCDIR} -CPPFLAGS+= -DHAVE_READLINE=1 -DHAVE_LOCALTIME_R \ - -DSQLITE_HAVE_ISNAN -DSQLITE_ENABLE_FTS4 \ +CPPFLAGS+= \ + -DHAVE_GMTIME_R=1 \ + -DHAVE_INTTYPES_H=1 \ + -DHAVE_LOCALTIME_R=1 \ + -DHAVE_READLINE=1 \ + -DHAVE_STDINT_H=1 \ + -DHAVE_STRERROR_R=1 \ + -DHAVE_USLEEP=1 \ + -DSQLITE_ENABLE_COLUMN_METADATA \ -DSQLITE_ENABLE_FTS3_PARENTHESIS \ - -DSQLITE_ENABLE_UNLOCK_NOTIFY \ + -DSQLITE_ENABLE_FTS4 \ -DSQLITE_ENABLE_LOAD_EXTENSION \ - -DSQLITE_ENABLE_COLUMN_METADATA + -DSQLITE_ENABLE_UNLOCK_NOTIFY \ + -DSQLITE_HAVE_ISNAN CWARNFLAGS+= -Wno-shadow -Wno-unused
CVS commit: src/external/public-domain/sqlite
Module Name:src Committed By: christos Date: Wed Apr 11 00:41:41 UTC 2012 Modified Files: src/external/public-domain/sqlite: Makefile.inc Log Message: PR/46322: Pierre Pronchery: SQLite from base is compiled without SQLITE_ENABLE_COLUMN_METADATA XXX: Pullup for 6 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/public-domain/sqlite/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/Makefile.inc diff -u src/external/public-domain/sqlite/Makefile.inc:1.3 src/external/public-domain/sqlite/Makefile.inc:1.4 --- src/external/public-domain/sqlite/Makefile.inc:1.3 Thu Nov 10 20:34:18 2011 +++ src/external/public-domain/sqlite/Makefile.inc Tue Apr 10 20:41:41 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.3 2011/11/11 01:34:18 christos Exp $ +# $NetBSD: Makefile.inc,v 1.4 2012/04/11 00:41:41 christos Exp $ WARNS= 2 @@ -10,6 +10,7 @@ CPPFLAGS+= -DHAVE_READLINE=1 -DHAVE_LOCA -DSQLITE_HAVE_ISNAN -DSQLITE_ENABLE_FTS4 \ -DSQLITE_ENABLE_FTS3_PARENTHESIS \ -DSQLITE_ENABLE_UNLOCK_NOTIFY \ - -DSQLITE_ENABLE_LOAD_EXTENSION + -DSQLITE_ENABLE_LOAD_EXTENSION \ + -DSQLITE_ENABLE_COLUMN_METADATA CWARNFLAGS+= -Wno-shadow -Wno-unused
CVS commit: src/external/public-domain/sqlite/lib
Module Name:src Committed By: wiz Date: Fri Apr 6 09:21:40 UTC 2012 Modified Files: src/external/public-domain/sqlite/lib: sqlite3.pc Log Message: Update version to 3.7.10, since that's what's currently in dist/ From Ryo ONODERA in PR 46300. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/public-domain/sqlite/lib/sqlite3.pc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/lib/sqlite3.pc diff -u src/external/public-domain/sqlite/lib/sqlite3.pc:1.1 src/external/public-domain/sqlite/lib/sqlite3.pc:1.2 --- src/external/public-domain/sqlite/lib/sqlite3.pc:1.1 Thu Oct 13 21:40:28 2011 +++ src/external/public-domain/sqlite/lib/sqlite3.pc Fri Apr 6 09:21:39 2012 @@ -1,4 +1,4 @@ Name: SQLite Description: SQL database engine -Version: 3.7.9 +Version: 3.7.10 Libs: -lsqlite3
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: matt Date: Mon Feb 6 17:24:49 UTC 2012 Modified Files: src/external/public-domain/sqlite/dist: sqlite3.c Log Message: Back out part of previous commit (no reason to define SQLITE_BIG_DBL especially for VAX since it uses DBL_MAX from the VAX float.h). To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/public-domain/sqlite/dist/sqlite3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/dist/sqlite3.c diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.5 src/external/public-domain/sqlite/dist/sqlite3.c:1.6 --- src/external/public-domain/sqlite/dist/sqlite3.c:1.5 Sun Feb 5 17:55:12 2012 +++ src/external/public-domain/sqlite/dist/sqlite3.c Mon Feb 6 17:24:49 2012 @@ -7792,11 +7792,7 @@ SQLITE_PRIVATE void sqlite3HashClear(Has # endif #endif #ifndef SQLITE_BIG_DBL -# ifdef __vax__ -# define SQLITE_BIG_DBL (1e38) -# else -# define SQLITE_BIG_DBL (1e99) -# endif +# define SQLITE_BIG_DBL (1e99) #endif #ifndef SQLITE_HUGE_DBL # define SQLITE_HUGE_DBL (1.0e+308) @@ -132876,7 +132872,7 @@ SQLITE_API int sqlite3_extension_init( **May you share freely, never taking more than you give. ** * -** $Id: sqlite3.c,v 1.5 2012/02/05 17:55:12 matt Exp $ +** $Id: sqlite3.c,v 1.6 2012/02/06 17:24:49 matt Exp $ ** ** This file implements an integration between the ICU library ** (International Components for Unicode, an open-source library
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: matt Date: Sun Feb 5 17:55:13 UTC 2012 Modified Files: src/external/public-domain/sqlite/dist: sqlite3.c Log Message: Make this compilable by VAX GCC 4.5 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/public-domain/sqlite/dist/sqlite3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/dist/sqlite3.c diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.4 src/external/public-domain/sqlite/dist/sqlite3.c:1.5 --- src/external/public-domain/sqlite/dist/sqlite3.c:1.4 Sat Jan 28 23:55:36 2012 +++ src/external/public-domain/sqlite/dist/sqlite3.c Sun Feb 5 17:55:12 2012 @@ -7792,7 +7792,11 @@ SQLITE_PRIVATE void sqlite3HashClear(Has # endif #endif #ifndef SQLITE_BIG_DBL -# define SQLITE_BIG_DBL (1e99) +# ifdef __vax__ +# define SQLITE_BIG_DBL (1e38) +# else +# define SQLITE_BIG_DBL (1e99) +# endif #endif #ifndef SQLITE_HUGE_DBL # define SQLITE_HUGE_DBL (1.0e+308) @@ -21353,6 +21357,7 @@ do_atof_calc: ** and store in result. */ if( e ){ double scale = 1.0; +#ifndef __vax__ /* attempt to handle extremely small/large numbers better */ if( e307 e342 ){ while( e%308 ) { scale *= 1.0e+1; e -= 1; } @@ -21369,7 +21374,9 @@ do_atof_calc: }else{ result = 1e308*1e308*s; /* Infinity */ } - }else{ + }else +#endif + { /* 1.0e+22 is the largest power of 10 than can be ** represented exactly. */ while( e%22 ) { scale *= 1.0e+1; e -= 1; } @@ -132869,7 +132876,7 @@ SQLITE_API int sqlite3_extension_init( **May you share freely, never taking more than you give. ** * -** $Id: sqlite3.c,v 1.4 2012/01/28 23:55:36 joerg Exp $ +** $Id: sqlite3.c,v 1.5 2012/02/05 17:55:12 matt Exp $ ** ** This file implements an integration between the ICU library ** (International Components for Unicode, an open-source library
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: joerg Date: Sat Jan 28 23:51:07 UTC 2012 Update of /cvsroot/src/external/public-domain/sqlite/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21691 Log Message: Update to sqlite 3.7.10: - Default schema format changed to version 4 - Various bugfixes and improvements. Status: Vendor Tag: SQLITE Release Tags: sqlite-3-7-10 U src/external/public-domain/sqlite/dist/sqlite3ext.h C src/external/public-domain/sqlite/dist/sqlite3.c U src/external/public-domain/sqlite/dist/shell.c U src/external/public-domain/sqlite/dist/sqlite3.h 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jSQLITE:yesterday -jSQLITE src/external/public-domain/sqlite/dist
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: martin Date: Mon Jan 9 11:20:21 UTC 2012 Modified Files: src/external/public-domain/sqlite/dist: sqlite3.c Log Message: When aggregate-allocating an index structure make sure to provide at least natural alignement for pointers. This makes firefox 3.6 work again on sparc64. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/sqlite/dist/sqlite3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/dist/sqlite3.c diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.2 src/external/public-domain/sqlite/dist/sqlite3.c:1.3 --- src/external/public-domain/sqlite/dist/sqlite3.c:1.2 Wed Nov 2 23:19:48 2011 +++ src/external/public-domain/sqlite/dist/sqlite3.c Mon Jan 9 11:20:20 2012 @@ -81883,7 +81883,8 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex Token *pName = 0;/* Unqualified name of the index to create */ struct ExprList_item *pListItem; /* For looping over pList */ int nCol; - int nExtra = 0; + int nExtra = 0, nPad = 0; + size_t nOff; char *zExtra; assert( pStart==0 || pEnd!=0 ); /* pEnd must be non-NULL if pStart is */ @@ -82053,6 +82054,8 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex */ nName = sqlite3Strlen30(zName); nCol = pList-nExpr; + nOff = sizeof(*pIndex)+sizeof(tRowcnt)*(nCol+1); + nPad = ((nOff + (sizeof(char*)-1)) ~ (sizeof(char*)-1)) - nOff; pIndex = sqlite3DbMallocZero(db, sizeof(Index) + /* Index structure */ sizeof(tRowcnt)*(nCol+1) + /* Index.aiRowEst */ @@ -82060,13 +82063,14 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex sizeof(char *)*nCol +/* Index.azColl */ sizeof(u8)*nCol +/* Index.aSortOrder */ nName + 1 + /* Index.zName */ - nExtra /* Collation sequence names */ + nExtra + /* Collation sequence names */ + nPad ); 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[nCol+1])+nPad); pIndex-aiColumn = (int *)(pIndex-azColl[nCol]); pIndex-aSortOrder = (u8 *)(pIndex-aiColumn[nCol]); pIndex-zName = (char *)(pIndex-aSortOrder[nCol]); @@ -130641,7 +130645,7 @@ SQLITE_API int sqlite3_extension_init( **May you share freely, never taking more than you give. ** * -** $Id: sqlite3.c,v 1.2 2011/11/02 23:19:48 christos Exp $ +** $Id: sqlite3.c,v 1.3 2012/01/09 11:20:20 martin Exp $ ** ** This file implements an integration between the ICU library ** (International Components for Unicode, an open-source library
CVS commit: src/external/public-domain/sqlite
Module Name:src Committed By: christos Date: Fri Nov 11 01:34:18 UTC 2011 Modified Files: src/external/public-domain/sqlite: Makefile.inc Log Message: enable unlock notify To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/sqlite/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/Makefile.inc diff -u src/external/public-domain/sqlite/Makefile.inc:1.2 src/external/public-domain/sqlite/Makefile.inc:1.3 --- src/external/public-domain/sqlite/Makefile.inc:1.2 Sun Oct 16 13:24:50 2011 +++ src/external/public-domain/sqlite/Makefile.inc Thu Nov 10 20:34:18 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.2 2011/10/16 17:24:50 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.3 2011/11/11 01:34:18 christos Exp $ WARNS= 2 @@ -9,6 +9,7 @@ SRCDIR:= ${.PARSEDIR}/dist CPPFLAGS+= -DHAVE_READLINE=1 -DHAVE_LOCALTIME_R \ -DSQLITE_HAVE_ISNAN -DSQLITE_ENABLE_FTS4 \ -DSQLITE_ENABLE_FTS3_PARENTHESIS \ + -DSQLITE_ENABLE_UNLOCK_NOTIFY \ -DSQLITE_ENABLE_LOAD_EXTENSION CWARNFLAGS+= -Wno-shadow -Wno-unused
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: christos Date: Wed Nov 2 23:19:49 UTC 2011 Modified Files: src/external/public-domain/sqlite/dist: sqlite3.c Log Message: fix vax floating point overflows. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/public-domain/sqlite/dist/sqlite3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/dist/sqlite3.c diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.1.1.1 src/external/public-domain/sqlite/dist/sqlite3.c:1.2 --- src/external/public-domain/sqlite/dist/sqlite3.c:1.1.1.1 Thu Oct 13 17:38:52 2011 +++ src/external/public-domain/sqlite/dist/sqlite3.c Wed Nov 2 19:19:48 2011 @@ -7615,10 +7615,19 @@ SQLITE_PRIVATE void sqlite3HashClear(Has # define SQLITE_OMIT_TRACE 1 # undef SQLITE_MIXED_ENDIAN_64BIT_FLOAT # undef SQLITE_HAVE_ISNAN +#else +# ifdef __vax__ +# include float.h +# define SQLITE_BIG_DBL DBL_MAX +# define SQLITE_HUGE_DBL DBL_MAX +# endif #endif #ifndef SQLITE_BIG_DBL # define SQLITE_BIG_DBL (1e99) #endif +#ifndef SQLITE_HUGE_DBL +# define SQLITE_HUGE_DBL (1.0e+308) +#endif /* ** OMIT_TEMPDB is set to 1 if SQLITE_OMIT_TEMPDB is defined, or 0 @@ -21000,10 +21009,10 @@ do_atof_calc: while( e%308 ) { scale *= 1.0e+1; e -= 1; } if( esign0 ){ result = s / scale; - result /= 1.0e+308; + result /= SQLITE_HUGE_DBL; }else{ result = s * scale; - result *= 1.0e+308; + result *= SQLITE_HUGE_DBL; } }else{ /* 1.0e+22 is the largest power of 10 than can be @@ -130632,7 +130641,7 @@ SQLITE_API int sqlite3_extension_init( **May you share freely, never taking more than you give. ** * -** $Id: sqlite3.c,v 1.1.1.1 2011/10/13 21:38:52 joerg Exp $ +** $Id: sqlite3.c,v 1.2 2011/11/02 23:19:48 christos Exp $ ** ** This file implements an integration between the ICU library ** (International Components for Unicode, an open-source library
CVS commit: src/external/public-domain/sqlite
Module Name:src Committed By: joerg Date: Sun Oct 16 17:24:50 UTC 2011 Modified Files: src/external/public-domain/sqlite: Makefile.inc Log Message: Build with -DSQLITE_ENABLE_FTS3_PARENTHESIS To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/public-domain/sqlite/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/Makefile.inc diff -u src/external/public-domain/sqlite/Makefile.inc:1.1 src/external/public-domain/sqlite/Makefile.inc:1.2 --- src/external/public-domain/sqlite/Makefile.inc:1.1 Thu Oct 13 21:40:27 2011 +++ src/external/public-domain/sqlite/Makefile.inc Sun Oct 16 17:24:50 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.1 2011/10/13 21:40:27 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.2 2011/10/16 17:24:50 joerg Exp $ WARNS= 2 @@ -8,6 +8,7 @@ SRCDIR:= ${.PARSEDIR}/dist CPPFLAGS+= -DHAVE_READLINE=1 -DHAVE_LOCALTIME_R \ -DSQLITE_HAVE_ISNAN -DSQLITE_ENABLE_FTS4 \ + -DSQLITE_ENABLE_FTS3_PARENTHESIS \ -DSQLITE_ENABLE_LOAD_EXTENSION CWARNFLAGS+= -Wno-shadow -Wno-unused
CVS commit: src/external/public-domain/sqlite/bin
Module Name:src Committed By: he Date: Sun Oct 16 21:31:16 UTC 2011 Modified Files: src/external/public-domain/sqlite/bin: Makefile Log Message: Make this build statically also by linking with -lterminfo as well. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/public-domain/sqlite/bin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/bin/Makefile diff -u src/external/public-domain/sqlite/bin/Makefile:1.1 src/external/public-domain/sqlite/bin/Makefile:1.2 --- src/external/public-domain/sqlite/bin/Makefile:1.1 Thu Oct 13 21:40:27 2011 +++ src/external/public-domain/sqlite/bin/Makefile Sun Oct 16 21:31:15 2011 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.1 2011/10/13 21:40:27 joerg Exp $ +# $NetBSD: Makefile,v 1.2 2011/10/16 21:31:15 he Exp $ PROG= sqlite3 SRCS= shell.c -DPADD+= ${LIBSQLITE3} ${LIBEDIT} -LDADD+= -lsqlite3 -ledit +DPADD+= ${LIBSQLITE3} ${LIBEDIT} ${LIBTERIMINFO} +LDADD+= -lsqlite3 -ledit -lterminfo NOMAN=
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: joerg Date: Thu Oct 13 21:38:58 UTC 2011 Update of /cvsroot/src/external/public-domain/sqlite/dist In directory ivanova.netbsd.org:/tmp/cvs-serv14811 Log Message: Import pre-release of SQLite 3.6.9 based on 8bf13b036a. Status: Vendor Tag: SQLITE Release Tags: sqlite-3-7-9-pre N src/external/public-domain/sqlite/dist/shell.c N src/external/public-domain/sqlite/dist/sqlite3.c N src/external/public-domain/sqlite/dist/sqlite3.h N src/external/public-domain/sqlite/dist/sqlite3ext.h No conflicts created by this import
CVS commit: src/external/public-domain/sqlite
Module Name:src Committed By: joerg Date: Thu Oct 13 21:40:28 UTC 2011 Added Files: src/external/public-domain/sqlite: Makefile Makefile.inc src/external/public-domain/sqlite/bin: Makefile src/external/public-domain/sqlite/lib: Makefile shlib_version sqlite3.pc Log Message: Add build glue for SQLite To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/public-domain/sqlite/Makefile \ src/external/public-domain/sqlite/Makefile.inc cvs rdiff -u -r0 -r1.1 src/external/public-domain/sqlite/bin/Makefile cvs rdiff -u -r0 -r1.1 src/external/public-domain/sqlite/lib/Makefile \ src/external/public-domain/sqlite/lib/shlib_version \ src/external/public-domain/sqlite/lib/sqlite3.pc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/external/public-domain/sqlite/Makefile diff -u /dev/null src/external/public-domain/sqlite/Makefile:1.1 --- /dev/null Thu Oct 13 21:40:28 2011 +++ src/external/public-domain/sqlite/Makefile Thu Oct 13 21:40:27 2011 @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2011/10/13 21:40:27 joerg Exp $ + +SUBDIR+= lib .WAIT bin + +.include bsd.subdir.mk Index: src/external/public-domain/sqlite/Makefile.inc diff -u /dev/null src/external/public-domain/sqlite/Makefile.inc:1.1 --- /dev/null Thu Oct 13 21:40:28 2011 +++ src/external/public-domain/sqlite/Makefile.inc Thu Oct 13 21:40:27 2011 @@ -0,0 +1,13 @@ +# $NetBSD: Makefile.inc,v 1.1 2011/10/13 21:40:27 joerg Exp $ + +WARNS= 2 + +SRCDIR:= ${.PARSEDIR}/dist + +.PATH: ${SRCDIR} + +CPPFLAGS+= -DHAVE_READLINE=1 -DHAVE_LOCALTIME_R \ + -DSQLITE_HAVE_ISNAN -DSQLITE_ENABLE_FTS4 \ + -DSQLITE_ENABLE_LOAD_EXTENSION + +CWARNFLAGS+= -Wno-shadow -Wno-unused Index: src/external/public-domain/sqlite/bin/Makefile diff -u /dev/null src/external/public-domain/sqlite/bin/Makefile:1.1 --- /dev/null Thu Oct 13 21:40:28 2011 +++ src/external/public-domain/sqlite/bin/Makefile Thu Oct 13 21:40:27 2011 @@ -0,0 +1,14 @@ +# $NetBSD: Makefile,v 1.1 2011/10/13 21:40:27 joerg Exp $ + +PROG= sqlite3 + +SRCS= shell.c + +DPADD+= ${LIBSQLITE3} ${LIBEDIT} +LDADD+= -lsqlite3 -ledit + +NOMAN= + +BINDIR= /usr/bin + +.include bsd.prog.mk Index: src/external/public-domain/sqlite/lib/Makefile diff -u /dev/null src/external/public-domain/sqlite/lib/Makefile:1.1 --- /dev/null Thu Oct 13 21:40:28 2011 +++ src/external/public-domain/sqlite/lib/Makefile Thu Oct 13 21:40:28 2011 @@ -0,0 +1,17 @@ +# $NetBSD: Makefile,v 1.1 2011/10/13 21:40:28 joerg Exp $ + +LIB= sqlite3 +INCS= sqlite3.h sqlite3ext.h +INCSDIR= /usr/include + +SRCS= sqlite3.c + +CFLAGS+= -DNDEBUG + +FILES+= sqlite3.pc +FILESOWN_sqlite3.pc= ${BINOWN} +FILESGRP_sqlite3.pc= ${BINGRP} +FILESMODE_sqlite3.pc= ${NONBINMODE} +FILESDIR_sqlite3.pc= /usr/lib/pkgconfig + +.include bsd.lib.mk Index: src/external/public-domain/sqlite/lib/shlib_version diff -u /dev/null src/external/public-domain/sqlite/lib/shlib_version:1.1 --- /dev/null Thu Oct 13 21:40:28 2011 +++ src/external/public-domain/sqlite/lib/shlib_version Thu Oct 13 21:40:28 2011 @@ -0,0 +1,4 @@ +# $NetBSD: shlib_version,v 1.1 2011/10/13 21:40:28 joerg Exp $ +# +major=1 +minor=0 Index: src/external/public-domain/sqlite/lib/sqlite3.pc diff -u /dev/null src/external/public-domain/sqlite/lib/sqlite3.pc:1.1 --- /dev/null Thu Oct 13 21:40:28 2011 +++ src/external/public-domain/sqlite/lib/sqlite3.pc Thu Oct 13 21:40:28 2011 @@ -0,0 +1,4 @@ +Name: SQLite +Description: SQL database engine +Version: 3.7.9 +Libs: -lsqlite3