Antalya 25.8: Bump to 25.8.33

cmake/autogenerated_versions.txt

@@ -2,13 +2,13 @@
 
 # NOTE: VERSION_REVISION has nothing common with DBMS_TCP_PROTOCOL_VERSION,
 # only DBMS_TCP_PROTOCOL_VERSION should be incremented on protocol changes.
-SET(VERSION_REVISION 54530)
+SET(VERSION_REVISION 54533)
 SET(VERSION_MAJOR 25)
 SET(VERSION_MINOR 8)
-SET(VERSION_PATCH 30)
-SET(VERSION_GITHASH 54df9137dcfc1ef0b307f264199e004a05a9a5dd)
-SET(VERSION_DESCRIBE v25.8.30.20001.altinityantalya)
-SET(VERSION_STRING 25.8.30.20001.altinityantalya)
+SET(VERSION_PATCH 33)
+SET(VERSION_GITHASH 46297556f3ac83e1a3ee4a05cc31f4287f5e17ac)
+SET(VERSION_DESCRIBE v25.8.33.20001.altinityantalya)
+SET(VERSION_STRING 25.8.33.20001.altinityantalya)
 # end of autochange
 
 SET(VERSION_TWEAK 20001)

contrib/libssh-cmake/CMakeLists.txt

@@ -7,8 +7,8 @@ endif()
 
 # CMake variables needed by libssh_version.h.cmake, update them when you update libssh
 set(libssh_VERSION_MAJOR 0)
