Skip to content

Commit e45d7ae

Browse files
utelleutelle
committed
Prepare release of wxSQLite3 4.10.6
- Add method wxSQLite3Database::Configure() - Add missing wxSQLite3Database::Restore() method variant - Fix mapping between cipher ids and cipher names - Update premake5 build files for gmake - Add new encrypted sample databases for Ascon128 and AEGIS tests
1 parent aac7112 commit e45d7ae

18 files changed

+244
-58
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+
## [4.10.6] - 2025-05-05
11+
12+
- Add method wxSQLite3Database::Configure()<br>
13+
- Add missing wxSQLite3Database::Restore() method variant
14+
- Fix mapping between cipher ids and cipher names<br>
15+
1016
## [4.10.5] - 2025-03-04
1117

1218
- Upgrade to SQLite3 Multiple Ciphers version 2.1.0 (SQLite version 3.49.1)
@@ -671,7 +677,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
671677

672678
- First public release
673679

674-
[Unreleased]: ../../compare/v4.10.5...HEAD
680+
[Unreleased]: ../../compare/v4.10.6...HEAD
681+
[4.10.6]: ../../compare/v4.10.5...v4.10.6
675682
[4.10.5]: ../../compare/v4.10.4...v4.10.5
676683
[4.10.4]: ../../compare/v4.10.3...v4.10.4
677684
[4.10.3]: ../../compare/v4.10.2...v4.10.3

‎build/minimal.make‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Alternative GNU Make project makefile autogenerated by Premake
1+
# GNU Make project makefile autogenerated by Premake
22

33
ifndef config
44
config=debug_win32
@@ -18,6 +18,15 @@ endif
1818
# Configurations
1919
# #############################################
2020

21+
ifeq ($(origin CC), default)
22+
CC = gcc
23+
endif
24+
ifeq ($(origin CXX), default)
25+
CXX = g++
26+
endif
27+
ifeq ($(origin AR), default)
28+
AR = ar
29+
endif
2130
RESCOMP = windres
2231
FORCE_INCLUDE +=
2332
ALL_CPPFLAGS += $(CPPFLAGS) -MD -MP $(DEFINES) $(INCLUDES)
@@ -185,22 +194,22 @@ endif
185194
# File sets
186195
# #############################################
187196

188-
CUSTOM :=
189197
GENERATED :=
190198
OBJECTS :=
199+
RESOURCES :=
191200

192-
CUSTOM += $(OBJDIR)/minimal.res
193201
GENERATED += $(OBJDIR)/minimal.o
194202
GENERATED += $(OBJDIR)/minimal.res
195203
OBJECTS += $(OBJDIR)/minimal.o
204+
RESOURCES += $(OBJDIR)/minimal.res
196205

197206
# Rules
198207
# #############################################
199208

200209
all: $(TARGET)
201210
@:
202211

203-
$(TARGET): $(CUSTOM) $(GENERATED) $(OBJECTS) $(LDDEPS) | $(TARGETDIR)
212+
$(TARGET): $(GENERATED) $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
204213
$(PRELINKCMDS)
205214
@echo Linking minimal
206215
$(SILENT) $(LINKCMD)
@@ -237,7 +246,6 @@ endif
237246
prebuild: | $(OBJDIR)
238247
$(PREBUILDCMDS)
239248

240-
$(CUSTOM): | prebuild
241249
ifneq (,$(PCH))
242250
$(OBJECTS): $(GCH) | $(PCH_PLACEHOLDER)
243251
$(GCH): $(PCH) | prebuild

‎build/minimal_mono.make‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Alternative GNU Make project makefile autogenerated by Premake
1+
# GNU Make project makefile autogenerated by Premake
22

33
ifndef config
44
config=debug_win32
@@ -18,6 +18,15 @@ endif
1818
# Configurations
1919
# #############################################
2020

21+
ifeq ($(origin CC), default)
22+
CC = gcc
23+
endif
24+
ifeq ($(origin CXX), default)
25+
CXX = g++
26+
endif
27+
ifeq ($(origin AR), default)
28+
AR = ar
29+
endif
2130
RESCOMP = windres
2231
FORCE_INCLUDE +=
2332
ALL_CPPFLAGS += $(CPPFLAGS) -MD -MP $(DEFINES) $(INCLUDES)
@@ -185,22 +194,22 @@ endif
185194
# File sets
186195
# #############################################
187196

