From 1a62e62de5d4fb5fe17119851414ac648c06d9a0 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 21 Sep 2023 10:13:11 +0000 Subject: [PATCH] import CS galera-25.3.37-1.module_el8+569+2b353cc3 --- .galera.metadata | 2 +- .gitignore | 2 +- SOURCES/galera-va_end.patch | 16 ++++++++++++++++ SPECS/galera.spec | 7 ++++++- 4 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 SOURCES/galera-va_end.patch diff --git a/.galera.metadata b/.galera.metadata index fb6790c..97fda42 100644 --- a/.galera.metadata +++ b/.galera.metadata @@ -1 +1 @@ -558c1d7fd01c36fcd7536ef7ffe9ebc2906c309b SOURCES/galera-25.3.35.tar.gz +5146c0d2a899cefaf537925d52382069d007b973 SOURCES/galera-25.3.37.tar.gz diff --git a/.gitignore b/.gitignore index a90b163..24a908e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/galera-25.3.35.tar.gz +SOURCES/galera-25.3.37.tar.gz diff --git a/SOURCES/galera-va_end.patch b/SOURCES/galera-va_end.patch new file mode 100644 index 0000000..167b3b1 --- /dev/null +++ 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; + diff --git a/SPECS/galera.spec b/SPECS/galera.spec index eb700d8..2fc9600 100644 --- a/SPECS/galera.spec +++ b/SPECS/galera.spec @@ -1,5 +1,5 @@ Name: galera -Version: 25.3.35 +Version: 25.3.37 Release: 1%{?dist} Summary: Synchronous multi-master wsrep provider (replication engine) @@ -16,6 +16,7 @@ Source1: garbd.service Source2: garbd-wrapper Patch0: cmake_paths.patch +Patch1: galera-va_end.patch BuildRequires: boost-devel check-devel openssl-devel cmake systemd gcc-c++ asio-devel Requires(pre): /usr/sbin/useradd @@ -38,6 +39,7 @@ replication engine see http://www.codership.com. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %{set_build_flags} @@ -155,6 +157,9 @@ install -D -m 755 %{SOURCE2} %{buildroot}%{_sbindir}/garbd-wrapper %changelog +* Tue Jul 04 2023 Anton Bobrov - 25.3.37-1 +- Rebase to 25.3.37 + * Fri Jul 01 2022 Zuzana Miklankova - 25.3.35-1 - Rebase to 25.3.35