diff --git a/external/patches/0001-Add-user-group-ids-to-docker-build.patch b/external/patches/0001-Add-user-group-ids-to-docker-build.patch index 831840f..17af543 100644 --- a/external/patches/0001-Add-user-group-ids-to-docker-build.patch +++ b/external/patches/0001-Add-user-group-ids-to-docker-build.patch @@ -1,6 +1,6 @@ -From a6dc225be95b2194e210d220703cdf4c82300854 Mon Sep 17 00:00:00 2001 +From ab4fc3549cc16c2f688360fcae3ecd3bf7a1ed80 Mon Sep 17 00:00:00 2001 From: Matthew Nelson -Date: Mon, 27 May 2024 17:25:11 -0400 +Date: Wed, 21 Aug 2024 12:11:44 -0400 Subject: [PATCH 1/8] Add user/group ids to docker build --- @@ -8,7 +8,7 @@ Subject: [PATCH 1/8] Add user/group ids to docker build 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile -index b32d85f..04cba66 100644 +index a698f26..605990f 100644 --- a/Makefile +++ b/Makefile @@ -29,6 +29,9 @@ SQLITE_INCLUDE := $(shell dirname "$(SQLITE_HEADER)") @@ -47,8 +47,8 @@ index b32d85f..04cba66 100644 linux-musl-arm64: $(SQLITE_UNPACKED) jni-header ./docker/dockcross-musl-arm64 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native native CROSS_PREFIX=aarch64-linux-musl- OS_NAME=Linux-Musl OS_ARCH=aarch64' -@@ -195,14 +198,14 @@ linux-ppc64: $(SQLITE_UNPACKED) jni-header - ./docker/dockcross-ppc64 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native native CROSS_PREFIX=powerpc64le-unknown-linux-gnu- OS_NAME=Linux OS_ARCH=ppc64' +@@ -198,14 +201,14 @@ linux-riscv64: $(SQLITE_UNPACKED) jni-header + ./docker/dockcross-riscv64 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native native CROSS_PREFIX=riscv64-unknown-linux-gnu- OS_NAME=Linux OS_ARCH=riscv64' mac64: $(SQLITE_UNPACKED) jni-header - docker run $(DOCKER_RUN_OPTS) -v $$PWD:/workdir -e CROSS_TRIPLE=x86_64-apple-darwin multiarch/crossbuild make clean-native native OS_NAME=Mac OS_ARCH=x86_64 diff --git a/external/patches/0002-Disable-double-quoted-strings.patch b/external/patches/0002-Disable-double-quoted-strings.patch index 0409564..383a58a 100644 --- a/external/patches/0002-Disable-double-quoted-strings.patch +++ b/external/patches/0002-Disable-double-quoted-strings.patch @@ -1,6 +1,6 @@ -From b79a4d9c5354a9c9b29916f744837186a647bac1 Mon Sep 17 00:00:00 2001 +From 8a3bc05b0c08d4c9d4270633a4ea8912dec7e7eb Mon Sep 17 00:00:00 2001 From: Matthew Nelson -Date: Mon, 27 May 2024 17:25:12 -0400 +Date: Wed, 21 Aug 2024 12:11:45 -0400 Subject: [PATCH 2/8] Disable double-quoted strings --- @@ -12,7 +12,7 @@ Subject: [PATCH 2/8] Disable double-quoted strings 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile -index 04cba66..1fc51c9 100644 +index 605990f..5297c5c 100644 --- a/Makefile +++ b/Makefile @@ -105,6 +105,7 @@ $(SQLITE_OUT)/sqlite3.o : $(SQLITE_UNPACKED) diff --git a/external/patches/0003-Remove-JDBC-extensions.patch b/external/patches/0003-Remove-JDBC-extensions.patch index 4c95bf0..315cb00 100644 --- a/external/patches/0003-Remove-JDBC-extensions.patch +++ b/external/patches/0003-Remove-JDBC-extensions.patch @@ -1,6 +1,6 @@ -From 9c51967a1c2d986b9849b0c76f3956f0696e7f99 Mon Sep 17 00:00:00 2001 +From 1904df0f4bdb9e3e05a5b4b7c076d6503434d474 Mon Sep 17 00:00:00 2001 From: Matthew Nelson -Date: Mon, 27 May 2024 17:25:13 -0400 +Date: Wed, 21 Aug 2024 12:11:45 -0400 Subject: [PATCH 3/8] Remove JDBC extensions --- @@ -8,7 +8,7 @@ Subject: [PATCH 3/8] Remove JDBC extensions 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Makefile b/Makefile -index 1fc51c9..e1c88b9 100644 +index 5297c5c..50f8735 100644 --- a/Makefile +++ b/Makefile @@ -70,18 +70,8 @@ clean: clean-native clean-java clean-tests diff --git a/external/patches/0004-Add-Linux-Musl-definitions.patch b/external/patches/0004-Add-Linux-Musl-definitions.patch index 56e7a77..99fad96 100644 --- a/external/patches/0004-Add-Linux-Musl-definitions.patch +++ b/external/patches/0004-Add-Linux-Musl-definitions.patch @@ -1,6 +1,6 @@ -From cb3613338dcd1d39832f18b55581e6d1a072d1c6 Mon Sep 17 00:00:00 2001 +From 0328e3006287191efa330362e78f3e095dfcf065 Mon Sep 17 00:00:00 2001 From: Matthew Nelson -Date: Mon, 27 May 2024 17:25:14 -0400 +Date: Wed, 21 Aug 2024 12:11:46 -0400 Subject: [PATCH 4/8] Add Linux-Musl definitions --- @@ -8,15 +8,15 @@ Subject: [PATCH 4/8] Add Linux-Musl definitions 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/Makefile.common b/Makefile.common -index c435e7c..0b374bf 100644 +index fb5dd48..2f99457 100644 --- a/Makefile.common +++ b/Makefile.common @@ -52,7 +52,7 @@ endif # os=Default is meant to be generic unix/linux --known_targets := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-Android-arm Linux-Android-aarch64 Linux-Android-x86 Linux-Android-x86_64 Linux-ppc64 Mac-x86 Mac-x86_64 Mac-aarch64 DragonFly-x86_64 FreeBSD-x86 FreeBSD-x86_64 FreeBSD-aarch64 OpenBSD-x86_64 Windows-x86 Windows-x86_64 Windows-armv7 Windows-aarch64 SunOS-sparcv9 HPUX-ia64_32 -+known_targets := Linux-x86 Linux-x86_64 Linux-Musl-x86 Linux-Musl-x86_64 Linux-Musl-aarch64 Linux-arm Linux-armv6 Linux-armv7 Linux-Android-arm Linux-Android-aarch64 Linux-Android-x86 Linux-Android-x86_64 Linux-ppc64 Mac-x86 Mac-x86_64 Mac-aarch64 DragonFly-x86_64 FreeBSD-x86 FreeBSD-x86_64 FreeBSD-aarch64 OpenBSD-x86_64 Windows-x86 Windows-x86_64 Windows-armv7 Windows-aarch64 SunOS-sparcv9 HPUX-ia64_32 +-known_targets := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-Android-arm Linux-Android-aarch64 Linux-Android-x86 Linux-Android-x86_64 Linux-ppc64 Linux-riscv64 Mac-x86 Mac-x86_64 Mac-aarch64 DragonFly-x86_64 FreeBSD-x86 FreeBSD-x86_64 FreeBSD-aarch64 OpenBSD-x86_64 Windows-x86 Windows-x86_64 Windows-armv7 Windows-aarch64 SunOS-sparcv9 HPUX-ia64_32 ++known_targets := Linux-x86 Linux-x86_64 Linux-Musl-x86 Linux-Musl-x86_64 Linux-Musl-aarch64 Linux-arm Linux-armv6 Linux-armv7 Linux-Android-arm Linux-Android-aarch64 Linux-Android-x86 Linux-Android-x86_64 Linux-ppc64 Linux-riscv64 Mac-x86 Mac-x86_64 Mac-aarch64 DragonFly-x86_64 FreeBSD-x86 FreeBSD-x86_64 FreeBSD-aarch64 OpenBSD-x86_64 Windows-x86 Windows-x86_64 Windows-armv7 Windows-aarch64 SunOS-sparcv9 HPUX-ia64_32 target := $(OS_NAME)-$(OS_ARCH) ifeq (,$(findstring $(strip $(target)),$(known_targets))) diff --git a/external/patches/0005-Disable-Windows-arm-FreeBSD-targets.patch b/external/patches/0005-Disable-Windows-arm-FreeBSD-targets.patch index 03785a5..10322bc 100644 --- a/external/patches/0005-Disable-Windows-arm-FreeBSD-targets.patch +++ b/external/patches/0005-Disable-Windows-arm-FreeBSD-targets.patch @@ -1,6 +1,6 @@ -From 379c7334b4bcd8f8c8be64dac2d2186e6079f3ac Mon Sep 17 00:00:00 2001 +From baf227a58c816e6f6fe0479ecdc28263e58ab724 Mon Sep 17 00:00:00 2001 From: Matthew Nelson -Date: Mon, 27 May 2024 17:25:14 -0400 +Date: Wed, 21 Aug 2024 12:11:47 -0400 Subject: [PATCH 5/8] Disable Windows arm & FreeBSD targets --- @@ -8,14 +8,14 @@ Subject: [PATCH 5/8] Disable Windows arm & FreeBSD targets 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index e1c88b9..4f43de9 100644 +index 50f8735..3898179 100644 --- a/Makefile +++ b/Makefile @@ -115,7 +115,7 @@ NATIVE_TARGET_DIR:=$(TARGET)/classes/org/sqlite/native/$(OS_NAME)/$(OS_ARCH) NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME) # For cross-compilation, install docker. See also https://github.com/dockcross/dockcross --native-all: native win32 win64 win-armv7 win-arm64 mac64-signed mac-arm64-signed linux32 linux64 freebsd32 freebsd64 freebsd-arm64 linux-arm linux-armv6 linux-armv7 linux-arm64 linux-android-arm linux-android-arm64 linux-android-x86 linux-android-x64 linux-ppc64 linux-musl32 linux-musl64 linux-musl-arm64 +-native-all: native win32 win64 win-armv7 win-arm64 mac64-signed mac-arm64-signed linux32 linux64 freebsd32 freebsd64 freebsd-arm64 linux-arm linux-armv6 linux-armv7 linux-arm64 linux-android-arm linux-android-arm64 linux-android-x86 linux-android-x64 linux-ppc64 linux-musl32 linux-musl64 linux-musl-arm64 linux-riscv64 +native-all: native win32 win64 mac64-signed mac-arm64-signed linux32 linux64 linux-arm linux-armv6 linux-armv7 linux-arm64 linux-android-arm linux-android-arm64 linux-android-x86 linux-android-x64 linux-ppc64 linux-musl32 linux-musl64 linux-musl-arm64 native: $(NATIVE_DLL) diff --git a/external/patches/0006-Disable-macOS-adhoc-signing.patch b/external/patches/0006-Disable-macOS-adhoc-signing.patch index da75f44..75c54db 100644 --- a/external/patches/0006-Disable-macOS-adhoc-signing.patch +++ b/external/patches/0006-Disable-macOS-adhoc-signing.patch @@ -1,6 +1,6 @@ -From a9f15c2b688eb45c2c909170d6f3fcdb5b8db057 Mon Sep 17 00:00:00 2001 +From dd490870c001345f763529761661b8a371ee4144 Mon Sep 17 00:00:00 2001 From: Matthew Nelson -Date: Mon, 27 May 2024 17:25:15 -0400 +Date: Wed, 21 Aug 2024 12:11:48 -0400 Subject: [PATCH 6/8] Disable macOS adhoc signing --- @@ -8,7 +8,7 @@ Subject: [PATCH 6/8] Disable macOS adhoc signing 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 4f43de9..8ea1e4b 100644 +index 3898179..561ad4c 100644 --- a/Makefile +++ b/Makefile @@ -115,7 +115,7 @@ NATIVE_TARGET_DIR:=$(TARGET)/classes/org/sqlite/native/$(OS_NAME)/$(OS_ARCH) diff --git a/external/patches/0007-Configure-build-to-use-SQLite3MultipleCiphers.patch b/external/patches/0007-Configure-build-to-use-SQLite3MultipleCiphers.patch index 8e9d921..c9e5089 100644 --- a/external/patches/0007-Configure-build-to-use-SQLite3MultipleCiphers.patch +++ b/external/patches/0007-Configure-build-to-use-SQLite3MultipleCiphers.patch @@ -1,6 +1,6 @@ -From 051f169d54c3e8cfc70baab3c44b1b1e88e8586d Mon Sep 17 00:00:00 2001 +From f1ded894f65ecc0d6de72900ccd2b737db8bd8bb Mon Sep 17 00:00:00 2001 From: Matthew Nelson -Date: Sat, 15 Jun 2024 07:21:18 -0400 +Date: Wed, 21 Aug 2024 12:11:49 -0400 Subject: [PATCH 7/8] Configure build to use SQLite3MultipleCiphers --- @@ -11,7 +11,7 @@ Subject: [PATCH 7/8] Configure build to use SQLite3MultipleCiphers 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Makefile b/Makefile -index 8ea1e4b..d2fa264 100644 +index 561ad4c..07e6510 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ SQLITE_OBJ?=$(SQLITE_OUT)/sqlite3.o @@ -77,7 +77,7 @@ index 8ea1e4b..d2fa264 100644 native: $(NATIVE_DLL) diff --git a/Makefile.common b/Makefile.common -index 0b374bf..c6e4ff0 100644 +index 2f99457..9bc779e 100644 --- a/Makefile.common +++ b/Makefile.common @@ -73,28 +73,28 @@ Default_SQLITE_FLAGS := @@ -130,7 +130,7 @@ index 0b374bf..c6e4ff0 100644 Linux-Android-x86_64_LINKFLAGS := $(Default_LINKFLAGS) -Wl,-soname,libsqlitejdbc.so Linux-Android-x86_64_LIBNAME := libsqlitejdbc.so Linux-Android-x86_64_SQLITE_FLAGS := -@@ -164,21 +164,21 @@ Linux-ppc64_SQLITE_FLAGS := +@@ -171,21 +171,21 @@ Linux-riscv64_SQLITE_FLAGS := DragonFly-x86_64_CC := $(CROSS_PREFIX)cc DragonFly-x86_64_STRIP := $(CROSS_PREFIX)strip @@ -155,7 +155,7 @@ index 0b374bf..c6e4ff0 100644 FreeBSD-x86_64_LINKFLAGS := -shared FreeBSD-x86_64_LIBNAME := libsqlitejdbc.so FreeBSD-x86_64_SQLITE_FLAGS := -@@ -192,7 +192,7 @@ FreeBSD-aarch64_SQLITE_FLAGS := +@@ -199,7 +199,7 @@ FreeBSD-aarch64_SQLITE_FLAGS := OpenBSD-x86_64_CC := $(CROSS_PREFIX)gcc OpenBSD-x86_64_STRIP := $(CROSS_PREFIX)strip @@ -164,7 +164,7 @@ index 0b374bf..c6e4ff0 100644 OpenBSD-x86_64_LINKFLAGS := -shared OpenBSD-x86_64_LIBNAME := libsqlitejdbc.so OpenBSD-x86_64_SQLITE_FLAGS := -@@ -206,7 +206,7 @@ SunOS-sparcv9_SQLITE_FLAGS := +@@ -213,7 +213,7 @@ SunOS-sparcv9_SQLITE_FLAGS := Mac-x86_CC := gcc Mac-x86_STRIP := strip -x @@ -173,7 +173,7 @@ index 0b374bf..c6e4ff0 100644 Mac-x86_LINKFLAGS := -dynamiclib Mac-x86_LIBNAME := libsqlitejdbc.dylib Mac-x86_SQLITE_FLAGS := -DSQLITE_ENABLE_LOCKING_STYLE=0 -@@ -224,8 +224,8 @@ MAC_SDK := /Developer/SDKs/MacOSX10.10.sdk +@@ -231,8 +231,8 @@ MAC_SDK := /Developer/SDKs/MacOSX10.10.sdk ifeq ($(wildcard MAC_SDK),) MAC_SDK := /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk endif @@ -184,7 +184,7 @@ index 0b374bf..c6e4ff0 100644 Mac-x86_64_LIBNAME := libsqlitejdbc.dylib Mac-x86_64_SQLITE_FLAGS := -@@ -235,20 +235,20 @@ Mac-aarch64_CC := $(CROSS_PREFIX)clang +@@ -242,20 +242,20 @@ Mac-aarch64_CC := $(CROSS_PREFIX)clang Mac-aarch64_STRIP := $(CROSS_PREFIX)strip -x MAC_SDK := /usr/osxcross/SDK/MacOSX11.3.sdk Mac-aarch64_CCFLAGS := -I$(MAC_SDK)/System/Library/Frameworks/JavaVM.framework/Headers -Ilib/inc_mac -Os -fPIC -mmacosx-version-min=10.9 -fvisibility=hidden -Wno-implicit-function-declaration @@ -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 79da200..3efc170 100644 +index d30720f..a7d7bf2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1,2 @@ - version=3.46.0 -+version_mc=1.8.6 + version=3.46.1 ++version_mc=1.8.7 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 diff --git a/external/patches/0008-Update-Docker-images.patch b/external/patches/0008-Update-Docker-images.patch index e7e9f9e..f4b7ebf 100644 --- a/external/patches/0008-Update-Docker-images.patch +++ b/external/patches/0008-Update-Docker-images.patch @@ -1,6 +1,6 @@ -From e8cb89eb6bb0d2c2f818953ce4d07ac194f32cf4 Mon Sep 17 00:00:00 2001 +From bfa506b800741aefbb689ae49837a79561b248e4 Mon Sep 17 00:00:00 2001 From: Matthew Nelson -Date: Sat, 15 Jun 2024 07:21:44 -0400 +Date: Wed, 21 Aug 2024 12:11:50 -0400 Subject: [PATCH 8/8] Update Docker images --- @@ -12,7 +12,7 @@ Subject: [PATCH 8/8] Update Docker images 5 files changed, 31 insertions(+), 37 deletions(-) diff --git a/Makefile b/Makefile -index d2fa264..c1713bf 100644 +index 07e6510..23666a9 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,7 @@ SQLITE_ARCHIVE:=$(TARGET)/$(sqlite)-amal.zip @@ -49,7 +49,7 @@ index d2fa264..c1713bf 100644 freebsd32: $(SQLITE_UNPACKED) jni-header docker run $(DOCKER_RUN_OPTS) -v $$PWD:/workdir empterdose/freebsd-cross-build:9.3 sh -c 'apk add bash; apk add openjdk8; apk add perl; make clean-native native OS_NAME=FreeBSD OS_ARCH=x86 CROSS_PREFIX=i386-freebsd9-' -@@ -167,31 +168,31 @@ linux-armv6: $(SQLITE_UNPACKED) jni-header +@@ -167,34 +168,34 @@ linux-armv6: $(SQLITE_UNPACKED) jni-header ./docker/dockcross-armv6-lts -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native native CROSS_PREFIX=armv6-unknown-linux-gnueabihf- OS_NAME=Linux OS_ARCH=armv6' linux-armv7: $(SQLITE_UNPACKED) jni-header @@ -80,6 +80,9 @@ index d2fa264..c1713bf 100644 - ./docker/dockcross-ppc64 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native native CROSS_PREFIX=powerpc64le-unknown-linux-gnu- OS_NAME=Linux OS_ARCH=ppc64' + docker run $(DOCKER_RUN_OPTS) -u $(U_ID):$(G_ID) -v $$PWD:/work 05nelsonm/build-env.linux-libc.ppc64le:$(TAG_BUILD_ENV) bash -c 'make clean-native native CROSS_PREFIX=$$CROSS_TRIPLE- OS_NAME=Linux OS_ARCH=ppc64' + linux-riscv64: $(SQLITE_UNPACKED) jni-header + ./docker/dockcross-riscv64 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native native CROSS_PREFIX=riscv64-unknown-linux-gnu- OS_NAME=Linux OS_ARCH=riscv64' + mac64: $(SQLITE_UNPACKED) jni-header - docker run $(DOCKER_RUN_OPTS) -u $(U_ID):$(G_ID) -v $$PWD:/workdir -e CROSS_TRIPLE=x86_64-apple-darwin multiarch/crossbuild make clean-native native OS_NAME=Mac OS_ARCH=x86_64 + docker run $(DOCKER_RUN_OPTS) -u $(U_ID):$(G_ID) -v $$PWD:/work 05nelsonm/build-env.macos-lts.x86_64:$(TAG_BUILD_ENV) bash -c 'make clean-native native CROSS_PREFIX=$$CROSS_TRIPLE- OS_NAME=Mac OS_ARCH=x86_64' @@ -91,7 +94,7 @@ index d2fa264..c1713bf 100644 # deprecated mac32: $(SQLITE_UNPACKED) jni-header diff --git a/Makefile.common b/Makefile.common -index c6e4ff0..6f9a654 100644 +index 9bc779e..855e31f 100644 --- a/Makefile.common +++ b/Makefile.common @@ -128,29 +128,29 @@ Linux-armv7_LIBNAME := libsqlitejdbc.so @@ -132,7 +135,7 @@ index c6e4ff0..6f9a654 100644 Linux-Android-x86_64_LINKFLAGS := $(Default_LINKFLAGS) -Wl,-soname,libsqlitejdbc.so Linux-Android-x86_64_LIBNAME := libsqlitejdbc.so Linux-Android-x86_64_SQLITE_FLAGS := -@@ -218,23 +218,16 @@ HPUX-ia64_32_LINKFLAGS := -b +@@ -225,23 +225,16 @@ HPUX-ia64_32_LINKFLAGS := -b HPUX-ia64_32_LIBNAME := libsqlitejdbc.so HPUX-ia64_32_SQLITE_FLAGS := @@ -160,7 +163,7 @@ index c6e4ff0..6f9a654 100644 Mac-aarch64_LINKFLAGS := -dynamiclib -framework Security Mac-aarch64_LIBNAME := libsqlitejdbc.dylib Mac-aarch64_SQLITE_FLAGS := -@@ -242,14 +235,14 @@ Mac-aarch64_SQLITE_FLAGS := +@@ -249,14 +242,14 @@ Mac-aarch64_SQLITE_FLAGS := Windows-x86_CC := $(CROSS_PREFIX)gcc Windows-x86_STRIP := $(CROSS_PREFIX)strip Windows-x86_CCFLAGS := -D_JNI_IMPLEMENTATION_ -Ilib/inc_win -Os -msse4.2 -maes diff --git a/external/sqlite-jdbc b/external/sqlite-jdbc index dc44d73..73e64f0 160000 --- a/external/sqlite-jdbc +++ b/external/sqlite-jdbc @@ -1 +1 @@ -Subproject commit dc44d7381dc0adb2acf0f040f5bbcd67e8663145 +Subproject commit 73e64f0655e1f0bdefc4a6a0dc1710cc9e2782ce