.corosync.metadata

@@ -1 +0,0 @@
-1630181bcac161c6136c79979d1fa4a11356b5a3 SOURCES/corosync-3.1.7.tar.gz

.gitignore

@@ -1 +1,2 @@
-SOURCES/corosync-3.1.7.tar.gz
+SOURCES/corosync-3.1.8.tar.gz
+SOURCES/spausedd-20201112.tar.gz

SPECS/corosync.spec

@@ -11,18 +11,31 @@
 %bcond_without vqsim
 %bcond_without runautogen
 %bcond_without userflags
+%bcond_without spausedd
 
 %global gitver %{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}
 %global gittarver %{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}
 
+%if %{with spausedd}
+%global spausedd_version 20201112
+%endif
+
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 3.1.7
+Version: 3.1.8
 Release: 1%{?gitver}%{?dist}
 License: BSD
 URL: http://corosync.github.io/corosync/
 Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz
 
+%if %{with spausedd}
+Source1: https://github.com/jfriesse/spausedd/releases/download/%{spausedd_version}/spausedd-%{spausedd_version}.tar.gz
+# VMGuestLib exists only for x86_64 architecture
+%ifarch x86_64
+%global use_vmguestlib 1
+%endif
+%endif
+
 # Runtime bits
 # The automatic dependency overridden in favor of explicit version lock
 Requires: corosynclib%{?_isa} = %{version}-%{release}
@@ -67,10 +80,16 @@ Requires: libxslt
 %if %{with vqsim}
 BuildRequires: readline-devel
 %endif
-BuildRequires: make
+%if %{defined use_vmguestlib}
+BuildRequires: pkgconfig(vmguestlib)
+%endif
 
 %prep
+%if %{with spausedd}
+%setup -q -a 1 -n %{name}-%{version}%{?gittarver}
+%else
 %setup -q -n %{name}-%{version}%{?gittarver}
+%endif
 
 %build
 %if %{with runautogen}
@@ -109,10 +128,22 @@ BuildRequires: make
 	--with-systemddir=%{_unitdir} \
 	--docdir=%{_docdir}
 
-%make_build
+make %{_smp_mflags}
+
+%if %{with spausedd}
+cd spausedd-%{spausedd_version}
+CFLAGS="${CFLAGS:-%{optflags}}" ; export CFLAGS
+make \
+%if %{defined use_vmguestlib}
+    WITH_VMGUESTLIB=1 \
+%else
+    WITH_VMGUESTLIB=0 \
+%endif
+    %{?_smp_mflags}
+%endif
 
 %install
-%make_install
+make install DESTDIR=%{buildroot}
 
 %if %{with dbus}
 mkdir -p -m 0700 %{buildroot}/%{_sysconfdir}/dbus-1/system.d
@@ -133,6 +164,21 @@ install -m 644 tools/corosync-notifyd.sysconfig.example \
 install -m 644 init/corosync.sysconfig.example \
    %{buildroot}%{_sysconfdir}/sysconfig/corosync
 
+%if %{with spausedd}
+cd spausedd-%{spausedd_version}
+make DESTDIR="%{buildroot}" PREFIX="%{_prefix}" install
+
+%if %{with systemd}
+mkdir -p %{buildroot}/%{_unitdir}
+install -m 644 -p init/spausedd.service %{buildroot}/%{_unitdir}
+%else
+mkdir -p %{buildroot}/%{_initrddir}
+install -m 755 -p init/spausedd %{buildroot}/%{_initrddir}
+%endif
+
+cd ..
+%endif
+
 %description
 This package contains the Corosync Cluster Engine Executive, several default
 APIs and libraries, default configuration files, and an init script.
@@ -230,14 +276,15 @@ This package contains corosync libraries.
 %{_libdir}/libsam.so.*
 %{_libdir}/libcorosync_common.so.*
 
-%ldconfig_scriptlets -n corosynclib
+%post -n corosynclib -p /sbin/ldconfig
+
+%postun -n corosynclib -p /sbin/ldconfig
 
 %package -n corosynclib-devel
 Summary: The Corosync Cluster Engine Development Kit
 Requires: corosynclib%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
