-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
50 changed files
with
223 additions
and
270,171 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
libs/unsigned/ |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file renamed
BIN
+11.6 MB
external/libs/sqlite-jdbc-3.45.0.0.jar → external/libs/sqlite-jdbc-3.45.1.0.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 3 additions & 3 deletions
6
external/patches/0001-Add-user-group-ids-to-docker-build.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From ad456ab1c125d72ffbcfd1a3e37c8a903073ea6e Mon Sep 17 00:00:00 2001 | ||
From dff1aff518f418d1fc7c8a6945e0205d9f4dd14d Mon Sep 17 00:00:00 2001 | ||
From: Matthew Nelson <[email protected]> | ||
Date: Fri, 13 Oct 2023 07:09:23 -0400 | ||
Subject: [PATCH 01/11] Add user/group ids to docker build | ||
Date: Tue, 13 Feb 2024 05:29:33 -0500 | ||
Subject: [PATCH 1/8] Add user/group ids to docker build | ||
|
||
--- | ||
Makefile | 17 ++++++++++------- | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From cf3e49135fe0d553daa77893cdf65d87cb87255d Mon Sep 17 00:00:00 2001 | ||
From 24788ad43d56e2b04d47cb933080cc954f58bea5 Mon Sep 17 00:00:00 2001 | ||
From: Matthew Nelson <[email protected]> | ||
Date: Fri, 13 Oct 2023 07:09:39 -0400 | ||
Subject: [PATCH 02/11] Disable double-quoted strings | ||
Date: Tue, 13 Feb 2024 05:29:59 -0500 | ||
Subject: [PATCH 2/8] Disable double-quoted strings | ||
|
||
--- | ||
Makefile | 1 + | ||
|
@@ -74,7 +74,7 @@ index ee2e77e..0a296b6 100644 | |
|
||
PreparedStatement prep = conn.prepareStatement("select colid from tbl where col = ?"); | ||
diff --git a/src/test/java/org/sqlite/StatementTest.java b/src/test/java/org/sqlite/StatementTest.java | ||
index ee08f4c..b9d3e9a 100644 | ||
index ebb50ec..b81349c 100644 | ||
--- a/src/test/java/org/sqlite/StatementTest.java | ||
+++ b/src/test/java/org/sqlite/StatementTest.java | ||
@@ -108,7 +108,7 @@ public class StatementTest { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From 6bda9a5a053ac128db4d4d161cd269b4919a6e84 Mon Sep 17 00:00:00 2001 | ||
From dc81e9dd4619647b1b2847d10bacab84f57bbc2a Mon Sep 17 00:00:00 2001 | ||
From: Matthew Nelson <[email protected]> | ||
Date: Fri, 13 Oct 2023 07:09:56 -0400 | ||
Subject: [PATCH 03/11] Remove JDBC extensions | ||
Date: Tue, 13 Feb 2024 05:30:41 -0500 | ||
Subject: [PATCH 3/8] Remove JDBC extensions | ||
|
||
--- | ||
Makefile | 12 +----------- | ||
|
6 changes: 3 additions & 3 deletions
6
...hes/0005-Add-Linux-Musl-definitions.patch → ...hes/0004-Add-Linux-Musl-definitions.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From 217d115b19b2460d4c7bffab492034b453b1b055 Mon Sep 17 00:00:00 2001 | ||
From 9dc4e5d576627b0a7feed9be83e2b93cec5c91c1 Mon Sep 17 00:00:00 2001 | ||
From: Matthew Nelson <[email protected]> | ||
Date: Fri, 13 Oct 2023 07:10:29 -0400 | ||
Subject: [PATCH 05/11] Add Linux-Musl definitions | ||
Date: Tue, 13 Feb 2024 05:31:16 -0500 | ||
Subject: [PATCH 4/8] Add Linux-Musl definitions | ||
|
||
--- | ||
Makefile.common | 23 ++++++++++++++++++++++- | ||
|
269,813 changes: 0 additions & 269,813 deletions
269,813
external/patches/0004-Delete-native-libs.patch
This file was deleted.
Oops, something went wrong.
6 changes: 3 additions & 3 deletions
6
...006-Disable-win-arm-freebsd-targets.patch → ...Disable-Windows-arm-FreeBSD-targets.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From ee5efa5826c1be1f7216e0860d50022cd3588f2d Mon Sep 17 00:00:00 2001 | ||
From f3a6ec20bf96efe0ab71cc0c455bd965badf7245 Mon Sep 17 00:00:00 2001 | ||
From: Matthew Nelson <[email protected]> | ||
Date: Fri, 13 Oct 2023 07:10:57 -0400 | ||
Subject: [PATCH 06/11] Disable win-arm/freebsd targets | ||
Date: Tue, 13 Feb 2024 05:31:57 -0500 | ||
Subject: [PATCH 5/8] Disable Windows arm & FreeBSD targets | ||
|
||
--- | ||
Makefile | 2 +- | ||
|
6 changes: 3 additions & 3 deletions
6
...isable-mac-shared-lib-adhoc-signing.patch → ...es/0006-Disable-macOS-adhoc-signing.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From 72bbc5a456c7c28519609fdbf6c26903c7bcadc5 Mon Sep 17 00:00:00 2001 | ||
From b3617cbba5daf2c8deca8f8a50c0ad2d3b24db1f Mon Sep 17 00:00:00 2001 | ||
From: Matthew Nelson <[email protected]> | ||
Date: Fri, 13 Oct 2023 07:11:28 -0400 | ||
Subject: [PATCH 07/11] Disable mac shared lib adhoc signing | ||
Date: Tue, 13 Feb 2024 05:32:27 -0500 | ||
Subject: [PATCH 6/8] Disable macOS adhoc signing | ||
|
||
--- | ||
Makefile | 2 +- | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From d5256823321b8be4273cee8d2d11dbead0d211ab Mon Sep 17 00:00:00 2001 | ||
From b53066c79719c63bdc7554b438db043fba5fe688 Mon Sep 17 00:00:00 2001 | ||
From: Matthew Nelson <[email protected]> | ||
Date: Fri, 13 Oct 2023 07:12:33 -0400 | ||
Subject: [PATCH 10/11] Configure build to use SQLite3MultipleCiphers | ||
Date: Tue, 13 Feb 2024 05:40:07 -0500 | ||
Subject: [PATCH 7/8] Configure build to use SQLite3MultipleCiphers | ||
|
||
--- | ||
Makefile | 25 +++++++++--------- | ||
|
@@ -11,7 +11,7 @@ Subject: [PATCH 10/11] Configure build to use SQLite3MultipleCiphers | |
4 files changed, 30 insertions(+), 30 deletions(-) | ||
|
||
diff --git a/Makefile b/Makefile | ||
index efd970b..d963f92 100644 | ||
index 8ea1e4b..d2fa264 100644 | ||
--- a/Makefile | ||
+++ b/Makefile | ||
@@ -20,7 +20,7 @@ SQLITE_OBJ?=$(SQLITE_OUT)/sqlite3.o | ||
|
@@ -209,12 +209,12 @@ index 0b374bf..c6e4ff0 100644 | |
Windows-x86_64_LIBNAME := sqlitejdbc.dll | ||
Windows-x86_64_SQLITE_FLAGS := | ||
diff --git a/VERSION b/VERSION | ||
index b679894..56bac5b 100644 | ||
index d6a23d0..b404641 100644 | ||
--- a/VERSION | ||
+++ b/VERSION | ||
@@ -1 +1,2 @@ | ||
version=3.45.0 | ||
+version_mc=1.8.2 | ||
version=3.45.1 | ||
+version_mc=1.8.3 | ||
diff --git a/src/main/java/org/sqlite/core/NativeDB.c b/src/main/java/org/sqlite/core/NativeDB.c | ||
index 7361dbc..17dab54 100644 | ||
--- a/src/main/java/org/sqlite/core/NativeDB.c | ||
|
193 changes: 0 additions & 193 deletions
193
external/patches/0008-Pin-dockcross-image-versions.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,18 @@ | ||
From 432d893099b01e634e8e624887a2b1ad042cb579 Mon Sep 17 00:00:00 2001 | ||
From 805055dfdff0b51770e43f4c1ececa4def8b0bc4 Mon Sep 17 00:00:00 2001 | ||
From: Matthew Nelson <[email protected]> | ||
Date: Thu, 18 Jan 2024 13:42:47 -0500 | ||
Subject: [PATCH 11/11] Use build-env where possible | ||
Date: Tue, 13 Feb 2024 05:46:40 -0500 | ||
Subject: [PATCH 8/8] Update Docker images | ||
|
||
--- | ||
Makefile | 27 ++++++++++++++------------- | ||
Makefile.common | 35 ++++++++++++++--------------------- | ||
2 files changed, 28 insertions(+), 34 deletions(-) | ||
Makefile | 27 ++++++++++++++------------- | ||
Makefile.common | 35 ++++++++++++++--------------------- | ||
docker/dockcross-armv5 | 2 +- | ||
docker/dockcross-armv6-lts | 2 +- | ||
docker/dockcross-musl-arm64 | 2 +- | ||
5 files changed, 31 insertions(+), 37 deletions(-) | ||
|
||
diff --git a/Makefile b/Makefile | ||
index d963f92..c1713bf 100644 | ||
index d2fa264..c1713bf 100644 | ||
--- a/Makefile | ||
+++ b/Makefile | ||
@@ -21,6 +21,7 @@ SQLITE_ARCHIVE:=$(TARGET)/$(sqlite)-amal.zip | ||
|
@@ -37,11 +40,11 @@ index d963f92..c1713bf 100644 | |
./docker/dockcross-windows-arm64 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native native CROSS_PREFIX=aarch64-w64-mingw32- OS_NAME=Windows OS_ARCH=aarch64' | ||
|
||
linux32: $(SQLITE_UNPACKED) jni-header | ||
- docker run $(DOCKER_RUN_OPTS) -u $(U_ID):$(G_ID) -v $$PWD:/work toxicity-io/ubuntu16-linux-x86 bash -c 'make clean-native native OS_NAME=Linux OS_ARCH=x86' | ||
- docker run $(DOCKER_RUN_OPTS) -u $(U_ID):$(G_ID) -v $$PWD:/work xerial/centos5-linux-x86 bash -c 'make clean-native native OS_NAME=Linux OS_ARCH=x86' | ||
+ docker run $(DOCKER_RUN_OPTS) -u $(U_ID):$(G_ID) -v $$PWD:/work 05nelsonm/build-env.linux-libc.x86:$(TAG_BUILD_ENV) bash -c 'make clean-native native CROSS_PREFIX=$$CROSS_TRIPLE- OS_NAME=Linux OS_ARCH=x86' | ||
|
||
linux64: $(SQLITE_UNPACKED) jni-header | ||
- docker run $(DOCKER_RUN_OPTS) -u $(U_ID):$(G_ID) -v $$PWD:/work toxicity-io/ubuntu16-linux-x86_64 bash -c 'make clean-native native OS_NAME=Linux OS_ARCH=x86_64' | ||
- docker run $(DOCKER_RUN_OPTS) -u $(U_ID):$(G_ID) -v $$PWD:/work xerial/centos5-linux-x86_64 bash -c 'make clean-native native OS_NAME=Linux OS_ARCH=x86_64' | ||
+ docker run $(DOCKER_RUN_OPTS) -u $(U_ID):$(G_ID) -v $$PWD:/work 05nelsonm/build-env.linux-libc.x86_64:$(TAG_BUILD_ENV) bash -c 'make clean-native native CROSS_PREFIX=$$CROSS_TRIPLE- OS_NAME=Linux OS_ARCH=x86_64' | ||
|
||
freebsd32: $(SQLITE_UNPACKED) jni-header | ||
|
@@ -174,6 +177,42 @@ index c6e4ff0..6f9a654 100644 | |
Windows-x86_64_LIBNAME := sqlitejdbc.dll | ||
Windows-x86_64_SQLITE_FLAGS := | ||
|
||
diff --git a/docker/dockcross-armv5 b/docker/dockcross-armv5 | ||
index 1961108..3348ac6 100755 | ||
--- a/docker/dockcross-armv5 | ||
+++ b/docker/dockcross-armv5 | ||
@@ -1,6 +1,6 @@ | ||
#!/usr/bin/env bash | ||
|
||
-DEFAULT_DOCKCROSS_IMAGE=dockcross/linux-armv5:latest | ||
+DEFAULT_DOCKCROSS_IMAGE=dockcross/linux-armv5:20240104-6eda627 | ||
|
||
#------------------------------------------------------------------------------ | ||
# Helpers | ||
diff --git a/docker/dockcross-armv6-lts b/docker/dockcross-armv6-lts | ||
index 7f2010e..3f1b6ed 100755 | ||
--- a/docker/dockcross-armv6-lts | ||
+++ b/docker/dockcross-armv6-lts | ||
@@ -1,6 +1,6 @@ | ||
#!/usr/bin/env bash | ||
|
||
-DEFAULT_DOCKCROSS_IMAGE=dockcross/linux-armv6-lts:latest | ||
+DEFAULT_DOCKCROSS_IMAGE=dockcross/linux-armv6-lts:20240104-6eda627 | ||
|
||
#------------------------------------------------------------------------------ | ||
# Helpers | ||
diff --git a/docker/dockcross-musl-arm64 b/docker/dockcross-musl-arm64 | ||
index 9f974d7..5f72def 100755 | ||
--- a/docker/dockcross-musl-arm64 | ||
+++ b/docker/dockcross-musl-arm64 | ||
@@ -1,6 +1,6 @@ | ||
#!/usr/bin/env bash | ||
|
||
-DEFAULT_DOCKCROSS_IMAGE=dockcross/linux-arm64-musl:latest | ||
+DEFAULT_DOCKCROSS_IMAGE=dockcross/linux-arm64-musl:20231110-9476e91 | ||
|
||
#------------------------------------------------------------------------------ | ||
# Helpers | ||
-- | ||
2.34.1 | ||
|
Oops, something went wrong.