databases/clickhouse: Update to 22.1.3.7

Reported by:	maintainer

7 files changed, 2 insertions, 130 deletions

diff --git a/databases/clickhouse/files/patch-cmake_find_krb5.cmake b/databases/clickhouse/files/patch-cmake_find_krb5.cmake
index ad14f69f0b77..c5f2f3935c70 100644
--- a/databases/clickhouse/files/patch-cmake_find_krb5.cmake
+++ b/databases/clickhouse/files/patch-cmake_find_krb5.cmake
@@ -1,4 +1,4 @@
---- cmake/find/krb5.cmake.orig	2021-12-26 09:29:33 UTC
+--- cmake/find/krb5.cmake.orig	2022-01-22 20:43:13 UTC
 +++ cmake/find/krb5.cmake
 @@ -5,7 +5,7 @@ if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/krb5/
      set (ENABLE_KRB5 0)
diff --git a/databases/clickhouse/files/patch-cmake_freebsd_default__libs.cmake b/databases/clickhouse/files/patch-cmake_freebsd_default__libs.cmake
index a83c7a0c08da..5a1dd2d559a4 100644
--- a/databases/clickhouse/files/patch-cmake_freebsd_default__libs.cmake
+++ b/databases/clickhouse/files/patch-cmake_freebsd_default__libs.cmake
@@ -1,4 +1,4 @@
---- cmake/freebsd/default_libs.cmake.orig	2021-12-26 09:29:33 UTC
+--- cmake/freebsd/default_libs.cmake.orig	2022-01-22 20:43:13 UTC
 +++ cmake/freebsd/default_libs.cmake
 @@ -4,13 +4,13 @@ if (NOT COMPILER_CLANG)
      message (FATAL_ERROR "FreeBSD build is supported only for Clang")
