Skip to content

Commit e2ea233

Browse files
05nelsonm05nelsonm
committed
Update git submodule:
Sqlite3MultipleCiphers >> 2.0.1 sqlite-jdbc >> 3.47.2.0
1 parent c75d333 commit e2ea233

12 files changed

+57
-33
lines changed

‎external/patches/0001-Add-user-group-ids-to-docker-build.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From c7673b893f4e1485b1406613861dc40335bac6c4 Mon Sep 17 00:00:00 2001
1+
From 75d67a6ac90884b4586b0906859279781bdc7177 Mon Sep 17 00:00:00 2001
22
From: Matthew Nelson <[email protected]>
3-
Date: Mon, 9 Dec 2024 02:59:08 -0500
4-
Subject: [PATCH 1/9] Add user/group ids to docker build
3+
Date: Thu, 16 Jan 2025 06:29:30 -0500
4+
Subject: [PATCH 01/10] Add user/group ids to docker build
55

66
---
77
Makefile | 17 ++++++++++-------

‎external/patches/0002-Disable-double-quoted-strings.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From f0f61af65345a482b8ec015d803d6c0d0ee07f92 Mon Sep 17 00:00:00 2001
1+
From f400f30d18ceae00c85350ed5f8d3d4688376a48 Mon Sep 17 00:00:00 2001
22
From: Matthew Nelson <[email protected]>
3-
Date: Mon, 9 Dec 2024 02:59:09 -0500
4-
Subject: [PATCH 2/9] Disable double-quoted strings
3+
Date: Thu, 16 Jan 2025 06:29:31 -0500
4+
Subject: [PATCH 02/10] Disable double-quoted strings
55

66
---
77
Makefile | 1 +

‎external/patches/0003-Remove-JDBC-extensions.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 57c57ffb1b805b3ef29272e3f7f89478d4a04aa3 Mon Sep 17 00:00:00 2001
1+
From 58d66ed37508f69e9124e9a381a213b3feecf3aa Mon Sep 17 00:00:00 2001
22
From: Matthew Nelson <[email protected]>
3-
Date: Mon, 9 Dec 2024 02:59:10 -0500
4-
Subject: [PATCH 3/9] Remove JDBC extensions
3+
Date: Thu, 16 Jan 2025 06:29:32 -0500
4+
Subject: [PATCH 03/10] Remove JDBC extensions
55

66
---
77
Makefile | 12 +-----------

‎external/patches/0004-Add-Linux-Musl-definitions.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 96e18f4952200a86088d50c8d16245177764d1d9 Mon Sep 17 00:00:00 2001
1+
From 11c259481d84d82a83e495583516fc3a7e16e0ab Mon Sep 17 00:00:00 2001
22
From: Matthew Nelson <[email protected]>
3-
Date: Mon, 9 Dec 2024 02:59:11 -0500
4-
Subject: [PATCH 4/9] Add Linux-Musl definitions
3+
Date: Thu, 16 Jan 2025 06:29:32 -0500
4+
Subject: [PATCH 04/10] Add Linux-Musl definitions
55

66
---
77
Makefile.common | 23 ++++++++++++++++++++++-

‎external/patches/0005-Disable-Windows-arm-FreeBSD-targets.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From ba0831afff517eb257a0d53348dccc0cafee413a Mon Sep 17 00:00:00 2001
1+
From b4e48a62191afc983979412c409a558fb85304e0 Mon Sep 17 00:00:00 2001
22
From: Matthew Nelson <[email protected]>
3-
Date: Mon, 9 Dec 2024 02:59:11 -0500
4-
Subject: [PATCH 5/9] Disable Windows arm & FreeBSD targets
3+
Date: Thu, 16 Jan 2025 06:29:33 -0500
4+
Subject: [PATCH 05/10] Disable Windows arm & FreeBSD targets
55

66
---
77
Makefile | 2 +-

‎external/patches/0006-Disable-macOS-adhoc-signing.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From df34f7956bed1b2b6c89ed5a8140436df07147bd Mon Sep 17 00:00:00 2001
1+
From ae6f1f665345749c0f848b0ef5f361ed203a3c21 Mon Sep 17 00:00:00 2001
22
From: Matthew Nelson <[email protected]>
3-
Date: Mon, 9 Dec 2024 02:59:12 -0500
4-
Subject: [PATCH 6/9] Disable macOS adhoc signing
3+
Date: Thu, 16 Jan 2025 06:29:34 -0500
4+
Subject: [PATCH 06/10] Disable macOS adhoc signing
55

66
---
77
Makefile | 2 +-

