Skip to content

Commit

Permalink
Update SQLite to version 3.45.0
Browse files Browse the repository at this point in the history
  • Loading branch information
utelle committed Jan 16, 2024
1 parent 09f09e1 commit e5ed494
Show file tree
Hide file tree
Showing 11 changed files with 11,091 additions and 5,072 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.8.2] - 2024-01-16

### Changed

- Based on SQLite version 3.45.0

## [1.8.1] - 2023-12-02

### Changed
Expand Down Expand Up @@ -469,7 +475,9 @@ The following ciphers are supported:
- AES 256 Bit CBC - SHA1/SHA256/SHA512 HMAC ([SQLCipher](https://www.zetetic.net/sqlcipher/), database versions 1, 2, 3, and 4)
- RC4 - No HMAC ([System.Data.SQLite](http://system.data.sqlite.org))

[Unreleased]: ../../compare/v1.8.0...HEAD
[Unreleased]: ../../compare/v1.8.2...HEAD
[1.8.2]: ../../compare/v1.8.1...v1.8.2
[1.8.1]: ../../compare/v1.8.0...v1.8.1
[1.8.0]: ../../compare/v1.7.4...v1.8.0
[1.7.4]: ../../compare/v1.7.3...v1.7.4
[1.7.3]: ../../compare/v1.7.2...v1.7.3
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019-2020 Ulrich Telle
Copyright (c) 2019-2024 Ulrich Telle

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dnl Copyright (C) 2019-2023 Ulrich Telle <ulrich@telle-online.de>
dnl
dnl This file is covered by the same licence as the entire SQLite3 Multiple Ciphers package.

AC_INIT([sqlite3mc], [1.8.1], [ulrich@telle-online.de])
AC_INIT([sqlite3mc], [1.8.2], [ulrich@telle-online.de])

dnl This is the version tested with, might work with earlier ones.
AC_PREREQ([2.69])
Expand Down
6 changes: 2 additions & 4 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@ The code was mainly developed under Windows, but was tested under Linux as well.

## Version information

* 1.8.1 - *December 2023*
- Based on SQLite version 3.44.2
- Fixed issue #133 - missing API symbols
- Applied several modifications to improve support for [SQLite3 WASM](https://sqlite.org/wasm/)
* 1.8.2 - *January 2024*
- Based on SQLite version 3.45.0

For further version information please consult the [CHANGELOG](CHANGELOG.md).

Expand Down
5 changes: 3 additions & 2 deletions scripts/patchshell.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ die() {
exit 2
}

sed -e '/^ oputf("SQLite version/{n;N;d}' "$INPUT" \
sed -e '/^ sputf(stdout, "SQLite version/{n;N;d}' "$INPUT" \
| sed '/#ifdef SQLITE_CUSTOM_INCLUDE/!{p;d;};n;n;n;a #if SQLITE3MC_USE_MINIZ != 0 && !defined(SQLITE_ENABLE_COMPRESS)\n#include "miniz.c"\n#ifdef SQLITE_HAVE_ZLIB\n#undef SQLITE_HAVE_ZLIB\n#endif\n#define SQLITE_HAVE_ZLIB 1\n#endif\n' \
| sed '/#include <zlib.h>/c #include "zlibwrap.h"' \
| sed '/^ oputf("SQLite version/c \ extern char* sqlite3mc_version();\n oputf("SQLite version \%s \%.19s%s" \/\*extra-version-info\*\/\n " (\%s)\\n" \/\*SQLite3-Multiple-Ciphers-version-info\*\/\n "Enter \\".help\\" for usage hints.\\n\",\n sqlite3_libversion(), sqlite3_sourceid(), SHELL_CIO_CHAR_SET, sqlite3mc_version());'
| sed '/^ sputf(stdout, "SQLite version/c \ extern char* sqlite3mc_version();\n sputf(stdout, "SQLite version \%s \%.19s%s" \/\*extra-version-info\*\/\n " (\%s)\\n" \/\*SQLite3-Multiple-Ciphers-version-info\*\/\n "Enter \\".help\\" for usage hints.\\n\",\n sqlite3_libversion(), sqlite3_sourceid(), SHELL_CIO_CHAR_SET, sqlite3mc_version());' \
| sed '/^ sqlite3_libversion(), sqlite3_sourceid());/a \ extern char* sqlite3mc_version();\n oputf("\%s\\n", sqlite3mc_version());'
2 changes: 1 addition & 1 deletion src/rekeyvacuum.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
** Change 4: Call sqlite3mcBtreeSetPageSize instead of sqlite3BtreeSetPageSize for main database
** (sqlite3mcBtreeSetPageSize allows to reduce the number of reserved bytes)
**
** This code is generated by the script rekeyvacuum.sh from SQLite version 3.44.2 amalgamation.
** This code is generated by the script rekeyvacuum.sh from SQLite version 3.45.0 amalgamation.
*/
SQLITE_PRIVATE SQLITE_NOINLINE int sqlite3mcRunVacuumForRekey(
char **pzErrMsg, /* Write error message here */
Expand Down
Loading

0 comments on commit e5ed494

Please sign in to comment.