diff --git a/databases/clickhouse/files/patch-contrib_abseil-cpp_absl_copts_AbseilConfigureCopts.cmake b/databases/clickhouse/files/patch-contrib_abseil-cpp_absl_copts_AbseilConfigureCopts.cmake
deleted file mode 100644
index 4db378c788b5..000000000000
--- a/databases/clickhouse/files/patch-contrib_abseil-cpp_absl_copts_AbseilConfigureCopts.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
---- contrib/abseil-cpp/absl/copts/AbseilConfigureCopts.cmake.orig	2021-09-10 11:00:21 UTC
-+++ contrib/abseil-cpp/absl/copts/AbseilConfigureCopts.cmake
-@@ -12,7 +12,9 @@ else()
-   set(ABSL_BUILD_DLL FALSE)
- endif()
- 
--if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64")
-+string (TOUPPER ${CMAKE_SYSTEM_PROCESSOR} CMAKE_SYSTEM_PROCESSOR_UC)
-+
-+if(CMAKE_SYSTEM_PROCESSOR_UC STREQUAL "X86_64" OR CMAKE_SYSTEM_PROCESSOR_UC STREQUAL "AMD64")
-   if (MSVC)
-     set(ABSL_RANDOM_RANDEN_COPTS "${ABSL_RANDOM_HWAES_MSVC_X64_FLAGS}")
-   else()
diff --git a/databases/clickhouse/files/patch-contrib_boringssl_crypto_cpu-aarch64-linux.c b/databases/clickhouse/files/patch-contrib_boringssl_crypto_cpu-aarch64-linux.c
deleted file mode 100644
index 50e88deb39e0..000000000000
--- a/databases/clickhouse/files/patch-contrib_boringssl_crypto_cpu-aarch64-linux.c
+++ /dev/null
@@ -1,75 +0,0 @@
---- contrib/boringssl/crypto/cpu-aarch64-linux.c.orig	2019-10-21 10:14:54 UTC
-+++ contrib/boringssl/crypto/cpu-aarch64-linux.c
-@@ -14,49 +14,47 @@
- 
- #include <openssl/cpu.h>
- 
--#if defined(OPENSSL_AARCH64) && defined(OPENSSL_LINUX) && \
--    !defined(OPENSSL_STATIC_ARMCAP)
-+#if defined(OPENSSL_AARCH64)
- 
--#include <sys/auxv.h>
--
- #include <openssl/arm_arch.h>
- 
- #include "internal.h"
- 
--
- extern uint32_t OPENSSL_armcap_P;
- 
--void OPENSSL_cpuid_setup(void) {
--  unsigned long hwcap = getauxval(AT_HWCAP);
-+#include <machine/armreg.h>
- 
--  // See /usr/include/asm/hwcap.h on an aarch64 installation for the source of
--  // these values.
--  static const unsigned long kNEON = 1 << 1;
--  static const unsigned long kAES = 1 << 3;
--  static const unsigned long kPMULL = 1 << 4;
--  static const unsigned long kSHA1 = 1 << 5;
--  static const unsigned long kSHA256 = 1 << 6;
-+#ifndef ID_AA64ISAR0_AES_VAL
-+#define ID_AA64ISAR0_AES_VAL ID_AA64ISAR0_AES
-+#endif
-+#ifndef ID_AA64ISAR0_AES_VAL
-+#define ID_AA64ISAR0_AES_VAL ID_AA64ISAR0_AES
-+#endif
-+#ifndef ID_AA64ISAR0_SHA1_VAL
-+#define ID_AA64ISAR0_SHA1_VAL ID_AA64ISAR0_SHA1
-+#endif
-+#ifndef ID_AA64ISAR0_SHA2_VAL
-+#define ID_AA64ISAR0_SHA2_VAL ID_AA64ISAR0_SHA2
-+#endif
- 
--  if ((hwcap & kNEON) == 0) {
--    // Matching OpenSSL, if NEON is missing, don't report other features
--    // either.
--    return;
--  }
-+void OPENSSL_cpuid_setup(void) {
-+  uint64_t id_aa64isar0;
- 
-+  id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1);
-+
-   OPENSSL_armcap_P |= ARMV7_NEON;
- 
--  if (hwcap & kAES) {
-+  if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) >= ID_AA64ISAR0_AES_BASE) {
-     OPENSSL_armcap_P |= ARMV8_AES;
-   }
--  if (hwcap & kPMULL) {
-+  if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL) {
-     OPENSSL_armcap_P |= ARMV8_PMULL;
-   }
--  if (hwcap & kSHA1) {
-+  if (ID_AA64ISAR0_SHA1_VAL(id_aa64isar0) == ID_AA64ISAR0_SHA1_BASE) {
-     OPENSSL_armcap_P |= ARMV8_SHA1;
-   }
--  if (hwcap & kSHA256) {
-+  if(ID_AA64ISAR0_SHA2_VAL(id_aa64isar0) >= ID_AA64ISAR0_SHA2_BASE) {
-     OPENSSL_armcap_P |= ARMV8_SHA256;
-   }
- }
--
--#endif  // OPENSSL_AARCH64 && !OPENSSL_STATIC_ARMCAP
-+#endif  // OPENSSL_AARCH64
diff --git a/databases/clickhouse/files/patch-contrib_jemalloc-cmake_CMakeLists.txt b/databases/clickhouse/files/patch-contrib_jemalloc-cmake_CMakeLists.txt
deleted file mode 100644
index 404f3a7c00ff..000000000000
--- a/databases/clickhouse/files/patch-contrib_jemalloc-cmake_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- contrib/jemalloc-cmake/CMakeLists.txt.orig	2021-12-26 09:29:33 UTC
-+++ contrib/jemalloc-cmake/CMakeLists.txt
-@@ -19,8 +19,8 @@ if (NOT ENABLE_JEMALLOC)
-     return()
- endif ()
- 
--if (NOT OS_LINUX)
--    message (WARNING "jemalloc support on non-linux is EXPERIMENTAL")
-+if (NOT OS_LINUX AND NOT OS_FREEBSD)
-+    message (WARNING "jemalloc support on non-linux and non-bsd is EXPERIMENTAL")
- endif()
- 
- if (OS_LINUX)
diff --git a/databases/clickhouse/files/patch-contrib_rocksdb-cmake_CMakeLists.txt b/databases/clickhouse/files/patch-contrib_rocksdb-cmake_CMakeLists.txt
deleted file mode 100644
index 6db0e41ea70d..000000000000
--- a/databases/clickhouse/files/patch-contrib_rocksdb-cmake_CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
---- contrib/rocksdb-cmake/CMakeLists.txt.orig	2021-09-13 16:50:13.827707000 +0200
-+++ contrib/rocksdb-cmake/CMakeLists.txt	2021-09-13 16:51:37.118209000 +0200
-@@ -233,6 +233,11 @@ if(HAVE_AUXV_GETAUXVAL)
-   add_definitions(-DROCKSDB_AUXV_GETAUXVAL_PRESENT)
- endif()
- 
-+check_cxx_symbol_exists(elf_aux_info sys/auxv.h HAVE_ELF_AUX_INFO)
-+if(HAVE_ELF_AUX_INFO)
-+  add_definitions(-DROCKSDB_AUXV_GETAUXVAL_PRESENT)
-+endif()
-+
- include_directories(${ROCKSDB_SOURCE_DIR})
- include_directories("${ROCKSDB_SOURCE_DIR}/include")
- if(WITH_FOLLY_DISTRIBUTED_MUTEX)
diff --git a/databases/clickhouse/files/patch-contrib_rocksdb_CMakeLists.txt b/databases/clickhouse/files/patch-contrib_rocksdb_CMakeLists.txt
deleted file mode 100644
index 67a092844f6f..000000000000
--- a/databases/clickhouse/files/patch-contrib_rocksdb_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- contrib/rocksdb/CMakeLists.txt.orig	2021-09-13 16:40:55.686967000 +0200
-+++ contrib/rocksdb/CMakeLists.txt	2021-09-13 16:44:42.046383000 +0200
-@@ -553,6 +553,10 @@ check_cxx_symbol_exists(getauxval auvx.h HAVE_AUXV_GET
- if(HAVE_AUXV_GETAUXVAL)
-   add_definitions(-DROCKSDB_AUXV_GETAUXVAL_PRESENT)
- endif()
-+check_cxx_symbol_exists(elf_aux_info sys/auxv.h HAVE_AUXV_ELF_AUX_INFO)
-+if(HAVE_AUXV_ELF_AUX_INFO)
-+  add_definitions(-DROCKSDB_AUXV_GETAUXVAL_PRESENT)
-+endif()
- 
- include_directories(${PROJECT_SOURCE_DIR})
- include_directories(${PROJECT_SOURCE_DIR}/include)