.sbd.metadata

@@ -1 +0,0 @@
-e8adcf4624bdebd17e112f3edc973b430c9c9e5c SOURCES/sbd-cf5c2208bad2db2dff9b09624b89b05415c3bc11.tar.gz

SPECS/sbd.spec

@@ -19,7 +19,7 @@
 %global shortcommit %(echo %{longcommit}|cut -c1-8)
 %global modified %(echo %{longcommit}-|cut -f2 -d-)
 %global github_owner Clusterlabs
-%global buildnum 1
+%global buildnum 2
 
 %ifarch s390x s390
 # minimum timeout on LPAR diag288 watchdog is 15s
@@ -61,18 +61,18 @@ BuildRequires:  libuuid-devel
 BuildRequires:  glib2-devel
 BuildRequires:  libaio-devel
 BuildRequires:  corosync-devel
-BuildRequires:  pacemaker-libs-devel
+BuildRequires:  pacemaker-libs-devel > 1.1.12
 BuildRequires:  libtool
 BuildRequires:  libuuid-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  pkgconfig
-BuildRequires:  make
 BuildRequires:  systemd
-Conflicts:      fence-agents-sbd < 4.5.0
+BuildRequires:  make
-Conflicts:      pacemaker-libs < 2.1.0-5
+Conflicts:      fence-agents-sbd < 4.2.1-38
+Conflicts:      pacemaker-libs < 2.0.5-4
 
-%if 0%{?rhel}
+%if 0%{?rhel} > 0
-ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le
+ExclusiveArch: i686 x86_64 s390x ppc64le aarch64
 %endif
 
 %if %{defined systemd_requires}
@@ -107,7 +107,7 @@ export CFLAGS="$RPM_OPT_FLAGS -Wall -Werror"
 %configure --with-watchdog-timeout-default=%{watchdog_timeout_default} \
            --with-sync-resource-startup-default=%{?with_sync_resource_startup_default:yes}%{!?with_sync_resource_startup_default:no} \
            --with-sync-resource-startup-sysconfig=%{sync_resource_startup_sysconfig} \
-           --runstatedir=%{_rundir}
+           --with-runstatedir=%{_rundir}
 make %{?_smp_mflags}
 
 ###########################################################
@@ -132,6 +132,9 @@ find %{buildroot} -name '*.la' -type f -print0 | xargs -0 rm -f
 
 ###########################################################
 
+%clean
+rm -rf %{buildroot}
+
 %if %{defined _unitdir}
 %post
 %systemd_post sbd.service
@@ -179,138 +182,298 @@ fi
 %{_libdir}/libsbdtestbed*
 
 %changelog
-* Tue May 23 2023 Klaus Wenninger <kwenning@redhat.com> - 1.5.2-1
+* Wed May 24 2023 Klaus Wenninger <kwenning@redhat.com> - 1.5.2-2
+- add required tests subdirectory in addition to gating.yaml
+  that had already been brought over before
+
+  Related: rhbz#2168567
+
+* Wed May 24 2023 Klaus Wenninger <kwenning@redhat.com> - 1.5.2-1
 - rebase to upstream v1.5.2
 - convert license naming to SPDX
 - make static analysis happy with a few checks & rearanges with
   dynamic-memory-management
 
-  Resolves: rhbz#2168579
+  Resolves: rhbz#2168567
 
-* Mon Jul 18 2022 Klaus Wenninger <kwenning@redhat.com> - 1.5.1-3
+* Fri Jul 15 2022 Klaus Wenninger <kwenning@redhat.com> - 1.5.1-2
 - Be a bit more descriptive on issues opening watchdog-devices
 
-  Resolves: rhbz#2108122
+  Resolves: rhbz#1841402
-
-* Mon Dec 6 2021 Klaus Wenninger <kwenning@redhat.com> - 1.5.1-2
-- obviously autoconf is defining runstatedir - but with a
-  wrong default - directly hand it over to configure
-  and skip --with-runstatedir implemented in configure.ac
-  for older versions of autoconf
-
-  Resolves: rhbz#2011707
 
 * Wed Dec 1 2021 Klaus Wenninger <kwenning@redhat.com> - 1.5.1-1
 - rebase to upstream v1.5.1
 
