6 changed files with 73 additions and 159 deletions
--- a/.galera.metadata
+++ b/.galera.metadata
@ -1 +1 @@
-ed55d57a704512140b3979d94b6ff0691c0a6227 SOURCES/galera-26.4.20.tar.gz
+5146c0d2a899cefaf537925d52382069d007b973 SOURCES/galera-25.3.37.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/galera-26.4.20.tar.gz
+SOURCES/galera-25.3.37.tar.gz
--- a/SOURCES/cmake_paths.patch
+++ b/SOURCES/cmake_paths.patch
@ -1,18 +1,12 @@
-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)
+--- galera-26.4.8/CMakeLists.txt	2021-04-08 08:05:44.000000000 +0200
+++ galera-26.4.8/CMakeLists.txt_patched	2021-06-10 01:40:26.886770832 +0200
+@@ -106,17 +106,23 @@
 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")
@ -20,17 +14,21 @@ on 21/02/2022
 +
 if (NOT ${CMAKE_SYSTEM_NAME} MATCHES ".*BSD")
   install(FILES
-     ${PROJECT_SOURCE_DIR}/AUTHORS
-     ${PROJECT_SOURCE_DIR}/COPYING
-     ${PROJECT_SOURCE_DIR}/README
+     ${CMAKE_SOURCE_DIR}/AUTHORS
+     ${CMAKE_SOURCE_DIR}/COPYING
+     ${CMAKE_SOURCE_DIR}/README
 -    DESTINATION doc)
-+    DESTINATION ${INSTALL_DOCDIR} )
-   install(FILES ${PROJECT_SOURCE_DIR}/asio/LICENSE_1_0.txt
+    DESTINATION ${INSTALL_DOCDIR})
+   install(FILES ${CMAKE_SOURCE_DIR}/asio/LICENSE_1_0.txt
 -    DESTINATION doc
 +    DESTINATION ${INSTALL_DOCDIR}
     RENAME LICENSE.asio)
+   install(FILES ${CMAKE_SOURCE_DIR}/chromium/LICENSE
+-    DESTINATION doc
+    DESTINATION ${INSTALL_DOCDIR}
+     RENAME LICENSE.chromium)
 endif()
- 
+


 2) Configuration file
@ -90,7 +88,7 @@ on 21/02/2022
 +  endif()
 +
   install(FILES
-     ${PROJECT_SOURCE_DIR}/man/garbd.8
+     ${CMAKE_SOURCE_DIR}/man/garbd.8
 -    DESTINATION man/man8)
 +    DESTINATION ${INSTALL_MANPAGE})
 +
--- a/SOURCES/docs.patch
+++ b/SOURCES/docs.patch
@ -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}
--- a/SOURCES/galera-va_end.patch
+++ b/SOURCES/galera-va_end.patch
@ -0,0 +1,16 @@
+This is an upstream patch for https://github.com/codership/galera/pull/617
+"remove duplicate va_end call" that originates from BZ #2051849 covscan
+results. The upstream has not addressed the issue for over a year so this
+is the reason to cover it as separate patch here.
+
+--- galera-25.3.37/galerautils/src/gu_dbug.c	2022-05-31 17:05:23.000000000 +0200
+++ ../../galera-25.3.37/galerautils/src/gu_dbug.c	2023-07-10 17:09:58.969599380 +0200
+@@ -1040,7 +1040,6 @@ _gu_db_doprnt_(const char *format, ...)
+ 	}
+ 	(void) fprintf(_gu_db_fp_, "%s: ", state->u_keyword);
+ 	(void) vfprintf(_gu_db_fp_, format, args);
+-	va_end(args);
+ 	(void) fputc('\n', _gu_db_fp_);
+ 	dbug_flush(state);
+ 	errno = save_errno;
+
--- a/SPECS/galera.spec
+++ b/SPECS/galera.spec
@ -1,8 +1,5 @@
-# To both save infrastrucutre resources and workaround for i686 FTBFS
-ExcludeArch: %{ix86}
-
 Name:           galera
-Version:        26.4.20
+Version:        25.3.37
 Release:        1%{?dist}
 Summary:        Synchronous multi-master wsrep provider (replication engine)

@ -11,7 +8,7 @@ URL:            http://galeracluster.com/

 # Actually, the truth is, we do use galera source tarball provided by MariaDB on
 # following URL (without macros):
-#   https://mirror.vpsfree.cz/mariadb/mariadb-10.4.11/galera-26.4.3/src/galera-26.4.3.tar.gz
+#   https://archive.mariadb.org/mariadb-10.3.32/galera-25.3.34/src/galera-25.3.34.tar.gz

 Source0:        http://releases.galeracluster.com/source/%{name}-%{version}.tar.gz

