[rpms/galera] f43: Rebase to 26.4.26

[rpms/galera] f43: Rebase to 26.4.26

[Pavol Sloboda]

            A new commit has been pushed.

            Repo   : rpms/galera
            Branch : f43
            Commit : 8ab23126389d6088da52314b965282ea81643fdd
            Author : Pavol Sloboda <psloboda@redhat.com>
            Date   : 2026-05-25T13:18:11+02:00
            Stats  : +7/-175 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/galera/c/8ab23126389d6088da52314b965282ea81643fdd?branch=f43

            Log:
            Rebase to 26.4.26

Removed the no longer needed patches since they are present in the
source tarball

The upstream has renamed some of the cmake variables for consistency but
they do the same as the ones we used in the patch.

The removal of the cmake_paths patch also removed the rename of garb.cnf
to garb but there is no need to keep a patch for a rename of a single
file so I moved it to the %install section

Upstream release notes:
https://github.com/mariadb-corporation/mariadb-docs/blob/main/release-notes/galera-cluster/26.4/26.4.6.md

---
diff --git a/cmake_paths.patch b/cmake_paths.patch
deleted file mode 100644
index 27d5643..0000000
--- a/cmake_paths.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-This patch has been offered upstream with slight typo fixes:
-  https://github.com/codership/galera/pull/614
-on 21/02/2022
-
-#----------------------
-
-
-1) Documentation files
-
---- galera-26.4.11/CMakeLists.txt	2022-02-20 03:35:32.039968825 +0100
-+++ galera-26.4.11/CMakeLists.txt_patched	2022-02-20 03:34:57.710641631 +0100
-@@ -109,14 +109,19 @@ add_subdirectory(galera)
- add_subdirectory(scripts/packages)
- add_subdirectory(wsrep/tests)
- 
-+# Make the intall destination for documentation files configurable
-+if(NOT DEFINED INSTALL_DOCDIR)
-+  set(INSTALL_DOCDIR "doc" CACHE STRING "path to install documentaion to")
-+endif()
-+
- if (NOT ${CMAKE_SYSTEM_NAME} MATCHES ".*BSD")
-   install(FILES
-     ${PROJECT_SOURCE_DIR}/AUTHORS
-     ${PROJECT_SOURCE_DIR}/COPYING
-     ${PROJECT_SOURCE_DIR}/README
--    DESTINATION doc)
-+    DESTINATION ${INSTALL_DOCDIR} )
-   install(FILES ${PROJECT_SOURCE_DIR}/asio/LICENSE_1_0.txt
--    DESTINATION doc
-+    DESTINATION ${INSTALL_DOCDIR}
-     RENAME LICENSE.asio)
- endif()
- 
-
-
-2) Configuration file
-3) Executable files
-4) Systemd service file
-
---- galera-26.4.23/garb/CMakeLists.txt	2025-07-15 07:34:42.000000000 +0200
-+++ galera-26.4.23/garb/CMakeLists.txt_patched	2025-08-08 15:22:15.492953438 +0200
-@@ -35,14 +35,51 @@ target_compile_options(garbd
- target_link_libraries(garbd gcs4garb gcomm gcache
-   ${Boost_PROGRAM_OPTIONS_LIBRARY})
- 
--install(TARGETS garbd DESTINATION bin)
-+# Make the install destination for garbd binary configurable
-+if(NOT DEFINED INSTALL_GARBD)
-+  set(INSTALL_GARBD "bin" CACHE STRING "path to install garbd binary to")
-+endif()
-+
-+install(TARGETS garbd
-+  DESTINATION ${INSTALL_GARBD})
-+
- if (NOT ${CMAKE_SYSTEM_NAME} MATCHES ".*BSD")
-+
-+  # Make the install destination for garbd-systemd wrapper script configurable
-+  if(NOT DEFINED INSTALL_GARBD-SYSTEMD)
-+    set(INSTALL_GARBD-SYSTEMD "share" CACHE STRING "path to install garbd-systemd wrapper script to")
-+  endif()
-+
-+  install(FILES
-+    ${CMAKE_CURRENT_SOURCE_DIR}/files/garb-systemd
-+    DESTINATION ${INSTALL_GARBD-SYSTEMD})
-+
-+  # Make the install destination for garbd configuration file configurable
-+  if(NOT DEFINED INSTALL_CONFIGURATION)
-+    set(INSTALL_CONFIGURATION "share" CACHE STRING "path to install garbd configuration to")
-+  endif()
-+
-   install(FILES
-     ${CMAKE_CURRENT_SOURCE_DIR}/files/garb.cnf
-+    DESTINATION ${INSTALL_CONFIGURATION}
-+    RENAME garb)
-+
-+  # Make the install destination for garbd systemd service file configurable
-+  if(NOT DEFINED INSTALL_SYSTEMD_SERVICE)
-+    set(INSTALL_SYSTEMD_SERVICE "share" CACHE STRING "path to install garbd Systemd service to")
-+  endif()
-+
-+  install(FILES
-     ${CMAKE_CURRENT_SOURCE_DIR}/files/garb.service
--    ${CMAKE_CURRENT_SOURCE_DIR}/files/garb-systemd
--    DESTINATION share)
-+    DESTINATION ${INSTALL_SYSTEMD_SERVICE})
-+
-+  # Make the install destination for manpage configurable
-+  if(NOT DEFINED INSTALL_MANPAGE)
-+    set(INSTALL_MANPAGE "man/man8" CACHE STRING "path to install manpage to")
-+  endif()
-+
-   install(FILES
-     ${PROJECT_SOURCE_DIR}/man/garbd.8
--    DESTINATION man/man8)
-+    DESTINATION ${INSTALL_MANPAGE})
-+
- endif()
-
-
-
-5) Shared library path
-
---- galera-26.4.8/galera/src/CMakeLists.txt	2021-06-10 03:13:05.465005845 +0200
-+++ galera-26.4.8/galera/src/CMakeLists.txt_patched	2021-06-10 03:16:53.388699046 +0200
-@@ -112,7 +112,12 @@ endif()
- 
- target_link_libraries(galera_smm galera ${GALERA_LINK_OPTIONS})
- 
--install(TARGETS galera_smm DESTINATION lib)
-+# Make the install destination for garbd binary configurable
-+if(NOT DEFINED INSTALL_LIBDIR)
-+  set(INSTALL_LIBDIR "lib" CACHE STRING "path to install shared libraries to")
-+endif()
-+
-+install(TARGETS galera_smm DESTINATION ${INSTALL_LIBDIR})
- 
- # The following checks are guaranteed to work only
- # Linux platform, we skip them on others.
-

