From e0589a00d91f89b802c46eb9a1d3433e71dafc41 Mon Sep 17 00:00:00 2001 From: Andrey Zvonov Date: Fri, 17 Oct 2025 14:48:16 +0200 Subject: [PATCH 1/5] bump openssl --- .gitmodules | 2 +- contrib/openssl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0a66031de8d1..8f7f0c6d0874 100644 --- a/.gitmodules +++ b/.gitmodules @@ -365,7 +365,7 @@ url = https://github.com/ClickHouse/rust_vendor.git [submodule "contrib/openssl"] path = contrib/openssl - url = https://github.com/ClickHouse/openssl.git + url = https://github.com/openssl/openssl.git [submodule "contrib/double-conversion"] path = contrib/double-conversion url = https://github.com/ClickHouse/double-conversion.git diff --git a/contrib/openssl b/contrib/openssl index 66deddc1e53c..9c462be2cea5 160000 --- a/contrib/openssl +++ b/contrib/openssl @@ -1 +1 @@ -Subproject commit 66deddc1e53cda8706604a019777259372d1bd62 +Subproject commit 9c462be2cea54ebfc62953224220b56f8ba22a0c From 8728a60b1788094d93703174bfbd04760dbec368 Mon Sep 17 00:00:00 2001 From: Andrey Zvonov Date: Sat, 18 Oct 2025 00:40:50 +0200 Subject: [PATCH 2/5] second attempt --- .gitmodules | 2 +- contrib/openssl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8f7f0c6d0874..5deea5eb488f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -365,7 +365,7 @@ url = https://github.com/ClickHouse/rust_vendor.git [submodule "contrib/openssl"] path = contrib/openssl - url = https://github.com/openssl/openssl.git + url = https://github.com/Altinity/openssl.git [submodule "contrib/double-conversion"] path = contrib/double-conversion url = https://github.com/ClickHouse/double-conversion.git diff --git a/contrib/openssl b/contrib/openssl index 9c462be2cea5..1d45f3d8723b 160000 --- a/contrib/openssl +++ b/contrib/openssl @@ -1 +1 @@ -Subproject commit 9c462be2cea54ebfc62953224220b56f8ba22a0c +Subproject commit 1d45f3d8723badea3a6c5cec83be89cc31cbea6d From 97179c420fcbacbec0579608057aad9d2fd344ea Mon Sep 17 00:00:00 2001 From: Andrey Zvonov Date: Sat, 18 Oct 2025 15:01:16 +0200 Subject: [PATCH 3/5] correct openssl version --- contrib/openssl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/openssl b/contrib/openssl index 1d45f3d8723b..19dd1ace3df5 160000 --- a/contrib/openssl +++ b/contrib/openssl @@ -1 +1 @@ -Subproject commit 1d45f3d8723badea3a6c5cec83be89cc31cbea6d +Subproject commit 19dd1ace3df58286c6fcf7d5cb6fb5b5ef0c3904 From b22de21e5decca9b272e8827f6ac2a93677716a9 Mon Sep 17 00:00:00 2001 From: Andrey Zvonov Date: Sat, 18 Oct 2025 15:04:28 +0200 Subject: [PATCH 4/5] even more correct commit --- contrib/openssl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/openssl b/contrib/openssl index 19dd1ace3df5..5dfb0a79cf5c 160000 --- a/contrib/openssl +++ b/contrib/openssl @@ -1 +1 @@ -Subproject commit 19dd1ace3df58286c6fcf7d5cb6fb5b5ef0c3904 +Subproject commit 5dfb0a79cf5cbba13f21fa5b065c93e318f49d8b From d6b97805a8ff7c4bb298946d99bceb6399862134 Mon Sep 17 00:00:00 2001 From: Andrey Zvonov Date: Sun, 19 Oct 2025 12:01:43 +0200 Subject: [PATCH 5/5] also bump alpine in keeper --- docker/keeper/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/keeper/Dockerfile b/docker/keeper/Dockerfile index 880dba685b95..d422a00b93fd 100644 --- a/docker/keeper/Dockerfile +++ b/docker/keeper/Dockerfile @@ -12,7 +12,7 @@ RUN arch=${TARGETARCH:-amd64} \ && ln -s "${rarch}-linux-gnu" /lib/linux-gnu -FROM alpine:3.21.3 +FROM alpine:3.21.5 ENV LANG=en_US.UTF-8 \ LANGUAGE=en_US:en \