188-
CUSTOM :=
189197
GENERATED :=
190198
OBJECTS :=
199+
RESOURCES :=
191200

192-
CUSTOM += $(OBJDIR)/minimal.res
193201
GENERATED += $(OBJDIR)/minimal.o
194202
GENERATED += $(OBJDIR)/minimal.res
195203
OBJECTS += $(OBJDIR)/minimal.o
204+
RESOURCES += $(OBJDIR)/minimal.res
196205

197206
# Rules
198207
# #############################################
199208

200209
all: $(TARGET)
201210
@:
202211

203-
$(TARGET): $(CUSTOM) $(GENERATED) $(OBJECTS) $(LDDEPS) | $(TARGETDIR)
212+
$(TARGET): $(GENERATED) $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
204213
$(PRELINKCMDS)
205214
@echo Linking minimal
206215
$(SILENT) $(LINKCMD)
@@ -237,7 +246,6 @@ endif
237246
prebuild: | $(OBJDIR)
238247
$(PREBUILDCMDS)
239248

240-
$(CUSTOM): | prebuild
241249
ifneq (,$(PCH))
242250
$(OBJECTS): $(GCH) | $(PCH_PLACEHOLDER)
243251
$(GCH): $(PCH) | prebuild

‎build/treeview.make‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Alternative GNU Make project makefile autogenerated by Premake
1+
# GNU Make project makefile autogenerated by Premake
22

33
ifndef config
44
config=debug_win32
@@ -18,6 +18,15 @@ endif
1818
# Configurations
1919
# #############################################
2020

21+
ifeq ($(origin CC), default)
22+
CC = gcc
23+
endif
24+
ifeq ($(origin CXX), default)
25+
CXX = g++
26+
endif
27+
ifeq ($(origin AR), default)
28+
AR = ar
29+
endif
2130
RESCOMP = windres
2231
FORCE_INCLUDE +=
2332
ALL_CPPFLAGS += $(CPPFLAGS) -MD -MP $(DEFINES) $(INCLUDES)
@@ -185,11 +194,10 @@ endif
185194
# File sets
186195
# #############################################
187196

188-
CUSTOM :=
189197
GENERATED :=
190198
OBJECTS :=
199+
RESOURCES :=
191200

192-
CUSTOM += $(OBJDIR)/treeview.res
193201
GENERATED += $(OBJDIR)/foldertree.o
194202
GENERATED += $(OBJDIR)/projectlist.o
195203
GENERATED += $(OBJDIR)/treeview.res
@@ -199,14 +207,15 @@ OBJECTS += $(OBJDIR)/foldertree.o
199207
OBJECTS += $(OBJDIR)/projectlist.o
200208
OBJECTS += $(OBJDIR)/treeviewapp.o
201209
OBJECTS += $(OBJDIR)/treeviewsample.o
210+
RESOURCES += $(OBJDIR)/treeview.res
202211

203212
# Rules
204213
# #############################################
205214

206215
all: $(TARGET)
207216
@:
208217

209-
$(TARGET): $(CUSTOM) $(GENERATED) $(OBJECTS) $(LDDEPS) | $(TARGETDIR)
218+
$(TARGET): $(GENERATED) $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
210219
$(PRELINKCMDS)
211220
@echo Linking treeview
212221
$(SILENT) $(LINKCMD)
@@ -243,7 +252,6 @@ endif
243252
prebuild: | $(OBJDIR)
244253
$(PREBUILDCMDS)
245254

246-
$(CUSTOM): | prebuild
247255
ifneq (,$(PCH))
248256
$(OBJECTS): $(GCH) | $(PCH_PLACEHOLDER)
249257
$(GCH): $(PCH) | prebuild

‎build/treeview_mono.make‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Alternative GNU Make project makefile autogenerated by Premake
1+
# GNU Make project makefile autogenerated by Premake
22

33
ifndef config
44
config=debug_win32
@@ -18,6 +18,15 @@ endif
1818
# Configurations
1919
# #############################################
2020