-Provides: corosync-devel = %{version}-%{release}
+Provides: corosync-devel = %{version}
-Provides: corosync-devel%{?_isa} = %{version}-%{release}
 
 %description -n corosynclib-devel
 This package contains include files and man pages used to develop using
@@ -288,148 +335,266 @@ network splits)
 %{_mandir}/man8/corosync-vqsim.8*
 %endif
 
+# optional spausedd
+%if %{with spausedd}
+
+%package -n spausedd
+Summary: Utility to detect and log scheduler pause
+URL: https://github.com/jfriesse/spausedd
+
+%if %{with systemd}
+%{?systemd_requires}
+%else
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+%endif
+
+%description -n spausedd
+Utility to detect and log scheduler pause
+
+%files -n spausedd
+%doc spausedd-%{spausedd_version}/AUTHORS spausedd-%{spausedd_version}/COPYING
+%{_bindir}/spausedd
+%{_mandir}/man8/spausedd*
+%if %{with systemd}
+%{_unitdir}/spausedd.service
+%else
+%{_initrddir}/spausedd
+%endif
+
+%post -n spausedd
+%if %{with systemd} && 0%{?systemd_post:1}
+%systemd_post spausedd.service
+%else
+if [ $1 -eq 1 ]; then
+    /sbin/chkconfig --add spausedd || :
+fi
+%endif
+
+%preun -n spausedd
+%if %{with systemd} && 0%{?systemd_preun:1}
+%systemd_preun spausedd.service
+%else
+if [ $1 -eq 0 ]; then
+    /sbin/service spausedd stop &>/dev/null || :
+    /sbin/chkconfig --del spausedd || :
+fi
+%endif
+
+%postun -n spausedd
+%if %{with systemd} && 0%{?systemd_postun:1}
+    %systemd_postun spausedd.service
+%endif
+
+%endif
+
 %changelog
-* Tue Nov 15 2022 Jan Friesse <jfriesse@redhat.com> - 3.1.7-1
+* Wed Nov 15 2023 Jan Friesse <jfriesse@redhat.com> - 3.1.8-1
-- Resolves: rhbz#2135861
+- Resolves: RHEL-15263
 
