landry 2020-12-15 09:03:27 +00:00
parent cdd6d70304
commit 25db15b360
4 changed files with 16 additions and 34 deletions

View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.108 2020/03/11 21:01:04 stsp Exp $
# $OpenBSD: Makefile,v 1.109 2020/12/15 09:03:27 landry Exp $
COMMENT= embedded SQL implementation
DISTNAME = sqlite-autoconf-3310100
PKGNAME= sqlite3-3.31.1
REVISION= 0
DISTNAME = sqlite-autoconf-3340000
PKGNAME= sqlite3-3.34.0
# XXX needs bumps every time :-
SHARED_LIBS += sqlite3 37.10 # 8.6
SHARED_LIBS += sqlite3 37.11 # 8.6
# sqlite suggests that users might like to assert() that library and header
# versions match, so bumps are needed even if function signatures don't change.
# ... at the current time the only one noticed is a < check (in subversion)
@ -26,8 +25,7 @@ WANTLIB += c curses m pthread readline z
MASTER_SITES = ${HOMEPAGE}2020/
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --enable-editline \
--disable-static-shell
CONFIGURE_ARGS= --disable-static-shell
# for x11/gnome/tracker
CONFIGURE_ARGS += --enable-fts5

View File

@ -1,2 +1,2 @@
SHA256 (sqlite-autoconf-3310100.tar.gz) = YihO/rwFp2+QnFgP+lwAin0ioShyhdaLeCWitrUZSa4=
SIZE (sqlite-autoconf-3310100.tar.gz) = 2887243
SHA256 (sqlite-autoconf-3340000.tar.gz) = v223+uN9UXVHN3R6qvQTtNaztfus1SvbLQ1uWy7dmu4=
SIZE (sqlite-autoconf-3340000.tar.gz) = 2930085

View File

@ -1,23 +0,0 @@
$OpenBSD: patch-sqlite3_c,v 1.3 2020/03/11 21:01:05 stsp Exp $
Upstream bugfix made after 3.31.1 for s390, which also applies to sparc64:
https://www.sqlite.org/src/vinfo/04885763c4cd00cb?diff=1
Index: sqlite3.c
--- sqlite3.c.orig
+++ sqlite3.c
@@ -121302,12 +121302,14 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks(
x = *sqlite3VdbeGetOp(v, addrConflictCk);
if( x.opcode!=OP_IdxRowid ){
int p2; /* New P2 value for copied conflict check opcode */
+ const char *zP4;
if( sqlite3OpcodeProperty[x.opcode]&OPFLG_JUMP ){
p2 = lblRecheckOk;
}else{
p2 = x.p2;
}
- sqlite3VdbeAddOp4(v, x.opcode, x.p1, p2, x.p3, x.p4.z, x.p4type);
+ zP4 = x.p4type==P4_INT32 ? SQLITE_INT_TO_PTR(x.p4.i) : x.p4.z;
+ sqlite3VdbeAddOp4(v, x.opcode, x.p1, p2, x.p3, zP4, x.p4type);
sqlite3VdbeChangeP5(v, x.p5);
VdbeCoverageIf(v, p2!=x.p2);
}

View File

@ -1,9 +1,9 @@
@comment $OpenBSD: PLIST,v 1.6 2019/01/16 20:09:12 landry Exp $
@comment $OpenBSD: PLIST,v 1.7 2020/12/15 09:03:27 landry Exp $
@pkgpath databases/sqlite3,-main
@bin bin/sqlite3
include/sqlite3.h
include/sqlite3ext.h
lib/libsqlite3.a
@static-lib lib/libsqlite3.a
lib/libsqlite3.la
@lib lib/libsqlite3.so.${LIBsqlite3_VERSION}
lib/pkgconfig/sqlite3.pc
@ -44,6 +44,7 @@ lib/pkgconfig/sqlite3.pc
@man man/man3/SQLITE_SYNC_NORMAL.3
@man man/man3/SQLITE_TESTCTRL_FIRST.3
@man man/man3/SQLITE_TRACE_STMT.3
@man man/man3/SQLITE_TXN_NONE.3
@man man/man3/SQLITE_UTF8.3
@man man/man3/SQLITE_VERSION.3
@man man/man3/SQLITE_VTAB_CONSTRAINT_SUPPORT.3
@ -87,10 +88,12 @@ lib/pkgconfig/sqlite3.pc
@man man/man3/sqlite3_context.3
@man man/man3/sqlite3_context_db_handle.3
@man man/man3/sqlite3_create_collation.3
@man man/man3/sqlite3_create_filename.3
@man man/man3/sqlite3_create_function.3
@man man/man3/sqlite3_create_module.3
@man man/man3/sqlite3_data_count.3
@man man/man3/sqlite3_data_directory.3
@man man/man3/sqlite3_database_file_object.3
@man man/man3/sqlite3_db_cacheflush.3
@man man/man3/sqlite3_db_config.3
@man man/man3/sqlite3_db_filename.3
@ -102,6 +105,7 @@ lib/pkgconfig/sqlite3.pc
@man man/man3/sqlite3_declare_vtab.3
@man man/man3/sqlite3_deserialize.3
@man man/man3/sqlite3_destructor_type.3
@man man/man3/sqlite3_drop_modules.3
@man man/man3/sqlite3_enable_load_extension.3
@man man/man3/sqlite3_enable_shared_cache.3
@man man/man3/sqlite3_errcode.3
@ -109,6 +113,7 @@ lib/pkgconfig/sqlite3.pc
@man man/man3/sqlite3_extended_result_codes.3
@man man/man3/sqlite3_file.3
@man man/man3/sqlite3_file_control.3
@man man/man3/sqlite3_filename_database.3
@man man/man3/sqlite3_finalize.3
@man man/man3/sqlite3_get_autocommit.3
@man man/man3/sqlite3_get_auxdata.3
@ -165,6 +170,7 @@ lib/pkgconfig/sqlite3.pc
@man man/man3/sqlite3_step.3
@man man/man3/sqlite3_stmt.3
@man man/man3/sqlite3_stmt_busy.3
@man man/man3/sqlite3_stmt_isexplain.3
@man man/man3/sqlite3_stmt_readonly.3
@man man/man3/sqlite3_stmt_scanstatus.3
@man man/man3/sqlite3_stmt_scanstatus_reset.3
@ -185,6 +191,7 @@ lib/pkgconfig/sqlite3.pc
@man man/man3/sqlite3_total_changes.3
@man man/man3/sqlite3_trace.3
@man man/man3/sqlite3_trace_v2.3
@man man/man3/sqlite3_txn_state.3
@man man/man3/sqlite3_unlock_notify.3
@man man/man3/sqlite3_update_hook.3
@man man/man3/sqlite3_uri_parameter.3