From de82427c3e4b193b834f79e628fb887211f59005 Mon Sep 17 00:00:00 2001 From: Ken Gaillot Date: Thu, 10 Jun 2021 10:49:06 -0500 Subject: [PATCH] Rebase on upstream 2.1.0 final release - Resolves: rhbz1936023 --- 002-ping-agent.patch => 001-ping-agent.patch | 0 001-rollup.patch | 161 ------------------ ...ions.patch => 002-pacemakerd-options.patch | 0 ...utput.patch => 003-pacemakerd-output.patch | 0 ...check-level.patch => 004-check-level.patch | 0 pacemaker.spec | 18 +- sources | 2 +- 7 files changed, 12 insertions(+), 169 deletions(-) rename 002-ping-agent.patch => 001-ping-agent.patch (100%) delete mode 100644 001-rollup.patch rename 003-pacemakerd-options.patch => 002-pacemakerd-options.patch (100%) rename 004-pacemakerd-output.patch => 003-pacemakerd-output.patch (100%) rename 005-check-level.patch => 004-check-level.patch (100%) diff --git a/002-ping-agent.patch b/001-ping-agent.patch similarity index 100% rename from 002-ping-agent.patch rename to 001-ping-agent.patch diff --git a/001-rollup.patch b/001-rollup.patch deleted file mode 100644 index c74b969..0000000 --- a/001-rollup.patch +++ /dev/null @@ -1,161 +0,0 @@ -From 7c5ec862fbc2bcf18de08fad716cd266e721d5a7 Mon Sep 17 00:00:00 2001 -From: Ken Gaillot -Date: Tue, 1 Jun 2021 16:53:19 -0500 -Subject: [PATCH 1/3] Refactor: libcrmcommon: use unique header guard - -should have been done with 42343b75 ---- - include/crm/msg_xml_compat.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/crm/msg_xml_compat.h b/include/crm/msg_xml_compat.h -index 250e183..d801aea 100644 ---- a/include/crm/msg_xml_compat.h -+++ b/include/crm/msg_xml_compat.h -@@ -7,8 +7,8 @@ - * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY. - */ - --#ifndef XML_TAGS__H --# define XML_TAGS__H -+#ifndef PCMK__MSG_XML_COMPAT__H -+# define PCMK__MSG_XML_COMPAT__H - - #ifdef __cplusplus - extern "C" { -@@ -39,4 +39,4 @@ extern "C" { - } - #endif - --#endif -+#endif // PCMK__MSG_XML_COMPAT__H --- -1.8.3.1 - - -From af5a2caa15eb0ca2cde5efe5b815405c46d795b5 Mon Sep 17 00:00:00 2001 -From: Chris Lumens -Date: Wed, 2 Jun 2021 10:08:56 -0400 -Subject: [PATCH 2/3] Low: schemas: Copy digests.rng to prepare for changes. - -See: rhbz#1967087 ---- - xml/api/digests-2.9.rng | 33 +++++++++++++++++++++++++++++++++ - 1 file changed, 33 insertions(+) - create mode 100644 xml/api/digests-2.9.rng - -diff --git a/xml/api/digests-2.9.rng b/xml/api/digests-2.9.rng -new file mode 100644 -index 0000000..7e843d4 ---- /dev/null -+++ b/xml/api/digests-2.9.rng -@@ -0,0 +1,33 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ --- -1.8.3.1 - - -From 03b320202761fa6617231680b8a6433f645b0449 Mon Sep 17 00:00:00 2001 -From: Chris Lumens -Date: Wed, 2 Jun 2021 10:15:26 -0400 -Subject: [PATCH 3/3] Low: schemas: Add "digests" and "digest" elements to - digests.rng. - -These elements had all their attributes and sub-elements defined, but -were missing their surrounding outer elements. - -See: rhbz#1967087 ---- - xml/api/digests-2.9.rng | 42 +++++++++++++++++++++++------------------- - 1 file changed, 23 insertions(+), 19 deletions(-) - -diff --git a/xml/api/digests-2.9.rng b/xml/api/digests-2.9.rng -index 7e843d4..3d00628 100644 ---- a/xml/api/digests-2.9.rng -+++ b/xml/api/digests-2.9.rng -@@ -7,27 +7,31 @@ - - - -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - --- -1.8.3.1 - diff --git a/003-pacemakerd-options.patch b/002-pacemakerd-options.patch similarity index 100% rename from 003-pacemakerd-options.patch rename to 002-pacemakerd-options.patch diff --git a/004-pacemakerd-output.patch b/003-pacemakerd-output.patch similarity index 100% rename from 004-pacemakerd-output.patch rename to 003-pacemakerd-output.patch diff --git a/005-check-level.patch b/004-check-level.patch similarity index 100% rename from 005-check-level.patch rename to 004-check-level.patch diff --git a/pacemaker.spec b/pacemaker.spec index 318d4f2..ce61034 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -32,10 +32,10 @@ ## can be incremented to build packages reliably considered "newer" ## than previously built packages with the same pcmkversion) %global pcmkversion 2.1.0 -%global specversion 3 +%global specversion 4 ## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build -%global commit b7762381d5c247951eaf68738b731b5c4e2b12ee +%global commit 7c3f660707a495a1331716ad32cd3ac9d9f8ff58 ## Since git v2.11, the extent of abbreviation is autoscaled by default ## (used to be constant of 7), so we need to convey it for non-tags, too. @@ -235,11 +235,10 @@ Source0: https://codeload.github.com/%{github_owner}/%{name}/tar.gz/%{arch Source1: https://codeload.github.com/%{github_owner}/%{nagios_name}/tar.gz/%{nagios_archive_github_url} # upstream commits -Patch1: 001-rollup.patch -Patch2: 002-ping-agent.patch -Patch3: 003-pacemakerd-options.patch -Patch4: 004-pacemakerd-output.patch -Patch5: 005-check-level.patch +Patch1: 001-ping-agent.patch +Patch2: 002-pacemakerd-options.patch +Patch3: 003-pacemakerd-output.patch +Patch4: 004-check-level.patch Requires: resource-agents Requires: %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release} @@ -493,6 +492,7 @@ export LDFLAGS_HARDENED_LIB="%{?_hardening_ldflags}" %{?with_sbd_sync: --with-sbd-sync-default="true"} \ %{?gnutls_priorities: --with-gnutls-priorities="%{gnutls_priorities}"} \ %{?bug_url: --with-bug-url=%{bug_url}} \ + %{?ocf_root: --with-ocfdir=%{ocf_root}} \ %{?concurrent_fencing} \ %{?resource_stickiness} \ %{?compat20} \ @@ -816,6 +816,10 @@ exit 0 %license %{nagios_name}-%{nagios_hash}/COPYING %changelog +* Thu Jun 10 2021 Ken Gaillot - 2.1.0-4 +- Rebase on upstream 2.1.0 final release +- Resolves: rhbz1936023 + * Tue Jun 1 2021 Ken Gaillot - 2.1.0-3 - Rebase on upstream 2.1.0-rc3 release - Resolves: rhbz1936023 diff --git a/sources b/sources index 642b709..2ab7f32 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (nagios-agents-metadata-105ab8a7b2c16b9a29cf1c1596b80136eeef332b.tar.gz) = 11ddeb48a4929e7642b6dfa9c7962aa1d7a1af1c569830f55ed6cd6773abac13377317327bc1db8411c8077884f83f81cc54d746c834b63a99fa6dc219b5caad -SHA512 (pacemaker-b7762381d.tar.gz) = 15f7d3705e062943233295aee3b43697639ca37d8f8690902be1c2d312b3c1903474bc1ecca66031f134d6e64f573e29d42b51c219da04479541e90a5562aff4 +SHA512 (pacemaker-7c3f66070.tar.gz) = e1c53d019c965395affc1bd78358927617c9bc8572c405ee884737a8213455c5e85102e6f58bb5239ab23ebe5aa794f72c9cc0746900b7a6cc14fd3cf1879064