diff --git a/galera.spec b/galera.spec index 1047edc..ecf51d4 100644 --- a/galera.spec +++ b/galera.spec @@ -2,8 +2,8 @@ ExcludeArch: %{ix86} Name: galera -Version: 26.4.19 -Release: 2%{?dist} +Version: 26.4.21 +Release: 1%{?dist} Summary: Synchronous multi-master wsrep provider (replication engine) License: GPL-2.0-only @@ -18,7 +18,6 @@ Source0: http://releases.galeracluster.com/source/%{name}-%{version}.tar. Patch0: cmake_paths.patch Patch1: docs.patch Patch2: network.patch -Patch3: openssl_engine.patch BuildRequires: boost-devel check-devel openssl-devel cmake systemd gcc-c++ asio-devel Requires(pre): /usr/sbin/useradd @@ -40,7 +39,6 @@ description of Galera replication engine see https://www.galeracluster.com web. %patch -P0 -p1 %patch -P1 -p1 %patch -P2 -p1 -%patch -P3 -p1 %build %{set_build_flags} @@ -147,6 +145,9 @@ unlink /etc/systemd/system/garb.service || : %changelog +* Wed Feb 05 2025 Michal Schorm - 26.4.21-1 +- Rebase to 26.4.21 + * Tue Oct 29 2024 Troy Dawson - 26.4.19-2 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018 diff --git a/openssl_engine.patch b/openssl_engine.patch deleted file mode 100644 index 3a2d1be..0000000 --- a/openssl_engine.patch +++ /dev/null @@ -1,27 +0,0 @@ -The galera package itself does not need "openssl/engine.h" to compile. - -There are only two instanced of that include: - -1) File: "asio/asio/ssl/detail/openssl_types.hpp", necessary for galera itself to build -Which contains coorectly conditioned: -| #if !defined(OPENSSL_NO_ENGINE) -| # include -| #endif // !defined(OPENSSL_NO_ENGINE) - -2) File: "galera-26.4.19/galerautils/tests/gu_asio_test.cpp", necessary for galera 'galerautils' tests to build - -which does not have the include inside a condition, as the code requires it in any case. - -== - -As a workaround, disable build of the 'galerautils' tests, until -the openssl engine functionality is correctly removed from it. - ---- galera-26.4.19/galerautils/CMakeLists.txt 2024-08-20 15:56:58.821943102 +0200 -+++ galera-26.4.19/galerautils/CMakeLists.txt_patched 2024-08-20 15:57:07.027849238 +0200 -@@ -3,4 +3,4 @@ - # - - add_subdirectory(src) --add_subdirectory(tests) -+#add_subdirectory(tests) diff --git a/sources b/sources index 26ca78f..0f96585 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (galera-26.4.19.tar.gz) = 5968d8def9882e30d714399c2c82ade4099e22b5fce3dc6646ad4068fb6e0cf2cf12dd714e8051c3fe7c38b68939892d8411b352ab6c7d302f558eb1d53c1597 +SHA512 (galera-26.4.21.tar.gz) = f43a04ad87e1948db74a174dd4e5364d63156aedb5bc29205829a74394715df56baec4903edc737daebbc333d95be4653492fef435d90614bd3fb94295dbd0f8