21+
ifeq ($(origin CC), default)
22+
CC = gcc
23+
endif
24+
ifeq ($(origin CXX), default)
25+
CXX = g++
26+
endif
27+
ifeq ($(origin AR), default)
28+
AR = ar
29+
endif
2130
RESCOMP = windres
2231
FORCE_INCLUDE +=
2332
ALL_CPPFLAGS += $(CPPFLAGS) -MD -MP $(DEFINES) $(INCLUDES)
@@ -185,11 +194,10 @@ endif
185194
# File sets
186195
# #############################################
187196

188-
CUSTOM :=
189197
GENERATED :=
190198
OBJECTS :=
199+
RESOURCES :=
191200

192-
CUSTOM += $(OBJDIR)/treeview.res
193201
GENERATED += $(OBJDIR)/foldertree.o
194202
GENERATED += $(OBJDIR)/projectlist.o
195203
GENERATED += $(OBJDIR)/treeview.res
@@ -199,14 +207,15 @@ OBJECTS += $(OBJDIR)/foldertree.o
199207
OBJECTS += $(OBJDIR)/projectlist.o
200208
OBJECTS += $(OBJDIR)/treeviewapp.o
201209
OBJECTS += $(OBJDIR)/treeviewsample.o
210+
RESOURCES += $(OBJDIR)/treeview.res
202211

203212
# Rules
204213
# #############################################
205214

206215
all: $(TARGET)
207216
@:
208217

209-
$(TARGET): $(CUSTOM) $(GENERATED) $(OBJECTS) $(LDDEPS) | $(TARGETDIR)
218+
$(TARGET): $(GENERATED) $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
210219
$(PRELINKCMDS)
211220
@echo Linking treeview
212221
$(SILENT) $(LINKCMD)
@@ -243,7 +252,6 @@ endif
243252
prebuild: | $(OBJDIR)
244253
$(PREBUILDCMDS)
245254

246-
$(CUSTOM): | prebuild
247255
ifneq (,$(PCH))
248256
$(OBJECTS): $(GCH) | $(PCH_PLACEHOLDER)
249257
$(GCH): $(PCH) | prebuild

‎build/wxsqlite3.make‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Alternative GNU Make project makefile autogenerated by Premake
1+
# GNU Make project makefile autogenerated by Premake
22

33
ifndef config
44
config=debug_win32
@@ -18,6 +18,15 @@ endif
1818
# Configurations
1919
# #############################################
2020

21+
ifeq ($(origin CC), default)
22+
CC = gcc
23+
endif
24+
ifeq ($(origin CXX), default)
25+
CXX = g++
26+
endif
27+
ifeq ($(origin AR), default)
28+
AR = ar
29+
endif
2130
RESCOMP = windres
2231
FORCE_INCLUDE +=
2332
ALL_CPPFLAGS += $(CPPFLAGS) -MD -MP $(DEFINES) $(INCLUDES)
@@ -174,24 +183,24 @@ endif
174183
# File sets
175184
# #############################################
176185

177-
CUSTOM :=
178186
GENERATED :=
179187
OBJECTS :=
188+
RESOURCES :=
180189

181-
CUSTOM += $(OBJDIR)/wxsqlite3_version.res
182190
GENERATED += $(OBJDIR)/sqlite3mc_amalgamation.o
183191
GENERATED += $(OBJDIR)/wxsqlite3.o
184192
GENERATED += $(OBJDIR)/wxsqlite3_version.res
185193
OBJECTS += $(OBJDIR)/sqlite3mc_amalgamation.o
186194
OBJECTS += $(OBJDIR)/wxsqlite3.o
195+
RESOURCES += $(OBJDIR)/wxsqlite3_version.res
187196

188197
# Rules
189198
# #############################################
190199

191200
all: $(TARGET)
192201
@:
193202

194-
$(TARGET): $(CUSTOM) $(GENERATED) $(OBJECTS) $(LDDEPS) | $(TARGETDIR)
203+
$(TARGET): $(GENERATED) $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
195204
$(PRELINKCMDS)
196205
@echo Linking wxsqlite3
197206
$(SILENT) $(LINKCMD)
@@ -228,7 +237,6 @@ endif
228237
prebuild: | $(OBJDIR)
229238
$(PREBUILDCMDS)
230239