diff --git a/docs.patch b/docs.patch
deleted file mode 100644
index 7a6bec5..0000000
--- a/docs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-The CMake prepares file AUTHORS for packing.
-It only contains one line, and isn't packed in any upstream-produced packagess.
-I don't find it useful and since upstream doesn't pack it either, stop packing it here.
-
-The README file contains infromation on how to build the project from sources, and thus isn't useful for the end users.
-
-On the other hand, the README-MySQL isn't prepared for packing by CMake, but contains useful information about the software usage and it is package in upstream-produced packages.
-
-Offered upstream:
-https://github.com/codership/galera/pull/666
-https://groups.google.com/g/codership-team/c/Cn4UO3MkNQs
-
---- galera-26.4.18/CMakeLists.txt	2024-06-09 04:54:56.281408893 +0200
-+++ galera-26.4.18/CMakeLists.txt_patched	2024-06-09 06:52:58.093217968 +0200
-@@ -118,9 +118,8 @@ endif()
- 
- if (NOT ${CMAKE_SYSTEM_NAME} MATCHES ".*BSD")
-   install(FILES
--    ${PROJECT_SOURCE_DIR}/AUTHORS
-     ${PROJECT_SOURCE_DIR}/COPYING
--    ${PROJECT_SOURCE_DIR}/README
-+    ${PROJECT_SOURCE_DIR}/scripts/packages/README-MySQL
-     DESTINATION ${INSTALL_DOCDIR} )
-   install(FILES ${PROJECT_SOURCE_DIR}/asio/LICENSE_1_0.txt
-     DESTINATION ${INSTALL_DOCDIR}

diff --git a/galera.spec b/galera.spec
index 81fdd81..f61de56 100644
--- a/galera.spec
+++ b/galera.spec
@@ -2,8 +2,8 @@
 ExcludeArch: %{ix86}
 
 Name:           galera
-Version:        26.4.25
-Release:        3%{?dist}
+Version:        26.4.26
+Release:        1%{?dist}
 Summary:        Synchronous multi-master wsrep provider (replication engine)
 
 License:        GPL-2.0-only
@@ -15,9 +15,6 @@ URL:            https://mariadb.com/docs/galera-cluster
 # Furthermore there is a lag (can be days, weeks) between when a new tag is done on GitHub and when MariaDB upstream releases the new version on their web with the new MariaDB server release.
 Source0:        https://archive.mariadb.org/mariadb-11.8/%{name}-%{version}/src/%{name}-%{version}.tar.gz
 
-Patch0:         cmake_paths.patch
-Patch1:         docs.patch
-Patch2:         network.patch
 Patch3:         asio-1.33-compat.patch
 Patch4:         upstream_810f3589742ecb8c4f32d44c363d30488582a9f6.patch
 
@@ -37,9 +34,6 @@ description of Galera replication engine see https://www.galeracluster.com web.
 
 %prep
 %setup -q
-%patch -P0 -p1
-%patch -P1 -p1
-%patch -P2 -p1
 %patch -P3 -p1
 %patch -P4 -p1
 
@@ -59,9 +53,9 @@ EOF
        \
        -DINSTALL_DOCDIR="share/doc/%{name}/" \
        -DINSTALL_GARBD="bin" \
-       -DINSTALL_GARBD-SYSTEMD="bin" \
-       -DINSTALL_CONFIGURATION="/etc/sysconfig/" \
-       -DINSTALL_SYSTEMD_SERVICE="lib/systemd/system" \
+       -DINSTALL_GARBD_SYSTEMD="bin" \
+       -DINSTALL_GARBD_CONFIGURATION="/etc/sysconfig/" \
+       -DINSTALL_GARBD_SERVICE="lib/systemd/system" \
        -DINSTALL_LIBDIR="%{_lib}/galera" \
        -DINSTALL_MANPAGE="share/man/man8"
 
@@ -102,6 +96,7 @@ sed -i 's/User=nobody/User=garb/g' %{buildroot}%{_unitdir}/garb.service
 
 install -m0644 -D galera.sysusers.conf %{buildroot}%{_sysusersdir}/galera.conf
 
+mv %{buildroot}%{_sysconfdir}/sysconfig/garb.cnf %{buildroot}%{_sysconfdir}/sysconfig/garb
 
 %check
 %ctest

diff --git a/network.patch b/network.patch
deleted file mode 100644
index 8d9f483..0000000
--- a/network.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Make sure the network is actually up at the moment of the service startup:
-https://systemd.io/NETWORK_ONLINE/
-
-Offered upstream:
-https://github.com/codership/galera/pull/667
-https://groups.google.com/g/codership-team/c/Cn4UO3MkNQs
-
---- galera-26.4.18/garb/files/garb.service	2024-04-17 19:39:35.000000000 +0200
-+++ galera-26.4.18/garb/files/garb.service_patched	2024-06-09 07:47:19.245480639 +0200
-@@ -4,7 +4,8 @@
- Description=Galera Arbitrator Daemon
- Documentation=man:garbd(8)
- Documentation=https://galeracluster.com/library/documentation/arbitrator.html
--After=network.target
-+After=network-online.target
-+Wants=network-online.target
- 
- [Install]
- WantedBy=multi-user.target

diff --git a/sources b/sources
index fb480b7..de71752 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (galera-26.4.25.tar.gz) = 40f320be461e1588ff2e50aee1912e1d9544b5d3ec95d3603c391a76abeaa54f3d7e3b975d0269370664e04935674a3a06823e3e7ee9ea9eb9a4879db97a3a61
+SHA512 (galera-26.4.26.tar.gz) = 6cca23da2a449f9a8e2ced963559abe0aab79cdeebee475478c0e18d5ad1ddfc184367d518cad555998921bb67bcf9494fa30ae9fff6ce4b2b251668672483e7