-  Resolves: rhbz#2013261
+  Resolves: rhbz#2013256
 
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.5.0-2.1
+* Wed Aug 18 2021 Klaus Wenninger <kwenning@redhat.com> - 1.5.0-2
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- reverted watchdog_timeout_default to 5s
-  Related: rhbz#1991688
+  (slipped in via an unreleased change on 8.4.0 branch)
 
-* Fri Jul 9 2021 Klaus Wenninger <kwenning@redhat.com> - 1.5.0-2
+  Resolves: rhbz#1980797
-- properly conflict with pacemaker not providing sync-default we need
-  Resolves: rhbz#1979961
-  Resolves: rhbz#1979573
 
-* Tue Jul 6 2021 Klaus Wenninger <kwenning@redhat.com> - 1.5.0-1
+* Mon Jul 19 2021 Klaus Wenninger <kwenning@redhat.com> - 1.5.0-1
-- sync with fedora sbd-1.5.0-1
+- rebase to upstream v1.5.0
-  Resolves: rhbz#1979961
+- sync with c9s & fedora
-  Resolves: rhbz#1979573
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.4.2-3.2
+  Resolves: rhbz#1980797
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-3.1
+* Mon Feb 1 2021 Klaus Wenninger <kwenning@redhat.com> - 1.4.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+- change the default for SBD_WATCHDOG_TIMEOUT to 10s
+  s390(x) stays at 15s as before
 
-* Mon Dec 7 2020 Klaus Wenninger <kwenning@redhat.com> - 1.4.2-3
+  Resolves: rhbz#1922143
-- this time really remove dist.depcheck from gating
 
-* Mon Dec 7 2020 Klaus Wenninger <kwenning@redhat.com> - 1.4.2-2
+* Thu Jan 28 2021 Klaus Wenninger <kwenning@redhat.com> - 1.4.2-2
-- remove deprecated dist.depcheck from gating
+- update SBD_SYNC_RESOURCE_STARTUP description for
-- add tier0 to push_stable to have rawhide gated as well
+  configurable default
 
-* Mon Dec 7 2020 Klaus Wenninger <kwenning@redhat.com> - 1.4.2-1
+  Resolves: rhbz#1915874
-- Rebase to upstream v1.4.2
-- Conflict with pacemaker that doesn't have pacemakerd-api
-- Set default to not do startup/shutdown-syncing via pacemakerd-api
-  but enable in template-config
 
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-7.1
+* Thu Dec 3 2020 Klaus Wenninger <kwenning@redhat.com> - 1.4.2-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+- rebase to upstream v1.4.2
+- make sbd default to do pacemakerd-api handshake
+- conflict with pacemaker-libs < 2.0.5-4 to assure pacemaker
+  is defaulting to pacemakerd-api handshake
 
-* Thu May 14 2020 Klaus Wenninger <kwenning@redhat.com> - 1.4.1-7
+  Resolves: rhbz#1903730
-- Rebuild against libqb2.0 (f33-build-side-23348)
+  Resolves: rhbz#1873135
 
-* Wed Mar 11 2020 Klaus Wenninger <kwenning@redhat.com> - 1.4.1-6
+* Thu Jul 30 2020 Klaus Wenninger <kwenning@redhat.com> - 1.4.1-7
-- Rebuild because tagging the build failed
+- conflict with pacemaker-libs < 2.0.4-5 instead of requiring
+  a minimum pacemaker version
 
