Skip to content

Commit 4a45902

Browse files
sjlombardosjlombardo
committed
Merge sqlite-release(3.34.1) into prerelease-integration
2 parents 804dfb3 + 718beb4 commit 4a45902

152 files changed

Lines changed: 4641 additions & 1276 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile.in‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,7 @@ TESTSRC += \
463463
$(TOP)/ext/expert/test_expert.c \
464464
$(TOP)/ext/misc/amatch.c \
465465
$(TOP)/ext/misc/carray.c \
466+
$(TOP)/ext/misc/cksumvfs.c \
466467
$(TOP)/ext/misc/closure.c \
467468
$(TOP)/ext/misc/csv.c \
468469
$(TOP)/ext/misc/decimal.c \
@@ -1123,6 +1124,7 @@ SHELL_SRC = \
11231124
$(TOP)/ext/misc/decimal.c \
11241125
$(TOP)/ext/misc/fileio.c \
11251126
$(TOP)/ext/misc/ieee754.c \
1127+
$(TOP)/ext/misc/series.c \
11261128
$(TOP)/ext/misc/shathree.c \
11271129
$(TOP)/ext/misc/sqlar.c \
11281130
$(TOP)/ext/misc/uint.c \
@@ -1269,6 +1271,7 @@ TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_STMTVTAB
12691271
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DBPAGE_VTAB
12701272
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_BYTECODE_VTAB
12711273
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DESERIALIZE
1274+
TESTFIXTURE_FLAGS += -DSQLITE_CKSUMVFS_STATIC
12721275

12731276
TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlcipher.la
12741277
TESTFIXTURE_SRC1 = sqlite3.c

‎Makefile.msc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1566,6 +1566,7 @@ TESTEXT = \
15661566
$(TOP)\ext\expert\test_expert.c \
15671567
$(TOP)\ext\misc\amatch.c \
15681568
$(TOP)\ext\misc\carray.c \
1569+
$(TOP)\ext\misc\cksumvfs.c \
15691570
$(TOP)\ext\misc\closure.c \
15701571
$(TOP)\ext\misc\csv.c \
15711572
$(TOP)\ext\misc\decimal.c \
@@ -2216,6 +2217,7 @@ SHELL_SRC = \
22162217
$(TOP)\ext\misc\decimal.c \
22172218
$(TOP)\ext\misc\fileio.c \
22182219
$(TOP)\ext\misc\ieee754.c \
2220+
$(TOP)\ext\misc\series.c \
22192221
$(TOP)\ext\misc\shathree.c \
22202222
$(TOP)\ext\misc\uint.c \
22212223
$(TOP)\ext\expert\sqlite3expert.c \
@@ -2394,6 +2396,7 @@ TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
23942396
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_BYTECODE_VTAB=1
23952397
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_JSON1=1
23962398
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_DESERIALIZE=1
2399+
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_CKSUMVFS_STATIC=1
23972400
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) $(TEST_CCONV_OPTS)
23982401

23992402
TESTFIXTURE_SRC0 = $(TESTEXT) $(TESTSRC2)

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.33.0
1+
3.34.1

‎autoconf/tea/win/makefile.vc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Please `cd` to its location first.
153153
#
154154
#-------------------------------------------------------------------------
155155

156-
PROJECT = tclsqlite3
156+
PROJECT = sqlite3
157157
!include "rules.vc"
158158

159159
# nmakehelp -V <file> <tag> will search the file for tag, skips until a

‎configure‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for sqlcipher 3.33.0.
3+
# Generated by GNU Autoconf 2.69 for sqlcipher 3.34.1.
44
#
55
#
66
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
587587
# Identity of this package.
588588
PACKAGE_NAME='sqlcipher'
589589
PACKAGE_TARNAME='sqlcipher'
590-
PACKAGE_VERSION='3.33.0'
591-
PACKAGE_STRING='sqlcipher 3.33.0'
590+
PACKAGE_VERSION='3.34.1'
591+
PACKAGE_STRING='sqlcipher 3.34.1'
592592
PACKAGE_BUGREPORT=''
593593
PACKAGE_URL=''
594594

