commit galera-4 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package galera-4 for openSUSE:Factory
checked in at 2024-02-21 17:51:54
Comparing /work/SRC/openSUSE:Factory/galera-4 (Old)
and /work/SRC/openSUSE:Factory/.galera-4.new.1706 (New)
Package is "galera-4"
Wed Feb 21 17:51:54 2024 rev:10 rq:1147559 version:26.4.17
Changes:
--- /work/SRC/openSUSE:Factory/galera-4/galera-4.changes2023-05-05
15:57:10.424046844 +0200
+++ /work/SRC/openSUSE:Factory/.galera-4.new.1706/galera-4.changes
2024-02-21 17:51:59.581698072 +0100
@@ -1,0 +2,37 @@
+Mon Feb 19 11:09:35 UTC 2024 - Danilo Spinella
+
+- Update to 26.4.17:
+ - "Zero-level" certification keys are implemented. Currently there are 3
levels
+ of resource keys: schema, table, row, yet one common resource used by every
+ writeset, a node. The key is added by default to every writeset with the
default
+ type WSREP_KEY_SHARED. Now, node-wide operations can be performed with the
same
+ semantics as regular transactions.
+ - Non-SYNCED nodes are not counted when calculating commit cut - maximum
seqno
+ that is no longer needed in certification index; situations may arise when
group
+ commit cut is applied before all preceding events are committed on a
non-SYNCED
+ node, now drain all monitors to ensure that preceding events are committed.
+ - Stability of node joining process for gmcast improved when new nodes are
+ connecting concurrently as nodes previously may arrive at a different
conclusion
+ on which nodes will be blocked, however now, connections are explicitly
allowed
+ from all nodes which may be accepted as members in the next view.
+ - Stability of node joining process for EVS improved by dropping EVS join
+ messages without own identified in joining state, to avoid starting
membership
+ protocol before at least one of the existing nodes has seen at least one join
+ message from a joiner.
+ - Improve "Failed to report last committed" warning to make it more accurate
and
+ user-friendly.
+- Update to 26.4.16:
+ - Removed out-of-order certification for BF aborted transactions.
+ - Better error handling when the socket is closed, also cleaned up excessive
+ debug logging.
+- Update to 26.4.15:
+ - an assertion is relaxed when Galera is configured with commit order
disabled
+ - in certificate index preload, an assertion in handle_ist_trx_preload()
fails
+ if the first handled IST preload write set has failed certification, and
+ incrementing the index position caused the certificate index to end up with
the
+ wrong position; now fixed by appending dummy writeset sequence numbers into
+ Certification::trx_map_
+ - ASAN reported memory leak if gcs is closed after becoming joined but before
+ reaching synced
+
+---
Old:
galera-4-26.4.14.tar.gz
galera-4-26.4.14.tar.gz.asc
New:
galera-4-26.4.17.tar.gz
galera-4-26.4.17.tar.gz.asc
Other differences:
--
++ galera-4.spec ++
--- /var/tmp/diff_new_pack.f9MC6g/_old 2024-02-21 17:52:00.857744257 +0100
+++ /var/tmp/diff_new_pack.f9MC6g/_new 2024-02-21 17:52:00.861744402 +0100
@@ -1,7 +1,7 @@
#
# spec file for package galera-4
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,14 +25,14 @@
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: galera-4
-Version:26.4.14
+Version:26.4.17
Release:0
Summary:Galera: a synchronous multi-master wsrep provider (replication
engine)
License:GPL-2.0-only
Group: Productivity/Databases/Tools
URL:https://galeracluster.com/
-Source:
https://releases.galeracluster.com/galera-4.12/source/%{name}-%{version}.tar.gz
-Source1:
https://releases.galeracluster.com/galera-4.12/source/%{name}-%{version}.tar.gz.asc
+Source:
https://releases.galeracluster.com/galera-4/source/%{name}-%{version}.tar.gz
+Source1:
https://releases.galeracluster.com/galera-4/source/%{name}-%{version}.tar.gz.asc
Source2:garb-user.conf
Patch0: galera-3-25.3.10_fix_startup_scripts.patch
Patch2: fix-cmake-install.patch
++ galera-4-26.4.14.tar.gz -> galera-4-26.4.17.tar.gz ++
4942 lines of diff (skipped)
commit galera-4 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package galera-4 for openSUSE:Factory
checked in at 2023-05-05 15:57:06
Comparing /work/SRC/openSUSE:Factory/galera-4 (Old)
and /work/SRC/openSUSE:Factory/.galera-4.new.1533 (New)
Package is "galera-4"
Fri May 5 15:57:06 2023 rev:9 rq:1084718 version:26.4.14
Changes:
--- /work/SRC/openSUSE:Factory/galera-4/galera-4.changes2022-12-16
17:50:54.375771483 +0100
+++ /work/SRC/openSUSE:Factory/.galera-4.new.1533/galera-4.changes
2023-05-05 15:57:10.424046844 +0200
@@ -1,0 +2,20 @@
+Thu May 4 13:43:00 UTC 2023 - Marcus Rueckert
+
+- Update to 26.4.14:
+ - memory leak in the gcs gcomm backend fixed (tp_ object deleted
+in GCommConn destructor)
+ - protonet.backend option deprecated since it only supports one
+option, asio, and the option will be removed in future release.
+Related, protonet.version is also deprecated
+ - deprecation message for socket.ssl_compression as SSL
+compression cannot be enabled and the option will be removed in
+future releases
+ - library could parse incorrect parameters as long as it had a
+"good" prefix, i.e. evs.*, so fix prevents setting of invalid
+option values
+ - parsing of ISO8601 durations previously accepted invalid
+values, now fixed
+ - in addition to ISO8601 format, parsing durations now supports
+real number representation
+
+---
Old:
galera-4-26.4.13.tar.gz
galera-4-26.4.13.tar.gz.asc
New:
galera-4-26.4.14.tar.gz
galera-4-26.4.14.tar.gz.asc
Other differences:
--
++ galera-4.spec ++
--- /var/tmp/diff_new_pack.t9GWkH/_old 2023-05-05 15:57:11.996055850 +0200
+++ /var/tmp/diff_new_pack.t9GWkH/_new 2023-05-05 15:57:12.55873 +0200
@@ -1,7 +1,7 @@
#
# spec file for package galera-4
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: galera-4
-Version:26.4.13
+Version:26.4.14
Release:0
Summary:Galera: a synchronous multi-master wsrep provider (replication
engine)
License:GPL-2.0-only
++ galera-4-26.4.13.tar.gz -> galera-4-26.4.14.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/galera-4-26.4.13/GALERA_GIT_REVISION
new/galera-4-26.4.14/GALERA_GIT_REVISION
--- old/galera-4-26.4.13/GALERA_GIT_REVISION2022-11-03 11:54:19.0
+0100
+++ new/galera-4-26.4.14/GALERA_GIT_REVISION2023-02-24 09:38:50.0
+0100
@@ -1 +1 @@
-0f7af311
\ No newline at end of file
+456ad404
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/galera-4-26.4.13/GALERA_REVISION
new/galera-4-26.4.14/GALERA_REVISION
--- old/galera-4-26.4.13/GALERA_REVISION2022-11-03 11:54:19.0
+0100
+++ new/galera-4-26.4.14/GALERA_REVISION2023-02-24 09:38:50.0
+0100
@@ -1 +1 @@
-0f7af311
\ No newline at end of file
+456ad404
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/galera-4-26.4.13/GALERA_VERSION
new/galera-4-26.4.14/GALERA_VERSION
--- old/galera-4-26.4.13/GALERA_VERSION 2022-11-03 11:54:17.0 +0100
+++ new/galera-4-26.4.14/GALERA_VERSION 2023-02-24 09:38:48.0 +0100
@@ -1,4 +1,4 @@
GALERA_VERSION_WSREP_API=26
GALERA_VERSION_MAJOR=4
-GALERA_VERSION_MINOR=13
+GALERA_VERSION_MINOR=14
GALERA_VERSION_EXTRA=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/galera-4-26.4.13/SConstruct
new/galera-4-26.4.14/SConstruct
--- old/galera-4-26.4.13/SConstruct 2022-11-03 11:54:17.0 +0100
+++ new/galera-4-26.4.14/SConstruct 2023-02-24 09:38:48.0 +0100
@@ -163,7 +163,7 @@
install = ARGUMENTS.get('install', None)
version_script = int(ARGUMENTS.get('version_script', 1))
-GALERA_VER = ARGUMENTS.get('version', '4.13')
+GALERA_VER = ARGUMENTS.get('version', '4.14')
GALERA_REV = ARGUMENTS.get('revno', '')
# Attempt to read from file if not given
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/galera-4-26.4.13/debian/changelog
new/galera-4-26.4.14/debian/changelog
--- old/galera-4-26.4.13/debian/changelog 2022-11-03 11:54:17.0
+0100
+++ new/galera-4-26.4.14/debian/changelog 2023-02-24 09:38:48.0
+0100
@@ -1,5
commit galera-4 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package galera-4 for openSUSE:Factory
checked in at 2022-12-16 17:50:52
Comparing /work/SRC/openSUSE:Factory/galera-4 (Old)
and /work/SRC/openSUSE:Factory/.galera-4.new.1835 (New)
Package is "galera-4"
Fri Dec 16 17:50:52 2022 rev:8 rq:1042975 version:26.4.13
Changes:
--- /work/SRC/openSUSE:Factory/galera-4/galera-4.changes2022-06-17
21:22:10.502762379 +0200
+++ /work/SRC/openSUSE:Factory/.galera-4.new.1835/galera-4.changes
2022-12-16 17:50:54.375771483 +0100
@@ -1,0 +2,9 @@
+Wed Dec 7 17:13:00 UTC 2022 - Marcus Rueckert
+
+- Update to 26.4.13:
+ - Complete IO for client handshake before starting an
+asynchronous read to fix an occasional connection failure when
+establishing new cluster connections
+ - EOF-while-reading errors now suppressed when using OpenSSL 3.0
+
+---
Old:
galera-4-26.4.12.tar.gz
galera-4-26.4.12.tar.gz.asc
New:
galera-4-26.4.13.tar.gz
galera-4-26.4.13.tar.gz.asc
Other differences:
--
++ galera-4.spec ++
--- /var/tmp/diff_new_pack.VAPTjx/_old 2022-12-16 17:50:54.803773839 +0100
+++ /var/tmp/diff_new_pack.VAPTjx/_new 2022-12-16 17:50:54.811773883 +0100
@@ -25,7 +25,7 @@
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: galera-4
-Version:26.4.12
+Version:26.4.13
Release:0
Summary:Galera: a synchronous multi-master wsrep provider (replication
engine)
License:GPL-2.0-only
++ galera-4-26.4.12.tar.gz -> galera-4-26.4.13.tar.gz ++
89009 lines of diff (skipped)
commit galera-4 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package galera-4 for openSUSE:Factory
checked in at 2022-06-17 21:19:57
Comparing /work/SRC/openSUSE:Factory/galera-4 (Old)
and /work/SRC/openSUSE:Factory/.galera-4.new.1548 (New)
Package is "galera-4"
Fri Jun 17 21:19:57 2022 rev:7 rq:982047 version:26.4.12
Changes:
--- /work/SRC/openSUSE:Factory/galera-4/galera-4.changes2022-04-30
00:44:15.474884803 +0200
+++ /work/SRC/openSUSE:Factory/.galera-4.new.1548/galera-4.changes
2022-06-17 21:22:10.502762379 +0200
@@ -1,0 +2,12 @@
+Thu Jun 9 14:11:09 UTC 2022 - Danilo Spinella
+
+- Update to 26.4.12:
+ * WORK_DIR parameter added for garb.cnf and launch scripts to ensure Galera
+Arbitrator handles recovery files better (this includes command line
option to
+specify working directory), fixing codership/galera#313
+ * Fixes to renaming fc_master_slave to fc_single_primary
+ * Catch local_endpoint() and remote_endpoint() exceptions, so they aren't
+propagated to the stack, fixing a cluster crash and MDEV-25068
+ * SSL options are explicitly initialised in garbd, fixing MDEV-28158
+
+---
Old:
galera-4-26.4.11.tar.gz
galera-4-26.4.11.tar.gz.asc
New:
galera-4-26.4.12.tar.gz
galera-4-26.4.12.tar.gz.asc
Other differences:
--
++ galera-4.spec ++
--- /var/tmp/diff_new_pack.PiMXAx/_old 2022-06-17 21:22:10.910762600 +0200
+++ /var/tmp/diff_new_pack.PiMXAx/_new 2022-06-17 21:22:10.914762603 +0200
@@ -25,14 +25,14 @@
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: galera-4
-Version:26.4.11
+Version:26.4.12
Release:0
Summary:Galera: a synchronous multi-master wsrep provider (replication
engine)
License:GPL-2.0-only
Group: Productivity/Databases/Tools
URL:https://galeracluster.com/
-Source:
http://releases.galeracluster.com/staging/galera-4/source/%{name}-%{version}.tar.gz
-Source1:
http://releases.galeracluster.com/staging/galera-4/source/%{name}-%{version}.tar.gz.asc
+Source:
https://releases.galeracluster.com/galera-4.12/source/%{name}-%{version}.tar.gz
+Source1:
https://releases.galeracluster.com/galera-4.12/source/%{name}-%{version}.tar.gz.asc
Source2:garb-user.conf
Patch0: galera-3-25.3.10_fix_startup_scripts.patch
Patch2: fix-cmake-install.patch
++ galera-4-26.4.11.tar.gz -> galera-4-26.4.12.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/galera-4-26.4.11/DartConfiguration.tcl
new/galera-4-26.4.12/DartConfiguration.tcl
--- old/galera-4-26.4.11/DartConfiguration.tcl 1970-01-01 01:00:00.0
+0100
+++ new/galera-4-26.4.12/DartConfiguration.tcl 2022-04-27 16:01:51.0
+0200
@@ -0,0 +1,115 @@
+# This file is configured by CMake automatically as DartConfiguration.tcl
+# If you choose not to use CMake, this file may be hand configured, by
+# filling in the required variables.
+
+
+# Configuration directories and files
+SourceDirectory: /var/lib/jenkins/workspace/aws-galera-4-sourcetar
+BuildDirectory: /var/lib/jenkins/workspace/aws-galera-4-sourcetar
+
+# Where to place the cost data store
+CostDataFile:
+
+# Site is something like machine.domain, i.e. pragmatic.crd
+Site: master
+
+# Build name is osname-revision-compiler, i.e. Linux-2.4.2-2smp-c++
+BuildName: Linux-c++
+
+# Subprojects
+LabelsForSubprojects:
+
+# Submission information
+IsCDash:
+CDashVersion:
+QueryCDashVersion:
+DropSite:
+DropLocation:
+DropSiteUser:
+DropSitePassword:
+DropSiteMode:
+DropMethod: http
+TriggerSite:
+ScpCommand: /usr/bin/scp
+
+# Dashboard start time
+NightlyStartTime: 00:00:00 EDT
+
+# Commands for the build/test/submit cycle
+ConfigureCommand: "/usr/bin/cmake"
"/var/lib/jenkins/workspace/aws-galera-4-sourcetar"
+MakeCommand: /usr/bin/cmake --build . --config "${CTEST_CONFIGURATION_TYPE}"
-- -i
+DefaultCTestConfigurationType: Release
+
+# version control
+UpdateVersionOnly:
+
+# CVS options
+# Default is "-d -P -A"
+CVSCommand: CVSCOMMAND-NOTFOUND
+CVSUpdateOptions: -d -A -P
+
+# Subversion options
+SVNCommand: /usr/bin/svn
+SVNOptions:
+SVNUpdateOptions:
+
+# Git options
+GITCommand: /usr/bin/git
+GITInitSubmodules:
+GITUpdateOptions:
+GITUpdateCustom:
+
+# Perforce options
+P4Command: P4COMMAND-NOTFOUND
+P4Client:
+P4Options:
+P4UpdateOptions:
+P4UpdateCustom:
+
+# Generic update command
+UpdateCommand: /usr/bin/git
+UpdateOptions:
+UpdateType: git
+
+# Compiler info
+Compiler: /usr/bin/c++
+CompilerVersion: 7.5.0
+
+# Dynamic analysis (MemCheck)
commit galera-4 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package galera-4 for openSUSE:Factory
checked in at 2022-04-30 00:44:11
Comparing /work/SRC/openSUSE:Factory/galera-4 (Old)
and /work/SRC/openSUSE:Factory/.galera-4.new.1538 (New)
Package is "galera-4"
Sat Apr 30 00:44:11 2022 rev:6 rq:973596 version:26.4.11
Changes:
--- /work/SRC/openSUSE:Factory/galera-4/galera-4.changes2022-02-23
16:26:31.339508986 +0100
+++ /work/SRC/openSUSE:Factory/.galera-4.new.1538/galera-4.changes
2022-04-30 00:44:15.474884803 +0200
@@ -1,0 +2,18 @@
+Thu Apr 28 08:18:32 UTC 2022 - Danilo Spinella
+
+- Fill sysconfig configuration file
+
+---
+Thu Apr 28 07:51:59 UTC 2022 - Thorsten Kukuk
+
+- Fix sysusers generation
+
+---
+Wed Apr 27 15:09:57 UTC 2022 - Danilo Spinella
+
+- Commit sed changes to file
+- Use default shell for garb user ("-" which is replaced by /usr/sbin/nologin)
+ * garb-user.conf
+- Add sysusers macro
+
+---
Other differences:
--
++ galera-4.spec ++
--- /var/tmp/diff_new_pack.DyQQXB/_old 2022-04-30 00:44:16.014885272 +0200
+++ /var/tmp/diff_new_pack.DyQQXB/_new 2022-04-30 00:44:16.018885275 +0200
@@ -44,6 +44,7 @@
BuildRequires: mariadb >= %{mariadb_version}
BuildRequires: pkgconfig
BuildRequires: sysuser-tools
+%sysusers_requires
BuildRequires: pkgconfig(systemd)
Requires: %{name}-wsrep-provider
Conflicts: galera-3
@@ -64,6 +65,7 @@
%if %{defined fedora}
BuildRequires: python
%endif
+Requires(post): %fillup_prereq
%description
Galera is a fast synchronous multimaster wsrep provider (replication engine)
@@ -100,6 +102,7 @@
%autosetup -p1
%build
+%sysusers_generate_pre %{SOURCE2} garb garb-user.conf
export CFLAGS="%{optflags}"
export CXXFLAGS="%{optflags}"
%if 0%{?suse_version} > 1320
@@ -110,7 +113,6 @@
-DCMAKE_INSTALL_LIBEXECDIR:PATH=%{_libexecdir} \
-DCMAKE_INSTALL_DOCDIR:PATH=%{_datarootdir}/doc/packages/%{name}
%cmake_build
-%sysusers_generate_pre %{SOURCE2} garb garb-user.conf
%install
%cmake_install
@@ -130,7 +132,7 @@
wsrep_provider=%{_libdir}/libgalera_smm.so
EOF
-sed -e 's;/usr/libexec;%{_libexecdir};' %{buildroot}%{_unitdir}/garb.service
+sed -e 's;/usr/libexec;%{_libexecdir};' -i %{buildroot}%{_unitdir}/garb.service
%files
# common
@@ -157,7 +159,7 @@
%{_libdir}/libgalera_smm.so
%config %{_sysconfdir}/my.cnf.d/51-%{name}-wsrep-provider.cnf
-%pre
+%pre -f garb.pre
%service_add_pre garb.service
%preun
@@ -165,6 +167,7 @@
%post
%service_add_post garb.service
+%fillup_only -n garb
%postun
%service_del_postun garb.service
++ garb-user.conf ++
--- /var/tmp/diff_new_pack.DyQQXB/_old 2022-04-30 00:44:16.102885348 +0200
+++ /var/tmp/diff_new_pack.DyQQXB/_new 2022-04-30 00:44:16.106885351 +0200
@@ -1,3 +1,3 @@
# Type Name ID GECOS [HOME]
-u garb - "Galera Arbitrator" /var/lib/garb /bin/false
+u garb - "Galera Arbitrator" /var/lib/garb -
commit galera-4 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package galera-4 for openSUSE:Factory
checked in at 2022-02-23 16:25:55
Comparing /work/SRC/openSUSE:Factory/galera-4 (Old)
and /work/SRC/openSUSE:Factory/.galera-4.new.1958 (New)
Package is "galera-4"
Wed Feb 23 16:25:55 2022 rev:5 rq:956824 version:26.4.11
Changes:
--- /work/SRC/openSUSE:Factory/galera-4/galera-4.changes2022-02-18
23:02:54.989412966 +0100
+++ /work/SRC/openSUSE:Factory/.galera-4.new.1958/galera-4.changes
2022-02-23 16:26:31.339508986 +0100
@@ -1,0 +2,7 @@
+Fri Feb 18 12:31:14 UTC 2022 - Danilo Spinella
+
+- Update to 26.4.11
+- Remove upstreamed fix-cmake-build.patch
+- Refresh fix-cmake-install.patch
+
+---
Old:
fix-cmake-build.patch
galera-4-26.4.10.tar.gz
galera-4-26.4.10.tar.gz.asc
New:
galera-4-26.4.11.tar.gz
galera-4-26.4.11.tar.gz.asc
Other differences:
--
++ galera-4.spec ++
--- /var/tmp/diff_new_pack.45Bxkb/_old 2022-02-23 16:26:31.823509002 +0100
+++ /var/tmp/diff_new_pack.45Bxkb/_new 2022-02-23 16:26:31.827509003 +0100
@@ -25,19 +25,16 @@
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: galera-4
-Version:26.4.10
+Version:26.4.11
Release:0
Summary:Galera: a synchronous multi-master wsrep provider (replication
engine)
License:GPL-2.0-only
Group: Productivity/Databases/Tools
URL:https://galeracluster.com/
-Source:
http://releases.galeracluster.com/galera-4/source/%{name}-%{version}.tar.gz
-Source1:
http://releases.galeracluster.com/galera-4/source/%{name}-%{version}.tar.gz.asc
+Source:
http://releases.galeracluster.com/staging/galera-4/source/%{name}-%{version}.tar.gz
+Source1:
http://releases.galeracluster.com/staging/galera-4/source/%{name}-%{version}.tar.gz.asc
Source2:garb-user.conf
Patch0: galera-3-25.3.10_fix_startup_scripts.patch
-# PATCH-FIX-UPSTREAM danilo.spine...@suse.com
-# https://github.com/codership/galera/issues/611
-Patch1: fix-cmake-build.patch
Patch2: fix-cmake-install.patch
BuildRequires: boost-devel
BuildRequires: check-devel
++ fix-cmake-install.patch ++
--- /var/tmp/diff_new_pack.45Bxkb/_old 2022-02-23 16:26:31.851509003 +0100
+++ /var/tmp/diff_new_pack.45Bxkb/_new 2022-02-23 16:26:31.855509004 +0100
@@ -1,7 +1,7 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3e65edbc..53e68817 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
+Index: galera-4-26.4.11/CMakeLists.txt
+===
+--- galera-4-26.4.11.orig/CMakeLists.txt
galera-4-26.4.11/CMakeLists.txt
@@ -12,6 +12,7 @@ include(CheckIncludeFile)
include(CheckIncludeFileCXX)
include(CheckCXXCompilerFlag)
@@ -9,8 +9,8 @@
+include(GNUInstallDirs)
include_directories(
- ${CMAKE_SOURCE_DIR}
-@@ -42,6 +43,9 @@ option(GALERA_GCS_SM_DEBUG
+ ${PROJECT_SOURCE_DIR}
+@@ -43,6 +44,9 @@ option(GALERA_GCS_SM_DEBUG
option(GALERA_GU_DEBUG_MUTEX "Enable mutex debug instrumentation" OFF)
option(GALERA_GU_DBUG_ON "Enable sync point macros (ON for Debug builds)" OFF)
@@ -20,22 +20,22 @@
#
# Set cmake policies before doing any checks.
#
-@@ -111,9 +115,9 @@ if (NOT ${CMAKE_SYSTEM_NAME} MATCHES ".*BSD")
- ${CMAKE_SOURCE_DIR}/AUTHORS
- ${CMAKE_SOURCE_DIR}/COPYING
- ${CMAKE_SOURCE_DIR}/README
+@@ -112,9 +116,9 @@ if (NOT ${CMAKE_SYSTEM_NAME} MATCHES ".*
+ ${PROJECT_SOURCE_DIR}/AUTHORS
+ ${PROJECT_SOURCE_DIR}/COPYING
+ ${PROJECT_SOURCE_DIR}/README
-DESTINATION doc)
+DESTINATION ${CMAKE_INSTALL_DOCDIR})
- install(FILES ${CMAKE_SOURCE_DIR}/asio/LICENSE_1_0.txt
+ install(FILES ${PROJECT_SOURCE_DIR}/asio/LICENSE_1_0.txt
-DESTINATION doc
+DESTINATION ${CMAKE_INSTALL_DOCDIR}
RENAME LICENSE.asio)
endif()
-diff --git a/galera/src/CMakeLists.txt b/galera/src/CMakeLists.txt
-index cc7775d7..c3c573a0 100644
a/galera/src/CMakeLists.txt
-+++ b/galera/src/CMakeLists.txt
+Index: galera-4-26.4.11/galera/src/CMakeLists.txt
+===
+--- galera-4-26.4.11.orig/galera/src/CMakeLists.txt
galera-4-26.4.11/galera/src/CMakeLists.txt
@@ -112,7 +112,7 @@ endif()
target_link_libraries(galera_smm galera ${GALERA_LINK_OPTIONS})
@@ -45,10 +45,10 @@
# The following checks are guaranteed to work only
# Linux platform, we skip them on others.
-diff --git a/garb/CMakeLists.txt b/garb/CMakeLists.txt
-index 156b984b..57cf1b2c 100644
a/garb/CMakeLists.txt
-+++ b/garb/CMakeLists.txt
+Index:
commit galera-4 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package galera-4 for openSUSE:Factory
checked in at 2022-02-18 23:02:42
Comparing /work/SRC/openSUSE:Factory/galera-4 (Old)
and /work/SRC/openSUSE:Factory/.galera-4.new.1958 (New)
Package is "galera-4"
Fri Feb 18 23:02:42 2022 rev:4 rq:955665 version:26.4.10
Changes:
--- /work/SRC/openSUSE:Factory/galera-4/galera-4.changes2022-02-03
23:15:57.876826505 +0100
+++ /work/SRC/openSUSE:Factory/.galera-4.new.1958/galera-4.changes
2022-02-18 23:02:54.989412966 +0100
@@ -1,0 +2,5 @@
+Thu Feb 17 10:36:09 UTC 2022 - Danilo Spinella
+
+- Fix build and systemd service for SLE-15-SP3
+
+---
Other differences:
--
++ galera-4.spec ++
--- /var/tmp/diff_new_pack.MN86tA/_old 2022-02-18 23:02:55.541412923 +0100
+++ /var/tmp/diff_new_pack.MN86tA/_new 2022-02-18 23:02:55.545412923 +0100
@@ -110,6 +110,7 @@
export CXXFLAGS="$CXXFLAGS -Wno-implicit-fallthrough"
%endif
%cmake -DGALERA_SYSTEMD_UNITDIR:PATH=%{_unitdir} \
+ -DCMAKE_INSTALL_LIBEXECDIR:PATH=%{_libexecdir} \
-DCMAKE_INSTALL_DOCDIR:PATH=%{_datarootdir}/doc/packages/%{name}
%cmake_build
%sysusers_generate_pre %{SOURCE2} garb garb-user.conf
@@ -132,6 +133,8 @@
wsrep_provider=%{_libdir}/libgalera_smm.so
EOF
+sed -e 's;/usr/libexec;%{_libexecdir};' %{buildroot}%{_unitdir}/garb.service
+
%files
# common
%doc %{docs}
commit galera-4 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package galera-4 for openSUSE:Factory
checked in at 2022-02-03 23:15:45
Comparing /work/SRC/openSUSE:Factory/galera-4 (Old)
and /work/SRC/openSUSE:Factory/.galera-4.new.1898 (New)
Package is "galera-4"
Thu Feb 3 23:15:45 2022 rev:3 rq:950692 version:26.4.10
Changes:
--- /work/SRC/openSUSE:Factory/galera-4/galera-4.changes2022-01-08
23:23:00.602201807 +0100
+++ /work/SRC/openSUSE:Factory/.galera-4.new.1898/galera-4.changes
2022-02-03 23:15:57.876826505 +0100
@@ -1,0 +2,7 @@
+Wed Jan 26 15:30:10 UTC 2022 - Danilo Spinella
+
+- Use cmake by default to fix build with GCC 12, fixes bsc#1194790
+ * Add fix-cmake-install.patch
+- Add fix-cmake-build.patch to fix cmake build, fixes bsc#1194827
+
+---
New:
fix-cmake-build.patch
fix-cmake-install.patch
Other differences:
--
++ galera-4.spec ++
--- /var/tmp/diff_new_pack.wFf4DI/_old 2022-02-03 23:15:58.400822928 +0100
+++ /var/tmp/diff_new_pack.wFf4DI/_new 2022-02-03 23:15:58.404822901 +0100
@@ -1,7 +1,7 @@
#
# spec file for package galera-4
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,6 @@
%define copyright Copyright 2007-2015 Codership Oy. All rights reserved. Use
is subject to license terms under GPLv2 license.
-%define libs %{_libdir}/%{name}
%define docs %{_docdir}/%{name}
%define homedir %{_localstatedir}/lib/garb
%define galeradir %{_localstatedir}/lib/galera
@@ -25,7 +24,6 @@
%if ! %{defined _fillupdir}
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
-%bcond_with cmake
Name: galera-4
Version:26.4.10
Release:0
@@ -37,6 +35,10 @@
Source1:
http://releases.galeracluster.com/galera-4/source/%{name}-%{version}.tar.gz.asc
Source2:garb-user.conf
Patch0: galera-3-25.3.10_fix_startup_scripts.patch
+# PATCH-FIX-UPSTREAM danilo.spine...@suse.com
+# https://github.com/codership/galera/issues/611
+Patch1: fix-cmake-build.patch
+Patch2: fix-cmake-install.patch
BuildRequires: boost-devel
BuildRequires: check-devel
BuildRequires: gcc-c++
@@ -44,17 +46,15 @@
# for fileownership of galeradir
BuildRequires: mariadb >= %{mariadb_version}
BuildRequires: pkgconfig
-BuildRequires: pkgconfig(systemd)
BuildRequires: sysuser-tools
+BuildRequires: pkgconfig(systemd)
Requires: %{name}-wsrep-provider
Conflicts: galera-3
%if 0%{?suse_version} >= 1500
BuildRequires: libboost_program_options-devel
BuildRequires: libboost_system-devel
%endif
-%if %{with cmake}
BuildRequires: cmake
-%endif
# for fileownership of galeradir
%if %{with split_package}
BuildRequires: mysql-server
@@ -67,9 +67,6 @@
%if %{defined fedora}
BuildRequires: python
%endif
-%if %{without cmake}
-BuildRequires: scons
-%endif
%description
Galera is a fast synchronous multimaster wsrep provider (replication engine)
@@ -112,32 +109,19 @@
export CFLAGS="$CFLAGS -Wno-implicit-fallthrough"
export CXXFLAGS="$CXXFLAGS -Wno-implicit-fallthrough"
%endif
-%if %{with cmake}
-%cmake
+%cmake -DGALERA_SYSTEMD_UNITDIR:PATH=%{_unitdir} \
+ -DCMAKE_INSTALL_DOCDIR:PATH=%{_datarootdir}/doc/packages/%{name}
%cmake_build
-%else
-scons %{?_smp_mflags} deterministic_tests=1 version=%{version} ssl=1
system_asio=1 boost_pool=1
-%endif
%sysusers_generate_pre %{SOURCE2} garb garb-user.conf
%install
-install -D -m 644 garb/files/garb.service %{buildroot}%{_unitdir}/garb.service
-install -D -m 755 garb/files/garb-systemd %{buildroot}%{_bindir}/garb-systemd
+%cmake_install
mkdir -p %{buildroot}%{_sysusersdir}
install -D -m 0644 %{SOURCE2} %{buildroot}%{_sysusersdir}/
-install -D -m 644 garb/files/garb.cnf
%{buildroot}%{_fillupdir}/sysconfig.garb
-
-install -D -m 755 garb/garbd %{buildroot}%{_bindir}/garbd
-install -D -m 755 libgalera_smm.so
%{buildroot}%{libs}/libgalera_smm.so
+mkdir -p %{buildroot}%{_fillupdir}
+mv %{buildroot}%{_prefix}/etc/garb.cnf %{buildroot}%{_fillupdir}/sysconfig.garb
-install -d %{buildroot}%{docs}
-install -m 644 COPYING %{buildroot}%{docs}/COPYING
-install -m 644 asio/LICENSE_1_0.txt %{buildroot}%{docs}/LICENSE.asio
-install -m 644 scripts/packages/README %{buildroot}%{docs}/README
-install -m 644 scripts/packages/README-MySQL %{buildroot}%{docs}/README-MySQL
-
-install -D -m 644 man/garbd.8
%{buildroot}%{_mandir}/man8/garbd.8
install -D -d -m
commit galera-4 for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package galera-4 for openSUSE:Factory
checked in at 2022-01-08 23:22:59
Comparing /work/SRC/openSUSE:Factory/galera-4 (Old)
and /work/SRC/openSUSE:Factory/.galera-4.new.1892 (New)
Package is "galera-4"
Sat Jan 8 23:22:59 2022 rev:2 rq:944498 version:26.4.10
Changes:
--- /work/SRC/openSUSE:Factory/galera-4/galera-4.changes2022-01-03
10:49:20.111578512 +0100
+++ /work/SRC/openSUSE:Factory/.galera-4.new.1892/galera-4.changes
2022-01-08 23:23:00.602201807 +0100
@@ -1,0 +2,5 @@
+Thu Dec 30 14:23:20 UTC 2021 - Danilo Spinella
+
+- Migrate to sysusers for creating garb user
+
+---
New:
garb-user.conf
Other differences:
--
++ galera-4.spec ++
--- /var/tmp/diff_new_pack.KrF0YA/_old 2022-01-08 23:23:01.318202391 +0100
+++ /var/tmp/diff_new_pack.KrF0YA/_new 2022-01-08 23:23:01.322202395 +0100
@@ -35,6 +35,7 @@
URL:https://galeracluster.com/
Source:
http://releases.galeracluster.com/galera-4/source/%{name}-%{version}.tar.gz
Source1:
http://releases.galeracluster.com/galera-4/source/%{name}-%{version}.tar.gz.asc
+Source2:garb-user.conf
Patch0: galera-3-25.3.10_fix_startup_scripts.patch
BuildRequires: boost-devel
BuildRequires: check-devel
@@ -44,6 +45,7 @@
BuildRequires: mariadb >= %{mariadb_version}
BuildRequires: pkgconfig
BuildRequires: pkgconfig(systemd)
+BuildRequires: sysuser-tools
Requires: %{name}-wsrep-provider
Conflicts: galera-3
%if 0%{?suse_version} >= 1500
@@ -116,10 +118,13 @@
%else
scons %{?_smp_mflags} deterministic_tests=1 version=%{version} ssl=1
system_asio=1 boost_pool=1
%endif
+%sysusers_generate_pre %{SOURCE2} garb garb-user.conf
%install
install -D -m 644 garb/files/garb.service %{buildroot}%{_unitdir}/garb.service
install -D -m 755 garb/files/garb-systemd %{buildroot}%{_bindir}/garb-systemd
+mkdir -p %{buildroot}%{_sysusersdir}
+install -D -m 0644 %{SOURCE2} %{buildroot}%{_sysusersdir}/
install -D -m 644 garb/files/garb.cnf
%{buildroot}%{_fillupdir}/sysconfig.garb
@@ -156,6 +161,7 @@
%{_mandir}/man8/garbd.8%{?ext_man}
#
%dir %attr(0750,garb,garb) %{homedir}
+%{_sysusersdir}/garb-user.conf
# /garb
# plugin
%if %{with split_package}
@@ -168,10 +174,7 @@
%{libs}/libgalera_smm.so
%config %{_sysconfdir}/my.cnf.d/51-%{name}-wsrep-provider.cnf
-%pre
-# Create user and group on the system if necessary
-%{_sbindir}/groupadd -r garb >/dev/null 2>&1 || :
-%{_sbindir}/useradd -g garb -s /bin/false -r -c "Galera Arbitrator" -d
%{homedir} garb >/dev/null 2>&1 || :
+%pre -f garb.pre
%service_add_pre garb.service
++ garb-user.conf ++
# Type Name ID GECOS [HOME]
u garb - "Galera Arbitrator" /var/lib/garb /bin/false