-* Thu Mar 5 2020 Klaus Wenninger <kwenning@redhat.com> - 1.4.1-5
+  Resolves: rhbz#1861713
-- Rebase to upstream v1.4.1
-- Make coverity happy with parameter passing in regressions.sh
-- Add auto generated environment section to man-page
-- Overhaul setting scheduler policy/priority
-- Enable Fedora CI Gating
 
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-3
+* Mon Jul 27 2020 Klaus Wenninger <kwenning@redhat.com> - 1.4.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+- match qdevice-sync_timeout against wd-timeout
+- sync startup/shutdown via pacemakerd-api
 
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-2
+  Resolves: rhbz#1703128
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+  Resolves: rhbz#1743726
 
-* Fri Feb 1 2019 Klaus Wenninger <kwenning@redhat.com> - 1.4.0-1
+* Wed Jun 24 2020 Klaus Wenninger <kwenning@redhat.com> - 1.4.1-5
-- Rebase to upstream v1.4.0
+- rebuild against pacemaker having new no_quorum_demote
-- Fail earlier on invalid servants (solves GCC9 build issue as well)
 
-* Wed Nov 21 2018 Klaus Wenninger <kwenning@redhat.com> - 1.3.1-1.git4927571
+  Resolves: rhbz#1850078
-- Rebased to commit 4927571f8e9b00db8242654b1329dfbd71dcfe99
-- Removed disabling of shared-disk-support
-  Resolves rhbz#1606301
 
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-4.3
+* Wed Jun 24 2020 Klaus Wenninger <kwenning@redhat.com> - 1.4.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+- handle new no_quorum_demote in pacemaker
 
-* Sun Mar 18 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.2.1-4.2
+  Resolves: rhbz#1850078
-- Update Python 2 dependency declarations to new packaging standards
-  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
 
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-4.1
+* Mon Feb 17 2020 Klaus Wenninger <kwenning@redhat.com> - 1.4.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+- append the man-page by a section auto-generated from
+  sbd.sysconfig
 
