From a9070a692930ecb59a4cb193c525f5e51337d63a Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 21 2020 20:54:52 +0000
Subject: import galera-25.3.26-1.module+el8.1.0+3974+90eded84


---

diff --git a/.galera.metadata b/.galera.metadata
index 2e566c9..ca5c6f1 100644
--- a/.galera.metadata
+++ b/.galera.metadata
@@ -1 +1 @@
-000e20ad02113e796a8a551a2733674338fbbc92 SOURCES/galera-25.3.23.tar.gz
+66615f585b3413fd112087092cc63be5b5bba57d SOURCES/galera-25.3.26.tar.gz
diff --git a/.gitignore b/.gitignore
index aae4bac..fd60ea0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/galera-25.3.23.tar.gz
+SOURCES/galera-25.3.26.tar.gz
diff --git a/SOURCES/galera-python3.patch b/SOURCES/galera-python3.patch
index 13bda0b..0543fc4 100644
--- a/SOURCES/galera-python3.patch
+++ b/SOURCES/galera-python3.patch
@@ -2,16 +2,16 @@ Upstream PR:
 https://github.com/codership/galera/pull/512
 
 diff -up galera-25.3.23/SConstruct.bak galera-25.3.23/SConstruct
---- galera-25.3.23/SConstruct.bak	2018-07-13 15:14:49.059835554 +0200
-+++ galera-25.3.23/SConstruct	2018-07-13 15:19:07.717967794 +0200
+--- galera-25.3.26/SConstruct.bak	2018-07-13 15:14:49.059835554 +0200
++++ galera-25.3.26/SConstruct	2018-07-13 15:19:07.717967794 +0200
 @@ -194,8 +194,8 @@ if link != 'default':
      env.Replace(LINK = link)
  
  # Get compiler name/version, CXX may be set to "c++" which may be clang or gcc
--cc_version = read_first_line(env['CC'].split() + ['--version'])
--cxx_version = read_first_line(env['CXX'].split() + ['--version'])
-+cc_version = read_first_line(env['CC'].split() + ['--version']).decode()
-+cxx_version = read_first_line(env['CXX'].split() + ['--version']).decode()
+-cc_version = str(read_first_line(env['CC'].split() + ['--version']))
+-cxx_version = str(read_first_line(env['CXX'].split() + ['--version']))
++cc_version = str(read_first_line(env['CC'].split() + ['--version']).decode())
++cxx_version = str(read_first_line(env['CXX'].split() + ['--version']).decode())
  
  print('Using C compiler executable: ' + env['CC'])
  print('C compiler version is: ' + cc_version)
diff --git a/SPECS/galera.spec b/SPECS/galera.spec
index 9db4eea..0fa69d1 100644
--- a/SPECS/galera.spec
+++ b/SPECS/galera.spec
@@ -1,6 +1,6 @@
 Name:           galera
-Version:        25.3.23
-Release:        5%{?dist}
+Version:        25.3.26
+Release:        1%{?dist}
 Summary:        Synchronous multi-master wsrep provider (replication engine)
 
 License:        GPLv2
@@ -38,12 +38,29 @@ replication engine see http://www.codership.com.
 %patch0 -p1
 
 %build
-CPPFLAGS="%{optflags}"
+%{set_build_flags}
+
+# FTBFS with the GLIBCXX_ASSERTIONS; #1546787
 CPPFLAGS=`echo $CPPFLAGS| sed -e "s|-Wp,-D_GLIBCXX_ASSERTIONS||g" `
-export CPPFLAGS
+CFLAGS=`echo $CFLAGS| sed -e "s|-Wp,-D_GLIBCXX_ASSERTIONS||g" `
+CXXFLAGS=`echo $CXXFLAGS| sed -e "s|-Wp,-D_GLIBCXX_ASSERTIONS||g" `
+export CPPFLAGS CFLAGS CXXFLAGS
 
-scons-3 %{?_smp_mflags} strict_build_flags=0
+# Print help:
+#   scons-3 --help
+#   scons-3 -H
 
+# Possibly usefull arguments:
+#   --debug=findlibs
+#   --debug=stacktrace
+#   --warn=all
+#   debug=0
+
+%if %_arch == i686 || %_arch == i386
+scons-3 %{?_smp_mflags} strict_build_flags=0
+%else
+scons-3 %{?_smp_mflags} strict_build_flags=1
+%endif
 
 %install
 install -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/garbd.service
@@ -89,6 +106,11 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE
 
 
 %changelog
+* Thu Jul 18 2019 Michal Schorm <mschorm@redhat.com> - 25.3.26-1
+- Rebase to 25.3.26
+  Resolves: #1687879
+  Resolves: #1657220
+
 * Mon Jul 16 2018 Honza Horak <hhorak@redhat.com> - 25.3.23-5
 - Require asio also on rhel