Skip to content

Commit 4510fc8

Browse files
committed
Prepare release of version 2.2.3
- Update to SQLite 3.50.3 - Adjust include for entropy on Apple platforms
1 parent 3477dec commit 4510fc8

File tree

14 files changed

+257
-217
lines changed

14 files changed

+257
-217
lines changed

CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [2.2.3] - 2025-07-18
11+
12+
### Changed
13+
14+
- Based on SQLite version 3.50.3
15+
1016
## [2.2.2] - 2025-07-13
1117

1218
### Fixed
@@ -660,7 +666,8 @@ The following ciphers are supported:
660666
- AES 256 Bit CBC - SHA1/SHA256/SHA512 HMAC ([SQLCipher](https://www.zetetic.net/sqlcipher/), database versions 1, 2, 3, and 4)
661667
- RC4 - No HMAC ([System.Data.SQLite](http://system.data.sqlite.org))
662668

663-
[Unreleased]: ../../compare/v2.2.2...HEAD
669+
[Unreleased]: ../../compare/v2.2.3...HEAD
670+
[2.2.3]: ../../compare/v2.2.2...v2.2.3
664671
[2.2.2]: ../../compare/v2.2.1...v2.2.2
665672
[2.2.1]: ../../compare/v2.2.0...v2.2.1
666673
[2.2.0]: ../../compare/v2.1.3...v2.2.0

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.24.0.0)
2-
project(sqlite3mc VERSION 2.2.2)
2+
project(sqlite3mc VERSION 2.2.3)
33

44
# Helper macro
55
macro(_Enable_MT _target)

autoconf/README.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
July 9, 2025
1+
July 18, 2025
22
============
33

44
This package contains an experimental variant for "SQLite3 Multiple

autoconf/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.1
1+
2.2.3

autoconf/sqlite3mc.pc.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ Name: SQLite3MC
99
Description: SQL database engine with encryption support
1010
Version: @PACKAGE_VERSION@
1111
Libs: -L${libdir} -lsqlite3mc
12-
Libs.private: @LDFLAGS_MATH@ @LDFLAGS_ZLIB@ @LDFLAGS_ICU@
12+
Libs.private: @LDFLAGS_MATH@ @LDFLAGS_ZLIB@ @LDFLAGS_DLOPEN@ @LDFLAGS_PTHREAD@ @LDFLAGS_ICU@
1313
Cflags: -I${includedir}/sqlite3mc

autoconf/sqlite3rc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#ifndef SQLITE_RESOURCE_VERSION
2-
#define SQLITE_RESOURCE_VERSION 3,50,1
2+
#define SQLITE_RESOURCE_VERSION 3,50,3
33
#endif

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dnl Copyright (C) 2019-2025 Ulrich Telle <[email protected]>
44
dnl
55
dnl This file is covered by the same licence as the entire SQLite3 Multiple Ciphers package.
66

7-
AC_INIT([sqlite3mc], [2.2.2], [[email protected]])
7+
AC_INIT([sqlite3mc], [2.2.3], [[email protected]])
88

99
dnl This is the version tested with, might work with earlier ones.
1010
AC_PREREQ([2.69])

readme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ The code was mainly developed under Windows, but was tested under Linux as well.
1010

1111
## Version information
1212

13-
* 2.2.2 - *July 2025*
14-
- Fixed issue [wxSQLite3 #126](https://github.com/utelle/wxsqlite3/issues/126)) - crash with "illegal instruction" on x86_64 Linux machines **without AVX** support
13+
* 2.2.3 - *July 2025*
14+
- Based on SQLite version 3.50.3
1515

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

src/chacha20poly1305.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,12 +383,17 @@ static size_t read_urandom(void* buf, size_t n)
383383
}
384384

385385
#if defined(__APPLE__)
386-
#include <CommonCrypto/CommonRandom.h>
386+
#if defined(__clang__) || defined(__GNUC__)
387+
#if __has_include(<CommonCrypto/CommonRandom.h>)
388+
#include <CommonCrypto/CommonRandom.h>
389+
#define HAVE_COMMONCRYPTO_COMMONRANDOM_H 1
390+
#endif
391+
#endif
387392
#endif
388393

389394
static size_t entropy(void* buf, size_t n)
390395
{
391-
#if defined(__APPLE__)
396+
#if defined(__APPLE__) && defined(HAVE_COMMONCRYPTO_COMMONRANDOM_H)
392397
if (CCRandomGenerateBytes(buf, n) == kCCSuccess)
393398
return n;
394399
#elif defined(__linux__) && defined(SYS_getrandom)

src/rekeyvacuum.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
** Change 4: Call sqlite3mcBtreeSetPageSize instead of sqlite3BtreeSetPageSize for main database
2828
** (sqlite3mcBtreeSetPageSize allows to reduce the number of reserved bytes)
2929
**
30-
** This code is generated by the script rekeyvacuum.sh from SQLite version 3.50.2 amalgamation.
30+
** This code is generated by the script rekeyvacuum.sh from SQLite version 3.50.3 amalgamation.
3131
*/
3232
SQLITE_PRIVATE SQLITE_NOINLINE int sqlite3mcRunVacuumForRekey(
3333
char **pzErrMsg, /* Write error message here */

0 commit comments

Comments
 (0)