From 990e0df2b56715dfa62abf0d5c7e1d394d596e89 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 2 Oct 2017 07:27:50 -0700 Subject: [PATCH 01/74] Bump to rebuild on newer binutils --- corosync.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index e281afb..6028f89 100644 --- a/corosync.spec +++ b/corosync.spec @@ -23,7 +23,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 2.4.2 -Release: 5%{?gitver}%{?dist} +Release: 6%{?gitver}%{?dist} License: BSD Group: System Environment/Base URL: http://corosync.github.io/corosync/ @@ -510,6 +510,9 @@ fi %endif %changelog +* Mon Oct 02 2017 Troy Dawson - 2.4.2-6 +- Bump to rebuild on newer binutils + * Wed Aug 23 2017 Adam Williamson - 2.4.2-5 - Disable RDMA on 32-bit ARM (#1484155) From 8306a5738470f7d759898f828b566673c3cbf0e5 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 9 Oct 2017 14:53:31 -0700 Subject: [PATCH 02/74] Cleanup spec file conditionals --- corosync.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/corosync.spec b/corosync.spec index 6028f89..bf1ed98 100644 --- a/corosync.spec +++ b/corosync.spec @@ -23,13 +23,13 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 2.4.2 -Release: 6%{?gitver}%{?dist} +Release: 7%{?gitver}%{?dist} License: BSD Group: System Environment/Base URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} <= 7 ExclusiveArch: i686 x86_64 %endif @@ -510,6 +510,9 @@ fi %endif %changelog +* Mon Oct 09 2017 Troy Dawson - 2.4.2-7 +- Cleanup spec file conditionals + * Mon Oct 02 2017 Troy Dawson - 2.4.2-6 - Bump to rebuild on newer binutils From 074d02a645e30ee0c1be583337d8992a4970c454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= Date: Thu, 19 Oct 2017 19:01:33 +0200 Subject: [PATCH 03/74] 2.4.2-6 - Rebuilt to solve corosync libraries built with MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... work-in-progress fix in libqb so as to re-establishing compatibility with ld from binutils 2.29 unusuable on powerpc platforms for further link (rhbz#1487787) Signed-off-by: Jan Pokorný --- corosync.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index e281afb..a0c501a 100644 --- a/corosync.spec +++ b/corosync.spec @@ -23,7 +23,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 2.4.2 -Release: 5%{?gitver}%{?dist} +Release: 6%{?gitver}%{?dist} License: BSD Group: System Environment/Base URL: http://corosync.github.io/corosync/ @@ -510,6 +510,11 @@ fi %endif %changelog +* Thu Oct 19 2017 Jan Pokorný - 2.4.2-6 +- Rebuilt to solve corosync libraries built with work-in-progress fix in libqb + so as to re-establishing compatibility with ld from binutils 2.29 unusuable + on powerpc platforms for further link (rhbz#1487787) + * Wed Aug 23 2017 Adam Williamson - 2.4.2-5 - Disable RDMA on 32-bit ARM (#1484155) From 64e30d76c247c8ceeca7356ce0639162e95be310 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Fri, 20 Oct 2017 16:35:57 +0200 Subject: [PATCH 04/74] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 23 +++++++++++++++++------ sources | 2 +- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 59db94b..bad6b37 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ corosync-1.2.7.tar.gz /corosync-2.4.0.tar.gz /corosync-2.4.1.tar.gz /corosync-2.4.2.tar.gz +/corosync-2.4.3.tar.gz diff --git a/corosync.spec b/corosync.spec index bf1ed98..a147d78 100644 --- a/corosync.spec +++ b/corosync.spec @@ -16,14 +16,15 @@ %bcond_without runautogen %bcond_without qdevices %bcond_without qnetd +%bcond_without libcgroup %global gitver %{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}} %global gittarver %{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}} Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 2.4.2 -Release: 7%{?gitver}%{?dist} +Version: 2.4.3 +Release: 1%{?gitver}%{?dist} License: BSD Group: System Environment/Base URL: http://corosync.github.io/corosync/ @@ -34,7 +35,8 @@ ExclusiveArch: i686 x86_64 %endif # Runtime bits -Requires: corosynclib = %{version}-%{release} +# The automatic dependency overridden in favor of explicit version lock +Requires: corosynclib%{?_isa} = %{version}-%{release} Requires(pre): /usr/sbin/useradd Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig @@ -77,6 +79,9 @@ Requires: nss-tools %if %{with qnetd} BuildRequires: sed %endif +%if %{with libcgroup} +BuildRequires: libcgroup-devel +%endif BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -127,6 +132,9 @@ export rdmacm_LIBS=-lrdmacm \ %endif %if %{with qnetd} --enable-qnetd \ +%endif +%if %{with libcgroup} + --enable-libcgroup \ %endif --with-initddir=%{_initrddir} \ --with-systemddir=%{_unitdir} \ @@ -302,7 +310,6 @@ This package contains corosync test agents. %package -n corosynclib Summary: The Corosync Cluster Engine Libraries Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} %description -n corosynclib This package contains corosync libraries. @@ -326,7 +333,7 @@ This package contains corosync libraries. %package -n corosynclib-devel Summary: The Corosync Cluster Engine Development Kit Group: Development/Libraries -Requires: corosynclib = %{version}-%{release} +Requires: corosynclib%{?_isa} = %{version}-%{release} Requires: pkgconfig Provides: corosync-devel = %{version} Obsoletes: corosync-devel < 0.92-7 @@ -380,7 +387,8 @@ The Corosync Cluster Engine APIs. Summary: The Corosync Cluster Engine Qdevice Group: System Environment/Base Requires: %{name} = %{version}-%{release} -Requires: corosynclib = %{version}-%{release} +# The automatic dependency overridden in favor of explicit version lock +Requires: corosynclib%{?_isa} = %{version}-%{release} Requires: nss-tools %if %{with systemd} @@ -510,6 +518,9 @@ fi %endif %changelog +* Fri Oct 20 2017 Jan Friesse - 2.4.3-1 +- New upstream release + * Mon Oct 09 2017 Troy Dawson - 2.4.2-7 - Cleanup spec file conditionals diff --git a/sources b/sources index 96f2148..acca7c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -547fa78704da53aa35912be58d31035f corosync-2.4.2.tar.gz +SHA512 (corosync-2.4.3.tar.gz) = 3e07da606c7004846739ab9b3446a75e5026158f731e68c671716ead7c370f9d7d97bd3ace94bc3cc52144b39da96dc3cb1882fca743ac4a771b911415b3d5b2 From 5bc1b1b270d951e29b0c5ae761960b6dc97e8391 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Fri, 20 Oct 2017 17:05:37 +0200 Subject: [PATCH 05/74] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 23 +++++++++++++++++------ sources | 2 +- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 59db94b..bad6b37 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ corosync-1.2.7.tar.gz /corosync-2.4.0.tar.gz /corosync-2.4.1.tar.gz /corosync-2.4.2.tar.gz +/corosync-2.4.3.tar.gz diff --git a/corosync.spec b/corosync.spec index a0c501a..c422872 100644 --- a/corosync.spec +++ b/corosync.spec @@ -16,14 +16,15 @@ %bcond_without runautogen %bcond_without qdevices %bcond_without qnetd +%bcond_without libcgroup %global gitver %{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}} %global gittarver %{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}} Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 2.4.2 -Release: 6%{?gitver}%{?dist} +Version: 2.4.3 +Release: 1%{?gitver}%{?dist} License: BSD Group: System Environment/Base URL: http://corosync.github.io/corosync/ @@ -34,7 +35,8 @@ ExclusiveArch: i686 x86_64 %endif # Runtime bits -Requires: corosynclib = %{version}-%{release} +# The automatic dependency overridden in favor of explicit version lock +Requires: corosynclib%{?_isa} = %{version}-%{release} Requires(pre): /usr/sbin/useradd Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig @@ -77,6 +79,9 @@ Requires: nss-tools %if %{with qnetd} BuildRequires: sed %endif +%if %{with libcgroup} +BuildRequires: libcgroup-devel +%endif BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -127,6 +132,9 @@ export rdmacm_LIBS=-lrdmacm \ %endif %if %{with qnetd} --enable-qnetd \ +%endif +%if %{with libcgroup} + --enable-libcgroup \ %endif --with-initddir=%{_initrddir} \ --with-systemddir=%{_unitdir} \ @@ -302,7 +310,6 @@ This package contains corosync test agents. %package -n corosynclib Summary: The Corosync Cluster Engine Libraries Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} %description -n corosynclib This package contains corosync libraries. @@ -326,7 +333,7 @@ This package contains corosync libraries. %package -n corosynclib-devel Summary: The Corosync Cluster Engine Development Kit Group: Development/Libraries -Requires: corosynclib = %{version}-%{release} +Requires: corosynclib%{?_isa} = %{version}-%{release} Requires: pkgconfig Provides: corosync-devel = %{version} Obsoletes: corosync-devel < 0.92-7 @@ -380,7 +387,8 @@ The Corosync Cluster Engine APIs. Summary: The Corosync Cluster Engine Qdevice Group: System Environment/Base Requires: %{name} = %{version}-%{release} -Requires: corosynclib = %{version}-%{release} +# The automatic dependency overridden in favor of explicit version lock +Requires: corosynclib%{?_isa} = %{version}-%{release} Requires: nss-tools %if %{with systemd} @@ -510,6 +518,9 @@ fi %endif %changelog +* Fri Oct 20 2017 Jan Friesse - 2.4.3-1 +- New upstream release + * Thu Oct 19 2017 Jan Pokorný - 2.4.2-6 - Rebuilt to solve corosync libraries built with work-in-progress fix in libqb so as to re-establishing compatibility with ld from binutils 2.29 unusuable diff --git a/sources b/sources index 96f2148..acca7c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -547fa78704da53aa35912be58d31035f corosync-2.4.2.tar.gz +SHA512 (corosync-2.4.3.tar.gz) = 3e07da606c7004846739ab9b3446a75e5026158f731e68c671716ead7c370f9d7d97bd3ace94bc3cc52144b39da96dc3cb1882fca743ac4a771b911415b3d5b2 From 68a4b94012c474bb825991d496a543c81ffb1e40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= Date: Tue, 24 Oct 2017 21:34:36 +0200 Subject: [PATCH 06/74] Re 2.4.2-6: fix typo in changelog entry (in case of more f27 updates) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan Pokorný --- corosync.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index c422872..1fa87cf 100644 --- a/corosync.spec +++ b/corosync.spec @@ -523,7 +523,7 @@ fi * Thu Oct 19 2017 Jan Pokorný - 2.4.2-6 - Rebuilt to solve corosync libraries built with work-in-progress fix in libqb - so as to re-establishing compatibility with ld from binutils 2.29 unusuable + so as to re-establish compatibility with ld from binutils 2.29 are unusuable on powerpc platforms for further link (rhbz#1487787) * Wed Aug 23 2017 Adam Williamson - 2.4.2-5 From 4418e689985c6010f1a0909841dbbf3de609568b Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Thu, 26 Oct 2017 08:45:51 +0200 Subject: [PATCH 07/74] Rebuild for new libqb Signed-off-by: Jan Friesse --- corosync.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index 1fa87cf..8e43678 100644 --- a/corosync.spec +++ b/corosync.spec @@ -24,7 +24,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 2.4.3 -Release: 1%{?gitver}%{?dist} +Release: 2%{?gitver}%{?dist} License: BSD Group: System Environment/Base URL: http://corosync.github.io/corosync/ @@ -518,6 +518,9 @@ fi %endif %changelog +* Thu Oct 26 2017 Jan Friesse - 2.4.3-2 +- Rebuild for new libqb + * Fri Oct 20 2017 Jan Friesse - 2.4.3-1 - New upstream release From 0faff4d9a3c7ac5e2bc6448e48d4d633a4a8165b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 19 Jan 2018 10:14:55 +0100 Subject: [PATCH 08/74] Rebuild to fix upgradepath Signed-off-by: Igor Gnatenko --- corosync.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index a147d78..32ddd94 100644 --- a/corosync.spec +++ b/corosync.spec @@ -24,7 +24,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 2.4.3 -Release: 1%{?gitver}%{?dist} +Release: 2%{?gitver}%{?dist} License: BSD Group: System Environment/Base URL: http://corosync.github.io/corosync/ @@ -518,6 +518,9 @@ fi %endif %changelog +* Fri Jan 19 2018 Igor Gnatenko - 2.4.3-2 +- Rebuild to fix upgradepath + * Fri Oct 20 2017 Jan Friesse - 2.4.3-1 - New upstream release From 1f4e674cb904e644436947910ef9b330bf9b6ff1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 05:46:28 +0000 Subject: [PATCH 09/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- corosync.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index 32ddd94..5509cd2 100644 --- a/corosync.spec +++ b/corosync.spec @@ -24,7 +24,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 2.4.3 -Release: 2%{?gitver}%{?dist} +Release: 3%{?gitver}%{?dist} License: BSD Group: System Environment/Base URL: http://corosync.github.io/corosync/ @@ -518,6 +518,9 @@ fi %endif %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.4.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Jan 19 2018 Igor Gnatenko - 2.4.3-2 - Rebuild to fix upgradepath From bf6213bc3f60a4271023699ca02fcc516c59e1ac Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:10:16 +0100 Subject: [PATCH 10/74] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- corosync.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index 5509cd2..feeb886 100644 --- a/corosync.spec +++ b/corosync.spec @@ -83,7 +83,6 @@ BuildRequires: sed BuildRequires: libcgroup-devel %endif -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %prep %setup -q -n %{name}-%{version}%{?gittarver} From 24004b75d82c9682a83e9be473fabea74aa5cd55 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 07:04:21 +0100 Subject: [PATCH 11/74] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- corosync.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/corosync.spec b/corosync.spec index feeb886..1616ad6 100644 --- a/corosync.spec +++ b/corosync.spec @@ -187,9 +187,6 @@ sed -i -e 's/^COROSYNC_QNETD_RUNAS=""$/COROSYNC_QNETD_RUNAS="coroqnetd"/' \ %endif %endif -%clean -rm -rf %{buildroot} - %description This package contains the Corosync Cluster Engine Executive, several default APIs and libraries, default configuration files, and an init script. From 84a99727719fa742ce97c7166448c4ffee2b2be1 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Thu, 22 Mar 2018 09:03:07 +0100 Subject: [PATCH 12/74] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 254 ++++---------------------------------------------- sources | 2 +- 3 files changed, 19 insertions(+), 238 deletions(-) diff --git a/.gitignore b/.gitignore index bad6b37..be45a88 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ corosync-1.2.7.tar.gz /corosync-2.4.1.tar.gz /corosync-2.4.2.tar.gz /corosync-2.4.3.tar.gz +/corosync-2.99.1.tar.gz diff --git a/corosync.spec b/corosync.spec index 1616ad6..8c80d6a 100644 --- a/corosync.spec +++ b/corosync.spec @@ -6,16 +6,9 @@ %bcond_with monitoring %bcond_without snmp %bcond_without dbus -# no InfiniBand stack on s390(x) and 32-bit ARM -%ifnarch s390 s390x %{arm} -%bcond_without rdma -%endif %bcond_without systemd -%bcond_with upstart %bcond_without xmlconf %bcond_without runautogen -%bcond_without qdevices -%bcond_without qnetd %bcond_without libcgroup %global gitver %{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}} @@ -23,31 +16,22 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 2.4.3 -Release: 3%{?gitver}%{?dist} +Version: 2.99.1 +Release: 1%{?gitver}%{?dist} License: BSD -Group: System Environment/Base URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz -%if 0%{?rhel} && 0%{?rhel} <= 7 -ExclusiveArch: i686 x86_64 -%endif - # Runtime bits # The automatic dependency overridden in favor of explicit version lock Requires: corosynclib%{?_isa} = %{version}-%{release} -Requires(pre): /usr/sbin/useradd -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -Obsoletes: openais, openais-devel, openaislib, openaislib-devel -Obsoletes: cman, clusterlib, clusterlib-devel # Build bits BuildRequires: groff -BuildRequires: libqb-devel >= 0.14.2 +BuildRequires: libqb-devel BuildRequires: nss-devel +BuildRequires: libknet1-devel BuildRequires: zlib-devel %if %{with runautogen} BuildRequires: autoconf automake libtool @@ -55,9 +39,6 @@ BuildRequires: autoconf automake libtool %if %{with monitoring} BuildRequires: libstatgrab-devel %endif -%if %{with rdma} -BuildRequires: libibverbs-devel librdmacm-devel -%endif %if %{with snmp} BuildRequires: net-snmp-devel %endif @@ -65,25 +46,20 @@ BuildRequires: net-snmp-devel BuildRequires: dbus-devel %endif %if %{with systemd} -BuildRequires: systemd-units -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +%{?systemd_requires} +BuildRequires: systemd +BuildRequires: systemd-devel +%else +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig %endif %if %{with xmlconf} Requires: libxslt %endif -%if %{with qdevices} || %{with qnetd} -Requires: nss-tools -%endif -%if %{with qnetd} -BuildRequires: sed -%endif %if %{with libcgroup} BuildRequires: libcgroup-devel %endif - %prep %setup -q -n %{name}-%{version}%{?gittarver} @@ -92,12 +68,6 @@ BuildRequires: libcgroup-devel ./autogen.sh %endif -%if %{with rdma} -export ibverbs_CFLAGS=-I/usr/include/infiniband \ -export ibverbs_LIBS=-libverbs \ -export rdmacm_CFLAGS=-I/usr/include/rdma \ -export rdmacm_LIBS=-lrdmacm \ -%endif %{configure} \ %if %{with testagents} --enable-testagents \ @@ -114,37 +84,22 @@ export rdmacm_LIBS=-lrdmacm \ %if %{with dbus} --enable-dbus \ %endif -%if %{with rdma} - --enable-rdma \ -%endif %if %{with systemd} --enable-systemd \ %endif -%if %{with upstart} - --enable-upstart \ -%endif %if %{with xmlconf} --enable-xmlconf \ %endif -%if %{with qdevices} - --enable-qdevices \ -%endif -%if %{with qnetd} - --enable-qnetd \ -%endif %if %{with libcgroup} --enable-libcgroup \ %endif --with-initddir=%{_initrddir} \ --with-systemddir=%{_unitdir} \ - --with-upstartdir=%{_sysconfdir}/init \ - --with-tmpfilesdir=%{_tmpfilesdir} + --docdir=%{_docdir} make %{_smp_mflags} %install -rm -rf %{buildroot} - make install DESTDIR=%{buildroot} %if %{with dbus} @@ -166,27 +121,6 @@ install -m 644 tools/corosync-notifyd.sysconfig.example \ install -m 644 init/corosync.sysconfig.example \ %{buildroot}%{_sysconfdir}/sysconfig/corosync -%if %{with qdevices} -# /etc/sysconfig/corosync-qdevice -install -m 644 init/corosync-qdevice.sysconfig.example \ - %{buildroot}%{_sysconfdir}/sysconfig/corosync-qdevice -%endif - -%if %{with qnetd} -# /etc/sysconfig/corosync-qnetd -install -m 644 init/corosync-qnetd.sysconfig.example \ - %{buildroot}%{_sysconfdir}/sysconfig/corosync-qnetd -%if %{with systemd} -sed -i -e 's/^#User=/User=/' \ - %{buildroot}%{_unitdir}/corosync-qnetd.service -sed -i -e 's/root/coroqnetd/g' \ - %{buildroot}%{_tmpfilesdir}/corosync-qnetd.conf -%else -sed -i -e 's/^COROSYNC_QNETD_RUNAS=""$/COROSYNC_QNETD_RUNAS="coroqnetd"/' \ - %{buildroot}%{_sysconfdir}/sysconfig/corosync-qnetd -%endif -%endif - %description This package contains the Corosync Cluster Engine Executive, several default APIs and libraries, default configuration files, and an init script. @@ -212,11 +146,10 @@ fi %postun %if %{with systemd} && 0%{?systemd_postun:1} -%systemd_postun +%systemd_postun corosync.service %endif %files -%defattr(-,root,root,-) %doc LICENSE SECURITY %{_sbindir}/corosync %{_sbindir}/corosync-keygen @@ -250,20 +183,13 @@ fi %if %{with systemd} %{_unitdir}/corosync.service %{_unitdir}/corosync-notifyd.service -%dir %{_datadir}/corosync -%{_datadir}/corosync/corosync -%{_datadir}/corosync/corosync-notifyd %else %{_initrddir}/corosync %{_initrddir}/corosync-notifyd %endif -%if %{with upstart} -%{_sysconfdir}/init/corosync.conf -%{_sysconfdir}/init/corosync-notifyd.conf -%endif %dir %{_localstatedir}/lib/corosync %dir %{_localstatedir}/log/cluster -%{_mandir}/man8/corosync_overview.8* +%{_mandir}/man7/corosync_overview.7* %{_mandir}/man8/corosync.8* %{_mandir}/man8/corosync-blackbox.8* %{_mandir}/man8/corosync-cmapctl.8* @@ -282,9 +208,7 @@ fi %package -n corosync-testagents Summary: The Corosync Cluster Engine Test Agents -Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libqb >= 0.14.2 %description -n corosync-testagents This package contains corosync test agents. @@ -305,13 +229,11 @@ This package contains corosync test agents. # %package -n corosynclib Summary: The Corosync Cluster Engine Libraries -Group: System Environment/Libraries %description -n corosynclib This package contains corosync libraries. %files -n corosynclib -%defattr(-,root,root,-) %doc LICENSE %{_libdir}/libcfg.so.* %{_libdir}/libcpg.so.* @@ -328,18 +250,15 @@ This package contains corosync libraries. %package -n corosynclib-devel Summary: The Corosync Cluster Engine Development Kit -Group: Development/Libraries Requires: corosynclib%{?_isa} = %{version}-%{release} Requires: pkgconfig Provides: corosync-devel = %{version} -Obsoletes: corosync-devel < 0.92-7 %description -n corosynclib-devel This package contains include files and man pages used to develop using The Corosync Cluster Engine APIs. %files -n corosynclib-devel -%defattr(-,root,root,-) %doc LICENSE %dir %{_includedir}/corosync/ %{_includedir}/corosync/corodefs.h @@ -355,6 +274,7 @@ The Corosync Cluster Engine APIs. %{_includedir}/corosync/totem/totem.h %{_includedir}/corosync/totem/totemip.h %{_includedir}/corosync/totem/totempg.h +%{_includedir}/corosync/totem/totemstats.h %{_libdir}/libcfg.so %{_libdir}/libcpg.so %{_libdir}/libcmap.so @@ -368,152 +288,12 @@ The Corosync Cluster Engine APIs. %{_mandir}/man3/quorum_*3* %{_mandir}/man3/votequorum_*3* %{_mandir}/man3/sam_*3* -%{_mandir}/man8/cpg_overview.8* -%{_mandir}/man8/votequorum_overview.8* -%{_mandir}/man8/sam_overview.8* %{_mandir}/man3/cmap_*3* -%{_mandir}/man8/cmap_overview.8* -%{_mandir}/man8/quorum_overview.8* - -# optional qdevices -# -%if %{with qdevices} - -%package -n corosync-qdevice -Summary: The Corosync Cluster Engine Qdevice -Group: System Environment/Base -Requires: %{name} = %{version}-%{release} -# The automatic dependency overridden in favor of explicit version lock -Requires: corosynclib%{?_isa} = %{version}-%{release} -Requires: nss-tools - -%if %{with systemd} -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd -%endif - -%description -n corosync-qdevice -This package contains the Corosync Cluster Engine Qdevice, script for creating -NSS certificates and an init script. - -%post -n corosync-qdevice -%if %{with systemd} && 0%{?systemd_post:1} -%systemd_post corosync-qdevice.service -%else -if [ $1 -eq 1 ]; then - /sbin/chkconfig --add corosync-qdevice || : -fi -%endif - -%preun -n corosync-qdevice -%if %{with systemd} && 0%{?systemd_preun:1} -%systemd_preun corosync-qdevice.service -%else -if [ $1 -eq 0 ]; then - /sbin/service corosync-qdevice stop &>/dev/null || : - /sbin/chkconfig --del corosync-qdevice || : -fi -%endif - -%postun -n corosync-qdevice -%if %{with systemd} && 0%{?systemd_postun:1} -%systemd_postun -%endif - -%files -n corosync-qdevice -%defattr(-,root,root,-) -%dir %{_sysconfdir}/corosync/qdevice -%dir %config(noreplace) %{_sysconfdir}/corosync/qdevice/net -%dir %{_localstatedir}/run/corosync-qdevice -%{_sbindir}/corosync-qdevice -%{_sbindir}/corosync-qdevice-net-certutil -%{_sbindir}/corosync-qdevice-tool -%config(noreplace) %{_sysconfdir}/sysconfig/corosync-qdevice -%if %{with systemd} -%{_unitdir}/corosync-qdevice.service -%dir %{_datadir}/corosync -%{_datadir}/corosync/corosync-qdevice -%else -%{_initrddir}/corosync-qdevice -%endif -%{_mandir}/man8/corosync-qdevice-tool.8* -%{_mandir}/man8/corosync-qdevice-net-certutil.8* -%{_mandir}/man8/corosync-qdevice.8* -%endif - -# optional qnetd -# -%if %{with qnetd} - -%package -n corosync-qnetd -Summary: The Corosync Cluster Engine Qdevice Network Daemon -Group: System Environment/Base -Requires: nss-tools -Requires(pre): shadow-utils - -%if %{with systemd} -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd -%endif - -%description -n corosync-qnetd -This package contains the Corosync Cluster Engine Qdevice Network Daemon, script for creating -NSS certificates and an init script. - -%pre -n corosync-qnetd -getent group coroqnetd >/dev/null || groupadd -r coroqnetd -getent passwd coroqnetd >/dev/null || \ - useradd -r -g coroqnetd -d / -s /sbin/nologin -c "User for corosync-qnetd" coroqnetd -exit 0 - -%post -n corosync-qnetd -%if %{with systemd} && 0%{?systemd_post:1} -%systemd_post corosync-qnetd.service -%else -if [ $1 -eq 1 ]; then - /sbin/chkconfig --add corosync-qnetd || : -fi -%endif - -%preun -n corosync-qnetd -%if %{with systemd} && 0%{?systemd_preun:1} -%systemd_preun corosync-qnetd.service -%else -if [ $1 -eq 0 ]; then - /sbin/service corosync-qnetd stop &>/dev/null || : - /sbin/chkconfig --del corosync-qnetd || : -fi -%endif - -%postun -n corosync-qnetd -%if %{with systemd} && 0%{?systemd_postun:1} -%systemd_postun -%endif - -%files -n corosync-qnetd -%defattr(-,root,root,-) -%dir %config(noreplace) %attr(770, coroqnetd, coroqnetd) %{_sysconfdir}/corosync/qnetd -%dir %attr(770, coroqnetd, coroqnetd) %{_localstatedir}/run/corosync-qnetd -%{_bindir}/corosync-qnetd -%{_bindir}/corosync-qnetd-certutil -%{_bindir}/corosync-qnetd-tool -%config(noreplace) %{_sysconfdir}/sysconfig/corosync-qnetd -%if %{with systemd} -%{_unitdir}/corosync-qnetd.service -%dir %{_datadir}/corosync -%{_datadir}/corosync/corosync-qnetd -%{_tmpfilesdir}/corosync-qnetd.conf -%else -%{_initrddir}/corosync-qnetd -%endif -%{_mandir}/man8/corosync-qnetd-tool.8* -%{_mandir}/man8/corosync-qnetd-certutil.8* -%{_mandir}/man8/corosync-qnetd.8* -%endif %changelog +* Fri Mar 16 2018 Jan Friesse - 2.99.1-1 +- New upstream release + * Wed Feb 07 2018 Fedora Release Engineering - 2.4.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index acca7c2..2215492 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-2.4.3.tar.gz) = 3e07da606c7004846739ab9b3446a75e5026158f731e68c671716ead7c370f9d7d97bd3ace94bc3cc52144b39da96dc3cb1882fca743ac4a771b911415b3d5b2 +SHA512 (corosync-2.99.1.tar.gz) = 67ac34e7ace93efeefd60a06f6ba320b55f122308a00279f7273beb9b5798694015356f060ba3155f8dede1627adf2006aa2c2c4cbf48090feb1b51152155ef3 From c11df91de9744093015c94897078e252af5b128f Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Thu, 12 Apr 2018 13:26:33 +0200 Subject: [PATCH 13/74] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 13 ++++++------- sources | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index bad6b37..c48cd9d 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ corosync-1.2.7.tar.gz /corosync-2.4.1.tar.gz /corosync-2.4.2.tar.gz /corosync-2.4.3.tar.gz +/corosync-2.4.4.tar.gz diff --git a/corosync.spec b/corosync.spec index 8e43678..6e3a98e 100644 --- a/corosync.spec +++ b/corosync.spec @@ -23,8 +23,8 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 2.4.3 -Release: 2%{?gitver}%{?dist} +Version: 2.4.4 +Release: 1%{?gitver}%{?dist} License: BSD Group: System Environment/Base URL: http://corosync.github.io/corosync/ @@ -138,8 +138,7 @@ export rdmacm_LIBS=-lrdmacm \ %endif --with-initddir=%{_initrddir} \ --with-systemddir=%{_unitdir} \ - --with-upstartdir=%{_sysconfdir}/init \ - --with-tmpfilesdir=%{_tmpfilesdir} + --with-upstartdir=%{_sysconfdir}/init make %{_smp_mflags} @@ -180,8 +179,6 @@ install -m 644 init/corosync-qnetd.sysconfig.example \ %if %{with systemd} sed -i -e 's/^#User=/User=/' \ %{buildroot}%{_unitdir}/corosync-qnetd.service -sed -i -e 's/root/coroqnetd/g' \ - %{buildroot}%{_tmpfilesdir}/corosync-qnetd.conf %else sed -i -e 's/^COROSYNC_QNETD_RUNAS=""$/COROSYNC_QNETD_RUNAS="coroqnetd"/' \ %{buildroot}%{_sysconfdir}/sysconfig/corosync-qnetd @@ -508,7 +505,6 @@ fi %{_unitdir}/corosync-qnetd.service %dir %{_datadir}/corosync %{_datadir}/corosync/corosync-qnetd -%{_tmpfilesdir}/corosync-qnetd.conf %else %{_initrddir}/corosync-qnetd %endif @@ -518,6 +514,9 @@ fi %endif %changelog +* Thu Apr 12 2018 Jan Friesse - 2.4.4-1 +- New upstream release + * Thu Oct 26 2017 Jan Friesse - 2.4.3-2 - Rebuild for new libqb diff --git a/sources b/sources index acca7c2..8dc0c0f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-2.4.3.tar.gz) = 3e07da606c7004846739ab9b3446a75e5026158f731e68c671716ead7c370f9d7d97bd3ace94bc3cc52144b39da96dc3cb1882fca743ac4a771b911415b3d5b2 +SHA512 (corosync-2.4.4.tar.gz) = df1bc0a452601cd8b6509d2be300c6c5a1906795a429e42718a8c07b82d86c2e973dd8a08b8b2a8cbdbef5c782a2e7881deeb983ce9c221712f7dda2233a4a99 From 2db81d5d6ecf44c5ab071b0fd6bc24fe5429d9f7 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Mon, 30 Apr 2018 16:24:16 +0200 Subject: [PATCH 14/74] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index be45a88..a877a22 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ corosync-1.2.7.tar.gz /corosync-2.4.2.tar.gz /corosync-2.4.3.tar.gz /corosync-2.99.1.tar.gz +/corosync-2.99.2.tar.gz diff --git a/corosync.spec b/corosync.spec index 8c80d6a..fd7e508 100644 --- a/corosync.spec +++ b/corosync.spec @@ -16,7 +16,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 2.99.1 +Version: 2.99.2 Release: 1%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ @@ -150,7 +150,7 @@ fi %endif %files -%doc LICENSE SECURITY +%doc LICENSE %{_sbindir}/corosync %{_sbindir}/corosync-keygen %{_sbindir}/corosync-cmapctl @@ -291,6 +291,9 @@ The Corosync Cluster Engine APIs. %{_mandir}/man3/cmap_*3* %changelog +* Mon Apr 30 2018 Jan Friesse - 2.99.2-1 +- New upstream release + * Fri Mar 16 2018 Jan Friesse - 2.99.1-1 - New upstream release diff --git a/sources b/sources index 2215492..6870395 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-2.99.1.tar.gz) = 67ac34e7ace93efeefd60a06f6ba320b55f122308a00279f7273beb9b5798694015356f060ba3155f8dede1627adf2006aa2c2c4cbf48090feb1b51152155ef3 +SHA512 (corosync-2.99.2.tar.gz) = 9029607ec3054d64cde89e84660962b34465ec31ba81e3568cad33d4a18c269e4ac718fdf192893dca7eb96c5bc0143cb9cefca499d87a64e46ac8c82f1bb901 From 72bbfc3f90cb6675587af220fd0a8b6f44da69a9 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Tue, 10 Jul 2018 08:16:51 +0200 Subject: [PATCH 15/74] Add gcc build require Signed-off-by: Jan Friesse --- corosync.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index fd7e508..302612c 100644 --- a/corosync.spec +++ b/corosync.spec @@ -27,7 +27,7 @@ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?git Requires: corosynclib%{?_isa} = %{version}-%{release} # Build bits - +BuildRequires: gcc BuildRequires: groff BuildRequires: libqb-devel BuildRequires: nss-devel From 8770850e742f46593930960d1d2792a8b1f49abf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 22:15:59 +0000 Subject: [PATCH 16/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- corosync.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index 302612c..bd13f5b 100644 --- a/corosync.spec +++ b/corosync.spec @@ -17,7 +17,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 2.99.2 -Release: 1%{?gitver}%{?dist} +Release: 2%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -291,6 +291,9 @@ The Corosync Cluster Engine APIs. %{_mandir}/man3/cmap_*3* %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 2.99.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Apr 30 2018 Jan Friesse - 2.99.2-1 - New upstream release From 44fbaf9d1a2e0bf8801ba0123876db7a20dce1fd Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Fri, 13 Jul 2018 14:28:39 +0200 Subject: [PATCH 17/74] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a877a22..0d4c0be 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ corosync-1.2.7.tar.gz /corosync-2.4.3.tar.gz /corosync-2.99.1.tar.gz /corosync-2.99.2.tar.gz +/corosync-2.99.3.tar.gz diff --git a/corosync.spec b/corosync.spec index bd13f5b..b082dc4 100644 --- a/corosync.spec +++ b/corosync.spec @@ -16,8 +16,8 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 2.99.2 -Release: 2%{?gitver}%{?dist} +Version: 2.99.3 +Release: 1%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -291,6 +291,9 @@ The Corosync Cluster Engine APIs. %{_mandir}/man3/cmap_*3* %changelog +* Fri Jul 13 2018 Jan Friesse - 2.99.3-1 +- New upstream release + * Thu Jul 12 2018 Fedora Release Engineering - 2.99.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 6870395..fc569dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-2.99.2.tar.gz) = 9029607ec3054d64cde89e84660962b34465ec31ba81e3568cad33d4a18c269e4ac718fdf192893dca7eb96c5bc0143cb9cefca499d87a64e46ac8c82f1bb901 +SHA512 (corosync-2.99.3.tar.gz) = 32a5ac4ba1c4eefd52c27b9fc42932be3731548652cb4bafb82acb04527c75d49f0659378340e8a0b73d195a571aea83e57e4ae321e2a1cd67c8f2c03e5b85ac From ddb1e0a841b6c893bf174a6c944c3e1994515e42 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 24 Jul 2018 14:40:15 -0700 Subject: [PATCH 18/74] Rebuild for new net-snmp --- corosync.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index b082dc4..23b69c3 100644 --- a/corosync.spec +++ b/corosync.spec @@ -17,7 +17,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 2.99.3 -Release: 1%{?gitver}%{?dist} +Release: 2%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -291,6 +291,9 @@ The Corosync Cluster Engine APIs. %{_mandir}/man3/cmap_*3* %changelog +* Tue Jul 24 2018 Adam Williamson - 2.99.3-2 +- Rebuild for new net-snmp + * Fri Jul 13 2018 Jan Friesse - 2.99.3-1 - New upstream release From 887b18eb357c9167bc7302702cb08932e09862fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= Date: Thu, 16 Aug 2018 21:06:55 +0200 Subject: [PATCH 19/74] 2.99.3-3 - Rebuild again, since the previous one was so unfortunate... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ...it got affected with binutils (2.31.1-3.fc29) producing non-monotonically increasing section offsets causing unprepared eu-strip to damage the binary (related: rhbz#1609577) Apply patch to drop prevent redundancy in systemd journal Signed-off-by: Jan Pokorný --- ...08ad402b45f52b5d3ee8d2a08df0779ec9aa.patch | 43 +++++++++++++++++++ corosync.spec | 16 ++++++- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 c34208ad402b45f52b5d3ee8d2a08df0779ec9aa.patch diff --git a/c34208ad402b45f52b5d3ee8d2a08df0779ec9aa.patch b/c34208ad402b45f52b5d3ee8d2a08df0779ec9aa.patch new file mode 100644 index 0000000..77da7f8 --- /dev/null +++ b/c34208ad402b45f52b5d3ee8d2a08df0779ec9aa.patch @@ -0,0 +1,43 @@ +From c34208ad402b45f52b5d3ee8d2a08df0779ec9aa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= +Date: Tue, 14 Aug 2018 01:18:47 +0200 +Subject: [PATCH] systemd: prevent redundancy in journal +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Originating from a dual sink (stderr and syslog). + +Annotated example from "journalctl -b --no-hostname -u corosync": + +Aug 14 00:27:45 corosync[5203]: [MAIN ] Corosync Cluster +Engine ('2.99.3'): started and ready to provide service. + ^ from syslog source +Aug 14 00:27:45 corosync[5203]: notice [MAIN ] Corosync Cluster +Engine ('2.99.3'): started and ready to provide service. + ^ from stderr source + +Signed-off-by: Jan Pokorný +Reviewed-by: Jan Friesse +--- + init/corosync.service.in | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/init/corosync.service.in b/init/corosync.service.in +index 8c57652d4..654e41fc2 100644 +--- a/init/corosync.service.in ++++ b/init/corosync.service.in +@@ -10,6 +10,13 @@ EnvironmentFile=-@INITCONFIGDIR@/corosync + ExecStart=@SBINDIR@/corosync -f $COROSYNC_OPTIONS + Type=notify + ++# In typical systemd deployments, both standard outputs are forwarded to ++# journal (stderr is what's relevant in the pristine corosync configuration), ++# which hazards a message redundancy since the syslog stream usually ends there ++# as well; before editing this line, you may want to check DefaultStandardError ++# in systemd-system.conf(5) and whether /dev/log is a systemd related symlink. ++StandardError=null ++ + # The following config is for corosync with enabled watchdog service. + # + # When corosync watchdog service is being enabled and using with diff --git a/corosync.spec b/corosync.spec index 23b69c3..9d3fb26 100644 --- a/corosync.spec +++ b/corosync.spec @@ -17,10 +17,11 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 2.99.3 -Release: 2%{?gitver}%{?dist} +Release: 3%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz +Patch0: https://github.com/corosync/corosync/commit/c34208ad402b45f52b5d3ee8d2a08df0779ec9aa.patch # Runtime bits # The automatic dependency overridden in favor of explicit version lock @@ -60,8 +61,14 @@ Requires: libxslt BuildRequires: libcgroup-devel %endif +# git-style patch application +BuildRequires: git + %prep %setup -q -n %{name}-%{version}%{?gittarver} +%global __scm git_am +%__scm_setup_git +%autopatch -p1 %build %if %{with runautogen} @@ -291,6 +298,13 @@ The Corosync Cluster Engine APIs. %{_mandir}/man3/cmap_*3* %changelog +* Thu Aug 16 2018 Jan Pokorný - 2.99.3-3 +- Rebuild again, since the previous one was so unfortunate it got affected + with binutils (2.31.1-3.fc29) producing non-monotonically increasing + section offsets causing unprepared eu-strip to damage the binary + (related: rhbz#1609577) +- Apply patch to drop prevent redundancy in systemd journal + * Tue Jul 24 2018 Adam Williamson - 2.99.3-2 - Rebuild for new net-snmp From 0b6b7e10ef253a93d3cff7311245e81843082651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= Date: Thu, 16 Aug 2018 21:36:20 +0200 Subject: [PATCH 20/74] Re 2.99.3-3: fix a changelog typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan Pokorný --- corosync.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index 9d3fb26..bbd3b7b 100644 --- a/corosync.spec +++ b/corosync.spec @@ -303,7 +303,7 @@ The Corosync Cluster Engine APIs. with binutils (2.31.1-3.fc29) producing non-monotonically increasing section offsets causing unprepared eu-strip to damage the binary (related: rhbz#1609577) -- Apply patch to drop prevent redundancy in systemd journal +- Apply patch to prevent redundancy in systemd journal * Tue Jul 24 2018 Adam Williamson - 2.99.3-2 - Rebuild for new net-snmp From da8712b0025e97aa8a42ef078d23c6dd57cacfd8 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Tue, 20 Nov 2018 16:06:56 +0100 Subject: [PATCH 21/74] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + ...08ad402b45f52b5d3ee8d2a08df0779ec9aa.patch | 43 -------------- corosync.spec | 58 ++----------------- sources | 2 +- 4 files changed, 7 insertions(+), 97 deletions(-) delete mode 100644 c34208ad402b45f52b5d3ee8d2a08df0779ec9aa.patch diff --git a/.gitignore b/.gitignore index 0d4c0be..a0b50ac 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ corosync-1.2.7.tar.gz /corosync-2.99.1.tar.gz /corosync-2.99.2.tar.gz /corosync-2.99.3.tar.gz +/corosync-2.99.4.tar.gz diff --git a/c34208ad402b45f52b5d3ee8d2a08df0779ec9aa.patch b/c34208ad402b45f52b5d3ee8d2a08df0779ec9aa.patch deleted file mode 100644 index 77da7f8..0000000 --- a/c34208ad402b45f52b5d3ee8d2a08df0779ec9aa.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c34208ad402b45f52b5d3ee8d2a08df0779ec9aa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= -Date: Tue, 14 Aug 2018 01:18:47 +0200 -Subject: [PATCH] systemd: prevent redundancy in journal -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Originating from a dual sink (stderr and syslog). - -Annotated example from "journalctl -b --no-hostname -u corosync": - -Aug 14 00:27:45 corosync[5203]: [MAIN ] Corosync Cluster -Engine ('2.99.3'): started and ready to provide service. - ^ from syslog source -Aug 14 00:27:45 corosync[5203]: notice [MAIN ] Corosync Cluster -Engine ('2.99.3'): started and ready to provide service. - ^ from stderr source - -Signed-off-by: Jan Pokorný -Reviewed-by: Jan Friesse ---- - init/corosync.service.in | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/init/corosync.service.in b/init/corosync.service.in -index 8c57652d4..654e41fc2 100644 ---- a/init/corosync.service.in -+++ b/init/corosync.service.in -@@ -10,6 +10,13 @@ EnvironmentFile=-@INITCONFIGDIR@/corosync - ExecStart=@SBINDIR@/corosync -f $COROSYNC_OPTIONS - Type=notify - -+# In typical systemd deployments, both standard outputs are forwarded to -+# journal (stderr is what's relevant in the pristine corosync configuration), -+# which hazards a message redundancy since the syslog stream usually ends there -+# as well; before editing this line, you may want to check DefaultStandardError -+# in systemd-system.conf(5) and whether /dev/log is a systemd related symlink. -+StandardError=null -+ - # The following config is for corosync with enabled watchdog service. - # - # When corosync watchdog service is being enabled and using with diff --git a/corosync.spec b/corosync.spec index bbd3b7b..0fa3ea0 100644 --- a/corosync.spec +++ b/corosync.spec @@ -1,7 +1,6 @@ # Conditionals # Invoke "rpmbuild --without " or "rpmbuild --with " # to disable or enable specific features -%bcond_with testagents %bcond_with watchdog %bcond_with monitoring %bcond_without snmp @@ -9,19 +8,17 @@ %bcond_without systemd %bcond_without xmlconf %bcond_without runautogen -%bcond_without libcgroup %global gitver %{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}} %global gittarver %{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}} Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 2.99.3 -Release: 3%{?gitver}%{?dist} +Version: 2.99.4 +Release: 1%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz -Patch0: https://github.com/corosync/corosync/commit/c34208ad402b45f52b5d3ee8d2a08df0779ec9aa.patch # Runtime bits # The automatic dependency overridden in favor of explicit version lock @@ -31,7 +28,6 @@ Requires: corosynclib%{?_isa} = %{version}-%{release} BuildRequires: gcc BuildRequires: groff BuildRequires: libqb-devel -BuildRequires: nss-devel BuildRequires: libknet1-devel BuildRequires: zlib-devel %if %{with runautogen} @@ -57,18 +53,9 @@ Requires(preun): /sbin/chkconfig %if %{with xmlconf} Requires: libxslt %endif -%if %{with libcgroup} -BuildRequires: libcgroup-devel -%endif - -# git-style patch application -BuildRequires: git %prep %setup -q -n %{name}-%{version}%{?gittarver} -%global __scm git_am -%__scm_setup_git -%autopatch -p1 %build %if %{with runautogen} @@ -76,9 +63,6 @@ BuildRequires: git %endif %{configure} \ -%if %{with testagents} - --enable-testagents \ -%endif %if %{with watchdog} --enable-watchdog \ %endif @@ -96,9 +80,6 @@ BuildRequires: git %endif %if %{with xmlconf} --enable-xmlconf \ -%endif -%if %{with libcgroup} - --enable-libcgroup \ %endif --with-initddir=%{_initrddir} \ --with-systemddir=%{_unitdir} \ @@ -168,7 +149,6 @@ fi %{_bindir}/corosync-blackbox %if %{with xmlconf} %{_bindir}/corosync-xmlproc -%config(noreplace) %{_sysconfdir}/corosync/corosync.xml.example %dir %{_datadir}/corosync %{_datadir}/corosync/xml2conf.xsl %{_mandir}/man8/corosync-xmlproc.8* @@ -177,7 +157,6 @@ fi %dir %{_sysconfdir}/corosync %dir %{_sysconfdir}/corosync/uidgid.d %config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example -%config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example.udpu %config(noreplace) %{_sysconfdir}/sysconfig/corosync-notifyd %config(noreplace) %{_sysconfdir}/sysconfig/corosync %config(noreplace) %{_sysconfdir}/logrotate.d/corosync @@ -209,29 +188,6 @@ fi %{_mandir}/man5/votequorum.5* %{_mandir}/man8/cmap_keys.8* -# optional testagent rpm -# -%if %{with testagents} - -%package -n corosync-testagents -Summary: The Corosync Cluster Engine Test Agents -Requires: %{name} = %{version}-%{release} - -%description -n corosync-testagents -This package contains corosync test agents. - -%files -n corosync-testagents -%defattr(755,root,root,-) -%{_datadir}/corosync/tests/mem_leak_test.sh -%{_datadir}/corosync/tests/net_breaker.sh -%{_datadir}/corosync/tests/cmap-dispatch-deadlock.sh -%{_datadir}/corosync/tests/shm_leak_audit.sh -%{_bindir}/cpg_test_agent -%{_bindir}/sam_test_agent -%{_bindir}/votequorum_test_agent - -%endif - # library # %package -n corosynclib @@ -245,7 +201,6 @@ This package contains corosync libraries. %{_libdir}/libcfg.so.* %{_libdir}/libcpg.so.* %{_libdir}/libcmap.so.* -%{_libdir}/libtotem_pg.so.* %{_libdir}/libquorum.so.* %{_libdir}/libvotequorum.so.* %{_libdir}/libsam.so.* @@ -277,15 +232,9 @@ The Corosync Cluster Engine APIs. %{_includedir}/corosync/sam.h %{_includedir}/corosync/quorum.h %{_includedir}/corosync/votequorum.h -%dir %{_includedir}/corosync/totem/ -%{_includedir}/corosync/totem/totem.h -%{_includedir}/corosync/totem/totemip.h -%{_includedir}/corosync/totem/totempg.h -%{_includedir}/corosync/totem/totemstats.h %{_libdir}/libcfg.so %{_libdir}/libcpg.so %{_libdir}/libcmap.so -%{_libdir}/libtotem_pg.so %{_libdir}/libquorum.so %{_libdir}/libvotequorum.so %{_libdir}/libsam.so @@ -298,6 +247,9 @@ The Corosync Cluster Engine APIs. %{_mandir}/man3/cmap_*3* %changelog +* Tue Nov 20 2018 Jan Friesse - 2.99.4-1 +- New upstream release + * Thu Aug 16 2018 Jan Pokorný - 2.99.3-3 - Rebuild again, since the previous one was so unfortunate it got affected with binutils (2.31.1-3.fc29) producing non-monotonically increasing diff --git a/sources b/sources index fc569dc..af8e88d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-2.99.3.tar.gz) = 32a5ac4ba1c4eefd52c27b9fc42932be3731548652cb4bafb82acb04527c75d49f0659378340e8a0b73d195a571aea83e57e4ae321e2a1cd67c8f2c03e5b85ac +SHA512 (corosync-2.99.4.tar.gz) = 3475441d23d2218f70e93674ea61ba2bca40202a93a17fbfa086acb7654a38f7e248463035fb8e904479170c93b057ae00ad7203b6a0f1db2da388b7ad07072b From aa14fb4aa43ed5d25611060e54bed6676ab6ada9 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Tue, 4 Dec 2018 18:21:03 +0100 Subject: [PATCH 22/74] Add libknet1-crypto-nss-plugin dependency Signed-off-by: Jan Friesse --- corosync.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index 0fa3ea0..bde8a87 100644 --- a/corosync.spec +++ b/corosync.spec @@ -15,7 +15,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 2.99.4 -Release: 1%{?gitver}%{?dist} +Release: 2%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -24,6 +24,9 @@ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?git # The automatic dependency overridden in favor of explicit version lock Requires: corosynclib%{?_isa} = %{version}-%{release} +# NSS crypto plugin should be always installed +Requires: libknet1-crypto-nss-plugin + # Build bits BuildRequires: gcc BuildRequires: groff @@ -247,6 +250,9 @@ The Corosync Cluster Engine APIs. %{_mandir}/man3/cmap_*3* %changelog +* Tue Dec 4 2018 Jan Friesse - 2.99.4-2 +- Add libknet1-crypto-nss-plugin dependency + * Tue Nov 20 2018 Jan Friesse - 2.99.4-1 - New upstream release From cf418a73bc532672c17ae3ea9203d1a8878bb0b6 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Fri, 7 Dec 2018 17:15:26 +0100 Subject: [PATCH 23/74] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a0b50ac..bba8cc3 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ corosync-1.2.7.tar.gz /corosync-2.99.2.tar.gz /corosync-2.99.3.tar.gz /corosync-2.99.4.tar.gz +/corosync-2.99.5.tar.gz diff --git a/corosync.spec b/corosync.spec index bde8a87..f7c879e 100644 --- a/corosync.spec +++ b/corosync.spec @@ -14,8 +14,8 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 2.99.4 -Release: 2%{?gitver}%{?dist} +Version: 2.99.5 +Release: 1%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -250,6 +250,9 @@ The Corosync Cluster Engine APIs. %{_mandir}/man3/cmap_*3* %changelog +* Fri Dec 7 2018 Jan Friesse - 2.99.5-1 +- New upstream release + * Tue Dec 4 2018 Jan Friesse - 2.99.4-2 - Add libknet1-crypto-nss-plugin dependency diff --git a/sources b/sources index af8e88d..5ed0193 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-2.99.4.tar.gz) = 3475441d23d2218f70e93674ea61ba2bca40202a93a17fbfa086acb7654a38f7e248463035fb8e904479170c93b057ae00ad7203b6a0f1db2da388b7ad07072b +SHA512 (corosync-2.99.5.tar.gz) = b8433f23d55993a8bba754ed3926fea0c7d7e3a9a3e1c03f0d0a34be1fce58007b81cb3da0bc991035250fc67a16351312c5225763303b7e3034de8cac4b582b From 2297645dcf9487035dd980a261e1c7301c699500 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Fri, 14 Dec 2018 14:11:29 +0100 Subject: [PATCH 24/74] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bba8cc3..82b1cf3 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ corosync-1.2.7.tar.gz /corosync-2.99.3.tar.gz /corosync-2.99.4.tar.gz /corosync-2.99.5.tar.gz +/corosync-3.0.0.tar.gz diff --git a/corosync.spec b/corosync.spec index f7c879e..d6d370b 100644 --- a/corosync.spec +++ b/corosync.spec @@ -14,7 +14,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 2.99.5 +Version: 3.0.0 Release: 1%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ @@ -250,6 +250,9 @@ The Corosync Cluster Engine APIs. %{_mandir}/man3/cmap_*3* %changelog +* Fri Dec 14 2018 Jan Friesse - 3.0.0-1 +- New upstream release + * Fri Dec 7 2018 Jan Friesse - 2.99.5-1 - New upstream release diff --git a/sources b/sources index 5ed0193..b7a07d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-2.99.5.tar.gz) = b8433f23d55993a8bba754ed3926fea0c7d7e3a9a3e1c03f0d0a34be1fce58007b81cb3da0bc991035250fc67a16351312c5225763303b7e3034de8cac4b582b +SHA512 (corosync-3.0.0.tar.gz) = 2e4f8216ee9b09654cf00fd26d116e00afd5330965203889e49b8fcef7c68fe65fd007402247a5a3df1c15b246c0d6de9aeb236a46c59ee91408a584b91269c9 From 2f2b1dd77422af476784e49f50c36907a63957b9 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Tue, 15 Jan 2019 14:31:27 +0100 Subject: [PATCH 25/74] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 82b1cf3..3567e84 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ corosync-1.2.7.tar.gz /corosync-2.99.4.tar.gz /corosync-2.99.5.tar.gz /corosync-3.0.0.tar.gz +/corosync-3.0.1.tar.gz diff --git a/corosync.spec b/corosync.spec index d6d370b..4bcce2c 100644 --- a/corosync.spec +++ b/corosync.spec @@ -14,7 +14,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 3.0.0 +Version: 3.0.1 Release: 1%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ @@ -250,6 +250,9 @@ The Corosync Cluster Engine APIs. %{_mandir}/man3/cmap_*3* %changelog +* Tue Jan 15 2019 Jan Friesse - 3.0.1-1 +- New upstream release + * Fri Dec 14 2018 Jan Friesse - 3.0.0-1 - New upstream release diff --git a/sources b/sources index b7a07d5..3d585e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-3.0.0.tar.gz) = 2e4f8216ee9b09654cf00fd26d116e00afd5330965203889e49b8fcef7c68fe65fd007402247a5a3df1c15b246c0d6de9aeb236a46c59ee91408a584b91269c9 +SHA512 (corosync-3.0.1.tar.gz) = 9e70aadb331ffb3ef86b4c7dff8608ef3723810b3065e9aa2dc8a7abe84a26c34445c7a6d872339e19e77247aac1be7297c97d2012fe64502372eeb3e2aa19b7 From f7bc9a1c2270d93585739bd18ad779bf8f533912 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:38:44 +0100 Subject: [PATCH 26/74] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- corosync.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/corosync.spec b/corosync.spec index 4bcce2c..25dfe13 100644 --- a/corosync.spec +++ b/corosync.spec @@ -209,9 +209,7 @@ This package contains corosync libraries. %{_libdir}/libsam.so.* %{_libdir}/libcorosync_common.so.* -%post -n corosynclib -p /sbin/ldconfig - -%postun -n corosynclib -p /sbin/ldconfig +%ldconfig_scriptlets -n corosynclib %package -n corosynclib-devel Summary: The Corosync Cluster Engine Development Kit From e4857e19a16bc2ecff69b68918c16304624785cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 16:18:30 +0000 Subject: [PATCH 27/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- corosync.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index 25dfe13..4c7984d 100644 --- a/corosync.spec +++ b/corosync.spec @@ -15,7 +15,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.0.1 -Release: 1%{?gitver}%{?dist} +Release: 2%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -248,6 +248,9 @@ The Corosync Cluster Engine APIs. %{_mandir}/man3/cmap_*3* %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 3.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jan 15 2019 Jan Friesse - 3.0.1-1 - New upstream release From 7d603e7ff1ed6631d9ecc8aa3e34becd369434c6 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Wed, 12 Jun 2019 17:34:50 +0200 Subject: [PATCH 28/74] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 44 ++++++++++++++++++++++++++++++++++++++++++-- sources | 2 +- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3567e84..7567368 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ corosync-1.2.7.tar.gz /corosync-2.99.5.tar.gz /corosync-3.0.0.tar.gz /corosync-3.0.1.tar.gz +/corosync-3.0.2.tar.gz diff --git a/corosync.spec b/corosync.spec index 4c7984d..391972c 100644 --- a/corosync.spec +++ b/corosync.spec @@ -7,15 +7,18 @@ %bcond_without dbus %bcond_without systemd %bcond_without xmlconf +%bcond_without nozzle +%bcond_without vqsim %bcond_without runautogen +%bcond_without userflags %global gitver %{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}} %global gittarver %{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}} Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 3.0.1 -Release: 2%{?gitver}%{?dist} +Version: 3.0.2 +Release: 1%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -45,6 +48,9 @@ BuildRequires: net-snmp-devel %if %{with dbus} BuildRequires: dbus-devel %endif +%if %{with nozzle} +BuildRequires: libnozzle1-devel +%endif %if %{with systemd} %{?systemd_requires} BuildRequires: systemd @@ -56,6 +62,9 @@ Requires(preun): /sbin/chkconfig %if %{with xmlconf} Requires: libxslt %endif +%if %{with vqsim} +BuildRequires: readline-devel +%endif %prep %setup -q -n %{name}-%{version}%{?gittarver} @@ -83,6 +92,15 @@ Requires: libxslt %endif %if %{with xmlconf} --enable-xmlconf \ +%endif +%if %{with nozzle} + --enable-nozzle \ +%endif +%if %{with vqsim} + --enable-vqsim \ +%endif +%if %{with userflags} + --enable-user-flags \ %endif --with-initddir=%{_initrddir} \ --with-systemddir=%{_unitdir} \ @@ -247,7 +265,29 @@ The Corosync Cluster Engine APIs. %{_mandir}/man3/sam_*3* %{_mandir}/man3/cmap_*3* +%if %{with vqsim} +%package -n corosync-vqsim +Summary: The Corosync Cluster Engine - Votequorum Simulator +Requires: corosynclib%{?_isa} = %{version}-%{release} +Requires: pkgconfig + +%description -n corosync-vqsim +A command-line simulator for the corosync votequorum subsystem. +It uses the same code as the corosync quorum system but forks +them into subprocesses to simulate nodes. +Nodes can be added and removed as well as partitioned (to simulate +network splits) + +%files -n corosync-vqsim +%doc LICENSE +%{_bindir}/corosync-vqsim +%{_mandir}/man8/corosync-vqsim.8* +%endif + %changelog +* Wed Jun 12 2019 Jan Friesse - 3.0.2-1 +- New upstream release + * Thu Jan 31 2019 Fedora Release Engineering - 3.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 3d585e7..c31c546 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-3.0.1.tar.gz) = 9e70aadb331ffb3ef86b4c7dff8608ef3723810b3065e9aa2dc8a7abe84a26c34445c7a6d872339e19e77247aac1be7297c97d2012fe64502372eeb3e2aa19b7 +SHA512 (corosync-3.0.2.tar.gz) = be2d5caf41fea9dc337a317ee4f2f90ad6587b2ad2ff09b62e376e0d9273fb8ac6b71a4c1b0ac8e263f1eef2fbc2fb7c0558f1c78cd71f1242a57c58b6d137ca From 49fbb1275f135807b3b003448b558e149732d343 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 21:02:45 +0000 Subject: [PATCH 29/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- corosync.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index 391972c..7d05b54 100644 --- a/corosync.spec +++ b/corosync.spec @@ -18,7 +18,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.0.2 -Release: 1%{?gitver}%{?dist} +Release: 2%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -285,6 +285,9 @@ network splits) %endif %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 3.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Wed Jun 12 2019 Jan Friesse - 3.0.2-1 - New upstream release From 4b7a0f46e61610b42502033c64926a1261f055a8 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Mon, 25 Nov 2019 13:48:55 +0100 Subject: [PATCH 30/74] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7567368..9c73c8f 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ corosync-1.2.7.tar.gz /corosync-3.0.0.tar.gz /corosync-3.0.1.tar.gz /corosync-3.0.2.tar.gz +/corosync-3.0.3.tar.gz diff --git a/corosync.spec b/corosync.spec index 7d05b54..90913ad 100644 --- a/corosync.spec +++ b/corosync.spec @@ -17,8 +17,8 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 3.0.2 -Release: 2%{?gitver}%{?dist} +Version: 3.0.3 +Release: 1%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -285,6 +285,9 @@ network splits) %endif %changelog +* Mon Nov 25 2019 Jan Friesse - 3.0.3-1 +- New upstream release + * Wed Jul 24 2019 Fedora Release Engineering - 3.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index c31c546..0cf7000 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-3.0.2.tar.gz) = be2d5caf41fea9dc337a317ee4f2f90ad6587b2ad2ff09b62e376e0d9273fb8ac6b71a4c1b0ac8e263f1eef2fbc2fb7c0558f1c78cd71f1242a57c58b6d137ca +SHA512 (corosync-3.0.3.tar.gz) = 6ffabb3261bcff18611a029f0c2682367f301caac6f5ddb2cfb2c1bbc69c67f1d1e7b9475eee8f40bcdca8fbc73cb8ec3854f74002dda9c3b70a27c8d3d16ec5 From ae11d23e5a50cd7ae8c60e3a4ea2087cb9cbdfdd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 14:50:41 +0000 Subject: [PATCH 31/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- corosync.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index 90913ad..3884b41 100644 --- a/corosync.spec +++ b/corosync.spec @@ -18,7 +18,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.0.3 -Release: 1%{?gitver}%{?dist} +Release: 2%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -285,6 +285,9 @@ network splits) %endif %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 3.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Nov 25 2019 Jan Friesse - 3.0.3-1 - New upstream release From d68d041157007ec050cb15c52fb23c580ce96857 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Thu, 26 Mar 2020 18:29:31 +0100 Subject: [PATCH 32/74] Add CI tests using the Standard Test Interface --- tests/.gitignore | 3 + tests/smoke/runtest.sh | 623 +++++++++++++++++++++++++++++++++++++++++ tests/tests.yml | 12 + 3 files changed, 638 insertions(+) create mode 100644 tests/.gitignore create mode 100644 tests/smoke/runtest.sh create mode 100644 tests/tests.yml diff --git a/tests/.gitignore b/tests/.gitignore new file mode 100644 index 0000000..e6c79fd --- /dev/null +++ b/tests/.gitignore @@ -0,0 +1,3 @@ +# Ignore tests runs/artefacts. +artifacts/** +**/*.retry diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh new file mode 100644 index 0000000..9fd5e68 --- /dev/null +++ b/tests/smoke/runtest.sh @@ -0,0 +1,623 @@ +#!/bin/bash + +# This file was autogenerated at 2019-05-13T13:43:38+02:00 from 90bd97ada89befa1a63133335a419ad7311c3d75 + +# Copyright (c) 2019, Red Hat, Inc. +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND RED HAT, INC. DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL RED HAT, INC. BE LIABLE +# FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +# OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# +# Author: Jan Friesse + + +# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +# !!! Script overwrites corosync.conf, authkey and qdevice/qnetd certificates !!! +# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +# Home https://github.com/jfriesse/csts/tree/master/smoke + +# -e is really important +set -xe +set -o pipefail + +# Variables changing test behavior +PREFIX="/" + +COROSYNC_SYSCONFD="${PREFIX}etc/corosync" +COROSYNC_CONF="${COROSYNC_SYSCONFD}/corosync.conf" +COROSYNC_AUTHKEY="${COROSYNC_SYSCONFD}/authkey" +COROSYNC_CLUSTER_NAME="smoketestcluster" + +TOKEN_TIMEOUT=1000 +MAX_REPEATS=60 + +#################### +# Helper functions # +#################### +get_ip() { + ip_res=$(ip route get 8.8.8.8) + # Format is "8.8.8.8 via ROUTE_IPADDR dev DEV src IPADDR uid NUMBER" + # Remove everything up to "src " and then everything after " " + addr=${ip_res##*src } + addr=${addr%% *} + + echo "$addr" +} + +# generate_corosync_conf crypto [token] [qdevice] +# crypto can be on or off +# when token is defined it is used for token timeout +# when qdevice is set to on qdevice section is created and second node is added +generate_corosync_conf() { + case "$1" in + "on") + cipher="aes256" + hash="sha256" + ;; + "off") + cipher="none" + hash="none" + ;; + *) + # Unknown crypto + exit 1 + esac + + token=$TOKEN_TIMEOUT + if [ ! -z "$2" ];then + token="$2" + fi + qdevice="$3" + true_command=`which true` + +cat << _EOF_ + totem { + version: 2 + cluster_name: $COROSYNC_CLUSTER_NAME + transport: knet + crypto_cipher: $cipher + crypto_hash: $hash + token: $token + } + + logging { + to_logfile: yes + logfile: /var/log/cluster/corosync.log + to_syslog: yes + } + + quorum { + provider: corosync_votequorum +_EOF_ + + if [ "$qdevice" == "on" ];then +cat << _EOF_ + device { + votes: 1 + model: net + net { + host: $LOCAL_IP + algorithm: ffsplit + } + heuristics { + mode: sync + exec_true: $true_command + } + } +_EOF_ + fi + +cat << _EOF_ + } + + nodelist { + node { + nodeid: 1 + ring0_addr: $LOCAL_IP + } +_EOF_ + + if [ "$qdevice" == "on" ];then +cat << _EOF_ + node { + nodeid: 2 + ring0_addr: 192.0.2.2 + } +_EOF_ + fi + +cat << _EOF_ + } +_EOF_ +} + +# service_start service +service_start() { + # service service must be inactive + systemctl is-active "$1" && exit 1 || true + + systemctl start "$1" + + systemctl is-active "$1" +} + +# service_stop service +service_stop() { + systemctl is-active "$1" || exit 1 + + systemctl stop "$1" + + systemctl is-active "$1" && exit 1 || true +} + +###################### +# Computed variables # +###################### +LOCAL_IP=$(get_ip) + +################## +# C test sources # +################## + +# Test sources are encoded as a base64 string and piped to base64 to store them in /tmp +# corosync-api-test.c +echo "LyoKICogQ29weXJpZ2h0IChjKSAyMDE5LCBSZWQgSGF0LCBJbmMuCiAqCiAqIFBlcm1pc3Npb24g +dG8gdXNlLCBjb3B5LCBtb2RpZnksIGFuZC9vciBkaXN0cmlidXRlIHRoaXMgc29mdHdhcmUgZm9y +IGFueQogKiBwdXJwb3NlIHdpdGggb3Igd2l0aG91dCBmZWUgaXMgaGVyZWJ5IGdyYW50ZWQsIHBy +b3ZpZGVkIHRoYXQgdGhlIGFib3ZlCiAqIGNvcHlyaWdodCBub3RpY2UgYW5kIHRoaXMgcGVybWlz +c2lvbiBub3RpY2UgYXBwZWFyIGluIGFsbCBjb3BpZXMuCiAqCiAqIFRIRSBTT0ZUV0FSRSBJUyBQ +Uk9WSURFRCAiQVMgSVMiIEFORCBSRUQgSEFULCBJTkMuIERJU0NMQUlNUyBBTEwgV0FSUkFOVElF +UwogKiBXSVRIIFJFR0FSRCBUTyBUSElTIFNPRlRXQVJFIElOQ0xVRElORyBBTEwgSU1QTElFRCBX +QVJSQU5USUVTCiAqIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUy4gSU4gTk8gRVZFTlQg +U0hBTEwgUkVEIEhBVCwgSU5DLiBCRSBMSUFCTEUKICogRk9SIEFOWSBTUEVDSUFMLCBESVJFQ1Qs +IElORElSRUNULCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgT1IgQU5ZIERBTUFHRVMKICogV0hB +VFNPRVZFUiBSRVNVTFRJTkcgRlJPTSBMT1NTIE9GIFVTRSwgREFUQSBPUiBQUk9GSVRTLCBXSEVU +SEVSIElOIEFOIEFDVElPTgogKiBPRiBDT05UUkFDVCwgTkVHTElHRU5DRSBPUiBPVEhFUiBUT1JU +SU9VUyBBQ1RJT04sIEFSSVNJTkcgT1VUIE9GIE9SIElOCiAqIENPTk5FQ1RJT04gV0lUSCBUSEUg +VVNFIE9SIFBFUkZPUk1BTkNFIE9GIFRISVMgU09GVFdBUkUuCiAqCiAqIEF1dGhvcjogSmFuIEZy +aWVzc2UgPGpmcmllc3NlQHJlZGhhdC5jb20+CiAqLwoKLyoKICogU2ltcGxlIHRlc3Qgb2YgQ1BH +IGNhbGxiYWNrcy4gUHJvZ3JhbSBpbml0aWFsbHkgam9pbnMgQ1BHIGdyb3VwLCB3YWl0cyBmb3IK +ICogY3BnX2NvbmZjaGcgYW5kIGNwZ190b3RlbV9jb25mY2hnIGNhbGxiYWNrcyBhbmQgdGhlbiBz +dGFydHMgbG9vcCBvZiBzZW5kaW5nCiAqIGFuZCB3YWl0aW5nIGZvciB0aGUgbWVzc2FnZS4gTWVz +c2FnZSBoYXMgcmFuZG9tIGxlbmd0aCAodXAtdG8gTUFYX01TR19MRU4pCiAqIGFuZCByYW5kb20g +Y29udGVudC4gcmFuZF9yIGlzIHVzZWQgZm9yIHJhbmRvbSBudW1iZXIgZ2VuZXJhdGluZy4gTWVz +c2FnZQogKiBpcyBjaGVja2VkIG9uIGRlbGl2ZXJ5IGJ5IGlzc3Vpbmcgc2FtZSByYW5kX3IuIFNl +ZWQgZm9yIHJhbmRfciBhcmUKICogc3RvcmVkIGluIHNlbnRfcmFuZF9zZWVkIGFuZCByZWNlaXZl +ZF9yYW5kX3NlZWQgdmFyaWFibGVzLgogKgogKiBUaGlzIHRlc3QgY2hlY2tzIGZvbGxvd2luZyBD +UEcgcHJvcGVydGllczoKICogLSBQcm9jZXNzIGNhbiBqb2luIENQRyBncm91cAogKiAtIEJvdGgg +Y3BnX2NvbmZjaGcgYW5kIGNwZ190b3RlbV9jb25mY2hnIGNhbGxiYWNrcyBhcmUgcmVjZWl2ZWQg +d2l0aAogKiAgIG9ubHkgb25lIG5vZGUgYW5kIG9ubHkgb25lIHByb2Nlc3MgaW4gdGhlcmUKICog +LSBNZXNzYWdlcyBhcmUgc2VudCBhbmQgcmVjZWl2ZWQgd2l0aG91dCBhbnkgY29ycnVwdGlvbgog +Ki8KCiNpbmNsdWRlIDxzeXMvdHlwZXMuaD4KI2luY2x1ZGUgPHN5cy9zb2NrZXQuaD4KCiNpbmNs +dWRlIDxhc3NlcnQuaD4KI2luY2x1ZGUgPGVycm5vLmg+CiNpbmNsdWRlIDxpbnR0eXBlcy5oPgoj +aW5jbHVkZSA8cG9sbC5oPgojaW5jbHVkZSA8c3RkaW8uaD4KI2luY2x1ZGUgPHN0ZGxpYi5oPgoj +aW5jbHVkZSA8c3RyaW5nLmg+CiNpbmNsdWRlIDx1bmlzdGQuaD4KCiNpbmNsdWRlIDxjb3Jvc3lu +Yy9jb3JvdHlwZXMuaD4KI2luY2x1ZGUgPGNvcm9zeW5jL2NwZy5oPgoKLyoKICogUHJlZGVmaW5l +ZCB0ZXN0IGNvbnN0YW50cwogKi8KI2RlZmluZSBURVNUX05PREVJRAkJMQojZGVmaW5lIFRFU1Rf +R1JPVVBfTkFNRQkJInNtb2tlLWFwaS10ZXN0LWNwZy1ncm91cCIKI2RlZmluZSBNQVhfUkVUUklF +UwkJMzAKI2RlZmluZSBNQVhfTVNHX0xFTgkJKDEwMjQgKiAxMjgpCiNkZWZpbmUgTUVTU0FHRVNf +VE9fU0VOVAkxMjgKCi8qCiAqIFVzZWZ1bCBtYWNyb3MKICovCiNkZWZpbmUgY3NfcmVwZWF0KGNv +ZGUpIGRvIHsJCQkJXAoJaW50IGNzX3JlcGVhdF9jb3VudGVyID0gMDsJCQlcCglkbyB7CQkJCQkJ +XAoJCWlmICgoY29kZSkgPT0gQ1NfRVJSX1RSWV9BR0FJTikgewlcCgkJCWNzX3JlcGVhdF9jb3Vu +dGVyKys7CQlcCgkJCXBvbGwoTlVMTCwgMCwgMTAwMCk7CQlcCgkJfSBlbHNlIHsJCQkJXAoJCQli +cmVhazsJCQkJXAoJCX0JCQkJCVwKCX0gd2hpbGUgKGNzX3JlcGVhdF9jb3VudGVyIDwgTUFYX1JF +VFJJRVMpOwlcCn0gd2hpbGUgKDApCgojaWZuZGVmIElORlRJTQojZGVmaW5lIElORlRJTQkJCS0x +CiNlbmRpZgoKI2RlZmluZSBFTlRFUigpIHByaW50ZigiKyAlczoldSAlc1xuIiwgX19GSUxFX18s +IF9fTElORV9fLCBfX2Z1bmNfXykKI2RlZmluZSBMRUFWRSgpIHByaW50ZigiLSAlczoldSAlc1xu +IiwgX19GSUxFX18sIF9fTElORV9fLCBfX2Z1bmNfXykKCnN0YXRpYyBpbnQgY3BnX2NvbmZjaGdf +cmVjZWl2ZWQgPSAwOwpzdGF0aWMgaW50IGNwZ190b3RlbV9jb25mY2hnX3JlY2VpdmVkID0gMDsK +Ci8qCiAqIGJvdGggcmFuZCBzZWVkcyBtdXN0IGJlIGluIHN5bmMKICovCnN0YXRpYyB1bnNpZ25l +ZCBpbnQgc2VudF9yYW5kX3NlZWQgPSAwOwpzdGF0aWMgdW5zaWduZWQgaW50IHJlY2VpdmVkX3Jh +bmRfc2VlZCA9IDA7CnN0YXRpYyB1aW50MzJfdCBzZW50X21zZ19zZXFfbm8gPSAwOwpzdGF0aWMg +dWludDMyX3QgcmVjZWl2ZWRfbXNnX3NlcV9ubyA9IDA7CgpzdHJ1Y3QgdGVzdF9tc2cgewoJdWlu +dDMyX3Qgc2VxX25vIF9fYXR0cmlidXRlX18gKChhbGlnbmVkICg4KSkpOwoJdWludDMyX3QgZGF0 +YV9sZW4gX19hdHRyaWJ1dGVfXyAoKGFsaWduZWQgKDgpKSk7Cgl1bnNpZ25lZCBjaGFyIGRhdGFb +MF0gX19hdHRyaWJ1dGVfXyAoKGFsaWduZWQgKDgpKSk7Cn07CgpzdGF0aWMgdm9pZApEZWxpdmVy +Q2FsbGJhY2soY3BnX2hhbmRsZV90IGhhbmRsZSwKICAgIGNvbnN0IHN0cnVjdCBjcGdfbmFtZSAq +Z3JvdXBOYW1lLAogICAgdWludDMyX3Qgbm9kZWlkLAogICAgdWludDMyX3QgcGlkLAogICAgdm9p +ZCAqY3BnX21zZywKICAgIHNpemVfdCBjcGdfbXNnX2xlbikKewoJc3RydWN0IHRlc3RfbXNnICpt +c2c7Cgl1aW50MzJfdCB1MzI7CgoJRU5URVIoKTsKCglhc3NlcnQobm9kZWlkID09IFRFU1RfTk9E +RUlEKTsKCWFzc2VydChwaWQgPT0gZ2V0cGlkKCkpOwoKCWFzc2VydChjcGdfbXNnX2xlbiA+PSBz +aXplb2Yoc3RydWN0IHRlc3RfbXNnKSk7CgoJbXNnID0gKHN0cnVjdCB0ZXN0X21zZyAqKWNwZ19t +c2c7Cglhc3NlcnQobXNnLT5zZXFfbm8gPT0gcmVjZWl2ZWRfbXNnX3NlcV9ubyk7CglyZWNlaXZl +ZF9tc2dfc2VxX25vKys7CgoJYXNzZXJ0KGNwZ19tc2dfbGVuID09IG1zZy0+ZGF0YV9sZW4gKyBz +aXplb2Yoc3RydWN0IHRlc3RfbXNnKSk7CgoJLyoKCSAqIE1lc3NhZ2UgaGFzIGV4cGVjdGVkIGxl +bmd0aCBhbmQgY29udGVudAoJICovCglhc3NlcnQobXNnLT5kYXRhX2xlbiA9PSAodWludDMyX3Qp +KHJhbmRfcigmcmVjZWl2ZWRfcmFuZF9zZWVkKSAlIE1BWF9NU0dfTEVOKSk7CgoJZm9yICh1MzIg +PSAwOyB1MzIgPCBtc2ctPmRhdGFfbGVuOyB1MzIrKykgewoJCWFzc2VydChtc2ctPmRhdGFbdTMy +XSA9PSAodW5zaWduZWQgY2hhcilyYW5kX3IoJnJlY2VpdmVkX3JhbmRfc2VlZCkpOwoJfQoKCUxF +QVZFKCk7Cn0KCnN0YXRpYyB2b2lkClRvdGVtQ29uZmNoZ0NhbGxiYWNrKGNwZ19oYW5kbGVfdCBo +YW5kbGUsCiAgICBzdHJ1Y3QgY3BnX3JpbmdfaWQgcmluZ19pZCwKICAgIHVpbnQzMl90IG1lbWJl +cl9saXN0X2VudHJpZXMsCiAgICBjb25zdCB1aW50MzJfdCAqbWVtYmVyX2xpc3QpCnsKCglFTlRF +UigpOwoKCWFzc2VydChtZW1iZXJfbGlzdF9lbnRyaWVzID09IDEpOwoJYXNzZXJ0KG1lbWJlcl9s +aXN0WzBdID09IFRFU1RfTk9ERUlEKTsKCgljcGdfdG90ZW1fY29uZmNoZ19yZWNlaXZlZCA9IDE7 +CgoJTEVBVkUoKTsKfQoKc3RhdGljIHZvaWQKQ29uZmNoZ0NhbGxiYWNrKGNwZ19oYW5kbGVfdCBo +YW5kbGUsCiAgICBjb25zdCBzdHJ1Y3QgY3BnX25hbWUgKmdyb3VwX25hbWUsCiAgICBjb25zdCBz +dHJ1Y3QgY3BnX2FkZHJlc3MgKm1lbWJlcl9saXN0LCBzaXplX3QgbWVtYmVyX2xpc3RfZW50cmll +cywKICAgIGNvbnN0IHN0cnVjdCBjcGdfYWRkcmVzcyAqbGVmdF9saXN0LCBzaXplX3QgbGVmdF9s +aXN0X2VudHJpZXMsCiAgICBjb25zdCBzdHJ1Y3QgY3BnX2FkZHJlc3MgKmpvaW5lZF9saXN0LCBz +aXplX3Qgam9pbmVkX2xpc3RfZW50cmllcykKewoKCUVOVEVSKCk7CgoJYXNzZXJ0KGdyb3VwX25h +bWUtPmxlbmd0aCA9PSBzdHJsZW4oVEVTVF9HUk9VUF9OQU1FKSk7Cglhc3NlcnQobWVtY21wKGdy +b3VwX25hbWUtPnZhbHVlLCBURVNUX0dST1VQX05BTUUsIHN0cmxlbihURVNUX0dST1VQX05BTUUp +KSA9PSAwKTsKCWFzc2VydChtZW1iZXJfbGlzdF9lbnRyaWVzID09IDEpOwoJYXNzZXJ0KG1lbWJl +cl9saXN0WzBdLm5vZGVpZCA9PSBURVNUX05PREVJRCk7Cglhc3NlcnQobWVtYmVyX2xpc3RbMF0u +cGlkID09IGdldHBpZCgpKTsKCgljcGdfY29uZmNoZ19yZWNlaXZlZCA9IDE7CgoJTEVBVkUoKTsK +fQoKc3RhdGljIGNwZ19tb2RlbF92MV9kYXRhX3QgbW9kZWxfZGF0YSA9IHsKCS5jcGdfZGVsaXZl +cl9mbiA9CURlbGl2ZXJDYWxsYmFjaywKCS5jcGdfY29uZmNoZ19mbiA9CUNvbmZjaGdDYWxsYmFj +aywKCS5jcGdfdG90ZW1fY29uZmNoZ19mbiA9CVRvdGVtQ29uZmNoZ0NhbGxiYWNrLAoJLmZsYWdz +ID0JCUNQR19NT0RFTF9WMV9ERUxJVkVSX0lOSVRJQUxfVE9URU1fQ09ORiwKfTsKCnN0YXRpYyB2 +b2lkCnNlbmRfbXNnKGNwZ19oYW5kbGVfdCBjcGdfaGFuZGxlKQp7CglzdHJ1Y3QgdGVzdF9tc2cg +bXNnOwoJdW5zaWduZWQgY2hhciAqZGF0YTsKCXVpbnQzMl90IHUzMjsKCXN0cnVjdCBpb3ZlYyBp +b3ZbMl07Cgljc19lcnJvcl90IGNzX3JlczsKCglFTlRFUigpOwoKCW1zZy5kYXRhX2xlbiA9IHJh +bmRfcigmc2VudF9yYW5kX3NlZWQpICUgTUFYX01TR19MRU47Cgltc2cuc2VxX25vID0gc2VudF9t +c2dfc2VxX25vOwoKCXNlbnRfbXNnX3NlcV9ubysrOwoKCWRhdGEgPSBtYWxsb2Moc2l6ZW9mKHVu +c2lnbmVkIGNoYXIpICogbXNnLmRhdGFfbGVuKTsKCWFzc2VydChkYXRhICE9IE5VTEwpOwoKCWZv +ciAodTMyID0gMDsgdTMyIDwgbXNnLmRhdGFfbGVuOyB1MzIrKykgewoJCWRhdGFbdTMyXSA9ICh1 +bnNpZ25lZCBjaGFyKXJhbmRfcigmc2VudF9yYW5kX3NlZWQpOwoJfQoKCWlvdlswXS5pb3ZfYmFz +ZSA9ICh2b2lkICopJm1zZzsKCWlvdlswXS5pb3ZfbGVuID0gc2l6ZW9mKG1zZyk7Cglpb3ZbMV0u +aW92X2Jhc2UgPSAodm9pZCAqKWRhdGE7Cglpb3ZbMV0uaW92X2xlbiA9IG1zZy5kYXRhX2xlbjsK +Cgljc19yZXMgPSBjcGdfbWNhc3Rfam9pbmVkKGNwZ19oYW5kbGUsIENQR19UWVBFX0FHUkVFRCwg +aW92LCAyKTsKCWFzc2VydChjc19yZXMgPT0gQ1NfT0spOwoKCWZyZWUoZGF0YSk7CgoJTEVBVkUo +KTsKfQoKc3RhdGljIHZvaWQKdGVzdF9jcGcodm9pZCkKewoJY3BnX2hhbmRsZV90IGNwZ19oYW5k +bGU7CglzdHJ1Y3QgY3BnX25hbWUgZ3JvdXBfbmFtZTsKCWNzX2Vycm9yX3QgY3NfcmVzOwoJdW5z +aWduZWQgaW50IGxvY2FsX25vZGVpZDsKCWludCBjcGdfZmQ7CglzdHJ1Y3QgcG9sbGZkIHBmZDsK +CWludCBwb2xsX3JlczsKCWludCBzdGF0ZTsKCWludCBjb250OwoKCUVOVEVSKCk7CgoJc3RhdGUg +PSAwOwoKCXN0cmNweShncm91cF9uYW1lLnZhbHVlLCBURVNUX0dST1VQX05BTUUpOwoJZ3JvdXBf +bmFtZS5sZW5ndGggPSBzdHJsZW4oVEVTVF9HUk9VUF9OQU1FKTsKCgljc19yZXBlYXQoY3NfcmVz +ID0gY3BnX21vZGVsX2luaXRpYWxpemUoJmNwZ19oYW5kbGUsIENQR19NT0RFTF9WMSwKCSAgICAo +Y3BnX21vZGVsX2RhdGFfdCAqKSZtb2RlbF9kYXRhLCBOVUxMKSk7Cglhc3NlcnQoY3NfcmVzID09 +IENTX09LKTsKCgljc19yZXBlYXQoY3NfcmVzID0gY3BnX2pvaW4oY3BnX2hhbmRsZSwgJmdyb3Vw +X25hbWUpKTsKCWFzc2VydChjc19yZXMgPT0gQ1NfT0spOwoKCWNzX3JlcGVhdChjc19yZXMgPSBj +cGdfbG9jYWxfZ2V0KGNwZ19oYW5kbGUsICZsb2NhbF9ub2RlaWQpKTsKCWFzc2VydChjc19yZXMg +PT0gQ1NfT0spOwoJYXNzZXJ0KGxvY2FsX25vZGVpZCA9PSBURVNUX05PREVJRCk7CgoJY3NfcmVw +ZWF0KGNzX3JlcyA9IGNwZ19mZF9nZXQoY3BnX2hhbmRsZSwgJmNwZ19mZCkpOwoJYXNzZXJ0KGNz +X3JlcyA9PSBDU19PSyk7CgoJY29udCA9IDE7CgoJZG8gewoJCXBmZC5mZCA9IGNwZ19mZDsKCQlw +ZmQuZXZlbnRzID0gUE9MTElOOwoJCXBmZC5yZXZlbnRzID0gMDsKCgkJcG9sbF9yZXMgPSBwb2xs +KCZwZmQsIDEsIElORlRJTSk7CgkJaWYgKHBvbGxfcmVzID09IC0xKSB7CgkJCXBlcnJvcigicG9s +bF9yZXMgPT0gLTEiKTsKCQl9CgoJCWFzc2VydChwb2xsX3JlcyAhPSAwKTsKCQlhc3NlcnQocGZk +LnJldmVudHMgJiBQT0xMSU4pOwoKCQljc19yZXBlYXQoY3NfcmVzID0gY3BnX2Rpc3BhdGNoKGNw +Z19oYW5kbGUsIENTX0RJU1BBVENIX0FMTCkpOwoJCWFzc2VydChjc19yZXMgPT0gQ1NfT0spOwoK +CQlzd2l0Y2ggKHN0YXRlKSB7CgkJY2FzZSAwOgoJCQkvKgoJCQkgKiBXYWl0aW5nIGZvciBjcGdf +Y29uZmNoZ19yZWNlaXZlZCBhbmQgY3BnX3RvdGVtX2NvbmZjaGdfcmVjZWl2ZWQKCQkJICovCgkJ +CWlmIChjcGdfY29uZmNoZ19yZWNlaXZlZCAmJiBjcGdfdG90ZW1fY29uZmNoZ19yZWNlaXZlZCkg +ewoJCQkJLyoKCQkJCSAqIFNlbmQgZmlyc3QgbWVzc2FnZSBhbmQgd2FpdCBmb3IgaXQgaW4gbmV4 +dCBzdGF0ZQoJCQkJICovCgkJCQlzZW5kX21zZyhjcGdfaGFuZGxlKTsKCQkJCXN0YXRlID0gMTsK +CQkJfQoJCQlicmVhazsKCQljYXNlIDE6CgkJCWlmIChyZWNlaXZlZF9tc2dfc2VxX25vID49IE1F +U1NBR0VTX1RPX1NFTlQpIHsKCQkJCWNvbnQgPSAwOwoJCQl9IGVsc2UgIGlmIChyZWNlaXZlZF9t +c2dfc2VxX25vID09IHNlbnRfbXNnX3NlcV9ubykgewoJCQkJLyoKCQkJCSAqIE1lc3NhZ2UgZGVs +aXZlcmVkIHNvIHNlbnQgbmV3IG9uZSBhbmQgd2FpdCBmb3IgaXQKCQkJCSAqLwoJCQkJc2VuZF9t +c2coY3BnX2hhbmRsZSk7CgkJCX0KCQkJYnJlYWs7CgkJfQoJfSB3aGlsZSAoY29udCk7CgoJY3Nf +cmVwZWF0KGNzX3JlcyA9IGNwZ19sZWF2ZShjcGdfaGFuZGxlLCAmZ3JvdXBfbmFtZSkpOwoJYXNz +ZXJ0KGNzX3JlcyA9PSBDU19PSyk7CgoJY3NfcmVwZWF0KGNzX3JlcyA9IGNwZ19maW5hbGl6ZShj +cGdfaGFuZGxlKSk7Cglhc3NlcnQoY3NfcmVzID09IENTX09LKTsKCglMRUFWRSgpOwp9CgppbnQK +bWFpbih2b2lkKQp7CgoJRU5URVIoKTsKCglzZXRsaW5lYnVmKHN0ZG91dCk7CgoJdGVzdF9jcGco +KTsKCglMRUFWRSgpOwoKCXJldHVybiAoMCk7Cn0K" | base64 -d | tee "/tmp/corosync-api-test.c" +# - corosync-api-test.c +# corosync-api-test-mp.c +echo "LyoKICogQ29weXJpZ2h0IChjKSAyMDE5LCBSZWQgSGF0LCBJbmMuCiAqCiAqIFBlcm1pc3Npb24g +dG8gdXNlLCBjb3B5LCBtb2RpZnksIGFuZC9vciBkaXN0cmlidXRlIHRoaXMgc29mdHdhcmUgZm9y +IGFueQogKiBwdXJwb3NlIHdpdGggb3Igd2l0aG91dCBmZWUgaXMgaGVyZWJ5IGdyYW50ZWQsIHBy +b3ZpZGVkIHRoYXQgdGhlIGFib3ZlCiAqIGNvcHlyaWdodCBub3RpY2UgYW5kIHRoaXMgcGVybWlz +c2lvbiBub3RpY2UgYXBwZWFyIGluIGFsbCBjb3BpZXMuCiAqCiAqIFRIRSBTT0ZUV0FSRSBJUyBQ +Uk9WSURFRCAiQVMgSVMiIEFORCBSRUQgSEFULCBJTkMuIERJU0NMQUlNUyBBTEwgV0FSUkFOVElF +UwogKiBXSVRIIFJFR0FSRCBUTyBUSElTIFNPRlRXQVJFIElOQ0xVRElORyBBTEwgSU1QTElFRCBX +QVJSQU5USUVTCiAqIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUy4gSU4gTk8gRVZFTlQg +U0hBTEwgUkVEIEhBVCwgSU5DLiBCRSBMSUFCTEUKICogRk9SIEFOWSBTUEVDSUFMLCBESVJFQ1Qs +IElORElSRUNULCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgT1IgQU5ZIERBTUFHRVMKICogV0hB +VFNPRVZFUiBSRVNVTFRJTkcgRlJPTSBMT1NTIE9GIFVTRSwgREFUQSBPUiBQUk9GSVRTLCBXSEVU +SEVSIElOIEFOIEFDVElPTgogKiBPRiBDT05UUkFDVCwgTkVHTElHRU5DRSBPUiBPVEhFUiBUT1JU +SU9VUyBBQ1RJT04sIEFSSVNJTkcgT1VUIE9GIE9SIElOCiAqIENPTk5FQ1RJT04gV0lUSCBUSEUg +VVNFIE9SIFBFUkZPUk1BTkNFIE9GIFRISVMgU09GVFdBUkUuCiAqCiAqIEF1dGhvcjogSmFuIEZy +aWVzc2UgPGpmcmllc3NlQHJlZGhhdC5jb20+CiAqLwoKLyoKICogTWFpbiBwcm9jZXNzIGNyZWF0 +ZXMgbXVsdGlwbGUgKE5PX0NISUxEUykgY2hpbGRzIGFuZCB3YWl0cyBmb3IgdGhlaXIgZXhpdC4K +ICogRWFjaCBjaGlsZCBqb2lucyBDUEcgZ3JvdXAgYW5kIHN0YXJ0cyBwcm9jZXNzaW5nIENQRyBl +dmVudHMuIEVhY2ggY2hpbGQgaXMKICogaWRlbnRpZmllZCBieSBJRCAobXlfaWQpIHdoaWNoIGlz +IHNldCBieSBtYWluIHByb2Nlc3MgaW4gaW5jcmVhc2luZyBvcmRlciAoc28KICogdmFsdWUgaXMg +MC4uTk9fQ0hJTERTLTEpLiBXaGVuIGFsbCBjaGlsZHMgam9pbiBDUEcgZ3JvdXAgKENvbmZjaGdD +YWxsYmFjayB2YXJpYWJsZQogKiBtZW1iZXJfbGlzdF9lbnRyaWVzIGlzIGVxdWFsIHRvIE5PX0NI +SUxEUykgdGhlbiBjaGlsZCB3aXRoIElEIDAgc2VuZHMgQ1BHIG1lc3NhZ2UKICogd2l0aCByYW5k +b20gbGVuZ3RoICh1cC10byBNQVhfTVNHX0xFTikgYW5kIHJhbmRvbSBjb250ZW50LiBXaGVuIGNo +aWxkIHdpdGggSUQgMQogKiByZWNlaXZlcyBtZXNzYWdlIGlzc3VlZCBieSBjaGlsZCB3aXRoIElE +IDAsIGl0IHNlbmRzIGFub3RoZXIgcmFuZG9tIG1lc3NhZ2UuCiAqIFRoaXMgcHJvY2VzcyBjb250 +aW51ZXMgd2l0aCBjaGlsZCB3aXRoIElEIDIsIHRoZW4gd2l0aCBjaGlsZCAzLCAuLi4gTk9fQ0hJ +TERTIC0gMSBhbmQKICogdGhlbiBvdmVybGFwcyBiYWNrIHRvIDAuIEVhY2ggY2hpbGQgY29tcGFy +ZXMgcmVjZWl2ZWQgbWVzc2FnZSBieSBnZW5lcmF0aW5nIHNhbWUKICogcmFuZG9tIG51bWJlcnMg +KHJhbmRfciBmdW5jdGlvbiBpcyB1c2VkKSBzdHJlYW0gYXMgc2VuZGVyIHNvIHNlbnRfcmFuZF9z +ZWVkIGFuZAogKiByZWNlaXZlZF9yYW5kX3NlZWQgbXVzdCBiZSBrZXB0IGluIHN5bmMuIEtlZXBp +bmcgcmVjZWllZF9yYW5kX3NlZWQgaW4gc3luYyBpcwogKiBzaW1wbGUsIGJlY2F1c2UgaXQgaXMg +dXBkYXRlZCBldmVyeSB0aW1lIHdoZW4gbWVzc2FnZSBpcyByZWNlaXZlZC4KICogc2VudF9yYW5k +X3NlZWQgaXMgdXBkYXRlZCBldGhlciBieSBzZW5kaW5nIG1lc3NhZ2Ugb3IgYnkKICogY2FsbGlu +ZyBhZGp1c3Rfc2VudF9yYW5kX3NlZWQgZnVuY3Rpb24uCiAqCiAqIFRoaXMgdGVzdCBjaGVja3Mg +Zm9sbG93aW5nIHByb3BlcnRpZXMgQ1BHOgogKiAtIE1vcmUgdGhhbiBvbmUgY2xpZW50IGNhbiBq +b2luIENQRyBncm91cAogKiAtIEVhY2ggY2xpZW50IGV2ZW50dWFsbHkgc2VlcyBhbGwgb3RoZXIg +Y2xpZW50cwogKiAtIEVhY2ggY2xpZW50IHJlY2VpdmVzIG1lc3NhZ2VzIHNlbnQgYnkgb3RoZXIg +Y2xpZW50cyBbMV0KICogLSBNZXNzYWdlIGlzIG5vdCBjb3JydXB0ZWQgWzFdCiAqIC0gTWVzc2Fn +ZXMgYXJlIGRlbGl2ZXJlZCB3aXRoIEZJRk8gcXVhcmFudGVlIFsxXQogKgogKiBbMV0gLSBFbnN1 +cmVkIGJ5IGVxdWFsaXR5IG9mIHJhbmRfciBnZW5lcmF0ZWQgYnl0ZXMgd2hlcmUgc2VuZGVyIHNl +ZWQKICogICAgICAgKHNlbnRfcmFuZF9zZWVkKSBhbmQgcmVjZWl2ZXIgc2VlZCAocmVjZWl2ZWRf +cmFuZF9zZWVkKSBhcmUga2VwdCBpbgogKiAgICAgICBzeW5jLgogKi8KCiNpbmNsdWRlIDxzeXMv +dHlwZXMuaD4KI2luY2x1ZGUgPHN5cy9zb2NrZXQuaD4KI2luY2x1ZGUgPHN5cy93YWl0Lmg+Cgoj +aW5jbHVkZSA8YXNzZXJ0Lmg+CiNpbmNsdWRlIDxlcnJuby5oPgojaW5jbHVkZSA8aW50dHlwZXMu +aD4KI2luY2x1ZGUgPHBvbGwuaD4KI2luY2x1ZGUgPHN0ZGlvLmg+CiNpbmNsdWRlIDxzdGRsaWIu +aD4KI2luY2x1ZGUgPHN0cmluZy5oPgojaW5jbHVkZSA8dW5pc3RkLmg+CgojaW5jbHVkZSA8Y29y +b3N5bmMvY29yb3R5cGVzLmg+CiNpbmNsdWRlIDxjb3Jvc3luYy9jcGcuaD4KCi8qCiAqIFByZWRl +ZmluZWQgdGVzdCBjb25zdGFudHMKICovCiNkZWZpbmUgVEVTVF9OT0RFSUQJCTEKI2RlZmluZSBU +RVNUX0dST1VQX05BTUUJCSJzbW9rZS1hcGktdGVzdC1jcGctZ3JvdXAtbXAiCiNkZWZpbmUgTUFY +X1JFVFJJRVMJCTMwCiNkZWZpbmUgTUFYX01TR19MRU4JCSgxMDI0ICogMTI4KQoKI2RlZmluZSBO +T19DSElMRFMJCTMKCiNkZWZpbmUgTUVTU0FHRVNfVE9fU0VOVAkoMTI4ICogTk9fQ0hJTERTKQoK +LyoKICogVXNlZnVsIG1hY3JvcwogKi8KI2RlZmluZSBjc19yZXBlYXQoY29kZSkgZG8gewkJCQlc +CglpbnQgY3NfcmVwZWF0X2NvdW50ZXIgPSAwOwkJCVwKCWRvIHsJCQkJCQlcCgkJaWYgKChjb2Rl +KSA9PSBDU19FUlJfVFJZX0FHQUlOKSB7CVwKCQkJY3NfcmVwZWF0X2NvdW50ZXIrKzsJCVwKCQkJ +cG9sbChOVUxMLCAwLCAxMDAwKTsJCVwKCQl9IGVsc2UgewkJCQlcCgkJCWJyZWFrOwkJCQlcCgkJ +fQkJCQkJXAoJfSB3aGlsZSAoY3NfcmVwZWF0X2NvdW50ZXIgPCBNQVhfUkVUUklFUyk7CVwKfSB3 +aGlsZSAoMCkKCiNpZm5kZWYgSU5GVElNCiNkZWZpbmUgSU5GVElNCQkJLTEKI2VuZGlmCgojZGVm +aW5lIEVOVEVSKCkgcHJpbnRmKCJbJWxkXSArICVzOiV1ICVzXG4iLCAobG9uZyBzaWduZWQgaW50 +KWdldHBpZCgpLCBfX0ZJTEVfXyxcCiAgICBfX0xJTkVfXywgX19mdW5jX18pCiNkZWZpbmUgTEVB +VkUoKSBwcmludGYoIlslbGRdIC0gJXM6JXUgJXNcbiIsIChsb25nIHNpZ25lZCBpbnQpZ2V0cGlk +KCksIF9fRklMRV9fLFwKICAgIF9fTElORV9fLCBfX2Z1bmNfXykKCnN0YXRpYyBpbnQzMl90IG15 +X2lkID0gLTE7CnN0YXRpYyBpbnQgZnVsbF9tZW1iZXJzaGlwX3NlZW4gPSAwOwpzdGF0aWMgaW50 +IHNlbnRfbWVzc2FnZXMgPSAwOwpzdGF0aWMgaW50IHRlc3RfY3BnX2xvb3BfY29udCA9IDE7Cgov +KgogKiBib3RoIHJhbmQgc2VlZHMgbXVzdCBiZSBpbiBzeW5jCiAqLwpzdGF0aWMgdW5zaWduZWQg +aW50IHNlbnRfcmFuZF9zZWVkID0gMDsKc3RhdGljIHVuc2lnbmVkIGludCByZWNlaXZlZF9yYW5k +X3NlZWQgPSAwOwpzdGF0aWMgaW50MzJfdCBleHBlY3RlZF9zZW5kZXJfaWQ7CnN0YXRpYyB1aW50 +MzJfdCBleHBlY3RlZF9tc2dfc2VxX25vID0gMDsKCnN0cnVjdCB0ZXN0X21zZyB7CglpbnQzMl90 +IHNlbmRlcl9pZCBfX2F0dHJpYnV0ZV9fICgoYWxpZ25lZCAoOCkpKTsKCXVpbnQzMl90IHNlcV9u +byBfX2F0dHJpYnV0ZV9fICgoYWxpZ25lZCAoOCkpKTsKCXVpbnQzMl90IGRhdGFfbGVuIF9fYXR0 +cmlidXRlX18gKChhbGlnbmVkICg4KSkpOwoJdW5zaWduZWQgY2hhciBkYXRhWzBdIF9fYXR0cmli +dXRlX18gKChhbGlnbmVkICg4KSkpOwp9OwoKc3RhdGljIHZvaWQKc2VuZF9tc2coY3BnX2hhbmRs +ZV90IGNwZ19oYW5kbGUpCnsKCXN0cnVjdCB0ZXN0X21zZyBtc2c7Cgl1bnNpZ25lZCBjaGFyICpk +YXRhOwoJdWludDMyX3QgdTMyOwoJc3RydWN0IGlvdmVjIGlvdlsyXTsKCWNzX2Vycm9yX3QgY3Nf +cmVzOwoKCUVOVEVSKCk7CgoJbXNnLnNlbmRlcl9pZCA9IG15X2lkOwoJbXNnLmRhdGFfbGVuID0g +cmFuZF9yKCZzZW50X3JhbmRfc2VlZCkgJSBNQVhfTVNHX0xFTjsKCW1zZy5zZXFfbm8gPSBleHBl +Y3RlZF9tc2dfc2VxX25vOwoKCWRhdGEgPSBtYWxsb2Moc2l6ZW9mKHVuc2lnbmVkIGNoYXIpICog +bXNnLmRhdGFfbGVuKTsKCWFzc2VydChkYXRhICE9IE5VTEwpOwoKCWZvciAodTMyID0gMDsgdTMy +IDwgbXNnLmRhdGFfbGVuOyB1MzIrKykgewoJCWRhdGFbdTMyXSA9ICh1bnNpZ25lZCBjaGFyKXJh +bmRfcigmc2VudF9yYW5kX3NlZWQpOwoJfQoKCWlvdlswXS5pb3ZfYmFzZSA9ICh2b2lkICopJm1z +ZzsKCWlvdlswXS5pb3ZfbGVuID0gc2l6ZW9mKG1zZyk7Cglpb3ZbMV0uaW92X2Jhc2UgPSAodm9p +ZCAqKWRhdGE7Cglpb3ZbMV0uaW92X2xlbiA9IG1zZy5kYXRhX2xlbjsKCgljc19yZXMgPSBjcGdf +bWNhc3Rfam9pbmVkKGNwZ19oYW5kbGUsIENQR19UWVBFX0FHUkVFRCwgaW92LCAyKTsKCWFzc2Vy +dChjc19yZXMgPT0gQ1NfT0spOwoKCWZyZWUoZGF0YSk7CgoJc2VudF9tZXNzYWdlcysrOwoKCUxF +QVZFKCk7Cn0KCnN0YXRpYyB2b2lkCmFkanVzdF9zZW50X3JhbmRfc2VlZCh2b2lkKQp7Cgl1aW50 +MzJfdCBkYXRhX2xlbjsKCXVpbnQzMl90IHUzMjsKCglkYXRhX2xlbiA9IHJhbmRfcigmc2VudF9y +YW5kX3NlZWQpICUgTUFYX01TR19MRU47CgoJZm9yICh1MzIgPSAwOyB1MzIgPCBkYXRhX2xlbjsg +dTMyKyspIHsKCQkodm9pZClyYW5kX3IoJnNlbnRfcmFuZF9zZWVkKTsKCX0KfQoKc3RhdGljIHZv +aWQKRGVsaXZlckNhbGxiYWNrKGNwZ19oYW5kbGVfdCBoYW5kbGUsCiAgICBjb25zdCBzdHJ1Y3Qg +Y3BnX25hbWUgKmdyb3VwTmFtZSwKICAgIHVpbnQzMl90IG5vZGVpZCwKICAgIHVpbnQzMl90IHBp +ZCwKICAgIHZvaWQgKmNwZ19tc2csCiAgICBzaXplX3QgY3BnX21zZ19sZW4pCnsKCXN0cnVjdCB0 +ZXN0X21zZyAqbXNnOwoJdWludDMyX3QgdTMyOwoKCUVOVEVSKCk7CgoJYXNzZXJ0KG5vZGVpZCA9 +PSBURVNUX05PREVJRCk7CgoJYXNzZXJ0KGNwZ19tc2dfbGVuID49IHNpemVvZihzdHJ1Y3QgdGVz +dF9tc2cpKTsKCgltc2cgPSAoc3RydWN0IHRlc3RfbXNnICopY3BnX21zZzsKCWFzc2VydChtc2ct +PnNlbmRlcl9pZCA9PSBleHBlY3RlZF9zZW5kZXJfaWQpOwoKCWV4cGVjdGVkX3NlbmRlcl9pZCA9 +IChleHBlY3RlZF9zZW5kZXJfaWQgKyAxKSAlIE5PX0NISUxEUzsKCglhc3NlcnQobXNnLT5zZXFf +bm8gPT0gZXhwZWN0ZWRfbXNnX3NlcV9ubyk7CglleHBlY3RlZF9tc2dfc2VxX25vKys7CgoJYXNz +ZXJ0KGNwZ19tc2dfbGVuID09IG1zZy0+ZGF0YV9sZW4gKyBzaXplb2Yoc3RydWN0IHRlc3RfbXNn +KSk7CgoJLyoKCSAqIE1lc3NhZ2UgaGFzIGV4cGVjdGVkIGxlbmd0aCBhbmQgY29udGVudAoJICov +Cglhc3NlcnQobXNnLT5kYXRhX2xlbiA9PSAodWludDMyX3QpKHJhbmRfcigmcmVjZWl2ZWRfcmFu +ZF9zZWVkKSAlIE1BWF9NU0dfTEVOKSk7CgoJZm9yICh1MzIgPSAwOyB1MzIgPCBtc2ctPmRhdGFf +bGVuOyB1MzIrKykgewoJCWFzc2VydChtc2ctPmRhdGFbdTMyXSA9PSAodW5zaWduZWQgY2hhcily +YW5kX3IoJnJlY2VpdmVkX3JhbmRfc2VlZCkpOwoJfQoKCWlmIChleHBlY3RlZF9tc2dfc2VxX25v +ID4gTUVTU0FHRVNfVE9fU0VOVCkgewoJCXRlc3RfY3BnX2xvb3BfY29udCA9IDA7Cgl9CgoJaWYg +KGV4cGVjdGVkX3NlbmRlcl9pZCA9PSBteV9pZCkgewoJCXNlbmRfbXNnKGhhbmRsZSk7Cgl9IGVs +c2UgewoJCWFkanVzdF9zZW50X3JhbmRfc2VlZCgpOwoJfQoKCUxFQVZFKCk7Cn0KCnN0YXRpYyB2 +b2lkClRvdGVtQ29uZmNoZ0NhbGxiYWNrKGNwZ19oYW5kbGVfdCBoYW5kbGUsCiAgICBzdHJ1Y3Qg +Y3BnX3JpbmdfaWQgcmluZ19pZCwKICAgIHVpbnQzMl90IG1lbWJlcl9saXN0X2VudHJpZXMsCiAg +ICBjb25zdCB1aW50MzJfdCAqbWVtYmVyX2xpc3QpCnsKCglFTlRFUigpOwoKCWFzc2VydChtZW1i +ZXJfbGlzdF9lbnRyaWVzID09IDEpOwoJYXNzZXJ0KG1lbWJlcl9saXN0WzBdID09IFRFU1RfTk9E +RUlEKTsKCglMRUFWRSgpOwp9CgpzdGF0aWMgdm9pZApDb25mY2hnQ2FsbGJhY2soY3BnX2hhbmRs +ZV90IGhhbmRsZSwKICAgIGNvbnN0IHN0cnVjdCBjcGdfbmFtZSAqZ3JvdXBfbmFtZSwKICAgIGNv +bnN0IHN0cnVjdCBjcGdfYWRkcmVzcyAqbWVtYmVyX2xpc3QsIHNpemVfdCBtZW1iZXJfbGlzdF9l +bnRyaWVzLAogICAgY29uc3Qgc3RydWN0IGNwZ19hZGRyZXNzICpsZWZ0X2xpc3QsIHNpemVfdCBs +ZWZ0X2xpc3RfZW50cmllcywKICAgIGNvbnN0IHN0cnVjdCBjcGdfYWRkcmVzcyAqam9pbmVkX2xp +c3QsIHNpemVfdCBqb2luZWRfbGlzdF9lbnRyaWVzKQp7CglpbnQgaTsKCglFTlRFUigpOwoKCWFz +c2VydChncm91cF9uYW1lLT5sZW5ndGggPT0gc3RybGVuKFRFU1RfR1JPVVBfTkFNRSkpOwoJYXNz +ZXJ0KG1lbWNtcChncm91cF9uYW1lLT52YWx1ZSwgVEVTVF9HUk9VUF9OQU1FLCBzdHJsZW4oVEVT +VF9HUk9VUF9OQU1FKSkgPT0gMCk7CgoJZm9yIChpID0gMDsgaSA8IG1lbWJlcl9saXN0X2VudHJp +ZXM7IGkrKykgewoJCWFzc2VydChtZW1iZXJfbGlzdFtpXS5ub2RlaWQgPT0gVEVTVF9OT0RFSUQp +OwoJfQoKCWlmICghZnVsbF9tZW1iZXJzaGlwX3NlZW4gJiYgbWVtYmVyX2xpc3RfZW50cmllcyA9 +PSBOT19DSElMRFMpIHsKCQlpZiAobXlfaWQgPT0gMCkgewoJCQkvKgoJCQkgKiBGaXJzdCBjaGls +ZCBzZW5kcyBmaXJzdCBtZXNzYWdlCgkJCSAqLwoJCQlzZW5kX21zZyhoYW5kbGUpOwoJCX0gZWxz +ZSB7CgkJCWFkanVzdF9zZW50X3JhbmRfc2VlZCgpOwoJCX0KCgkJZnVsbF9tZW1iZXJzaGlwX3Nl +ZW4gPSAxOwoJfQoKCUxFQVZFKCk7Cn0KCnN0YXRpYyBjcGdfbW9kZWxfdjFfZGF0YV90IG1vZGVs +X2RhdGEgPSB7CgkuY3BnX2RlbGl2ZXJfZm4gPQlEZWxpdmVyQ2FsbGJhY2ssCgkuY3BnX2NvbmZj +aGdfZm4gPQlDb25mY2hnQ2FsbGJhY2ssCgkuY3BnX3RvdGVtX2NvbmZjaGdfZm4gPQlUb3RlbUNv +bmZjaGdDYWxsYmFjaywKCS5mbGFncyA9CQlDUEdfTU9ERUxfVjFfREVMSVZFUl9JTklUSUFMX1RP +VEVNX0NPTkYsCn07CgoKc3RhdGljIHZvaWQKdGVzdF9jcGcodm9pZCkKewoJY3BnX2hhbmRsZV90 +IGNwZ19oYW5kbGU7CglzdHJ1Y3QgY3BnX25hbWUgZ3JvdXBfbmFtZTsKCWNzX2Vycm9yX3QgY3Nf +cmVzOwoJdW5zaWduZWQgaW50IGxvY2FsX25vZGVpZDsKCWludCBjcGdfZmQ7CglzdHJ1Y3QgcG9s +bGZkIHBmZDsKCWludCBwb2xsX3JlczsKCglFTlRFUigpOwoKCXN0cmNweShncm91cF9uYW1lLnZh +bHVlLCBURVNUX0dST1VQX05BTUUpOwoJZ3JvdXBfbmFtZS5sZW5ndGggPSBzdHJsZW4oVEVTVF9H +Uk9VUF9OQU1FKTsKCgljc19yZXBlYXQoY3NfcmVzID0gY3BnX21vZGVsX2luaXRpYWxpemUoJmNw +Z19oYW5kbGUsIENQR19NT0RFTF9WMSwKCSAgICAoY3BnX21vZGVsX2RhdGFfdCAqKSZtb2RlbF9k +YXRhLCBOVUxMKSk7Cglhc3NlcnQoY3NfcmVzID09IENTX09LKTsKCgljc19yZXBlYXQoY3NfcmVz +ID0gY3BnX2pvaW4oY3BnX2hhbmRsZSwgJmdyb3VwX25hbWUpKTsKCWFzc2VydChjc19yZXMgPT0g +Q1NfT0spOwoKCWNzX3JlcGVhdChjc19yZXMgPSBjcGdfbG9jYWxfZ2V0KGNwZ19oYW5kbGUsICZs +b2NhbF9ub2RlaWQpKTsKCWFzc2VydChjc19yZXMgPT0gQ1NfT0spOwoJYXNzZXJ0KGxvY2FsX25v +ZGVpZCA9PSBURVNUX05PREVJRCk7CgoJY3NfcmVwZWF0KGNzX3JlcyA9IGNwZ19mZF9nZXQoY3Bn +X2hhbmRsZSwgJmNwZ19mZCkpOwoJYXNzZXJ0KGNzX3JlcyA9PSBDU19PSyk7CgoJZG8gewoJCXBm +ZC5mZCA9IGNwZ19mZDsKCQlwZmQuZXZlbnRzID0gUE9MTElOOwoJCXBmZC5yZXZlbnRzID0gMDsK +CgkJcG9sbF9yZXMgPSBwb2xsKCZwZmQsIDEsIElORlRJTSk7CgkJaWYgKHBvbGxfcmVzID09IC0x +KSB7CgkJCXBlcnJvcigicG9sbF9yZXMgPT0gLTEiKTsKCQl9CgoJCWFzc2VydChwb2xsX3JlcyAh +PSAwKTsKCQlhc3NlcnQocGZkLnJldmVudHMgJiBQT0xMSU4pOwoKCQljc19yZXBlYXQoY3NfcmVz +ID0gY3BnX2Rpc3BhdGNoKGNwZ19oYW5kbGUsIENTX0RJU1BBVENIX0FMTCkpOwoJCWFzc2VydChj +c19yZXMgPT0gQ1NfT0spOwoJfSB3aGlsZSAodGVzdF9jcGdfbG9vcF9jb250KTsKCgljc19yZXBl +YXQoY3NfcmVzID0gY3BnX2xlYXZlKGNwZ19oYW5kbGUsICZncm91cF9uYW1lKSk7Cglhc3NlcnQo +Y3NfcmVzID09IENTX09LKTsKCgljc19yZXBlYXQoY3NfcmVzID0gY3BnX2ZpbmFsaXplKGNwZ19o +YW5kbGUpKTsKCWFzc2VydChjc19yZXMgPT0gQ1NfT0spOwoKCUxFQVZFKCk7Cn0KCmludAptYWlu +KHZvaWQpCnsKCWludCBpOwoJcGlkX3QgZm9ya19yZXM7CglwaWRfdCB3YWl0X3JlczsKCWludCBz +dGF0dXM7CgoJRU5URVIoKTsKCglzZXRsaW5lYnVmKHN0ZG91dCk7CgoJZm9yIChpID0gMDsgaSA8 +IE5PX0NISUxEUzsgaSsrKSB7CgkJbXlfaWQgPSBpOwoKCQlmb3JrX3JlcyA9IGZvcmsoKTsKCgkJ +aWYgKGZvcmtfcmVzID09IC0xKSB7CgkJCXBlcnJvcigiZm9yayIpOwoJCX0KCgkJaWYgKGZvcmtf +cmVzID09IDApIHsKCQkJLyoKCQkJICogQ2hpbGQKCQkJICovCgkJCWJyZWFrIDsKCQl9IGVsc2Ug +ewoJCQkvKgoJCQkgKiBQYXJlbnQKCQkJICovCgkJCW15X2lkID0gLTE7CgkJfQoJfQoKCWlmIChm +b3JrX3JlcyA9PSAwKSB7CgkJLyoKCQkgKiBDaGlsZCBydW5zIHRoZSB0ZXN0CgkJICovCgkJdGVz +dF9jcGcoKTsKCX0gZWxzZSB7CgkJLyoKCQkgKiBXYWl0IGZvciBjaGlsZHMKCQkgKi8KCQlmb3Ig +KGkgPSAwOyBpIDwgTk9fQ0hJTERTOyBpKyspIHsKCQkJd2FpdF9yZXMgPSB3YWl0KCZzdGF0dXMp +OwoJCQlpZiAod2FpdF9yZXMgPT0gLTEpIHsKCQkJCXBlcnJvcigid2FpdCIpOwoJCQl9CgoJCQlh +c3NlcnQoV0lGRVhJVEVEKHN0YXR1cykpOwoJCQlhc3NlcnQoV0VYSVRTVEFUVVMoc3RhdHVzKSA9 +PSAwKTsKCQl9Cgl9CgoJTEVBVkUoKTsKCglyZXR1cm4gKDApOwp9Cg==" | base64 -d | tee "/tmp/corosync-api-test-mp.c" +# - corosync-api-test-mp.c +################## +# Test functions # +################## +test_corosync_v() { + # Check corosync -v exits without error and + # result version contain numbers in path format [0-9]*.[0-9]*.[0-9] + ver_res=$(corosync -v) + [ "$ver_res" != "${ver_res/[0-9]*\.[0-9]*\.[0-9]/}" ] +} + +test_corosync_keygen() { + rm -f "$COROSYNC_AUTHKEY" + corosync-keygen + + # File exists + [ -f "$COROSYNC_AUTHKEY" ] + + # ... and is not empty (wc format is "SIZE FILENAME" - remove FILENAME part) + wc_res=$(wc -c "$COROSYNC_AUTHKEY") + [ "${wc_res%% *}" -gt 0 ] +} + +# test_corosync_start crypto +# crypto can be on or off +test_corosync_start() { + generate_corosync_conf "$1" > "$COROSYNC_CONF" + cat "$COROSYNC_CONF" + + service_start "corosync" +} + +test_corosync_stop() { + service_stop "corosync" +} + +test_corosync_quorumtool() { + quorumtool_res_file=`mktemp` + # This is already fixed in upstream db38e3958c4f88d5d06e8f7c83d6d90334d9fbd2 + (corosync-quorumtool -ips || true) | tee "$quorumtool_res_file" + + # Ensure this is single node cluster + grep -qi '^Nodes:.*1$' "$quorumtool_res_file" + # Current node id is 1 + grep -qi '^Node ID:.*1$' "$quorumtool_res_file" + # Is quorate (libquorum) + grep -qi '^Quorate:.*Yes$' "$quorumtool_res_file" + # Quorum is 1 + grep -qi '^Quorum:.*1' "$quorumtool_res_file" + # Is quorate (libvotequorum) + grep -qi '^Flags:.*Quorate' "$quorumtool_res_file" + + rm -f "$quorumtool_res_file" +} + +test_corosync_cmapctl() { + cmapctl_res_file=`mktemp` + corosync-cmapctl | tee "$cmapctl_res_file" + # cluster_name key exists in full output + grep -qi '^totem.cluster_name (str) = smoketestcluster$' "$cmapctl_res_file" + + corosync-cmapctl "totem." | tee "$cmapctl_res_file" + # cluster_name key exists in reduced output + grep -qi '^totem.cluster_name (str) = smoketestcluster$' "$cmapctl_res_file" + + # cluster_name key should be returned + corosync-cmapctl -g "totem.cluster_name" | tee "$cmapctl_res_file" + grep -qi '^totem.cluster_name (str) = smoketestcluster$' "$cmapctl_res_file" + + rm -f "$cmapctl_res_file" +} + +# test_corosync_reload - requires stopped corosync +test_corosync_reload() { + cmapctl_res_file=`mktemp` + + test_corosync_start "off" + + # Get current token timeout + corosync-cmapctl -g "runtime.config.totem.token" | tee "$cmapctl_res_file" + cmapctl_res=$(cat "$cmapctl_res_file") + # Format is runtime.config.totem.token (u32) = value + token_pre_reload=${cmapctl_res##* } + [ "$token_pre_reload" -eq "$TOKEN_TIMEOUT" ] + + # Generate new corosync.conf with token_timeout*10 + new_token_timeout=$((TOKEN_TIMEOUT*10)) + generate_corosync_conf "off" "$new_token_timeout" > "$COROSYNC_CONF" + cat "$COROSYNC_CONF" + + # Main call of the test + corosync-cfgtool -R + + # Check that new token timeout is in use + corosync-cmapctl -g "runtime.config.totem.token" | tee "$cmapctl_res_file" + cmapctl_res=$(cat "$cmapctl_res_file") + # Format is runtime.config.totem.token (u32) = value + token_post_reload=${cmapctl_res##* } + [ "$token_post_reload" -eq "$new_token_timeout" ] + + test_corosync_stop + + rm -f "$cmapctl_res_file" +} + +test_corosync_api() { + cflags=$(pkg-config --cflags libcpg) + libs=$(pkg-config --libs libcpg) + + gcc -ggdb -Wall $cflags "/tmp/corosync-api-test.c" \ + $libs -o "/tmp/corosync-api-test" + + /tmp/corosync-api-test +} + +test_corosync_api_mp() { + cflags=$(pkg-config --cflags libcpg) + libs=$(pkg-config --libs libcpg) + + gcc -ggdb -Wall $cflags "/tmp/corosync-api-test-mp.c" \ + $libs -o "/tmp/corosync-api-test-mp" + + /tmp/corosync-api-test-mp +} + +test_corosync_man_pages() { + # At least these man pages should be installed + expected_mp="corosync corosync.conf corosync-cfgtool corosync-cmapctl + corosync-keygen corosync-quorumtool" + + for mp in $expected_mp;do + man -w "$mp" + done +} + +######## +# main # +######## +if [ -z "$PREFIX" ];then + echo "PREFIX not defined. Do not run *.inc.sh directly" + exit 1 +fi + +test_corosync_v +test_corosync_keygen +test_corosync_man_pages + +for crypto in "off" "on";do + test_corosync_start "$crypto" + test_corosync_quorumtool + test_corosync_cmapctl + test_corosync_api + test_corosync_api_mp + test_corosync_stop +done + +test_corosync_reload diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..39b6209 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,12 @@ +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + tests: + - smoke + required_packages: + - gcc + - iproute + - corosync + - corosync-devel From 0baeb3b0de2bc10b36b50d953b35e43b3451d18e Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Thu, 19 Mar 2020 14:51:48 +0100 Subject: [PATCH 33/74] Enable gating Signed-off-by: Jan Friesse --- gating.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 gating.yaml diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..f075ad7 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,15 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_testing +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} From 299a3b42dc4b145a4dfae27be9b8b5016b7260f0 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Fri, 27 Mar 2020 08:59:36 +0100 Subject: [PATCH 34/74] Test build with CI gating enabled Signed-off-by: Jan Friesse --- corosync.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index 3884b41..f8e67b1 100644 --- a/corosync.spec +++ b/corosync.spec @@ -18,7 +18,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.0.3 -Release: 2%{?gitver}%{?dist} +Release: 3%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -285,6 +285,10 @@ network splits) %endif %changelog +* Fri Mar 27 2020 Jan Friesse - 3.0.3-3 +- Add CI tests +- Enable gating + * Tue Jan 28 2020 Fedora Release Engineering - 3.0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From bcd074e27ec97de9cfc7f4f2c1db39cbd04739ae Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Fri, 27 Mar 2020 11:59:24 +0100 Subject: [PATCH 35/74] Add rpmlint error whitelist Signed-off-by: Jan Friesse --- corosync.rpmlintrc | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 corosync.rpmlintrc diff --git a/corosync.rpmlintrc b/corosync.rpmlintrc new file mode 100644 index 0000000..39e1f00 --- /dev/null +++ b/corosync.rpmlintrc @@ -0,0 +1,29 @@ +# Empty %postun +addFilter(r'W: empty-%postun') + +# Spelling error init +addFilter(r'W: spelling-error %description -l en_US init') + +# Spelling error corosync +addFilter(r'W: spelling-error .* (C|c)orosync') + +# Spelling error votequorum and subprocesses +addFilter(r'corosync-vqsim\.[^:]+: W: spelling-error .* votequorum') +addFilter(r'corosync-vqsim\.[^:]+: W: spelling-error .* subprocesses') + +# Repeated Corosync +addFilter(r'W: name-repeated-in-summary C Corosync') + +# Explicit lib dependency - knet nss has been requested by QA, +# libxslt may be replaced with xsltproc binary +addFilter(r'corosync\.[^:]+: (E|W): explicit-lib-dependency libknet1-crypto-nss-plugin') +addFilter(r'corosync\.[^:]+: (E|W): explicit-lib-dependency libxslt') + +# Dbus is not config file +addFilter(r'corosync\.[^:]+: (E|W): non-conffile-in-etc /etc/dbus-1/system\.d/corosync-signals\.conf') + +# Logrotate is not requirement +addFilter(r'corosync\.[^:]+: (E|W): missing-dependency-to-logrotate') + +# libcorosync_common.so has no libc call +addFilter(r'corosynclib\.[^:]+: (E|W): library-not-linked-against-libc /usr/lib(64)?/libcorosync_common\.so') From 275d61fa9577f734064a9557160355b8150322e6 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Thu, 23 Apr 2020 12:51:33 +0200 Subject: [PATCH 36/74] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9c73c8f..5e07c7c 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ corosync-1.2.7.tar.gz /corosync-3.0.1.tar.gz /corosync-3.0.2.tar.gz /corosync-3.0.3.tar.gz +/corosync-3.0.4.tar.gz diff --git a/corosync.spec b/corosync.spec index f8e67b1..4ffeeff 100644 --- a/corosync.spec +++ b/corosync.spec @@ -17,8 +17,8 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 3.0.3 -Release: 3%{?gitver}%{?dist} +Version: 3.0.4 +Release: 1%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -207,7 +207,7 @@ fi %{_mandir}/man8/corosync-quorumtool.8* %{_mandir}/man5/corosync.conf.5* %{_mandir}/man5/votequorum.5* -%{_mandir}/man8/cmap_keys.8* +%{_mandir}/man7/cmap_keys.7* # library # @@ -285,6 +285,9 @@ network splits) %endif %changelog +* Thu Apr 23 2020 Jan Friesse - 3.0.4-1 +- New upstream release + * Fri Mar 27 2020 Jan Friesse - 3.0.3-3 - Add CI tests - Enable gating diff --git a/sources b/sources index 0cf7000..4427f75 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-3.0.3.tar.gz) = 6ffabb3261bcff18611a029f0c2682367f301caac6f5ddb2cfb2c1bbc69c67f1d1e7b9475eee8f40bcdca8fbc73cb8ec3854f74002dda9c3b70a27c8d3d16ec5 +SHA512 (corosync-3.0.4.tar.gz) = 0d3a19d8811f15d7e4ca6b0805bbd007726751626633279ddb40db37069aa789261b203b2e74474f6ceda366f30391e7effe2efa1e471fbd7dce17a04077e534 From e1a29e0daf6f0361a78e10bcf783fbb92ddaf581 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Wed, 13 May 2020 10:24:44 +0200 Subject: [PATCH 37/74] Rebuild for new libqb Signed-off-by: Jan Friesse --- corosync.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index 4ffeeff..ec8f9a1 100644 --- a/corosync.spec +++ b/corosync.spec @@ -18,7 +18,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.0.4 -Release: 1%{?gitver}%{?dist} +Release: 2%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -285,6 +285,9 @@ network splits) %endif %changelog +* Wed May 13 2020 Jan Friesse - 3.0.4-2 +5- Rebuild for new libqb + * Thu Apr 23 2020 Jan Friesse - 3.0.4-1 - New upstream release From 937f18d7a2db2e34fd0eb40b744a2855a937b204 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Wed, 13 May 2020 10:38:46 +0200 Subject: [PATCH 38/74] Fix changelog typo Signed-off-by: Jan Friesse --- corosync.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index ec8f9a1..f3c19f5 100644 --- a/corosync.spec +++ b/corosync.spec @@ -286,7 +286,7 @@ network splits) %changelog * Wed May 13 2020 Jan Friesse - 3.0.4-2 -5- Rebuild for new libqb +- Rebuild for new libqb * Thu Apr 23 2020 Jan Friesse - 3.0.4-1 - New upstream release From fa278792f79555d8eade73a141262a87843edf55 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Wed, 13 May 2020 10:49:03 +0200 Subject: [PATCH 39/74] Really fix typo in the changelog Signed-off-by: Jan Friesse --- corosync.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index f3c19f5..ab308d2 100644 --- a/corosync.spec +++ b/corosync.spec @@ -18,7 +18,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.0.4 -Release: 2%{?gitver}%{?dist} +Release: 3%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -285,6 +285,9 @@ network splits) %endif %changelog +* Wed May 13 2020 Jan Friesse - 3.0.4-3 +- Fix typo in the changelog + * Wed May 13 2020 Jan Friesse - 3.0.4-2 - Rebuild for new libqb From 3e139736ed6e29a1a9c7388359fcbd93bdc0d85d Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mon, 13 Jul 2020 18:53:52 +0000 Subject: [PATCH 40/74] Use make macros https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- corosync.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/corosync.spec b/corosync.spec index ab308d2..2a2ac7c 100644 --- a/corosync.spec +++ b/corosync.spec @@ -18,7 +18,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.0.4 -Release: 3%{?gitver}%{?dist} +Release: 4%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -106,10 +106,10 @@ BuildRequires: readline-devel --with-systemddir=%{_unitdir} \ --docdir=%{_docdir} -make %{_smp_mflags} +%make_build %install -make install DESTDIR=%{buildroot} +%make_install %if %{with dbus} mkdir -p -m 0700 %{buildroot}/%{_sysconfdir}/dbus-1/system.d @@ -285,6 +285,10 @@ network splits) %endif %changelog +* Mon Jul 13 2020 Tom Stellard - 3.0.4-4 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Wed May 13 2020 Jan Friesse - 3.0.4-3 - Fix typo in the changelog From a5acc2f9165d8bc4bbc5a0864de4f0ce9b16e800 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 14:35:52 +0000 Subject: [PATCH 41/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- corosync.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index 2a2ac7c..7d15ede 100644 --- a/corosync.spec +++ b/corosync.spec @@ -18,7 +18,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.0.4 -Release: 4%{?gitver}%{?dist} +Release: 5%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -285,6 +285,9 @@ network splits) %endif %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 3.0.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 13 2020 Tom Stellard - 3.0.4-4 - Use make macros - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro From f5d04d3ef888057942681da291d516392bfd597b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=98=C3=ADdk=C3=BD?= Date: Thu, 27 Aug 2020 14:13:47 +0200 Subject: [PATCH 42/74] Rebuilt for new net-snmp release --- corosync.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index 7d15ede..62223ad 100644 --- a/corosync.spec +++ b/corosync.spec @@ -18,7 +18,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.0.4 -Release: 5%{?gitver}%{?dist} +Release: 6%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -285,6 +285,9 @@ network splits) %endif %changelog +* Thu Aug 27 2020 Josef Řídký - 3.0.4-6 +- Rebuilt for new net-snmp release + * Mon Jul 27 2020 Fedora Release Engineering - 3.0.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 0b059adcd75f2badb4cadba99662f6247cc8636e Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Tue, 20 Oct 2020 17:18:14 +0200 Subject: [PATCH 43/74] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5e07c7c..1afb5d3 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ corosync-1.2.7.tar.gz /corosync-3.0.2.tar.gz /corosync-3.0.3.tar.gz /corosync-3.0.4.tar.gz +/corosync-3.1.0.tar.gz diff --git a/corosync.spec b/corosync.spec index 62223ad..fa58235 100644 --- a/corosync.spec +++ b/corosync.spec @@ -17,8 +17,8 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 3.0.4 -Release: 6%{?gitver}%{?dist} +Version: 3.1.0 +Release: 1%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -27,14 +27,16 @@ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?git # The automatic dependency overridden in favor of explicit version lock Requires: corosynclib%{?_isa} = %{version}-%{release} +# Support crypto reload +Requires: libknet1 >= 1.18 # NSS crypto plugin should be always installed -Requires: libknet1-crypto-nss-plugin +Requires: libknet1-crypto-nss-plugin >= 1.18 # Build bits BuildRequires: gcc BuildRequires: groff BuildRequires: libqb-devel -BuildRequires: libknet1-devel +BuildRequires: libknet1-devel >= 1.18 BuildRequires: zlib-devel %if %{with runautogen} BuildRequires: autoconf automake libtool @@ -285,6 +287,9 @@ network splits) %endif %changelog +* Tue Oct 20 2020 Jan Friesse - 3.1.0-1 +- New upstream release + * Thu Aug 27 2020 Josef Řídký - 3.0.4-6 - Rebuilt for new net-snmp release diff --git a/sources b/sources index 4427f75..b9407c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-3.0.4.tar.gz) = 0d3a19d8811f15d7e4ca6b0805bbd007726751626633279ddb40db37069aa789261b203b2e74474f6ceda366f30391e7effe2efa1e471fbd7dce17a04077e534 +SHA512 (corosync-3.1.0.tar.gz) = 1982549ea3031c7bc30cdf9d7d0a353717d35ad96c46a01a8af6e12072630d4d2b26657fd4987ff7f56b0cc0038edb1c6cc41f7a12a7249e714353de52118ba0 From aa04197369e74d7a27657dae591fdb2d1ecd2fdf Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Mon, 2 Nov 2020 17:47:37 +0100 Subject: [PATCH 44/74] Add isa version of corosync-devel provides Also add release to version to match autogenerated corosynclib-devel provides. Signed-off-by: Jan Friesse --- corosync.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/corosync.spec b/corosync.spec index fa58235..d6dd720 100644 --- a/corosync.spec +++ b/corosync.spec @@ -18,7 +18,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.1.0 -Release: 1%{?gitver}%{?dist} +Release: 2%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -235,7 +235,8 @@ This package contains corosync libraries. Summary: The Corosync Cluster Engine Development Kit Requires: corosynclib%{?_isa} = %{version}-%{release} Requires: pkgconfig -Provides: corosync-devel = %{version} +Provides: corosync-devel = %{version}-%{release} +Provides: corosync-devel%{?_isa} = %{version}-%{release} %description -n corosynclib-devel This package contains include files and man pages used to develop using @@ -287,6 +288,11 @@ network splits) %endif %changelog +* Mon Nov 02 2020 Jan Friesse - 3.1.0-2 +- Add isa version of corosync-devel +- Add release to corosync-devel version to match autogenerated + corosynclib-devel provides + * Tue Oct 20 2020 Jan Friesse - 3.1.0-1 - New upstream release From 6cabdfe2009dc5c6a5203615b57ac059358f82d6 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 19 Dec 2020 05:28:56 +0000 Subject: [PATCH 45/74] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- corosync.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/corosync.spec b/corosync.spec index d6dd720..8cc8a66 100644 --- a/corosync.spec +++ b/corosync.spec @@ -67,6 +67,7 @@ Requires: libxslt %if %{with vqsim} BuildRequires: readline-devel %endif +BuildRequires: make %prep %setup -q -n %{name}-%{version}%{?gittarver} From 57744512c8df377a3eb1452925975fe74f8cbdf7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 02:34:27 +0000 Subject: [PATCH 46/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- corosync.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index 8cc8a66..677e869 100644 --- a/corosync.spec +++ b/corosync.spec @@ -18,7 +18,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.1.0 -Release: 2%{?gitver}%{?dist} +Release: 3%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -289,6 +289,9 @@ network splits) %endif %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 3.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Nov 02 2020 Jan Friesse - 3.1.0-2 - Add isa version of corosync-devel - Add release to corosync-devel version to match autogenerated From f9116a5084bdb829877f8858ea06a981d0baafc7 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Wed, 31 Mar 2021 15:19:39 +0200 Subject: [PATCH 47/74] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1afb5d3..508417d 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ corosync-1.2.7.tar.gz /corosync-3.0.3.tar.gz /corosync-3.0.4.tar.gz /corosync-3.1.0.tar.gz +/corosync-3.1.1.tar.gz diff --git a/corosync.spec b/corosync.spec index 677e869..d15772d 100644 --- a/corosync.spec +++ b/corosync.spec @@ -17,8 +17,8 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 3.1.0 -Release: 3%{?gitver}%{?dist} +Version: 3.1.1 +Release: 1%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -289,6 +289,9 @@ network splits) %endif %changelog +* Wed Mar 31 2021 Jan Friesse - 3.1.1-1 +- New upstream release + * Tue Jan 26 2021 Fedora Release Engineering - 3.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index b9407c6..97c32ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-3.1.0.tar.gz) = 1982549ea3031c7bc30cdf9d7d0a353717d35ad96c46a01a8af6e12072630d4d2b26657fd4987ff7f56b0cc0038edb1c6cc41f7a12a7249e714353de52118ba0 +SHA512 (corosync-3.1.1.tar.gz) = a2a2ca9110e8c2955f4be131ac6411d66f1cfbc7b3b2bcf2862501367c22d615e3e35ea269b537778cd55e18c94d0e1504e8a3b6eb1bad67054c2fd6dbbb554c From 6e3877b72df162383e1f4e2207f7a735d4efeb22 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Tue, 6 Apr 2021 12:25:25 +0200 Subject: [PATCH 48/74] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 508417d..61ed832 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ corosync-1.2.7.tar.gz /corosync-3.0.4.tar.gz /corosync-3.1.0.tar.gz /corosync-3.1.1.tar.gz +/corosync-3.1.2.tar.gz diff --git a/corosync.spec b/corosync.spec index d15772d..88edbe5 100644 --- a/corosync.spec +++ b/corosync.spec @@ -17,7 +17,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 3.1.1 +Version: 3.1.2 Release: 1%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ @@ -289,6 +289,9 @@ network splits) %endif %changelog +* Tue Apr 06 2021 Jan Friesse - 3.1.2-1 +- New upstream release + * Wed Mar 31 2021 Jan Friesse - 3.1.1-1 - New upstream release diff --git a/sources b/sources index 97c32ec..ff6fd8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-3.1.1.tar.gz) = a2a2ca9110e8c2955f4be131ac6411d66f1cfbc7b3b2bcf2862501367c22d615e3e35ea269b537778cd55e18c94d0e1504e8a3b6eb1bad67054c2fd6dbbb554c +SHA512 (corosync-3.1.2.tar.gz) = 8ac35c3d8d3a869dfabc4383ae7b5bc31d4cfe344082451594b571a06c0412536b04301e32e30fda09c0d0aa975124cbb7018686d93b4a94e46041990b179098 From c8d63add1e9d4de3740702995da555a459090412 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Fri, 21 May 2021 09:23:39 +0200 Subject: [PATCH 49/74] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 61ed832..e47254d 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ corosync-1.2.7.tar.gz /corosync-3.1.0.tar.gz /corosync-3.1.1.tar.gz /corosync-3.1.2.tar.gz +/corosync-3.1.3.tar.gz diff --git a/corosync.spec b/corosync.spec index 88edbe5..8d6bae4 100644 --- a/corosync.spec +++ b/corosync.spec @@ -17,7 +17,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 3.1.2 +Version: 3.1.3 Release: 1%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ @@ -289,6 +289,9 @@ network splits) %endif %changelog +* Fri May 21 2021 Jan Friesse - 3.1.3-1 +- New upstream release + * Tue Apr 06 2021 Jan Friesse - 3.1.2-1 - New upstream release diff --git a/sources b/sources index ff6fd8a..31321cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-3.1.2.tar.gz) = 8ac35c3d8d3a869dfabc4383ae7b5bc31d4cfe344082451594b571a06c0412536b04301e32e30fda09c0d0aa975124cbb7018686d93b4a94e46041990b179098 +SHA512 (corosync-3.1.3.tar.gz) = 5985b6a6163cfbc2ccdad9bfb3fa1c5f56c6d1f866a783a2ddc6a04f036850e119d0a31aea9c5e73cb289c4cfb7d05a81c90389d97bd0c62f39fbcfbfdc1d9b5 From e4b2ca892c20c8e0b209685adb4e8641e1098cf2 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Thu, 3 Jun 2021 14:39:32 +0200 Subject: [PATCH 50/74] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e47254d..e882047 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ corosync-1.2.7.tar.gz /corosync-3.1.1.tar.gz /corosync-3.1.2.tar.gz /corosync-3.1.3.tar.gz +/corosync-3.1.4.tar.gz diff --git a/corosync.spec b/corosync.spec index 8d6bae4..9eab928 100644 --- a/corosync.spec +++ b/corosync.spec @@ -17,7 +17,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 3.1.3 +Version: 3.1.4 Release: 1%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ @@ -289,6 +289,9 @@ network splits) %endif %changelog +* Thu Jun 03 2021 Jan Friesse - 3.1.4-1 +- New upstream release + * Fri May 21 2021 Jan Friesse - 3.1.3-1 - New upstream release diff --git a/sources b/sources index 31321cc..232fe18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-3.1.3.tar.gz) = 5985b6a6163cfbc2ccdad9bfb3fa1c5f56c6d1f866a783a2ddc6a04f036850e119d0a31aea9c5e73cb289c4cfb7d05a81c90389d97bd0c62f39fbcfbfdc1d9b5 +SHA512 (corosync-3.1.4.tar.gz) = 3e8ed70653d2559449765dac91f3ad87b8a474b81529895a7b33dee044946e05b08dbf9f36da5be60d93527976ac0e390beb3ce2f77d088613fdb45e940558ec From 9fc14848551deeb30b8ce44d32c961c3c02d54fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 15:05:29 +0000 Subject: [PATCH 51/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From bca70d1078cbd6a479737dad05912bba121f69b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 20:02:30 +0000 Subject: [PATCH 52/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- corosync.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index 9eab928..105bdeb 100644 --- a/corosync.spec +++ b/corosync.spec @@ -18,7 +18,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.1.4 -Release: 1%{?gitver}%{?dist} +Release: 2%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -289,6 +289,9 @@ network splits) %endif %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 3.1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jun 03 2021 Jan Friesse - 3.1.4-1 - New upstream release From 15caf43c068f7a4b53b74de2937b32c1ac6973c0 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Wed, 4 Aug 2021 11:12:27 +0200 Subject: [PATCH 53/74] New upstream release --- .gitignore | 1 + corosync.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e882047..8e9ea1a 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ corosync-1.2.7.tar.gz /corosync-3.1.2.tar.gz /corosync-3.1.3.tar.gz /corosync-3.1.4.tar.gz +/corosync-3.1.5.tar.gz diff --git a/corosync.spec b/corosync.spec index 105bdeb..2f9e429 100644 --- a/corosync.spec +++ b/corosync.spec @@ -17,8 +17,8 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 3.1.4 -Release: 2%{?gitver}%{?dist} +Version: 3.1.5 +Release: 1%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -289,6 +289,9 @@ network splits) %endif %changelog +* Wed Aug 04 2021 Jan Friesse - 3.1.5-1 +- New upstream release + * Wed Jul 21 2021 Fedora Release Engineering - 3.1.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 232fe18..2a816ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-3.1.4.tar.gz) = 3e8ed70653d2559449765dac91f3ad87b8a474b81529895a7b33dee044946e05b08dbf9f36da5be60d93527976ac0e390beb3ce2f77d088613fdb45e940558ec +SHA512 (corosync-3.1.5.tar.gz) = eb974a32f60c52564057ed41c1ebf31fe4332a5a082ebbd5fa2540af8fa9e8c0c42d4ef9066abcb9d7dd04c12b97cd13642289c65b5b6b65cfd30c12641ada1d From 16d3278606285c5cb3f3c546a9804eff8fde350f Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Mon, 15 Nov 2021 11:17:44 +0100 Subject: [PATCH 54/74] New upstream release --- .gitignore | 1 + corosync.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8e9ea1a..15b906f 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ corosync-1.2.7.tar.gz /corosync-3.1.3.tar.gz /corosync-3.1.4.tar.gz /corosync-3.1.5.tar.gz +/corosync-3.1.6.tar.gz diff --git a/corosync.spec b/corosync.spec index 2f9e429..98497d1 100644 --- a/corosync.spec +++ b/corosync.spec @@ -17,7 +17,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 3.1.5 +Version: 3.1.6 Release: 1%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ @@ -289,6 +289,9 @@ network splits) %endif %changelog +* Mon Nov 15 2021 Jan Friesse - 3.1.6-1 +- New upstream release + * Wed Aug 04 2021 Jan Friesse - 3.1.5-1 - New upstream release diff --git a/sources b/sources index 2a816ad..4a1cc64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-3.1.5.tar.gz) = eb974a32f60c52564057ed41c1ebf31fe4332a5a082ebbd5fa2540af8fa9e8c0c42d4ef9066abcb9d7dd04c12b97cd13642289c65b5b6b65cfd30c12641ada1d +SHA512 (corosync-3.1.6.tar.gz) = 8f5d12851f296e0ee9dd425d40252988f0b8485d2c2098028b25265506f846e3f34df86007a7c273d020921b2532bdbc01b52e1631f6abfae79981436230225e From e2d21ef16620443ed7858b6ab2431582438bbef9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 23:51:25 +0000 Subject: [PATCH 55/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- corosync.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index 98497d1..d08a460 100644 --- a/corosync.spec +++ b/corosync.spec @@ -18,7 +18,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.1.6 -Release: 1%{?gitver}%{?dist} +Release: 2%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -289,6 +289,9 @@ network splits) %endif %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 3.1.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Nov 15 2021 Jan Friesse - 3.1.6-1 - New upstream release From 6d8d5bd0e799d8a1f50604a4afea7e1d6458087d Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Wed, 30 Mar 2022 16:54:41 +0200 Subject: [PATCH 56/74] Use copytruncate method for logrotate --- corosync.spec | 8 ++- ...e-Use-copytruncate-method-by-default.patch | 60 +++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 logrotate-Use-copytruncate-method-by-default.patch diff --git a/corosync.spec b/corosync.spec index d08a460..6a7ad52 100644 --- a/corosync.spec +++ b/corosync.spec @@ -18,11 +18,13 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.1.6 -Release: 2%{?gitver}%{?dist} +Release: 3%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz +Patch0: logrotate-Use-copytruncate-method-by-default.patch + # Runtime bits # The automatic dependency overridden in favor of explicit version lock Requires: corosynclib%{?_isa} = %{version}-%{release} @@ -71,6 +73,7 @@ BuildRequires: make %prep %setup -q -n %{name}-%{version}%{?gittarver} +%patch0 -p1 %build %if %{with runautogen} @@ -289,6 +292,9 @@ network splits) %endif %changelog +* Wed Mar 30 2022 Jan Friesse - 3.1.6-3 +- Use copytruncate method for logrotate + * Wed Jan 19 2022 Fedora Release Engineering - 3.1.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/logrotate-Use-copytruncate-method-by-default.patch b/logrotate-Use-copytruncate-method-by-default.patch new file mode 100644 index 0000000..11d2cf3 --- /dev/null +++ b/logrotate-Use-copytruncate-method-by-default.patch @@ -0,0 +1,60 @@ +From 04362046c4a9d7307feb5b68341d567b7d0b94d6 Mon Sep 17 00:00:00 2001 +From: Jan Friesse +Date: Tue, 29 Mar 2022 17:09:22 +0200 +Subject: [PATCH] logrotate: Use copytruncate method by default + +The reopen lograte method has two main problems: +1. It does fail when corosync is not running (solvable by + adding "|| true") +2. If (for some reason, like SELinux) cfgtool -L fails, logrotate + fails and corosync keeps logging into old file. Added "|| true" + makes situation even worse because logrotate removes file but + corosync keeps logging into it. + +Solution is to install copytruncate logrotate snip by default (and +keep reopen config file only for reference). + +Signed-off-by: Jan Friesse +Reviewed-by: Christine Caulfield +--- + conf/logrotate/Makefile.am | 7 ------- + conf/logrotate/corosync-reopen.in | 5 +++++ + 2 files changed, 5 insertions(+), 7 deletions(-) + +diff --git a/conf/logrotate/Makefile.am b/conf/logrotate/Makefile.am +index 4f7b7536..35efa2de 100644 +--- a/conf/logrotate/Makefile.am ++++ b/conf/logrotate/Makefile.am +@@ -34,16 +34,9 @@ MAINTAINERCLEANFILES = Makefile.in + + EXTRA_DIST = corosync-reopen.in corosync-copytruncate.in + +-if HAVE_QB_LOG_FILE_REOPEN +-corosync: corosync-reopen.in +- $(SED) -e 's#@''LOGDIR@#${LOGDIR}#g' \ +- -e 's#@''SBINDIR@#$(sbindir)#g' \ +- $< > $@ +-else + corosync: corosync-copytruncate.in + $(SED) -e 's#@''LOGDIR@#${LOGDIR}#g' \ + $< > $@ +-endif + + logrotatecorosyncdir = ${LOGROTATEDIR} + logrotatecorosync_DATA = corosync +diff --git a/conf/logrotate/corosync-reopen.in b/conf/logrotate/corosync-reopen.in +index 839c5dae..730fb741 100644 +--- a/conf/logrotate/corosync-reopen.in ++++ b/conf/logrotate/corosync-reopen.in +@@ -1,3 +1,8 @@ ++# This logrotate method has two main problems and it's kept only for reference: ++# 1. It does fail when corosync is not running (solvable by adding "|| true") ++# 2. If (for some reason) cfgtool -L fails, logrotate fails and corosync keeps ++# logging into old file. Added "|| true" makes situation even worse ++# because logrotate removes file but corosync keeps logging into it. + @LOGDIR@/corosync.log { + missingok + compress +-- +2.33.1 + From 35376a7b8ddd64e67900c4649ea8216d7ad2a995 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 23:36:04 +0000 Subject: [PATCH 57/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- corosync.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index 6a7ad52..9516414 100644 --- a/corosync.spec +++ b/corosync.spec @@ -18,7 +18,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.1.6 -Release: 3%{?gitver}%{?dist} +Release: 4%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -292,6 +292,9 @@ network splits) %endif %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 3.1.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Mar 30 2022 Jan Friesse - 3.1.6-3 - Use copytruncate method for logrotate From 8fc25245a8ba4ab89b58d42a13ef03db13061f38 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Tue, 15 Nov 2022 18:31:51 +0100 Subject: [PATCH 58/74] New upstream release --- .gitignore | 1 + corosync.spec | 10 ++-- ...e-Use-copytruncate-method-by-default.patch | 60 ------------------- sources | 2 +- 4 files changed, 7 insertions(+), 66 deletions(-) delete mode 100644 logrotate-Use-copytruncate-method-by-default.patch diff --git a/.gitignore b/.gitignore index 15b906f..58e7955 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ corosync-1.2.7.tar.gz /corosync-3.1.4.tar.gz /corosync-3.1.5.tar.gz /corosync-3.1.6.tar.gz +/corosync-3.1.7.tar.gz diff --git a/corosync.spec b/corosync.spec index 9516414..f7e783e 100644 --- a/corosync.spec +++ b/corosync.spec @@ -17,14 +17,12 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 3.1.6 -Release: 4%{?gitver}%{?dist} +Version: 3.1.7 +Release: 1%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz -Patch0: logrotate-Use-copytruncate-method-by-default.patch - # Runtime bits # The automatic dependency overridden in favor of explicit version lock Requires: corosynclib%{?_isa} = %{version}-%{release} @@ -73,7 +71,6 @@ BuildRequires: make %prep %setup -q -n %{name}-%{version}%{?gittarver} -%patch0 -p1 %build %if %{with runautogen} @@ -292,6 +289,9 @@ network splits) %endif %changelog +* Tue Nov 15 2022 Jan Friesse - 3.1.7-1 +- New upstream release + * Wed Jul 20 2022 Fedora Release Engineering - 3.1.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/logrotate-Use-copytruncate-method-by-default.patch b/logrotate-Use-copytruncate-method-by-default.patch deleted file mode 100644 index 11d2cf3..0000000 --- a/logrotate-Use-copytruncate-method-by-default.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 04362046c4a9d7307feb5b68341d567b7d0b94d6 Mon Sep 17 00:00:00 2001 -From: Jan Friesse -Date: Tue, 29 Mar 2022 17:09:22 +0200 -Subject: [PATCH] logrotate: Use copytruncate method by default - -The reopen lograte method has two main problems: -1. It does fail when corosync is not running (solvable by - adding "|| true") -2. If (for some reason, like SELinux) cfgtool -L fails, logrotate - fails and corosync keeps logging into old file. Added "|| true" - makes situation even worse because logrotate removes file but - corosync keeps logging into it. - -Solution is to install copytruncate logrotate snip by default (and -keep reopen config file only for reference). - -Signed-off-by: Jan Friesse -Reviewed-by: Christine Caulfield ---- - conf/logrotate/Makefile.am | 7 ------- - conf/logrotate/corosync-reopen.in | 5 +++++ - 2 files changed, 5 insertions(+), 7 deletions(-) - -diff --git a/conf/logrotate/Makefile.am b/conf/logrotate/Makefile.am -index 4f7b7536..35efa2de 100644 ---- a/conf/logrotate/Makefile.am -+++ b/conf/logrotate/Makefile.am -@@ -34,16 +34,9 @@ MAINTAINERCLEANFILES = Makefile.in - - EXTRA_DIST = corosync-reopen.in corosync-copytruncate.in - --if HAVE_QB_LOG_FILE_REOPEN --corosync: corosync-reopen.in -- $(SED) -e 's#@''LOGDIR@#${LOGDIR}#g' \ -- -e 's#@''SBINDIR@#$(sbindir)#g' \ -- $< > $@ --else - corosync: corosync-copytruncate.in - $(SED) -e 's#@''LOGDIR@#${LOGDIR}#g' \ - $< > $@ --endif - - logrotatecorosyncdir = ${LOGROTATEDIR} - logrotatecorosync_DATA = corosync -diff --git a/conf/logrotate/corosync-reopen.in b/conf/logrotate/corosync-reopen.in -index 839c5dae..730fb741 100644 ---- a/conf/logrotate/corosync-reopen.in -+++ b/conf/logrotate/corosync-reopen.in -@@ -1,3 +1,8 @@ -+# This logrotate method has two main problems and it's kept only for reference: -+# 1. It does fail when corosync is not running (solvable by adding "|| true") -+# 2. If (for some reason) cfgtool -L fails, logrotate fails and corosync keeps -+# logging into old file. Added "|| true" makes situation even worse -+# because logrotate removes file but corosync keeps logging into it. - @LOGDIR@/corosync.log { - missingok - compress --- -2.33.1 - diff --git a/sources b/sources index 4a1cc64..5abef83 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-3.1.6.tar.gz) = 8f5d12851f296e0ee9dd425d40252988f0b8485d2c2098028b25265506f846e3f34df86007a7c273d020921b2532bdbc01b52e1631f6abfae79981436230225e +SHA512 (corosync-3.1.7.tar.gz) = a4d00f18a6dda07f36e77fc48f5bddff77e12a3e6ee40d9450734e281d20479b90cd0c653e255cfc46e0e42e4a0177291a3daba671e751d027e4317e601f0cd2 From 1d119ea67b3232d1a35824f97b8f3d4c4415c80d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 00:31:29 +0000 Subject: [PATCH 59/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- corosync.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index f7e783e..43b0a20 100644 --- a/corosync.spec +++ b/corosync.spec @@ -18,7 +18,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.1.7 -Release: 1%{?gitver}%{?dist} +Release: 2%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -289,6 +289,9 @@ network splits) %endif %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 3.1.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Nov 15 2022 Jan Friesse - 3.1.7-1 - New upstream release From 5f9286ab9f329e1b4b5da763d04a061ff7098e4b Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Tue, 6 Jun 2023 11:39:03 +0200 Subject: [PATCH 60/74] Migrated to SPDX license Signed-off-by: Jan Friesse --- corosync.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/corosync.spec b/corosync.spec index 43b0a20..2855445 100644 --- a/corosync.spec +++ b/corosync.spec @@ -18,8 +18,8 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.1.7 -Release: 2%{?gitver}%{?dist} -License: BSD +Release: 3%{?gitver}%{?dist} +License: BSD-3-Clause URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -289,6 +289,9 @@ network splits) %endif %changelog +* Tue Jun 06 2023 Jan Friesse - 3.1.7-3 +- migrated to SPDX license + * Thu Jan 19 2023 Fedora Release Engineering - 3.1.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From e0bfdb2bb991ac15880517db945e0b2ea2adf1f8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 16:24:33 +0000 Subject: [PATCH 61/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- corosync.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index 2855445..e48b3b8 100644 --- a/corosync.spec +++ b/corosync.spec @@ -18,7 +18,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.1.7 -Release: 3%{?gitver}%{?dist} +Release: 4%{?gitver}%{?dist} License: BSD-3-Clause URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -289,6 +289,9 @@ network splits) %endif %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 3.1.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jun 06 2023 Jan Friesse - 3.1.7-3 - migrated to SPDX license From a39be7a0603803f428c67af9f39bb93fd83ebe65 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Wed, 15 Nov 2023 18:07:22 +0100 Subject: [PATCH 62/74] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 58e7955..63f502d 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ corosync-1.2.7.tar.gz /corosync-3.1.5.tar.gz /corosync-3.1.6.tar.gz /corosync-3.1.7.tar.gz +/corosync-3.1.8.tar.gz diff --git a/corosync.spec b/corosync.spec index e48b3b8..614a28d 100644 --- a/corosync.spec +++ b/corosync.spec @@ -17,8 +17,8 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 3.1.7 -Release: 4%{?gitver}%{?dist} +Version: 3.1.8 +Release: 1%{?gitver}%{?dist} License: BSD-3-Clause URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -289,6 +289,9 @@ network splits) %endif %changelog +* Wed Nov 15 2023 Jan Friesse - 3.1.8-1 +- New upstream release + * Wed Jul 19 2023 Fedora Release Engineering - 3.1.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 5abef83..fd916ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-3.1.7.tar.gz) = a4d00f18a6dda07f36e77fc48f5bddff77e12a3e6ee40d9450734e281d20479b90cd0c653e255cfc46e0e42e4a0177291a3daba671e751d027e4317e601f0cd2 +SHA512 (corosync-3.1.8.tar.gz) = 6325ae39bada33dbc0c85eb07d137af78235a1c0f8a4d1f90a20088e011bff65263903e5688956256ddfb58daec45f6d96c04624ff320be0c00ec36aa5d568f8 From b333a9fbaeb5ce3a0cb71f5aba39ae05961d7181 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 16:12:20 +0000 Subject: [PATCH 63/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- corosync.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index 614a28d..d622fec 100644 --- a/corosync.spec +++ b/corosync.spec @@ -18,7 +18,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.1.8 -Release: 1%{?gitver}%{?dist} +Release: 2%{?gitver}%{?dist} License: BSD-3-Clause URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -289,6 +289,9 @@ network splits) %endif %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 3.1.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Nov 15 2023 Jan Friesse - 3.1.8-1 - New upstream release From 88be69d4432a370699f692b6d2e751c870d55ce5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 08:07:39 +0000 Subject: [PATCH 64/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- corosync.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index d622fec..1494717 100644 --- a/corosync.spec +++ b/corosync.spec @@ -18,7 +18,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.1.8 -Release: 2%{?gitver}%{?dist} +Release: 3%{?gitver}%{?dist} License: BSD-3-Clause URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -289,6 +289,9 @@ network splits) %endif %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 3.1.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 3.1.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2bba86553f6f25d79ca8ef0ce9f0681bf7221f5c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 20:01:05 +0000 Subject: [PATCH 65/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- corosync.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index 1494717..0430a0b 100644 --- a/corosync.spec +++ b/corosync.spec @@ -18,7 +18,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.1.8 -Release: 3%{?gitver}%{?dist} +Release: 4%{?gitver}%{?dist} License: BSD-3-Clause URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -289,6 +289,9 @@ network splits) %endif %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 3.1.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 3.1.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 8abfa3b0c91092c447e003bafcb3c60dda1c4096 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Fri, 15 Nov 2024 11:03:23 +0100 Subject: [PATCH 66/74] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 63f502d..836dba5 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ corosync-1.2.7.tar.gz /corosync-3.1.6.tar.gz /corosync-3.1.7.tar.gz /corosync-3.1.8.tar.gz +/corosync-3.1.9.tar.gz diff --git a/corosync.spec b/corosync.spec index 0430a0b..1e545f0 100644 --- a/corosync.spec +++ b/corosync.spec @@ -17,8 +17,8 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 3.1.8 -Release: 4%{?gitver}%{?dist} +Version: 3.1.9 +Release: 1%{?gitver}%{?dist} License: BSD-3-Clause URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -116,7 +116,7 @@ BuildRequires: make %if %{with dbus} mkdir -p -m 0700 %{buildroot}/%{_sysconfdir}/dbus-1/system.d -install -m 644 %{_builddir}/%{name}-%{version}%{?gittarver}/conf/corosync-signals.conf %{buildroot}/%{_sysconfdir}/dbus-1/system.d/corosync-signals.conf +install -m 644 %{_builddir}/%{name}-%{version}%{?gittarver}/conf/corosync-signals.conf %{buildroot}/%{_datadir}/dbus-1/system.d/corosync-signals.conf %endif ## tree fixup @@ -185,7 +185,7 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/corosync %config(noreplace) %{_sysconfdir}/logrotate.d/corosync %if %{with dbus} -%{_sysconfdir}/dbus-1/system.d/corosync-signals.conf +%{_datadir}/dbus-1/system.d/corosync-signals.conf %endif %if %{with snmp} %{_datadir}/snmp/mibs/COROSYNC-MIB.txt @@ -289,6 +289,9 @@ network splits) %endif %changelog +* Fri Nov 15 2024 Jan Friesse - 3.1.9-1 +- New upstream release + * Wed Jul 17 2024 Fedora Release Engineering - 3.1.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index fd916ac..d3e0db1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-3.1.8.tar.gz) = 6325ae39bada33dbc0c85eb07d137af78235a1c0f8a4d1f90a20088e011bff65263903e5688956256ddfb58daec45f6d96c04624ff320be0c00ec36aa5d568f8 +SHA512 (corosync-3.1.9.tar.gz) = d5332c65535dd40e3bee48912ebf2e71c55380b3dba93c36ff8b74090edf3ec44b69685cd11fda3732e4b0dab0b2954f08be94d772fcff6aaf9a4a846ef2e4cc From a1ab73206a26a800959cff958d267d18b6dad352 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 14:33:06 +0000 Subject: [PATCH 67/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- corosync.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index 1e545f0..a4022f1 100644 --- a/corosync.spec +++ b/corosync.spec @@ -18,7 +18,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.1.9 -Release: 1%{?gitver}%{?dist} +Release: 2%{?gitver}%{?dist} License: BSD-3-Clause URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -289,6 +289,9 @@ network splits) %endif %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 3.1.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Nov 15 2024 Jan Friesse - 3.1.9-1 - New upstream release From c97695360d63da3cc1143591780c7c869c85c6d4 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Tue, 25 Mar 2025 11:40:52 +0100 Subject: [PATCH 68/74] Use autosetup - Add git build dependency required for autosetup git_am - Remove unused gitver and gittarver Signed-off-by: Jan Friesse --- corosync.spec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/corosync.spec b/corosync.spec index a4022f1..67ff94d 100644 --- a/corosync.spec +++ b/corosync.spec @@ -12,16 +12,13 @@ %bcond_without runautogen %bcond_without userflags -%global gitver %{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}} -%global gittarver %{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}} - Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.1.9 -Release: 2%{?gitver}%{?dist} +Release: 2%{?dist} License: BSD-3-Clause URL: http://corosync.github.io/corosync/ -Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz +Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}.tar.gz # Runtime bits # The automatic dependency overridden in favor of explicit version lock @@ -68,9 +65,10 @@ Requires: libxslt BuildRequires: readline-devel %endif BuildRequires: make +BuildRequires: git %prep -%setup -q -n %{name}-%{version}%{?gittarver} +%autosetup -S git_am %build %if %{with runautogen} @@ -116,7 +114,7 @@ BuildRequires: make %if %{with dbus} mkdir -p -m 0700 %{buildroot}/%{_sysconfdir}/dbus-1/system.d -install -m 644 %{_builddir}/%{name}-%{version}%{?gittarver}/conf/corosync-signals.conf %{buildroot}/%{_datadir}/dbus-1/system.d/corosync-signals.conf +install -m 644 %{_builddir}/%{name}-%{version}/conf/corosync-signals.conf %{buildroot}/%{_datadir}/dbus-1/system.d/corosync-signals.conf %endif ## tree fixup From 10cd9580c6f290706c1ab4dd5f34385a67cd269c Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Wed, 26 Mar 2025 10:27:31 +0100 Subject: [PATCH 69/74] Fix CVE-2025-30472 - totemsrp: Check size of orf_token msg (fixes CVE-2025-30472) Signed-off-by: Jan Friesse --- corosync.spec | 8 ++- totemsrp-Check-size-of-orf_token-msg.patch | 68 ++++++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 totemsrp-Check-size-of-orf_token-msg.patch diff --git a/corosync.spec b/corosync.spec index 67ff94d..e433376 100644 --- a/corosync.spec +++ b/corosync.spec @@ -15,11 +15,13 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.1.9 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD-3-Clause URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}.tar.gz +Patch0: totemsrp-Check-size-of-orf_token-msg.patch + # Runtime bits # The automatic dependency overridden in favor of explicit version lock Requires: corosynclib%{?_isa} = %{version}-%{release} @@ -287,6 +289,10 @@ network splits) %endif %changelog +* Wed Mar 26 2025 Jan Friesse - 3.1.9-3 +- totemsrp: Check size of orf_token msg + (fixes CVE-2025-30472) + * Thu Jan 16 2025 Fedora Release Engineering - 3.1.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/totemsrp-Check-size-of-orf_token-msg.patch b/totemsrp-Check-size-of-orf_token-msg.patch new file mode 100644 index 0000000..17b4c3e --- /dev/null +++ b/totemsrp-Check-size-of-orf_token-msg.patch @@ -0,0 +1,68 @@ +From 7839990f9cdf34e55435ed90109e82709032466a Mon Sep 17 00:00:00 2001 +From: Jan Friesse +Date: Mon, 24 Mar 2025 12:05:08 +0100 +Subject: [PATCH] totemsrp: Check size of orf_token msg + +orf_token message is stored into preallocated array on endian convert +so carefully crafted malicious message can lead to crash of corosync. + +Solution is to check message size beforehand. + +Signed-off-by: Jan Friesse +Reviewed-by: Christine Caulfield +--- + exec/totemsrp.c | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +diff --git a/exec/totemsrp.c b/exec/totemsrp.c +index 962d0e2a..364528ce 100644 +--- a/exec/totemsrp.c ++++ b/exec/totemsrp.c +@@ -3679,12 +3679,20 @@ static int check_orf_token_sanity( + const struct totemsrp_instance *instance, + const void *msg, + size_t msg_len, ++ size_t max_msg_len, + int endian_conversion_needed) + { + int rtr_entries; + const struct orf_token *token = (const struct orf_token *)msg; + size_t required_len; + ++ if (msg_len > max_msg_len) { ++ log_printf (instance->totemsrp_log_level_security, ++ "Received orf_token message is too long... ignoring."); ++ ++ return (-1); ++ } ++ + if (msg_len < sizeof(struct orf_token)) { + log_printf (instance->totemsrp_log_level_security, + "Received orf_token message is too short... ignoring."); +@@ -3698,6 +3706,13 @@ static int check_orf_token_sanity( + rtr_entries = token->rtr_list_entries; + } + ++ if (rtr_entries > RETRANSMIT_ENTRIES_MAX) { ++ log_printf (instance->totemsrp_log_level_security, ++ "Received orf_token message rtr_entries is corrupted... ignoring."); ++ ++ return (-1); ++ } ++ + required_len = sizeof(struct orf_token) + rtr_entries * sizeof(struct rtr_item); + if (msg_len < required_len) { + log_printf (instance->totemsrp_log_level_security, +@@ -3868,7 +3883,8 @@ static int message_handler_orf_token ( + "Time since last token %0.4f ms", tv_diff / (float)QB_TIME_NS_IN_MSEC); + #endif + +- if (check_orf_token_sanity(instance, msg, msg_len, endian_conversion_needed) == -1) { ++ if (check_orf_token_sanity(instance, msg, msg_len, sizeof(token_storage), ++ endian_conversion_needed) == -1) { + return (0); + } + +-- +2.47.0 + From ea77d15fb73753ce9d5253957b5ea9c4f8b81408 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Mon, 16 Jun 2025 15:35:55 +0200 Subject: [PATCH 70/74] Fix bootc container lint warnings Signed-off-by: Jan Friesse --- corosync.spec | 10 +- ...-Add-support-for-env-STATE_DIRECTORY.patch | 113 ++++++++++++++++++ ...e-LogsDirectory-in-systemd-unit-file.patch | 50 ++++++++ 3 files changed, 172 insertions(+), 1 deletion(-) create mode 100644 exec-Add-support-for-env-STATE_DIRECTORY.patch create mode 100644 init-Use-LogsDirectory-in-systemd-unit-file.patch diff --git a/corosync.spec b/corosync.spec index e433376..c568fd2 100644 --- a/corosync.spec +++ b/corosync.spec @@ -15,12 +15,14 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.1.9 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD-3-Clause URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}.tar.gz Patch0: totemsrp-Check-size-of-orf_token-msg.patch +Patch1: exec-Add-support-for-env-STATE_DIRECTORY.patch +Patch2: init-Use-LogsDirectory-in-systemd-unit-file.patch # Runtime bits # The automatic dependency overridden in favor of explicit version lock @@ -197,8 +199,10 @@ fi %{_initrddir}/corosync %{_initrddir}/corosync-notifyd %endif +%if %{without systemd} %dir %{_localstatedir}/lib/corosync %dir %{_localstatedir}/log/cluster +%endif %{_mandir}/man7/corosync_overview.7* %{_mandir}/man8/corosync.8* %{_mandir}/man8/corosync-blackbox.8* @@ -289,6 +293,10 @@ network splits) %endif %changelog +* Mon Jun 16 2025 Jan Friesse - 3.1.9-4 +- exec: Add support for env STATE_DIRECTORY +- init: Use LogsDirectory in systemd unit file + * Wed Mar 26 2025 Jan Friesse - 3.1.9-3 - totemsrp: Check size of orf_token msg (fixes CVE-2025-30472) diff --git a/exec-Add-support-for-env-STATE_DIRECTORY.patch b/exec-Add-support-for-env-STATE_DIRECTORY.patch new file mode 100644 index 0000000..461a668 --- /dev/null +++ b/exec-Add-support-for-env-STATE_DIRECTORY.patch @@ -0,0 +1,113 @@ +From: Jan Friesse +Date: Wed, 11 Jun 2025 17:26:41 +0200 +Subject: [PATCH 1/2] exec: Add support for env STATE_DIRECTORY + +Image mode recommendation is to not ship /var/lib subdirectories if +possible and bootc lint produces warning if not. This was the case +also for Corosync. + +Simplest possible solution seems to implement support for systemd +unit StateDirectory functionality and not ship /var/lib/corosync +in rpm. + +So patch: +1. Adds support for reading the environment variable STATE_DIRECTORY + which is set by systemd and use it as a default value for + system.state_dir configuration option. This is generally useful + feature even for non-systemd builds. +2. Set StateDirectory in service file +3. Drop /var/lib/corosync directory from RPM for systemd builds + +Signed-off-by: Jan Friesse +Reviewed-by: Christine Caulfield +--- + corosync.spec.in | 2 ++ + exec/util.c | 19 +++++++++++++++---- + init/corosync.service.in | 1 + + man/corosync.conf.5 | 4 ++-- + 4 files changed, 20 insertions(+), 6 deletions(-) + +diff --git a/corosync.spec.in b/corosync.spec.in +index 80040a46..049c585a 100644 +--- a/corosync.spec.in ++++ b/corosync.spec.in +@@ -207,7 +207,9 @@ fi + %{_initrddir}/corosync + %{_initrddir}/corosync-notifyd + %endif ++%if %{without systemd} + %dir %{_localstatedir}/lib/corosync ++%endif + %dir %{_localstatedir}/log/cluster + %{_mandir}/man7/corosync_overview.7* + %{_mandir}/man8/corosync.8* +diff --git a/exec/util.c b/exec/util.c +index 8988ab29..795ea5c5 100644 +--- a/exec/util.c ++++ b/exec/util.c +@@ -174,13 +174,24 @@ int cs_name_tisEqual (cs_name_t *str1, char *str2) { + const char *get_state_dir(void) + { + static char path[PATH_MAX] = {'\0'}; +- char *cmap_state_dir; ++ char *state_dir; + int res; + + if (path[0] == '\0') { +- if (icmap_get_string("system.state_dir", &cmap_state_dir) == CS_OK) { +- res = snprintf(path, PATH_MAX, "%s", cmap_state_dir); +- free(cmap_state_dir); ++ if (icmap_get_string("system.state_dir", &state_dir) == CS_OK) { ++ res = snprintf(path, PATH_MAX, "%s", state_dir); ++ free(state_dir); ++ } else if ((state_dir = getenv("STATE_DIRECTORY")) != NULL) { ++ /* ++ * systemd allows multiple directory names that are ++ * passed to env variable separated by colon. Support for this feature ++ * is deliberately not implemented because corosync always ++ * uses just one state directory and it is unclear what behavior should ++ * be taken for multiple ones. If reasonable need for ++ * supporting multiple directories appear, it must be implemented also ++ * for cmap. ++ */ ++ res = snprintf(path, PATH_MAX, "%s", state_dir); + } else { + res = snprintf(path, PATH_MAX, "%s/%s", LOCALSTATEDIR, "lib/corosync"); + } +diff --git a/init/corosync.service.in b/init/corosync.service.in +index bd2a48a9..3e3efef8 100644 +--- a/init/corosync.service.in ++++ b/init/corosync.service.in +@@ -9,6 +9,7 @@ After=network-online.target + EnvironmentFile=-@INITCONFIGDIR@/corosync + ExecStart=@SBINDIR@/corosync -f $COROSYNC_OPTIONS + ExecStop=@SBINDIR@/corosync-cfgtool -H --force ++StateDirectory=corosync + Type=notify + + # In typical systemd deployments, both standard outputs are forwarded to +diff --git a/man/corosync.conf.5 b/man/corosync.conf.5 +index 3510ab6b..3bcda7c7 100644 +--- a/man/corosync.conf.5 ++++ b/man/corosync.conf.5 +@@ -32,7 +32,7 @@ + .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + .\" * THE POSSIBILITY OF SUCH DAMAGE. + .\" */ +-.TH COROSYNC_CONF 5 2024-07-22 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual" ++.TH COROSYNC_CONF 5 2025-06-12 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual" + .SH NAME + corosync.conf - corosync executive configuration file + +@@ -900,7 +900,7 @@ state_dir + Existing directory where corosync should chdir into. Corosync stores + important state files and blackboxes there. + +-The default is /var/lib/corosync. ++The default is the value of the environment variable STATE_DIRECTORY or /var/lib/corosync. + + .PP + Within the +-- +2.47.0 + diff --git a/init-Use-LogsDirectory-in-systemd-unit-file.patch b/init-Use-LogsDirectory-in-systemd-unit-file.patch new file mode 100644 index 0000000..eb38f6f --- /dev/null +++ b/init-Use-LogsDirectory-in-systemd-unit-file.patch @@ -0,0 +1,50 @@ +From 050933cf334ef4ac6a6b4a3988508ca181da34b0 Mon Sep 17 00:00:00 2001 +From: Jan Friesse +Date: Thu, 12 Jun 2025 09:40:45 +0200 +Subject: [PATCH 2/2] init: Use LogsDirectory in systemd unit file + +Similarly as StateDirectory, this is mainly for image mode. +/var/log/cluster shouldn't be included in rpm package, so +use LogsDirectory to make systemd create /var/log/cluster during +corosync startup. + +No code change is needed, because logging to log file is fully +configured by user in config file so there is no default to read from +environment variable. + +Signed-off-by: Jan Friesse +Reviewed-by: Christine Caulfield +--- + corosync.spec.in | 2 +- + init/corosync.service.in | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/corosync.spec.in b/corosync.spec.in +index 049c585a..7cb70114 100644 +--- a/corosync.spec.in ++++ b/corosync.spec.in +@@ -209,8 +209,8 @@ fi + %endif + %if %{without systemd} + %dir %{_localstatedir}/lib/corosync +-%endif + %dir %{_localstatedir}/log/cluster ++%endif + %{_mandir}/man7/corosync_overview.7* + %{_mandir}/man8/corosync.8* + %{_mandir}/man8/corosync-blackbox.8* +diff --git a/init/corosync.service.in b/init/corosync.service.in +index 3e3efef8..89d67b5e 100644 +--- a/init/corosync.service.in ++++ b/init/corosync.service.in +@@ -10,6 +10,7 @@ EnvironmentFile=-@INITCONFIGDIR@/corosync + ExecStart=@SBINDIR@/corosync -f $COROSYNC_OPTIONS + ExecStop=@SBINDIR@/corosync-cfgtool -H --force + StateDirectory=corosync ++LogsDirectory=cluster + Type=notify + + # In typical systemd deployments, both standard outputs are forwarded to +-- +2.47.0 + From a2c975b92de91e7e600828e1e8c3f2557a7c1551 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:40:51 +0000 Subject: [PATCH 71/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- corosync.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index c568fd2..4989c5a 100644 --- a/corosync.spec +++ b/corosync.spec @@ -15,7 +15,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 3.1.9 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD-3-Clause URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}.tar.gz @@ -293,6 +293,9 @@ network splits) %endif %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 3.1.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jun 16 2025 Jan Friesse - 3.1.9-4 - exec: Add support for env STATE_DIRECTORY - init: Use LogsDirectory in systemd unit file From 290649b778a9c526f3843b6bec9b0c47f211524e Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Thu, 24 Jul 2025 10:47:31 +0200 Subject: [PATCH 72/74] Migrate tests from STI to TMT format Signed-off-by: Jan Friesse --- .fmf/version | 1 + tests/.gitignore | 3 --- tests/plan.fmf | 12 ++++++++++++ tests/smoke/main.fmf | 2 ++ tests/smoke/runtest.sh | 0 tests/tests.yml | 12 ------------ 6 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 .fmf/version delete mode 100644 tests/.gitignore create mode 100644 tests/plan.fmf create mode 100644 tests/smoke/main.fmf mode change 100644 => 100755 tests/smoke/runtest.sh delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/tests/.gitignore b/tests/.gitignore deleted file mode 100644 index e6c79fd..0000000 --- a/tests/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Ignore tests runs/artefacts. -artifacts/** -**/*.retry diff --git a/tests/plan.fmf b/tests/plan.fmf new file mode 100644 index 0000000..1c97683 --- /dev/null +++ b/tests/plan.fmf @@ -0,0 +1,12 @@ +summary: Run all smoke tests +discover: + how: fmf +execute: + how: tmt +prepare: + how: install + package: + - gcc + - iproute + - corosync + - corosync-devel diff --git a/tests/smoke/main.fmf b/tests/smoke/main.fmf new file mode 100644 index 0000000..c431594 --- /dev/null +++ b/tests/smoke/main.fmf @@ -0,0 +1,2 @@ +summary: Basic smoke test +test: ./runtest.sh diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh old mode 100644 new mode 100755 diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 39b6209..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,12 +0,0 @@ -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - tests: - - smoke - required_packages: - - gcc - - iproute - - corosync - - corosync-devel From 2de47be2d1227827c642eeb38faf1938e11064d3 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Sat, 15 Nov 2025 16:44:01 +0100 Subject: [PATCH 73/74] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 13 +- ...-Add-support-for-env-STATE_DIRECTORY.patch | 113 ------------------ ...e-LogsDirectory-in-systemd-unit-file.patch | 50 -------- sources | 2 +- totemsrp-Check-size-of-orf_token-msg.patch | 68 ----------- 6 files changed, 8 insertions(+), 239 deletions(-) delete mode 100644 exec-Add-support-for-env-STATE_DIRECTORY.patch delete mode 100644 init-Use-LogsDirectory-in-systemd-unit-file.patch delete mode 100644 totemsrp-Check-size-of-orf_token-msg.patch diff --git a/.gitignore b/.gitignore index 836dba5..be468d1 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ corosync-1.2.7.tar.gz /corosync-3.1.7.tar.gz /corosync-3.1.8.tar.gz /corosync-3.1.9.tar.gz +/corosync-3.1.10.tar.gz diff --git a/corosync.spec b/corosync.spec index 4989c5a..3cb7648 100644 --- a/corosync.spec +++ b/corosync.spec @@ -14,15 +14,11 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 3.1.9 -Release: 5%{?dist} +Version: 3.1.10 +Release: 1%{?dist} License: BSD-3-Clause URL: http://corosync.github.io/corosync/ -Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}.tar.gz - -Patch0: totemsrp-Check-size-of-orf_token-msg.patch -Patch1: exec-Add-support-for-env-STATE_DIRECTORY.patch -Patch2: init-Use-LogsDirectory-in-systemd-unit-file.patch +Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}%{?gittarver}.tar.gz # Runtime bits # The automatic dependency overridden in favor of explicit version lock @@ -293,6 +289,9 @@ network splits) %endif %changelog +* Sat Nov 15 2025 Jan Friesse - 3.1.10-1 +- New upstream release + * Wed Jul 23 2025 Fedora Release Engineering - 3.1.9-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/exec-Add-support-for-env-STATE_DIRECTORY.patch b/exec-Add-support-for-env-STATE_DIRECTORY.patch deleted file mode 100644 index 461a668..0000000 --- a/exec-Add-support-for-env-STATE_DIRECTORY.patch +++ /dev/null @@ -1,113 +0,0 @@ -From: Jan Friesse -Date: Wed, 11 Jun 2025 17:26:41 +0200 -Subject: [PATCH 1/2] exec: Add support for env STATE_DIRECTORY - -Image mode recommendation is to not ship /var/lib subdirectories if -possible and bootc lint produces warning if not. This was the case -also for Corosync. - -Simplest possible solution seems to implement support for systemd -unit StateDirectory functionality and not ship /var/lib/corosync -in rpm. - -So patch: -1. Adds support for reading the environment variable STATE_DIRECTORY - which is set by systemd and use it as a default value for - system.state_dir configuration option. This is generally useful - feature even for non-systemd builds. -2. Set StateDirectory in service file -3. Drop /var/lib/corosync directory from RPM for systemd builds - -Signed-off-by: Jan Friesse -Reviewed-by: Christine Caulfield ---- - corosync.spec.in | 2 ++ - exec/util.c | 19 +++++++++++++++---- - init/corosync.service.in | 1 + - man/corosync.conf.5 | 4 ++-- - 4 files changed, 20 insertions(+), 6 deletions(-) - -diff --git a/corosync.spec.in b/corosync.spec.in -index 80040a46..049c585a 100644 ---- a/corosync.spec.in -+++ b/corosync.spec.in -@@ -207,7 +207,9 @@ fi - %{_initrddir}/corosync - %{_initrddir}/corosync-notifyd - %endif -+%if %{without systemd} - %dir %{_localstatedir}/lib/corosync -+%endif - %dir %{_localstatedir}/log/cluster - %{_mandir}/man7/corosync_overview.7* - %{_mandir}/man8/corosync.8* -diff --git a/exec/util.c b/exec/util.c -index 8988ab29..795ea5c5 100644 ---- a/exec/util.c -+++ b/exec/util.c -@@ -174,13 +174,24 @@ int cs_name_tisEqual (cs_name_t *str1, char *str2) { - const char *get_state_dir(void) - { - static char path[PATH_MAX] = {'\0'}; -- char *cmap_state_dir; -+ char *state_dir; - int res; - - if (path[0] == '\0') { -- if (icmap_get_string("system.state_dir", &cmap_state_dir) == CS_OK) { -- res = snprintf(path, PATH_MAX, "%s", cmap_state_dir); -- free(cmap_state_dir); -+ if (icmap_get_string("system.state_dir", &state_dir) == CS_OK) { -+ res = snprintf(path, PATH_MAX, "%s", state_dir); -+ free(state_dir); -+ } else if ((state_dir = getenv("STATE_DIRECTORY")) != NULL) { -+ /* -+ * systemd allows multiple directory names that are -+ * passed to env variable separated by colon. Support for this feature -+ * is deliberately not implemented because corosync always -+ * uses just one state directory and it is unclear what behavior should -+ * be taken for multiple ones. If reasonable need for -+ * supporting multiple directories appear, it must be implemented also -+ * for cmap. -+ */ -+ res = snprintf(path, PATH_MAX, "%s", state_dir); - } else { - res = snprintf(path, PATH_MAX, "%s/%s", LOCALSTATEDIR, "lib/corosync"); - } -diff --git a/init/corosync.service.in b/init/corosync.service.in -index bd2a48a9..3e3efef8 100644 ---- a/init/corosync.service.in -+++ b/init/corosync.service.in -@@ -9,6 +9,7 @@ After=network-online.target - EnvironmentFile=-@INITCONFIGDIR@/corosync - ExecStart=@SBINDIR@/corosync -f $COROSYNC_OPTIONS - ExecStop=@SBINDIR@/corosync-cfgtool -H --force -+StateDirectory=corosync - Type=notify - - # In typical systemd deployments, both standard outputs are forwarded to -diff --git a/man/corosync.conf.5 b/man/corosync.conf.5 -index 3510ab6b..3bcda7c7 100644 ---- a/man/corosync.conf.5 -+++ b/man/corosync.conf.5 -@@ -32,7 +32,7 @@ - .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - .\" * THE POSSIBILITY OF SUCH DAMAGE. - .\" */ --.TH COROSYNC_CONF 5 2024-07-22 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual" -+.TH COROSYNC_CONF 5 2025-06-12 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual" - .SH NAME - corosync.conf - corosync executive configuration file - -@@ -900,7 +900,7 @@ state_dir - Existing directory where corosync should chdir into. Corosync stores - important state files and blackboxes there. - --The default is /var/lib/corosync. -+The default is the value of the environment variable STATE_DIRECTORY or /var/lib/corosync. - - .PP - Within the --- -2.47.0 - diff --git a/init-Use-LogsDirectory-in-systemd-unit-file.patch b/init-Use-LogsDirectory-in-systemd-unit-file.patch deleted file mode 100644 index eb38f6f..0000000 --- a/init-Use-LogsDirectory-in-systemd-unit-file.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 050933cf334ef4ac6a6b4a3988508ca181da34b0 Mon Sep 17 00:00:00 2001 -From: Jan Friesse -Date: Thu, 12 Jun 2025 09:40:45 +0200 -Subject: [PATCH 2/2] init: Use LogsDirectory in systemd unit file - -Similarly as StateDirectory, this is mainly for image mode. -/var/log/cluster shouldn't be included in rpm package, so -use LogsDirectory to make systemd create /var/log/cluster during -corosync startup. - -No code change is needed, because logging to log file is fully -configured by user in config file so there is no default to read from -environment variable. - -Signed-off-by: Jan Friesse -Reviewed-by: Christine Caulfield ---- - corosync.spec.in | 2 +- - init/corosync.service.in | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/corosync.spec.in b/corosync.spec.in -index 049c585a..7cb70114 100644 ---- a/corosync.spec.in -+++ b/corosync.spec.in -@@ -209,8 +209,8 @@ fi - %endif - %if %{without systemd} - %dir %{_localstatedir}/lib/corosync --%endif - %dir %{_localstatedir}/log/cluster -+%endif - %{_mandir}/man7/corosync_overview.7* - %{_mandir}/man8/corosync.8* - %{_mandir}/man8/corosync-blackbox.8* -diff --git a/init/corosync.service.in b/init/corosync.service.in -index 3e3efef8..89d67b5e 100644 ---- a/init/corosync.service.in -+++ b/init/corosync.service.in -@@ -10,6 +10,7 @@ EnvironmentFile=-@INITCONFIGDIR@/corosync - ExecStart=@SBINDIR@/corosync -f $COROSYNC_OPTIONS - ExecStop=@SBINDIR@/corosync-cfgtool -H --force - StateDirectory=corosync -+LogsDirectory=cluster - Type=notify - - # In typical systemd deployments, both standard outputs are forwarded to --- -2.47.0 - diff --git a/sources b/sources index d3e0db1..9c626fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-3.1.9.tar.gz) = d5332c65535dd40e3bee48912ebf2e71c55380b3dba93c36ff8b74090edf3ec44b69685cd11fda3732e4b0dab0b2954f08be94d772fcff6aaf9a4a846ef2e4cc +SHA512 (corosync-3.1.10.tar.gz) = cf2014d15fdbd3495cfe64629255f7855a79651a595938dac7bc7ec67338d843079ae40cf1c15de23b50d85cb39b2c2e3e3448a9cc33759ad8988b8c85ce59d3 diff --git a/totemsrp-Check-size-of-orf_token-msg.patch b/totemsrp-Check-size-of-orf_token-msg.patch deleted file mode 100644 index 17b4c3e..0000000 --- a/totemsrp-Check-size-of-orf_token-msg.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 7839990f9cdf34e55435ed90109e82709032466a Mon Sep 17 00:00:00 2001 -From: Jan Friesse -Date: Mon, 24 Mar 2025 12:05:08 +0100 -Subject: [PATCH] totemsrp: Check size of orf_token msg - -orf_token message is stored into preallocated array on endian convert -so carefully crafted malicious message can lead to crash of corosync. - -Solution is to check message size beforehand. - -Signed-off-by: Jan Friesse -Reviewed-by: Christine Caulfield ---- - exec/totemsrp.c | 18 +++++++++++++++++- - 1 file changed, 17 insertions(+), 1 deletion(-) - -diff --git a/exec/totemsrp.c b/exec/totemsrp.c -index 962d0e2a..364528ce 100644 ---- a/exec/totemsrp.c -+++ b/exec/totemsrp.c -@@ -3679,12 +3679,20 @@ static int check_orf_token_sanity( - const struct totemsrp_instance *instance, - const void *msg, - size_t msg_len, -+ size_t max_msg_len, - int endian_conversion_needed) - { - int rtr_entries; - const struct orf_token *token = (const struct orf_token *)msg; - size_t required_len; - -+ if (msg_len > max_msg_len) { -+ log_printf (instance->totemsrp_log_level_security, -+ "Received orf_token message is too long... ignoring."); -+ -+ return (-1); -+ } -+ - if (msg_len < sizeof(struct orf_token)) { - log_printf (instance->totemsrp_log_level_security, - "Received orf_token message is too short... ignoring."); -@@ -3698,6 +3706,13 @@ static int check_orf_token_sanity( - rtr_entries = token->rtr_list_entries; - } - -+ if (rtr_entries > RETRANSMIT_ENTRIES_MAX) { -+ log_printf (instance->totemsrp_log_level_security, -+ "Received orf_token message rtr_entries is corrupted... ignoring."); -+ -+ return (-1); -+ } -+ - required_len = sizeof(struct orf_token) + rtr_entries * sizeof(struct rtr_item); - if (msg_len < required_len) { - log_printf (instance->totemsrp_log_level_security, -@@ -3868,7 +3883,8 @@ static int message_handler_orf_token ( - "Time since last token %0.4f ms", tv_diff / (float)QB_TIME_NS_IN_MSEC); - #endif - -- if (check_orf_token_sanity(instance, msg, msg_len, endian_conversion_needed) == -1) { -+ if (check_orf_token_sanity(instance, msg, msg_len, sizeof(token_storage), -+ endian_conversion_needed) == -1) { - return (0); - } - --- -2.47.0 - From 46f6d72cf7e780b4aaee985a882f75ded1c697cd Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Mon, 24 Nov 2025 15:55:35 +0100 Subject: [PATCH 74/74] Remove unused gittarver from source URL Signed-off-by: Jan Friesse --- corosync.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index 3cb7648..6e04bf1 100644 --- a/corosync.spec +++ b/corosync.spec @@ -18,7 +18,7 @@ Version: 3.1.10 Release: 1%{?dist} License: BSD-3-Clause URL: http://corosync.github.io/corosync/ -Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}%{?gittarver}.tar.gz +Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz # Runtime bits # The automatic dependency overridden in favor of explicit version lock