@ -19,27 +16,30 @@ Source1:        garbd.service
 Source2:        garbd-wrapper

 Patch0:         cmake_paths.patch
-Patch1:         docs.patch
+Patch1:         galera-va_end.patch

 BuildRequires:  boost-devel check-devel openssl-devel cmake systemd gcc-c++ asio-devel
 Requires(pre):  /usr/sbin/useradd
 Requires:       nmap-ncat
 Requires:       procps-ng

-%{?systemd_requires}
+
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd


 %description
-Galera is a fast synchronous multimaster wsrep provider (replication engine)
+Galera is a fast synchronous multi-master wsrep provider (replication engine)
 for transactional databases and similar applications. For more information
-about wsrep API see https://github.com/codership/wsrep-API repository. For a
-description of Galera replication engine see https://www.galeracluster.com web.
+about wsrep API see http://launchpad.net/wsrep. For a description of Galera
+replication engine see http://www.codership.com.


 %prep
 %setup -q
-%patch -P0 -p1
-%patch -P1 -p1
+%patch0 -p1
+%patch1 -p1

 %build
 %{set_build_flags}
@ -108,18 +108,11 @@ sed -i 's;/usr/bin/garbd;/usr/sbin/garbd;g' %{buildroot}/usr/share/doc/galera/ga
 ##   specific to this service, either statically via systemd-sysusers or dynamically
 ##   via the DynamicUser= service setting.
 sed -i 's/User=nobody/User=garb/g' %{buildroot}/usr/share/doc/galera/garbd.service
-# Maintainers from other distributions also tries to resolve it on the upstream:
-#   https://github.com/codership/galera/pull/633

 # Install old service and wrapper to maintain compatibility
 install -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/garbd.service
 install -D -m 755 %{SOURCE2} %{buildroot}%{_sbindir}/garbd-wrapper

-
-%check
-%ctest
-
-
 %pre
 /usr/sbin/useradd -M -r -d /dev/null -s /sbin/nologin -c "Galera Arbitrator Daemon" garb >/dev/null 2>&1 || :

@ -155,117 +148,49 @@ install -D -m 755 %{SOURCE2} %{buildroot}%{_sbindir}/garbd-wrapper

 %{_libdir}/galera/libgalera_smm.so

+%doc %{_docdir}/galera/AUTHORS
 %doc %{_docdir}/galera/COPYING
 %doc %{_docdir}/galera/LICENSE.asio
-%doc %{_docdir}/galera/README-MySQL
+%doc %{_docdir}/galera/LICENSE.chromium
+%doc %{_docdir}/galera/README
+#%doc %{_docdir}/galera/README-MySQL


 %changelog
-* Thu Nov 14 2024 Michal Schorm <mschorm@redhat.com> - 26.4.20-1
- Rebase to 26.4.20
+* Tue Jul 04 2023 Anton Bobrov <abobrov@redhat.com> - 25.3.37-1
+- Rebase to 25.3.37

-* Fri Oct 18 2024 Michal Schorm <mschorm@redhat.com> - 26.4.19-1
- Rebase to 26.4.19
+* Fri Jul 01 2022 Zuzana Miklankova <zmiklank@redhat.com> - 25.3.35-1
+- Rebase to 25.3.35

-* Fri Jun 07 2024 Michal Schorm <mschorm@redhat.com> - 26.4.18-1
- Rebase to 26.4.18
-
-* Fri Nov 17 2023 Michal Schorm <mschorm@redhat.com> - 26.4.16-1
- Rebase to 26.4.16
-
-* Sat Apr 29 2023 Michal Schorm <mschorm@redhat.com> - 26.4.14-1
- Rebase to 26.4.14
-
-* Tue Nov 15 2022 Michal Schorm <mschorm@redhat.com> - 26.4.13-1
- Rebase to 26.4.13
-
-* Wed Aug 24 2022 Michal Schorm <mschorm@redhat.com> - 26.4.12-1
- Rebase to 26.4.12
-
-* Sun Feb 20 2022 Michal Schorm <mschorm@redhat.com> - 26.4.11-1
- Rebase to 26.4.11
-
-* Fri Jan 28 2022 Lukas Javorsky <ljavorsk@redhat.com> - 26.4.9-4
- Use downstream garbd-wrapper and garbd.service to ensure compatibility
- Add upstream versions of garbd-wrapper (called garbd-systemd) and garbd.service
-  in case user want's to use them
-
-* Wed Jan 19 2022 Lukas Javorsky <ljavorsk@redhat.com> - 26.4.9-3
+* Thu Feb 03 2022 Lukas Javorsky <ljavorsk@redhat.com> - 25.3.34-4
 - Explicitly require the 'procps-ng' package
 - Otherwise it will not require it in the lightweight systems (e.g. containers)
 - and Galera won't work properly

