diff --git a/0047-openssl-no-engine.patch b/0047-openssl-no-engine.patch new file mode 100644 index 0000000..3c2db95 --- /dev/null +++ b/0047-openssl-no-engine.patch @@ -0,0 +1,55 @@ +diff --git a/src/common/openssl_opts_handler.cc b/src/common/openssl_opts_handler.cc +index 81d0c4786..d9866f197 100644 +--- a/src/common/openssl_opts_handler.cc ++++ b/src/common/openssl_opts_handler.cc +@@ -16,7 +16,10 @@ + + #include + #include ++#include ++#ifndef OPENSSL_NO_ENGINE + #include ++#endif + #include + #include + #include +@@ -116,11 +119,13 @@ void load_module(const string &engine_conf) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + ++#ifndef OPENSSL_NO_ENGINE + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + ENGINE_load_builtin_engines(); + #pragma clang diagnostic pop + #pragma GCC diagnostic pop ++#endif + + if (CONF_modules_load( + conf, nullptr, +diff --git a/src/crypto/openssl/openssl_crypto_accel.cc b/src/crypto/openssl/openssl_crypto_accel.cc +index f99844a38..4944205dd 100644 +--- a/src/crypto/openssl/openssl_crypto_accel.cc ++++ b/src/crypto/openssl/openssl_crypto_accel.cc +@@ -14,7 +14,6 @@ + + #include "crypto/openssl/openssl_crypto_accel.h" + #include +-#include + #include "common/debug.h" + + // ----------------------------------------------------------------------------- +diff --git a/src/jaegertracing/opentelemetry-cpp/third_party/prometheus-cpp/3rdparty/civetweb/src/civetweb.c b/src/jaegertracing/opentelemetry-cpp/third_party/prometheus-cpp/3rdparty/civetweb/src/civetweb.c +index fea9e6f98..c7eddb20b 100644 +--- a/src/jaegertracing/opentelemetry-cpp/third_party/prometheus-cpp/3rdparty/civetweb/src/civetweb.c ++++ b/src/jaegertracing/opentelemetry-cpp/third_party/prometheus-cpp/3rdparty/civetweb/src/civetweb.c +@@ -1744,7 +1744,9 @@ typedef struct SSL_CTX SSL_CTX; + #include + #include + #include ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) + #include ++#endif + #include + #include + #include diff --git a/ceph.spec b/ceph.spec index 27a59df..b4c2ccf 100644 --- a/ceph.spec +++ b/ceph.spec @@ -223,6 +223,7 @@ Patch0043: 0043_src_common_crc32c_ppc_asm.S.patch Patch0044: 0044_src_cpp_redis_CMakeLists.txt.patch Patch0045: 0045_src-commom-crc32c_ppc_fast_zero_asm.S.patch Patch0046: 0046-src-s3select-include-s3select_parquet_intrf.h.patch +Patch0047: 0047-openssl-no-engine.patch # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787 ExcludeArch: i686 armv7hl @@ -458,7 +459,6 @@ BuildRequires: librdmacm-devel BuildRequires: openldap-devel #BuildRequires: krb5-devel BuildRequires: openssl-devel -BuildRequires: openssl-devel-engine BuildRequires: CUnit-devel BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-prettytable