From b6122c6180bd4f59e076ff5b6480d1e8a3bbf2e7 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 20 Oct 2026 14:55:35 -0400 Subject: [PATCH 1/2] Utilities/Release: Update Linux build images to OpenSSL 3.6.5 --- Utilities/Release/linux/aarch64/deps/Dockerfile | 8 ++++---- Utilities/Release/linux/x86_64/deps/Dockerfile | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Utilities/Release/linux/aarch64/deps/Dockerfile b/Utilities/Release/linux/aarch64/deps/Dockerfile index 198177c698..5658452a20 100644 --- a/Utilities/Release/linux/aarch64/deps/Dockerfile +++ b/Utilities/Release/linux/aarch64/deps/Dockerfile @@ -121,10 +121,10 @@ COPY openssl-source.patch /opt/openssl/src/ RUN : \ && mkdir -p /opt/openssl/src \ && cd /opt/openssl/src \ - && curl -OL https://github.com/openssl/openssl/releases/download/openssl-3.6.0/openssl-3.6.0.tar.gz \ - && sha256sum openssl-3.6.0.tar.gz | grep -q b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9 \ - && tar xzf openssl-3.6.0.tar.gz \ - && cd openssl-3.6.0 \ + && curl -OL https://github.com/openssl/openssl/releases/download/openssl-3.6.5/openssl-3.6.5.tar.gz \ + && sha256sum openssl-3.6.5.tar.gz | grep -q a2157c2830efdec3788939b00c9b0638306d3f0bbb76dc4832ee503bb397df98 \ + && tar xzf openssl-3.6.5.tar.gz \ + && cd openssl-3.6.5 \ && patch -p1 -i ../openssl-source.patch \ && ./Configure --prefix=/opt/openssl linux-elf no-asm no-shared -D_POSIX_C_SOURCE=199506L -D_POSIX_SOURCE=1 -D_SVID_SOURCE=1 -D_BSD_SOURCE=1 \ && make install_dev -j $(nproc) \ diff --git a/Utilities/Release/linux/x86_64/deps/Dockerfile b/Utilities/Release/linux/x86_64/deps/Dockerfile index 9f55436fc0..7124a460ac 100644 --- a/Utilities/Release/linux/x86_64/deps/Dockerfile +++ b/Utilities/Release/linux/x86_64/deps/Dockerfile @@ -123,10 +123,10 @@ COPY openssl-source.patch /opt/openssl/src/ RUN : \ && mkdir -p /opt/openssl/src \ && cd /opt/openssl/src \ - && curl -OL https://github.com/openssl/openssl/releases/download/openssl-3.6.0/openssl-3.6.0.tar.gz \ - && sha256sum openssl-3.6.0.tar.gz | grep -q b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9 \ - && tar xzf openssl-3.6.0.tar.gz \ - && cd openssl-3.6.0 \ + && curl -OL https://github.com/openssl/openssl/releases/download/openssl-3.6.5/openssl-3.6.5.tar.gz \ + && sha256sum openssl-3.6.5.tar.gz | grep -q a2157c2830efdec3788939b00c9b0638306d3f0bbb76dc4832ee503bb397df98 \ + && tar xzf openssl-3.6.5.tar.gz \ + && cd openssl-3.6.5 \ && patch -p1 -i ../openssl-source.patch \ && source /opt/rh/devtoolset-7/enable \ && ./Configure --prefix=/opt/openssl linux-elf no-asm no-shared -D_POSIX_C_SOURCE=199506L -D_POSIX_SOURCE=1 -D_SVID_SOURCE=1 -D_BSD_SOURCE=1 \ From 6eadd08f4737246700d6e963ca7afe429b4ad815 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 22 Oct 2026 13:08:28 -0400 Subject: [PATCH 2/2] Utilities/Release: Update Linux build images to ncurses 6.6 Also switch to the wide character ABI, now built by default. Fixes: #28175 --- .gitlab/os-linux.yml | 4 ++-- Utilities/Release/linux/aarch64/Dockerfile | 4 ++-- Utilities/Release/linux/aarch64/cache.txt | 4 ++-- Utilities/Release/linux/aarch64/deps/Dockerfile | 9 +++++---- Utilities/Release/linux/x86_64/Dockerfile | 4 ++-- Utilities/Release/linux/x86_64/cache.txt | 4 ++-- Utilities/Release/linux/x86_64/deps/Dockerfile | 9 +++++---- 7 files changed, 20 insertions(+), 18 deletions(-) diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index f3a2d9eabb..e7b409f658 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -11,7 +11,7 @@ GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" .linux_release_x86_64: - image: "kitware/cmake:build-linux-x86_64-deps-2026-01-13@sha256:eae18d032e8d7be3caa97d2e5754ae2b7196d7a3d375b7b4d1ba9034f1229317" + image: "kitware/cmake:build-linux-x86_64-deps-2026-10-22@sha256:650889862a59c5a4053b01a54afce5006c7cbb2f64e9f1c34975477bee50cd52" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" @@ -19,7 +19,7 @@ CMAKE_ARCH: x86_64 .linux_release_aarch64: - image: "kitware/cmake:build-linux-aarch64-deps-2026-01-13@sha256:7373fe775ea571a3113251b3e8b5857ef321f6e9b5dfa5963f6e44d062349244" + image: "kitware/cmake:build-linux-aarch64-deps-2026-10-22@sha256:89b7eec9fc7272d5b54a588d24400c87e61d9414b544c63b20a95dfba8dd322c" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" diff --git a/Utilities/Release/linux/aarch64/Dockerfile b/Utilities/Release/linux/aarch64/Dockerfile index 4ed3d4e3ec..f20ede2bd2 100644 --- a/Utilities/Release/linux/aarch64/Dockerfile +++ b/Utilities/Release/linux/aarch64/Dockerfile @@ -6,8 +6,8 @@ # The resulting image will have an '/out' directory containing the package. # Keep this in sync with the `.gitlab/os-linux.yml` `.linux_release_aarch64` image. -ARG FROM_IMAGE_NAME=kitware/cmake:build-linux-aarch64-deps-2026-01-13 -ARG FROM_IMAGE_DIGEST=@sha256:7373fe775ea571a3113251b3e8b5857ef321f6e9b5dfa5963f6e44d062349244 +ARG FROM_IMAGE_NAME=kitware/cmake:build-linux-aarch64-deps-2026-10-22 +ARG FROM_IMAGE_DIGEST=@sha256:89b7eec9fc7272d5b54a588d24400c87e61d9414b544c63b20a95dfba8dd322c ARG FROM_IMAGE=$FROM_IMAGE_NAME$FROM_IMAGE_DIGEST FROM $FROM_IMAGE diff --git a/Utilities/Release/linux/aarch64/cache.txt b/Utilities/Release/linux/aarch64/cache.txt index 3cc97128d9..95d0dfe5b9 100644 --- a/Utilities/Release/linux/aarch64/cache.txt +++ b/Utilities/Release/linux/aarch64/cache.txt @@ -14,9 +14,9 @@ OPENSSL_SSL_LIBRARY:FILEPATH=/opt/openssl/lib/libssl.a # Enable ccmake BUILD_CursesDialog:BOOL=ON -CURSES_FORM_LIBRARY:FILEPATH=/opt/ncurses/lib/libform.a +CURSES_FORM_LIBRARY:FILEPATH=/opt/ncurses/lib/libformw.a CURSES_INCLUDE_PATH:PATH=/opt/ncurses/include -CURSES_NCURSES_LIBRARY:FILEPATH=/opt/ncurses/lib/libncurses.a +CURSES_NCURSES_LIBRARY:FILEPATH=/opt/ncurses/lib/libncursesw.a # Enable cmake-gui with static qt plugins BUILD_QtDialog:BOOL=TRUE diff --git a/Utilities/Release/linux/aarch64/deps/Dockerfile b/Utilities/Release/linux/aarch64/deps/Dockerfile index 5658452a20..09c0d38cf0 100644 --- a/Utilities/Release/linux/aarch64/deps/Dockerfile +++ b/Utilities/Release/linux/aarch64/deps/Dockerfile @@ -101,15 +101,16 @@ RUN : \ RUN : \ && mkdir -p /opt/ncurses/src/ncurses-build \ && cd /opt/ncurses/src \ - && curl -O https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.1.tar.gz \ - && sha512sum ncurses-6.1.tar.gz | grep -q e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee \ - && tar xzf ncurses-6.1.tar.gz \ + && curl -O https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.6.tar.gz \ + && sha512sum ncurses-6.6.tar.gz | grep -q 02647baae53abc844fbadee5b0a2187ad073125c4e8950df6d1c4feb781cb74ba64fb838cedfee2c246c39932187f6775b1df124f18b99a4233f0d98c72191de \ + && tar xzf ncurses-6.6.tar.gz \ && cd ncurses-build \ - && ../ncurses-6.1/configure \ + && ../ncurses-6.6/configure \ --prefix=/opt/ncurses \ --with-terminfo-dirs=/etc/terminfo:/lib/terminfo:/usr/share/terminfo \ --with-default-terminfo-dir=/usr/share/terminfo \ --without-shared \ + --enable-overwrite \ && make -j $(nproc) \ && make install.libs install.includes \ && cd /opt \ diff --git a/Utilities/Release/linux/x86_64/Dockerfile b/Utilities/Release/linux/x86_64/Dockerfile index 1e96a1dfe9..a59415ff3c 100644 --- a/Utilities/Release/linux/x86_64/Dockerfile +++ b/Utilities/Release/linux/x86_64/Dockerfile @@ -6,8 +6,8 @@ # The resulting image will have an '/out' directory containing the package. # Keep this in sync with the `.gitlab/os-linux.yml` `.linux_release_x86_64` image. -ARG FROM_IMAGE_NAME=kitware/cmake:build-linux-x86_64-deps-2026-01-13 -ARG FROM_IMAGE_DIGEST=@sha256:eae18d032e8d7be3caa97d2e5754ae2b7196d7a3d375b7b4d1ba9034f1229317 +ARG FROM_IMAGE_NAME=kitware/cmake:build-linux-x86_64-deps-2026-10-22 +ARG FROM_IMAGE_DIGEST=@sha256:650889862a59c5a4053b01a54afce5006c7cbb2f64e9f1c34975477bee50cd52 ARG FROM_IMAGE=$FROM_IMAGE_NAME$FROM_IMAGE_DIGEST FROM $FROM_IMAGE diff --git a/Utilities/Release/linux/x86_64/cache.txt b/Utilities/Release/linux/x86_64/cache.txt index 46dc81a06b..b43fba8020 100644 --- a/Utilities/Release/linux/x86_64/cache.txt +++ b/Utilities/Release/linux/x86_64/cache.txt @@ -14,9 +14,9 @@ OPENSSL_SSL_LIBRARY:FILEPATH=/opt/openssl/lib/libssl.a # Enable ccmake BUILD_CursesDialog:BOOL=ON -CURSES_FORM_LIBRARY:FILEPATH=/opt/ncurses/lib/libform.a +CURSES_FORM_LIBRARY:FILEPATH=/opt/ncurses/lib/libformw.a CURSES_INCLUDE_PATH:PATH=/opt/ncurses/include -CURSES_NCURSES_LIBRARY:FILEPATH=/opt/ncurses/lib/libncurses.a +CURSES_NCURSES_LIBRARY:FILEPATH=/opt/ncurses/lib/libncursesw.a # Enable cmake-gui with static qt plugins BUILD_QtDialog:BOOL=TRUE diff --git a/Utilities/Release/linux/x86_64/deps/Dockerfile b/Utilities/Release/linux/x86_64/deps/Dockerfile index 7124a460ac..2d25f6d2e1 100644 --- a/Utilities/Release/linux/x86_64/deps/Dockerfile +++ b/Utilities/Release/linux/x86_64/deps/Dockerfile @@ -102,16 +102,17 @@ RUN : \ RUN : \ && mkdir -p /opt/ncurses/src/ncurses-build \ && cd /opt/ncurses/src \ - && curl -O https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.1.tar.gz \ - && sha512sum ncurses-6.1.tar.gz | grep -q e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee \ - && tar xzf ncurses-6.1.tar.gz \ + && curl -O https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.6.tar.gz \ + && sha512sum ncurses-6.6.tar.gz | grep -q 02647baae53abc844fbadee5b0a2187ad073125c4e8950df6d1c4feb781cb74ba64fb838cedfee2c246c39932187f6775b1df124f18b99a4233f0d98c72191de \ + && tar xzf ncurses-6.6.tar.gz \ && cd ncurses-build \ && source /opt/rh/devtoolset-7/enable \ - && ../ncurses-6.1/configure \ + && ../ncurses-6.6/configure \ --prefix=/opt/ncurses \ --with-terminfo-dirs=/etc/terminfo:/lib/terminfo:/usr/share/terminfo \ --with-default-terminfo-dir=/usr/share/terminfo \ --without-shared \ + --enable-overwrite \ && make -j $(nproc) \ && make install.libs install.includes \ && cd /opt \