-* Wed Jan 19 2022 Michal Schorm <mschorm@redhat.com> -     26.4.9-2
+* Fri Jan 28 2022 Lukas Javorsky <ljavorsk@redhat.com> - 25.3.34-3
+- Use downstream garbd-wrapper and garbd.service to ensure compatibility
+- Add upstream versions of garbd-wrapper (called garbd-systemd) and garbd.service
+  in case user want's to use them
+
+* Wed Jan 19 2022 Michal Schorm <mschorm@redhat.com> -  25.3.34-2
 - Switch from SCONS build tooling to CMAKE build tooling

-* Wed Jan 19 2022 Lukas Javorsky <ljavorsk@redhat.com> - 26.4.9-1
- Rebase to 26.4.9
+* Wed Jan 19 2022 Zuzana Miklankova <zmiklank@redhat.com> - 25.3.34-1
+- Rebase to 25.3.34
+  Resolves: #2042298
+  
+* Tue Mar 23 2021 Michal Schorm <mschorm@redhat.com> - 25.3.32-1
+- Rebase to 25.3.32

-* Mon Mar 22 2021 Michal Schorm <mschorm@redhat.com> - 26.4.7-1
- Rebase to 26.4.7
+* Tue Nov 10 2020 Michal Schorm <mschorm@redhat.com> - 25.3.31-1
+- Rebase to 25.3.31
+  Resolves: #1731289, #1856812

-* Mon Dec 07 2020 Honza Horak <hhorak@redhat.com> - 26.4.6-2
- Do not use scrict flags on RHEL-8, it does not find check.h that way
-  Related: #1855781
-
-* Wed Nov 04 2020 Michal Schorm <mschorm@redhat.com> - 26.4.6-1
- Rebase to 26.4.6
-
-* Thu Sep 17 2020 Michal Schorm <mschorm@redhat.com> - 26.4.5-2
- Extend the workaround also to ELN
-
-* Wed Sep 16 2020 Michal Schorm <mschorm@redhat.com> - 26.4.5-1
- Rebase to 26.4.5
-
-* Wed Sep 16 2020 Michal Schorm <mschorm@redhat.com> - 26.4.4-5
- Apply workaround for FTBFS on F33+
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 26.4.4-4
- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 26.4.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jun 08 2020 Michal Schorm <mschorm@redhat.com> - 26.4.4-2
- Second rebuild for Boost 1.73
-
-* Fri Jun 05 2020 Michal Schorm <mschorm@redhat.com> - 26.4.4-1
- Rebase to 26.4.4
-  Resolves: rhbz#1546787
-
-* Thu May 28 2020 Jonathan Wakely <jwakely@redhat.com> - 26.4.3-4
- Rebuilt for Boost 1.73
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 26.4.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jan 18 2020 Michal Schorm <mschorm@redhat.com> - 26.4.3-2
- Rebase to 26.4.3
-
-* Wed Nov 06 2019 Michal Schorm <mschorm@redhat.com> - 25.3.28-1
- Rebase to 25.3.28
-
-* Thu Aug 01 2019 Michal Schorm <mschorm@redhat.com> - 25.3.26-3
- Fix for #1735233 and #1737108
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 25.3.26-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Jul 19 2019 Michal Schorm <mschorm@redhat.com> - 25.3.26-1
+* Thu Jul 18 2019 Michal Schorm <mschorm@redhat.com> - 25.3.26-1
 - Rebase to 25.3.26
-
-* Fri Jul 19 2019 Michal Schorm <mschorm@redhat.com> - 25.3.25-4
- Use macro for setting up the compiler flags
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 25.3.25-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jan 29 2019 Jonathan Wakely <jwakely@redhat.com> - 25.3.25-2
- Rebuilt for Boost 1.69
-
-* Tue Jan 01 2019 Michal Schorm <mschorm@redhat.com> - 25.3.25-1
- Rebase to 25.3.25
+  Resolves: #1687879
+  Resolves: #1657220

 * Mon Jul 16 2018 Honza Horak <hhorak@redhat.com> - 25.3.23-5
 - Require asio also on rhel