231-
$(CUSTOM): | prebuild
232240
ifneq (,$(PCH))
233241
$(OBJECTS): $(GCH) | $(PCH_PLACEHOLDER)
234242
$(GCH): $(PCH) | prebuild

‎build/wxsqlite3_mono.make‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Alternative GNU Make project makefile autogenerated by Premake
1+
# GNU Make project makefile autogenerated by Premake
22

33
ifndef config
44
config=debug_win32
@@ -18,6 +18,15 @@ endif
1818
# Configurations
1919
# #############################################
2020

21+
ifeq ($(origin CC), default)
22+
CC = gcc
23+
endif
24+
ifeq ($(origin CXX), default)
25+
CXX = g++
26+
endif
27+
ifeq ($(origin AR), default)
28+
AR = ar
29+
endif
2130
RESCOMP = windres
2231
FORCE_INCLUDE +=
2332
ALL_CPPFLAGS += $(CPPFLAGS) -MD -MP $(DEFINES) $(INCLUDES)
@@ -185,24 +194,24 @@ endif
185194
# File sets
186195
# #############################################
187196

188-
CUSTOM :=
189197
GENERATED :=
190198
OBJECTS :=
199+
RESOURCES :=
191200

192-
CUSTOM += $(OBJDIR)/wxsqlite3_version.res
193201
GENERATED += $(OBJDIR)/sqlite3mc_amalgamation.o
194202
GENERATED += $(OBJDIR)/wxsqlite3.o
195203
GENERATED += $(OBJDIR)/wxsqlite3_version.res
196204
OBJECTS += $(OBJDIR)/sqlite3mc_amalgamation.o
197205
OBJECTS += $(OBJDIR)/wxsqlite3.o
206+
RESOURCES += $(OBJDIR)/wxsqlite3_version.res
198207

199208
# Rules
200209
# #############################################
201210

202211
all: $(TARGET)
203212
@:
204213

205-
$(TARGET): $(CUSTOM) $(GENERATED) $(OBJECTS) $(LDDEPS) | $(TARGETDIR)
214+
$(TARGET): $(GENERATED) $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
206215
$(PRELINKCMDS)
207216
@echo Linking wxsqlite3
208217
$(SILENT) $(LINKCMD)
@@ -239,7 +248,6 @@ endif
239248
prebuild: | $(OBJDIR)
240249
$(PREBUILDCMDS)
241250

242-
$(CUSTOM): | prebuild
243251
ifneq (,$(PCH))
244252
$(OBJECTS): $(GCH) | $(PCH_PLACEHOLDER)
245253
$(GCH): $(PCH) | prebuild

‎configure.ac‎

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

7-
AC_INIT([wxsqlite3], [4.10.5], [[email protected]])
7+
AC_INIT([wxsqlite3], [4.10.6], [[email protected]])
88

99
dnl This is the version tested with, might work with earlier ones.
1010
AC_PREREQ([2.69])
@@ -173,6 +173,8 @@ AC_CONFIG_LINKS([samples/sqlcipher-1.1.8-testkey.db:samples/sqlcipher-1.1.8-test
173173
samples/sqlcipher-2.0-le-testkey.db:samples/sqlcipher-2.0-le-testkey.db
174174
samples/sqlcipher-3.0-testkey.db:samples/sqlcipher-3.0-testkey.db
175175
samples/sqlcipher-4.0-testkey.db:samples/sqlcipher-4.0-testkey.db
176+
samples/persons-ascon128-testkey.db3:samples/persons-ascon128-testkey.db3
177+
samples/persons-aegis-testkey.db3:samples/persons-aegis-testkey.db3
176178
])
177179

178180
AC_CANONICAL_HOST

‎docs/Doxyfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ PROJECT_NAME = wxSQLite3
4848
# could be handy for archiving the generated documentation or if some version
4949
# control system is used.
5050

51-
PROJECT_NUMBER = 4.10.5
51+
PROJECT_NUMBER = 4.10.6
5252

5353
# Using the PROJECT_BRIEF tag one can provide an optional one line description
5454
# for a project that appears at the top of each page and should give viewers a

0 commit comments

Comments
 (0)