Fix regression in crm_resource -O

- Resolves: rhbz2089353

I'm jumping from specversion 3 to 5 to restore parity with RHEL 8.7, otherwise
users of both might get confused about whether they have all fixes.

Also correct some broken URLs in the spec file

012-crm_resource.patch

@@ -0,0 +1,38 @@
+From fe9150bc4b740b3748fec34fe668df4f8c0d0e25 Mon Sep 17 00:00:00 2001
+From: Ken Gaillot <kgaillot@redhat.com>
+Date: Tue, 9 Aug 2022 15:38:03 -0500
+Subject: [PATCH] Fix: tools: correct minimum execution status shown by
+ crm_resource -O
+
+regression introduced in 2.1.0 by 5ef28b946
+
+Fixes T533
+---
+ lib/pengine/pe_output.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/pengine/pe_output.c b/lib/pengine/pe_output.c
+index 5d716fe6cb..dbb49637c9 100644
+--- a/lib/pengine/pe_output.c
++++ b/lib/pengine/pe_output.c
+@@ -1878,7 +1878,7 @@ node_and_op(pcmk__output_t *out, va_list args) {
+     time_t last_change = 0;
+ 
+     pcmk__scan_min_int(crm_element_value(xml_op, XML_LRM_ATTR_OPSTATUS),
+-                       &status, 0);
++                       &status, PCMK_EXEC_UNKNOWN);
+ 
+     rsc = pe_find_resource(data_set->resources, op_rsc);
+ 
+@@ -1932,7 +1932,7 @@ node_and_op_xml(pcmk__output_t *out, va_list args) {
+     xmlNode *node = NULL;
+ 
+     pcmk__scan_min_int(crm_element_value(xml_op, XML_LRM_ATTR_OPSTATUS),
+-                       &status, 0);
++                       &status, PCMK_EXEC_UNKNOWN);
+     node = pcmk__output_create_xml_node(out, "operation",
+                                         "op", op_key ? op_key : ID(xml_op),
+                                         "node", crm_element_value(xml_op, XML_ATTR_UNAME),
+-- 
+2.31.1
+

pacemaker.spec

@@ -36,7 +36,7 @@
 ## can be incremented to build packages reliably considered "newer"
 ## than previously built packages with the same pcmkversion)
 %global pcmkversion 2.1.4
-%global specversion 3
+%global specversion 5
 
 ## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
 %global commit dc6eb4362e67c1497a413434eba097063bf1ef83
@@ -257,6 +257,7 @@ Patch008:      008-metadata.patch
 Patch009:      009-validate.patch
 Patch010:      010-regression.patch
 Patch011:      011-unfencing.patch
+Patch012:      012-crm_resource.patch
 
 Requires:      resource-agents
 Requires:      %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release}
@@ -854,6 +855,10 @@ exit 0
 %license %{nagios_name}-%{nagios_hash}/COPYING
 
 %changelog
+* Wed Aug 10 2022 Ken Gaillot <kgaillot@redhat.com> - 2.1.4-5
+- Fix regression in crm_resource -O
+- Resolves: rhbz2089353
+
 * Wed Jul 20 2022 Ken Gaillot <kgaillot@redhat.com> - 2.1.4-3
 - stonith_admin --validate works again
 - Resolves: rhbz2102292
@@ -936,7 +941,7 @@ exit 0
 - Avoid selecting wrong device when dynamic-list fencing is used with host map
 - Show better error messages in crm_resource with invalid resource types
 - Do not schedule probes of unmanaged resources on pending nodes
-- Fix regressions in crm_attribute and crm_master argument handling
+- Fix argument handling regressions in crm_attribute and wrappers
 - Resolves: rhbz1978013
 - Resolves: rhbz1983196
 - Resolves: rhbz1983197
@@ -1457,7 +1462,7 @@ exit 0
 
 * Thu Aug 20 2015 Andrew Beekhof <abeekhof@redhat.com> - 1.1.13-2
 - Update for new upstream tarball: Pacemaker-1.1.13
-- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/master/ChangeLog for full details
+- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/main/ChangeLog for full details
 
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.12-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
@@ -1467,7 +1472,7 @@ exit 0
 
 * Tue Oct 28 2014 Andrew Beekhof <abeekhof@redhat.com> - 1.1.12-1
 - Update for new upstream tarball: Pacemaker-1.1.12+ (a9c8177)
-- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/master/ChangeLog for full details
+- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/main/ChangeLog for full details
 
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.11-1.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
@@ -1477,11 +1482,11 @@ exit 0
 
 * Tue Feb 18 2014 Andrew Beekhof <abeekhof@redhat.com> - 1.1.11-1
 - Update for new upstream tarball: Pacemaker-1.1.11 (9d39a6b)
-- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/master/ChangeLog for full details
+- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/main/ChangeLog for full details
 
 * Thu Jun 20 2013 Andrew Beekhof <abeekhof@redhat.com> - 1.1.9-3
 - Update to upstream 7d8acec
-- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/master/ChangeLog for full details
+- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/main/ChangeLog for full details
 
   + Feature: Turn off auto-respawning of systemd services when the cluster starts them
   + Fix: crmd: Ensure operations for cleaned up resources don't block recovery
@@ -1489,11 +1494,11 @@ exit 0
 
 * Mon Jun 17 2013 Andrew Beekhof <abeekhof@redhat.com> - 1.1.9-2
 - Update for new upstream tarball: 781a388
-- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/master/ChangeLog for full details
+- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/main/ChangeLog for full details
 
 * Wed May 12 2010 Andrew Beekhof <andrew@beekhof.net> - 1.1.2-1
 - Update the tarball from the upstream 1.1.2 release
-- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/master/ChangeLog for full details
+- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/main/ChangeLog for full details
 
 * Tue Jul 14 2009 Andrew Beekhof <andrew@beekhof.net> - 1.0.4-1
 - Initial checkin