-* Tue Jan 30 2018 Merlin Mathesius <mmathesi@redhat.com> - 1.2.1-4
+  Resolves: rhbz#1803826
-- Patch to use correct C inline function semantics to fix FTBFS (BZ#1424417)
-  Cleanup spec file conditionals
 
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-3.4
+* Wed Nov 20 2019 Klaus Wenninger <kwenning@redhat.com> - 1.4.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+- silence coverity regarding inconsistent parameter passing
+- adapt fence-agents-dependency from upstream to distribution
 
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-3.3
+  Resolves: rhbz#1769305
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-3.2
+* Tue Nov 19 2019 Klaus Wenninger <kwenning@redhat.com> - 1.4.1-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+- rebase to upstream v1.4.0
 
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-3.1
+  Resolves: rhbz#1769305
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+  Resolves: rhbz#1768906
 
-* Tue Jan 19 2016 Jan Pokorný <jpokorny+rpm-sbd@redhat.com> - 1.2.1-3
+* Fri Aug 16 2019 Klaus Wenninger <kwenning@redhat.com> - 1.4.0-15
-- Rebuilt for libpe_status soname bump arising from Pacemaker 1.1.14
+- check for shutdown attribute on every cib-diff
 
-* Thu Jul 02 2015 Ralf Corsépius <corsepiu@fedoraproject.org> - 1.2.1-2
+  Resolves: rhbz#1718296
-- Add dist-tag (RHBZ #1237187).
 
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.1-1.1
+* Wed Jun 12 2019 Klaus Wenninger <kwenning@redhat.com> - 1.4.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+- added missing patches to git
 
-* Thu Oct 30 2014 <andrew@beekhof.net> - 1.2.1-1
+  Resolves: rhbz#1702727
+  Resolves: rhbz#1718296
+
+* Tue Jun 11 2019 Klaus Wenninger <kwenning@redhat.com> - 1.4.0-9
+- assume graceful pacemaker exit if leftovers are unmanaged
+- query corosync liveness via votequorum-api
+
+  Resolves: rhbz#1702727
+  Resolves: rhbz#1718296
+
+* Mon Jun 3 2019 Klaus Wenninger <kwenning@redhat.com> - 1.4.0-8
+- check for rt-budget > 0 and move to root-slice otherwise
+
+  Resolves: rhbz#1713021
+
+* Wed Apr 10 2019 Klaus Wenninger <kwenning@redhat.com> - 1.4.0-7
+- add some minor fixes from upstream found by coverity
+
+  Resolves: rhbz#1698056
+
+* Wed Apr 10 2019 Klaus Wenninger <kwenning@redhat.com> - 1.4.0-6
+- add decision-context to gating.yaml
+
+  Resolves: rhbz#1682137
+
+* Mon Jan 14 2019 Klaus Wenninger <kwenning@redhat.com> - 1.4.0-5
+- rebase to upstream v1.4.0
+- finalize cmap connection if disconnected from cluster
+- make handling of cib-connection loss more robust
+- add ci test files
+- use generic term cluster-services in doc
+- stress in doc that on-disk metadata watchdog-timeout
+  takes precedence
+- fail earlier on invalid servants to make gcc 9 happy
+
+  Resolves: rhbz#1698056
+  Resolves: rhbz#1682137
+
+* Mon Dec 17 2018 Klaus Wenninger <kwenning@redhat.com> - 1.3.1-18
+- make timeout-action executed by sbd configurable
+
+  Resolves: rhbz#1660147
+
+* Mon Dec 3 2018 Klaus Wenninger <kwenning@redhat.com> - 1.3.1-17
+- use pacemaker's new pe api with constructors/destructors
+
+  Resolves: rhbz#1650663
+
+* Wed Sep 19 2018 Klaus Wenninger <kwenning@redhat.com> - 1.3.1-16
+- avoid statting potential symlink-targets in /dev
+
+  Resolves: rhbz#1629020
+
+* Wed Sep 19 2018 Klaus Wenninger <kwenning@redhat.com> - 1.3.1-15
+- rebuild against new versions of libqb (1.0.3-7.el8),
+  corosync (2.99.3-4.el8) and pacemaker (2.0.0-9.el8)
+
+  Related: rhbz#1615945
+
+* Fri Sep 14 2018 Klaus Wenninger <kwenning@redhat.com> - 1.3.1-14
+- skip symlinks pointing to dev-nodes outside of /dev
+
+  Resolves: rhbz#1629020
+
+* Wed Sep 5 2018 Klaus Wenninger <kwenning@redhat.com> - 1.3.1-13
+- Require systemd-package during build to have the macros
+
+  Resolves: rhbz#1625553
+
+* Mon Jul 30 2018 Florian Weimer <fweimer@redhat.com> - 1.3.1-12
+- Rebuild with fixed binutils
+
+* Tue Jul 3 2018 <kwenning@redhat.com> - 1.3.1-11
+- replaced tarball by version downloaded from github
+
+* Mon Jul 2 2018 <kwenning@redhat.com> - 1.3.1-10
+- removed unneeded python build-dependency
+- updated legacy corosync-devel to corosynclib-devel
+
+  Resolves: rhbz#1595856
+
+* Fri May 4 2018 <kwenning@redhat.com> - 1.3.1-9
+- use cib-api directly as get_cib_copy gone with
+  pacemaker 2.0.0
+- add sys/sysmacros.h to build with glibc-2.25
+- enlarge string buffer to satisfy newer gcc
+- no corosync 1 support with pacemaker 2.0.0
+- set default to LOG_NOTICE + overhaul levels
+- refactor proc-parsing
+- adaptions for daemon-names changed with
+  pacemaker 2.0.0 rc3
+- added .do-not-sync-with-fedora
+  Resolves: rhbz#1571797
+
+* Mon Apr 16 2018 <kwenning@redhat.com> - 1.3.1-8
+- Added aarch64 target
+
+  Resolves: rhbz#1568029
+
+* Mon Jan 15 2018 <kwenning@redhat.com> - 1.3.1-7
+- reenable sbd on upgrade so that additional
+  links to make pacemaker properly depend on
+  sbd are created
+
+  Resolves: rhbz#1525981
+
+* Wed Jan 10 2018 <kwenning@redhat.com> - 1.3.1-5
+- add man sections for query- & test-watchdog
+
+  Resolves: rhbz#1462002
+
+* Wed Dec 20 2017 <kwenning@redhat.com> - 1.3.1-3
+- mention timeout caveat with SBD_DELAY_START
+  in configuration template
+- make systemd wait for sbd-start to finish
+  before starting pacemaker or dlm
+
+  Resolves: rhbz#1525981
+
+* Fri Nov 3 2017 <kwenning@redhat.com> - 1.3.1-2
+- rebase to upstream v1.3.1
+
+  Resolves: rhbz#1499864
+            rhbz#1468580
+            rhbz#1462002
+
+* Wed Jun 7 2017 <kwenning@redhat.com> - 1.3.0-3
+- prevent creation of duplicate servants
+- check 2Node flag in corosync to support
+  2-node-clusters with shared disk fencing
+- move disk-triggered reboot/off/crashdump
+  to inquisitor to have sysrq observed by watchdog
+
+  Resolves: rhbz#1413951
+
+* Sun Mar 26 2017 <kwenning@redhat.com> - 1.3.0-1
+- rebase to upstream v1.3.0
+- remove watchdog-limitation from description
+  Resolves: rhbz#1413951
+
+* Mon Feb 27 2017 <kwenning@redhat.com> - 1.2.1-23
+- if shared-storage enabled check for node-name <= 63 chars
+  Resolves: rhbz#1413951
+
+* Tue Jan 31 2017 <kwenning@redhat.com> - 1.2.1-22
+- Rebuild with shared-storage enabled
+- Package original manpage
+- Added ppc64le target
+  Resolves: rhbz#1413951
+
+* Fri Apr 15 2016 <kwenning@redhat.com> - 1.2.1-21
+- Rebuild for new pacemaker
+  Resolves: rhbz#1320400
+
+* Fri Apr 15 2016 <kwenning@redhat.com> - 1.2.1-20
+- tarball updated to c511b0692784a7085df4b1ae35748fb318fa79ee
+  from https://github.com/Clusterlabs/sbd
+  Resolves: rhbz#1324240
+
+* Thu Jul 23 2015 <abeekhof@redhat.com> - 1.2.1-5
+- Rebuild for pacemaker
+
+* Tue Jun 02 2015 <abeekhof@redhat.com> - 1.2.1-4
+- Include the dist tag in the release string
+- Rebuild for new pacemaker
+
+* Mon Jan 12 2015 <abeekhof@redhat.com> - 1.2.1-3
+- Correctly parse SBD_WATCHDOG_TIMEOUT into seconds (not milliseconds)
+
+* Mon Oct 27 2014 <abeekhof@redhat.com> - 1.2.1-2
 - Correctly enable /proc/pid validation for sbd_lock_running()
+
+* Fri Oct 24 2014 <abeekhof@redhat.com> - 1.2.1-1
+- Further improve integration with the el7 environment
+
+* Thu Oct 16 2014 <abeekhof@redhat.com> - 1.2.1-0.5.872e82f3.git
+- Disable unsupported functionality (for now)
+
+* Wed Oct 15 2014 <abeekhof@redhat.com> - 1.2.1-0.4.872e82f3.git
 - Improved integration with the el7 environment
 
-* Fri Aug 29 2014 <andrew@beekhof.net> - 1.2.1-0.2.8f912945.git
+* Tue Sep 30 2014 <abeekhof@redhat.com> - 1.2.1-0.3.8f912945.git
+- Only build on archs supported by the HA Add-on
+
+* Fri Aug 29 2014 <abeekhof@redhat.com> - 1.2.1-0.2.8f912945.git
 - Remove some additional SUSE-isms
 
-* Fri Aug 29 2014 <andrew@beekhof.net> - 1.2.1-0.1.8f912945.git
+* Fri Aug 29 2014 <abeekhof@redhat.com> - 1.2.1-0.1.8f912945.git
 - Prepare for package review
-  Resolves: rhbz#1134245