-- New upstream release (rhbz#2135861)
+- New upstream release (RHEL-15263)
 
-* Thu Mar 31 2022 Jan Friesse <jfriesse@redhat.com> - 3.1.5-4
+* Tue Nov 15 2022 Jan Friesse <jfriesse@redhat.com> 3.1.7-1
-- Resolves: rhbz#2070623
+- Resolves: rhbz#2135860
 
-- logrotate: Use copytruncate method by default (rhbz#2070623)
+- New upstream release (rhbz#2135860)
-- merge upstream commit 04362046c4a9d7307feb5b68341d567b7d0b94d6 (rhbz#2070623)
 
-* Thu Nov 25 2021 Jan Friesse <jfriesse@redhat.com> - 3.1.5-3
+* Wed Nov 24 2021 Jan Friesse <jfriesse@redhat.com> 3.1.5-2
-- Resolves: rhbz#2024652
+- Resolves: rhbz#2002115
-- Resolves: rhbz#2024657
+- Resolves: rhbz#2024658
 
-- totem: Add cancel_hold_on_retransmit config option (rhbz#2024652)
+- totem: Add cancel_hold_on_retransmit config option (rhbz#2002115)
-- merge upstream commit cdf72925db5a81e546ca8e8d7d8291ee1fc77be4 (rhbz#2024652)
+- merge upstream commit cdf72925db5a81e546ca8e8d7d8291ee1fc77be4 (rhbz#2002115)
-- totemsrp: Switch totempg buffers at the right time (rhbz#2024657)
+- totemsrp: Switch totempg buffers at the right time (rhbz#2024658)
-- merge upstream commit e7a82370a7b5d3ca342d5e42e25763fa2c938739 (rhbz#2024657)
+- merge upstream commit e7a82370a7b5d3ca342d5e42e25763fa2c938739 (rhbz#2024658)
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.1.5-2
+* Wed Aug 04 2021 Jan Friesse <jfriesse@redhat.com> 3.1.5-1
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Related: rhbz#1948973
-  Related: rhbz#1991688
 
-* Wed Aug 04 2021 Jan Friesse <jfriesse@redhat.com> - 3.1.5-1
+- New upstream release (rhbz#1948973)
-- Related: rhbz#1948974
 
-- New upstream release (rhbz#1948974)
+* Thu Jun 03 2021 Jan Friesse <jfriesse@redhat.com> 3.1.4-1
+- Related: rhbz#1948973
+- Resolves: rhbz#1962139
 
-* Fri Jul 23 2021 Jan Friesse <jfriesse@redhat.com> - 3.1.4-3
+- New upstream release (rhbz#1948973)
-- Related: rhbz#1948974
+- stats: fix crash when iterating over deleted keys (rhbz#1962139)
 
-- Add support for cgroup v2 and auto mode (rhbz#1948974)
+* Fri May 21 2021 Jan Friesse <jfriesse@redhat.com> 3.1.3-1
+- Resolves: rhbz#1948973
 
-* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 3.1.4-2
+- New upstream release (rhbz#1948973)
-- Rebuilt for RHEL 9 BETA for openssl 3.0
-  Related: rhbz#1971065
 
-* Thu Jun 03 2021 Jan Friesse <jfriesse@redhat.com> - 3.1.4-1
+* Fri Apr 30 2021 Jan Friesse <jfriesse@redhat.com> 3.1.0-5
-- Related: rhbz#1948974
+- Resolves: rhbz#1954432
-- Resolves: rhbz#1967485
 
-- New upstream release (rhbz#1948974)
+* Tue Apr 06 2021 Jan Friesse <jfriesse@redhat.com> 3.1.0-4
-- stats: fix crash when iterating over deleted keys (rhbz#1967485)
+- Resolves: rhbz#1946623
 
-* Fri May 21 2021 Jan Friesse <jfriesse@redhat.com> - 3.1.3-1
+- knet: pass correct handle to knet_handle_compress (rhbz#1946623)
-- Resolves: rhbz#1948974
 
-- New upstream release
+* Thu Nov 12 2020 Jan Friesse <jfriesse@redhat.com> 3.1.0-3
+- Resolves: rhbz#1897085
+- Resolves: rhbz#1896493
 
-* Wed Apr 21 2021 Jan Friesse <jfriesse@redhat.com> - 3.1.2-1
+- spausedd: Add ability to move process into root cgroup (rhbz#1897085)
-- Related: rhbz#1948974
+- totemknet: Check both cipher and hash for crypto (rhbz#1896493)
 
-- New upstream release
+* Tue Nov 10 2020 Jan Friesse <jfriesse@redhat.com> 3.1.0-2
+- Resolves: rhbz#1896309
 
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.1.1-2
+- Fix log_perror (rhbz#1896309)
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
-* Wed Mar 31 2021 Jan Friesse <jfriesse@redhat.com> - 3.1.1-1
+* Tue Oct 20 2020 Jan Friesse <jfriesse@redhat.com> 3.1.0-1
-- New upstream release
+- Resolves: rhbz#1855293
+- Resolves: rhbz#1855303
+- Resolves: rhbz#1870449
+- Resolves: rhbz#1887400
 
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-3
+- New upstream release (rhbz#1855293)
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+- Support for reload of crypto configuration (rhbz#1855303)
+- Increase default token timeout to 3000ms (rhbz#1870449)
+- Add support for nodelist callback into quorum service (rhbz#1887400)
 
-* Mon Nov 02 2020 Jan Friesse <jfriesse@redhat.com> - 3.1.0-2
+* Tue May 26 2020 Jan Friesse <jfriesse@redhat.com> 3.0.3-4
-- Add isa version of corosync-devel
+- Resolves: rhbz#1780137
-- Add release to corosync-devel version to match autogenerated
+- Resolves: rhbz#1791792
-  corosynclib-devel provides
+- Resolves: rhbz#1809864
+- Resolves: rhbz#1816653
 
-* Tue Oct 20 2020 Jan Friesse <jfriesse@redhat.com> - 3.1.0-1
+- votequorum: Ignore the icmap_get_* return value (rhbz#1780137)
-- New upstream release
+- merge upstream commit cddd62f972bca276c934e58f08da84071cec1ddb (rhbz#1780137)
+- man: move cmap_keys man page from section 8 to 7 (rhbz#1791792)
+- merge upstream commit f1d36307e524f9440733f0b01a9fc627a0e1cac7 (rhbz#1791792)
+- votequorum: Reflect runtime change of 2Node to WFA (rhbz#1780137)
+- merge upstream commit 8ce65bf951bc1e5b2d64b60ea027fbdc551d4fc8 (rhbz#1780137)
+- stats: Add stats for scheduler misses (rhbz#1791792)
+- merge upstream commit 48b6894ef41e9a06ccbb696d062d86ef60dc2c4b (rhbz#1791792)
+- stats: Use nanoseconds from epoch for schedmiss (rhbz#1791792)
+- merge upstream commit ebd05fa00826c366922e619b012a0684c6856539 (rhbz#1791792)
+- main: Add schedmiss timestamp into message (rhbz#1791792)
+- merge upstream commit 35662dd0ec53f456445c30c0ef92892f47b25aa2 (rhbz#1791792)
+- votequorum: Change check of expected_votes (rhbz#1809864)
+- merge upstream commit 0c16442f2d93f32a229b87d2672e2dc8025ec704 (rhbz#1809864)
+- quorumtool: exit on invalid expected votes (rhbz#1809864)
+- merge upstream commit 5f543465bb3506b7f4929a426f1c22a9c854cecd (rhbz#1809864)
+- votequorum: set wfa status only on startup (rhbz#1816653)
+- merge upstream commit ca320beac25f82c0c555799e647a47975a333c28 (rhbz#1816653)
 
-* Thu Aug 27 2020 Josef Řídký <jridky@redhat.com> - 3.0.4-6
+* Tue Apr 28 2020 Jan Friesse <jfriesse@redhat.com> - 3.0.3-3
-- Rebuilt for new net-snmp release
+- Resolves: rhbz#1828295
 
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.4-5
+- Add explicit spausedd dependency for revdeps CI test
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
-* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 3.0.4-4
+* Mon Nov 25 2019 Jan Friesse <jfriesse@redhat.com> - 3.0.3-2
-- Use make macros
+- Related: rhbz#1745623
-- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
 
-* Wed May 13 2020 Jan Friesse <jfriesse@redhat.com> - 3.0.4-3
+- New upstream release of spausedd
-- Fix typo in the changelog
-
-* Wed May 13 2020 Jan Friesse <jfriesse@redhat.com> - 3.0.4-2
-- Rebuild for new libqb
-
-* Thu Apr 23 2020 Jan Friesse <jfriesse@redhat.com> - 3.0.4-1
-- New upstream release
-
-* Fri Mar 27 2020 Jan Friesse <jfriesse@redhat.com> - 3.0.3-3
-- Add CI tests
-- Enable gating
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
 * Mon Nov 25 2019 Jan Friesse <jfriesse@redhat.com> - 3.0.3-1
+- Resolves: rhbz#1745623
+
 - New upstream release
 
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-2
+* Wed Oct 30 2019 Jan Friesse <jfriesse@redhat.com> 3.0.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+- Resolves: rhbz#1745624
+- Resolves: rhbz#1745642
+- Resolves: rhbz#1749263
+- Resolves: rhbz#1765025
 
-* Wed Jun 12 2019 Jan Friesse <jfriesse@redhat.com> - 3.0.2-1
+- totem: fix check if all nodes have same number of links (rhbz#1749263)
-- New upstream release
+- merge upstream commit 816324c94cfb917b11f43954b8757424db28b390 (rhbz#1749263)
+- totem: Increase ring_id seq after load (rhbz#1745624)
+- merge upstream commit 3675daceeeeb72af043f5c051daed463fdd2d2a1 (rhbz#1745624)
+- man: Fix link_mode priority description (rhbz#1745642)
+- merge upstream commit 0a323ff2ed0f2aff9cb691072906e69cb96ed662 (rhbz#1745642)
+- totemsrp: Reduce MTU to left room second mcast (rhbz#1765025)
+- merge upstream commit ee8b8993d98b3f6af9c058194228fc534fcd0796 (rhbz#1765025)
 
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-2
+* Tue Aug 06 2019 Jan Friesse <jfriesse@redhat.com> - 3.0.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+- Resolves: rhbz#1738218
 
-* Tue Jan 15 2019 Jan Friesse <jfriesse@redhat.com> - 3.0.1-1
+- Do not set exec permission for service file
-- New upstream release
+- Fix CFLAGS definition
+
+* Thu Jun 13 2019 Jan Friesse <jfriesse@redhat.com> 3.0.2-2
+- Related: rhbz#1679656
+
+- Improve spausedd test
+
+* Wed Jun 12 2019 Jan Friesse <jfriesse@redhat.com> 3.0.2-1
+- Resolves: rhbz#1705591
+- Resolves: rhbz#1688889
+
+* Mon May 13 2019 Jan Friesse <jfriesse@redhat.com> 3.0.0-4
+- Related: rhbz#1679656
+
+- Really add gating
+
+* Mon May 13 2019 Jan Friesse <jfriesse@redhat.com> 3.0.0-3
+- Resolves: rhbz#1691401
+- Related: rhbz#1679656
+
+- Add spausedd subpackage
+- Add gating tests
+
+* Fri Jan 11 2019 Jan Friesse <jfriesse@redhat.com> 3.0.0-2
+- Resolves: rhbz#1665211
+
+- totemip: Use AF_UNSPEC for ipv4-6 and ipv6-4 (rhbz#1665211)
+- merge upstream commit 2ab4d4188670356dcb82a80f2fc4598f5145c77d (rhbz#1665211)
 
 * Fri Dec 14 2018 Jan Friesse <jfriesse@redhat.com> - 3.0.0-1
+- Resolves: rhbz#1600915
+
 - New upstream release
 
+* Tue Dec 11 2018 Jan Friesse <jfriesse@redhat.com> 2.99.5-2
+- Resolves: rhbz#1654630
+
+- man: Add some information about address resolution (rhbz#1654630)
+- merge upstream commit 8d50bd946dd7e01da75f06da3f885e7dc82f4f12 (rhbz#1654630)
+- config: Look up hostnames in a defined order (rhbz#1654630)
+- merge upstream commit 3d7f136f86a56dd9d9caa9060f7a01e8b681eb7f (rhbz#1654630)
+
 * Fri Dec  7 2018 Jan Friesse <jfriesse@redhat.com> - 2.99.5-1
+- Related: rhbz#1600915
+
 - New upstream release
 
 * Tue Dec  4 2018 Jan Friesse <jfriesse@redhat.com> - 2.99.4-2
+- Resolves: rhbz#1655179
+
 - Add libknet1-crypto-nss-plugin dependency
 
 * Tue Nov 20 2018 Jan Friesse <jfriesse@redhat.com> - 2.99.4-1
+- Related: rhbz#1600915
+
 - New upstream release
 
-* Thu Aug 16 2018 Jan Pokorný <jpokorny+rpm-corosync@redhat.com> - 2.99.3-3
+* Mon Oct 15 2018 Jan Friesse <jfriesse@redhat.com> 2.99.3-5
-- Rebuild again, since the previous one was so unfortunate it got affected
+- Resolves: rhbz#1639211
-  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 prevent redundancy in systemd journal
 
-* Tue Jul 24 2018 Adam Williamson <awilliam@redhat.com> - 2.99.3-2
+- config: Fix crash in reload if new interfaces are added (rhbz#1639211)
-- Rebuild for new net-snmp
+- merge upstream commit 9f2d5a3a3faa8bd1021b505bcf3c5428b3435e39 (rhbz#1639211)
+
+* Tue Sep 18 2018 Jan Friesse <jfriesse@redhat.com> 2.99.3-4
+- Related: rhbz#1615945
+
+- Rebuild for new LibQB
+
+* Mon Aug 20 2018 Jan Friesse <jfriesse@redhat.com> 2.99.3-3
+- Resolves: rhbz#1602409
+
+- Remove libcgroup (rhbz#1602409)
+- merge upstream commit c9e5d6db13fa965d83e27a3b664477e9b5b26edf (rhbz#1602409)
+
+* Mon Jul 30 2018 Florian Weimer <fweimer@redhat.com> - 2.99.3-2
+- Rebuild with fixed binutils
 
 * Fri Jul 13 2018 Jan Friesse <jfriesse@redhat.com> - 2.99.3-1
 - New upstream release
 
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.99.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Mon Apr 30 2018 Jan Friesse <jfriesse@redhat.com> - 2.99.2-1
 - New upstream release