‎external/patches/0007-Configure-build-to-use-SQLite3MultipleCiphers.patch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From c0b4df051e1d0be780965763d239d28592fef258 Mon Sep 17 00:00:00 2001
1+
From 43aa1dc071d2d8baa44074e417ed1eb788a07ffc Mon Sep 17 00:00:00 2001
22
From: Matthew Nelson <[email protected]>
3-
Date: Mon, 9 Dec 2024 02:59:13 -0500
4-
Subject: [PATCH 7/9] Configure build to use SQLite3MultipleCiphers
3+
Date: Thu, 16 Jan 2025 06:29:35 -0500
4+
Subject: [PATCH 07/10] Configure build to use SQLite3MultipleCiphers
55

66
---
77
Makefile | 25 +++++++++---------
@@ -209,12 +209,12 @@ index 2f99457..9bc779e 100644
209209
Windows-x86_64_LIBNAME := sqlitejdbc.dll
210210
Windows-x86_64_SQLITE_FLAGS :=
211211
diff --git a/VERSION b/VERSION
212-
index 90c9e32..dce009a 100644
212+
index 0f283db..460b5dd 100644
213213
--- a/VERSION
214214
+++ b/VERSION
215215
@@ -1 +1,2 @@
216-
version=3.47.1
217-
+version_mc=1.9.1
216+
version=3.47.2
217+
+version_mc=2.0.1
218218
diff --git a/src/main/java/org/sqlite/core/NativeDB.c b/src/main/java/org/sqlite/core/NativeDB.c
219219
index 7361dbc..17dab54 100644
220220
--- a/src/main/java/org/sqlite/core/NativeDB.c

‎external/patches/0008-Update-Docker-images.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 08be9c7ef9f783d7cae33908f58cb51fa625f3fc Mon Sep 17 00:00:00 2001
1+
From 0abf0a50520279de182f9eb0f0a930efabfab88d Mon Sep 17 00:00:00 2001
22
From: Matthew Nelson <[email protected]>
3-
Date: Mon, 9 Dec 2024 02:59:14 -0500
4-
Subject: [PATCH 8/9] Update Docker images
3+
Date: Thu, 16 Jan 2025 06:29:36 -0500
4+
Subject: [PATCH 08/10] Update Docker images
55

66
---
77
Makefile | 27 ++++++++++++++-------------

‎external/patches/0009-Fix-Android-API-23-compatibility-Disable-all-logging.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 0cee1687bbc81a237398df143ed94f8a32c719fa Mon Sep 17 00:00:00 2001
1+
From 92ffc4ad80f7050315a686c0cfd6a5c1f7564703 Mon Sep 17 00:00:00 2001
22
From: Matthew Nelson <[email protected]>
3-
Date: Mon, 9 Dec 2024 02:59:15 -0500
4-
Subject: [PATCH 9/9] Fix Android API 23- compatibility (Disable all logging)
3+
Date: Thu, 16 Jan 2025 06:29:37 -0500
4+
Subject: [PATCH 09/10] Fix Android API 23- compatibility (Disable all logging)
55

66
---
77
src/main/java/org/sqlite/JDBC.java | 8 ++--
@@ -200,7 +200,7 @@ index a71e8ea..b563484 100644
200200
}
201201

202202
diff --git a/src/main/java/org/sqlite/jdbc3/JDBC3DatabaseMetaData.java b/src/main/java/org/sqlite/jdbc3/JDBC3DatabaseMetaData.java
203-
index 086fcbc..bd1ba88 100644
203+
index 59aadfb..6e94570 100644
204204
--- a/src/main/java/org/sqlite/jdbc3/JDBC3DatabaseMetaData.java
205205
+++ b/src/main/java/org/sqlite/jdbc3/JDBC3DatabaseMetaData.java
206206
@@ -25,8 +25,8 @@ import org.sqlite.SQLiteConnection;

‎external/patches/0010-Disable-cipher-AEGIS.patch‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From edc5948525ac563a92df951965ef22d9205708c6 Mon Sep 17 00:00:00 2001
2+
From: Matthew Nelson <[email protected]>
3+
Date: Thu, 16 Jan 2025 06:29:38 -0500
4+
Subject: [PATCH 10/10] Disable cipher AEGIS
5+
6+
---
7+
Makefile | 1 +
8+
1 file changed, 1 insertion(+)
9+
10+
diff --git a/Makefile b/Makefile
11+
index bb2e184..d2ec350 100644
12+
--- a/Makefile
13+
+++ b/Makefile
14+
@@ -96,6 +96,7 @@ $(SQLITE_OUT)/sqlite3.o : $(SQLITE_UNPACKED)
15+
-DSQLITE_ENABLE_REGEXP=1 \
16+
-DSQLITE_TEMP_STORE=2 \
17+
-DSQLITE_USE_URI=1 \
18+
+ -DWXSQLITE3_HAVE_CIPHER_AEGIS=0 \
19+
$(SQLITE_FLAGS) \
20+
$(SQLITE_OUT)/sqlite3mc_amalgamation.c
21+
22+
--
23+
2.34.1
24+

0 commit comments

Comments
 (0)