@@ -661,7 +661,6 @@ ALLOWRELEASE
661661
XTHREADCONNECT
662662
SQLITE_THREADSAFE
663663
BUILD_CC
664-
VERSION_NUMBER
665664
RELEASE
666665
VERSION
667666
program_prefix
@@ -1349,7 +1348,7 @@ if test "$ac_init_help" = "long"; then
13491348
# Omit some internal or obsolete options to make the list less imposing.
13501349
# This message is too long to be a string in the A/UX 3.1 sh.
13511350
cat <<_ACEOF
1352-
\`configure' configures sqlcipher 3.33.0 to adapt to many kinds of systems.
1351+
\`configure' configures sqlcipher 3.34.1 to adapt to many kinds of systems.
13531352
13541353
Usage: $0 [OPTION]... [VAR=VALUE]...
13551354
@@ -1415,7 +1414,7 @@ fi
14151414

14161415
if test -n "$ac_init_help"; then
14171416
case $ac_init_help in
1418-
short | recursive ) echo "Configuration of sqlcipher 3.33.0:";;
1417+
short | recursive ) echo "Configuration of sqlcipher 3.34.1:";;
14191418
esac
14201419
cat <<\_ACEOF
14211420
@@ -1552,7 +1551,7 @@ fi
15521551
test -n "$ac_init_help" && exit $ac_status
15531552
if $ac_init_version; then
15541553
cat <<\_ACEOF
1555-
sqlcipher configure 3.33.0
1554+
sqlcipher configure 3.34.1
15561555
generated by GNU Autoconf 2.69
15571556
15581557
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1971,7 +1970,7 @@ cat >config.log <<_ACEOF
19711970
This file contains any messages produced by compilers while
19721971
running configure, to aid debugging if configure makes a mistake.
19731972
1974-
It was created by sqlcipher $as_me 3.33.0, which was
1973+
It was created by sqlcipher $as_me 3.34.1, which was
19751974
generated by GNU Autoconf 2.69. Invocation command line was
19761975
19771976
$ $0 $@
@@ -11787,12 +11786,6 @@ RELEASE=`cat $srcdir/VERSION`
1178711786
{ $as_echo "$as_me:${as_lineno-$LINENO}: Release set to $RELEASE" >&5
1178811787
$as_echo "$as_me: Release set to $RELEASE" >&6;}
1178911788

11790-
VERSION_NUMBER=`cat $srcdir/VERSION \
11791-
| sed 's/[^0-9]/ /g' \
11792-
| awk '{printf "%d%03d%03d",$1,$2,$3}'`
11793-
{ $as_echo "$as_me:${as_lineno-$LINENO}: Version number set to $VERSION_NUMBER" >&5
11794-
$as_echo "$as_me: Version number set to $VERSION_NUMBER" >&6;}
11795-
1179611789

1179711790
#########
1179811791
# Locate a compiler for the build machine. This compiler should
@@ -13850,7 +13843,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1385013843
# report actual input values of CONFIG_FILES etc. instead of their
1385113844
# values after options handling.
1385213845
ac_log="
13853-
This file was extended by sqlcipher $as_me 3.33.0, which was
13846+
This file was extended by sqlcipher $as_me 3.34.1, which was
1385413847
generated by GNU Autoconf 2.69. Invocation command line was
1385513848
1385613849
CONFIG_FILES = $CONFIG_FILES
@@ -13916,7 +13909,7 @@ _ACEOF
1391613909
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1391713910
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1391813911
ac_cs_version="\\
13919-
sqlcipher config.status 3.33.0
13912+
sqlcipher config.status 3.34.1
1392013913
configured by $0, generated by GNU Autoconf 2.69,
1392113914
with options \\"\$ac_cs_config\\"
1392213915

‎configure.ac‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,6 @@ AC_SUBST(VERSION)
154154
RELEASE=`cat $srcdir/VERSION`
155155
AC_MSG_NOTICE(Release set to $RELEASE)
156156
AC_SUBST(RELEASE)
157-
VERSION_NUMBER=[`cat $srcdir/VERSION \
158-
| sed 's/[^0-9]/ /g' \
159-
| awk '{printf "%d%03d%03d",$1,$2,$3}'`]
160-
AC_MSG_NOTICE(Version number set to $VERSION_NUMBER)
161-
AC_SUBST(VERSION_NUMBER)
162157

163158
#########
164159
# Locate a compiler for the build machine. This compiler should

0 commit comments

Comments
 (0)