-set(libssh_VERSION_MINOR 9)
-set(libssh_VERSION_PATCH 8)
+set(libssh_VERSION_MINOR 12)
+set(libssh_VERSION_PATCH 0)
 
 set(LIB_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libssh")
 set(LIB_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/libssh")
@@ -37,6 +37,7 @@ set(libssh_SRCS
     ${LIB_SOURCE_DIR}/src/external/poly1305.c
     ${LIB_SOURCE_DIR}/src/external/sntrup761.c
     ${LIB_SOURCE_DIR}/src/getpass.c
+    ${LIB_SOURCE_DIR}/src/hybrid_mlkem.c
     ${LIB_SOURCE_DIR}/src/init.c
     ${LIB_SOURCE_DIR}/src/kdf.c
     ${LIB_SOURCE_DIR}/src/kex.c
@@ -47,6 +48,7 @@ set(libssh_SRCS
     ${LIB_SOURCE_DIR}/src/match.c
     ${LIB_SOURCE_DIR}/src/messages.c
     ${LIB_SOURCE_DIR}/src/misc.c
+    ${LIB_SOURCE_DIR}/src/mlkem.c
     ${LIB_SOURCE_DIR}/src/options.c
     ${LIB_SOURCE_DIR}/src/packet.c
     ${LIB_SOURCE_DIR}/src/packet_cb.c
@@ -79,6 +81,7 @@ set(libssh_SRCS
     ${LIB_SOURCE_DIR}/src/gzip.c
     ${LIB_SOURCE_DIR}/src/libcrypto.c
     ${LIB_SOURCE_DIR}/src/md_crypto.c
+    ${LIB_SOURCE_DIR}/src/mlkem_crypto.c
     ${LIB_SOURCE_DIR}/src/pki_crypto.c
     ${LIB_SOURCE_DIR}/src/pki_context.c
     ${LIB_SOURCE_DIR}/src/sntrup761.c

contrib/libssh-cmake/darwin/config.h

@@ -14,6 +14,18 @@
 /* Global client configuration file path */
 #define GLOBAL_CLIENT_CONFIG "/etc/ssh/ssh_config"
 
+/* Global configuration directory (libssh >= 0.12 uses it unconditionally) */
+#define GLOBAL_CONF_DIR "/etc/ssh"
+
+/* Define to 1 if we have support for ML-KEM in libgcrypt */
+/* #undef HAVE_GCRYPT_MLKEM */
+
+/* Define to 1 if we have support for ML-KEM in OpenSSL */
+#define HAVE_OPENSSL_MLKEM 1
+
+/* Define to 1 if we have support for ML-KEM1024 in either backend */
+#define HAVE_MLKEM1024 1
+
 /************************** HEADER FILES *************************/
 
 /* Define to 1 if you have the <argp.h> header file. */

contrib/libssh-cmake/freebsd/config.h

@@ -14,6 +14,18 @@
 /* Global client configuration file path */
 #define GLOBAL_CLIENT_CONFIG "/etc/ssh/ssh_config"
 
+/* Global configuration directory (libssh >= 0.12 uses it unconditionally) */
+#define GLOBAL_CONF_DIR "/etc/ssh"
+
+/* Define to 1 if we have support for ML-KEM in libgcrypt */
+/* #undef HAVE_GCRYPT_MLKEM */
+
+/* Define to 1 if we have support for ML-KEM in OpenSSL */
+#define HAVE_OPENSSL_MLKEM 1
+
+/* Define to 1 if we have support for ML-KEM1024 in either backend */
+#define HAVE_MLKEM1024 1
+
 /************************** HEADER FILES *************************/
 
 /* Define to 1 if you have the <argp.h> header file. */

contrib/libssh-cmake/linux/aarch64-musl/config.h

@@ -14,6 +14,18 @@
 /* Global client configuration file path */
 #define GLOBAL_CLIENT_CONFIG "/etc/ssh/ssh_config"
 
+/* Global configuration directory (libssh >= 0.12 uses it unconditionally) */
+#define GLOBAL_CONF_DIR "/etc/ssh"
+
+/* Define to 1 if we have support for ML-KEM in libgcrypt */
+/* #undef HAVE_GCRYPT_MLKEM */
+
+/* Define to 1 if we have support for ML-KEM in OpenSSL */
+#define HAVE_OPENSSL_MLKEM 1
+
+/* Define to 1 if we have support for ML-KEM1024 in either backend */
+#define HAVE_MLKEM1024 1
+
 /************************** HEADER FILES *************************/
 
 /* Define to 1 if you have the <argp.h> header file. */

contrib/libssh-cmake/linux/aarch64/config.h

@@ -14,6 +14,18 @@
 /* Global client configuration file path */
 #define GLOBAL_CLIENT_CONFIG "/etc/ssh/ssh_config"
 
+/* Global configuration directory (libssh >= 0.12 uses it unconditionally) */
+#define GLOBAL_CONF_DIR "/etc/ssh"
+
+/* Define to 1 if we have support for ML-KEM in libgcrypt */
+/* #undef HAVE_GCRYPT_MLKEM */
+
+/* Define to 1 if we have support for ML-KEM in OpenSSL */
+#define HAVE_OPENSSL_MLKEM 1
+
+/* Define to 1 if we have support for ML-KEM1024 in either backend */
+#define HAVE_MLKEM1024 1
+
 /************************** HEADER FILES *************************/
 
 /* Define to 1 if you have the <argp.h> header file. */

contrib/libssh-cmake/linux/loongarch64/config.h

@@ -14,6 +14,18 @@
 /* Global client configuration file path */
 #define GLOBAL_CLIENT_CONFIG "/etc/ssh/ssh_config"
 
+/* Global configuration directory (libssh >= 0.12 uses it unconditionally) */
+#define GLOBAL_CONF_DIR "/etc/ssh"
+
+/* Define to 1 if we have support for ML-KEM in libgcrypt */
+/* #undef HAVE_GCRYPT_MLKEM */
+
+/* Define to 1 if we have support for ML-KEM in OpenSSL */
+#define HAVE_OPENSSL_MLKEM 1
+
+/* Define to 1 if we have support for ML-KEM1024 in either backend */
+#define HAVE_MLKEM1024 1
+
 /************************** HEADER FILES *************************/
 
 /* Define to 1 if you have the <argp.h> header file. */

contrib/libssh-cmake/linux/ppc64le/config.h

@@ -14,6 +14,18 @@
 /* Global client configuration file path */
 #define GLOBAL_CLIENT_CONFIG "/etc/ssh/ssh_config"
 
+/* Global configuration directory (libssh >= 0.12 uses it unconditionally) */
+#define GLOBAL_CONF_DIR "/etc/ssh"
+
+/* Define to 1 if we have support for ML-KEM in libgcrypt */
+/* #undef HAVE_GCRYPT_MLKEM */
+
+/* Define to 1 if we have support for ML-KEM in OpenSSL */
+#define HAVE_OPENSSL_MLKEM 1
+
+/* Define to 1 if we have support for ML-KEM1024 in either backend */
+#define HAVE_MLKEM1024 1
+
 /************************** HEADER FILES *************************/
 
 /* Define to 1 if you have the <argp.h> header file. */

contrib/libssh-cmake/linux/riscv64/config.h

@@ -14,6 +14,18 @@
 /* Global client configuration file path */
 #define GLOBAL_CLIENT_CONFIG "/etc/ssh/ssh_config"
 
+/* Global configuration directory (libssh >= 0.12 uses it unconditionally) */
+#define GLOBAL_CONF_DIR "/etc/ssh"
+
+/* Define to 1 if we have support for ML-KEM in libgcrypt */
+/* #undef HAVE_GCRYPT_MLKEM */
+
+/* Define to 1 if we have support for ML-KEM in OpenSSL */
+#define HAVE_OPENSSL_MLKEM 1
+
+/* Define to 1 if we have support for ML-KEM1024 in either backend */
+#define HAVE_MLKEM1024 1
+
 /************************** HEADER FILES *************************/
 
 /* Define to 1 if you have the <argp.h> header file. */

contrib/libssh-cmake/linux/s390x/config.h

@@ -14,6 +14,18 @@
 /* Global client configuration file path */
 #define GLOBAL_CLIENT_CONFIG "/etc/ssh/ssh_config"
 
+/* Global configuration directory (libssh >= 0.12 uses it unconditionally) */
+#define GLOBAL_CONF_DIR "/etc/ssh"
+
+/* Define to 1 if we have support for ML-KEM in libgcrypt */
+/* #undef HAVE_GCRYPT_MLKEM */
+
+/* Define to 1 if we have support for ML-KEM in OpenSSL */
+#define HAVE_OPENSSL_MLKEM 1
+
+/* Define to 1 if we have support for ML-KEM1024 in either backend */
+#define HAVE_MLKEM1024 1
+
 /************************** HEADER FILES *************************/
 
 /* Define to 1 if you have the <argp.h> header file. */

contrib/libssh-cmake/linux/x86-64-musl/config.h

@@ -14,6 +14,18 @@
 /* Global client configuration file path */
 #define GLOBAL_CLIENT_CONFIG "/etc/ssh/ssh_config"
 
+/* Global configuration directory (libssh >= 0.12 uses it unconditionally) */
+#define GLOBAL_CONF_DIR "/etc/ssh"
+
+/* Define to 1 if we have support for ML-KEM in libgcrypt */
+/* #undef HAVE_GCRYPT_MLKEM */
+
+/* Define to 1 if we have support for ML-KEM in OpenSSL */
+#define HAVE_OPENSSL_MLKEM 1
+
+/* Define to 1 if we have support for ML-KEM1024 in either backend */
+#define HAVE_MLKEM1024 1
+
 /************************** HEADER FILES *************************/
 
 /* Define to 1 if you have the <argp.h> header file. */

contrib/libssh-cmake/linux/x86-64/config.h

@@ -14,6 +14,18 @@
 /* Global client configuration file path */
 #define GLOBAL_CLIENT_CONFIG "/etc/ssh/ssh_config"
 
+/* Global configuration directory (libssh >= 0.12 uses it unconditionally) */
+#define GLOBAL_CONF_DIR "/etc/ssh"
+
+/* Define to 1 if we have support for ML-KEM in libgcrypt */
+/* #undef HAVE_GCRYPT_MLKEM */
+
+/* Define to 1 if we have support for ML-KEM in OpenSSL */
+#define HAVE_OPENSSL_MLKEM 1
+
+/* Define to 1 if we have support for ML-KEM1024 in either backend */
+#define HAVE_MLKEM1024 1
+
 /************************** HEADER FILES *************************/
 
 /* Define to 1 if you have the <argp.h> header file. */
@@ -188,8 +200,6 @@
 /* Define to 1 if we have support for blowfish */
 /* #undef HAVE_BLOWFISH */
 
-/* Define to 1 if we have support for ML-KEM */
-/* #undef HAVE_MLKEM */
 
 /*************************** LIBRARIES ***************************/
 

contrib/postgres-cmake/CMakeLists.txt

@@ -66,6 +66,12 @@ if(NOT OS_DARWIN)
     )
 endif()
 
+if(OS_DARWIN OR ARCH_PPC64LE)
+    set(SRCS ${SRCS}
+        "${POSTGRES_SOURCE_DIR}/src/port/explicit_bzero.c"
+    )
+endif()
+
 add_library(_libpq ${SRCS})
 
 add_definitions(-DFRONTEND)

src/Analyzer/Passes/UniqInjectiveFunctionsEliminationPass.cpp

@@ -11,6 +11,8 @@
 
 #include <Core/Settings.h>
 
+#include <DataTypes/IDataType.h>
+
 
 namespace DB
 {
@@ -66,6 +68,12 @@ class UniqInjectiveFunctionsEliminationVisitor : public InDepthQueryTreeVisitorW
             if (!arg_function->isInjective({}))
                 return false;
 
+            /// The `Null` combinator makes `uniq*` skip rows where a Nullable argument is NULL: `uniq(tuple(x))`
+            /// counts the (NULL) row while `uniq(x)` skips it.
+            if (isNullableOrLowCardinalityNullable(arg->getResultType())
+                != isNullableOrLowCardinalityNullable(arg_arguments_nodes[0]->getResultType()))
+                return false;
+
             arg = arg_arguments_nodes[0];
             return replaced_argument = true;
         };