Rebase on upstream 2.1.7-rc4 release

- Pacemaker Remote nodes can validate against later schema versions
- Resolves: RHEL-7597
- Related: RHEL-17224
This commit is contained in:
Chris Lumens 2023-12-13 09:46:43 -05:00
parent 5d4febdf2d
commit 797fe504a7
5 changed files with 4332 additions and 4 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ SOURCES/pacemaker-a3f4479.tar.gz
/pacemaker-a3f4479.tar.gz
/pacemaker-6fdc9deea.tar.gz
/pacemaker-7534cc50a.tar.gz
/pacemaker-c858c13cb.tar.gz

2334
001-schema-glib.patch Normal file

File diff suppressed because it is too large Load Diff

1986
002-schema-transfer.patch Normal file

File diff suppressed because it is too large Load Diff

View File

@ -36,10 +36,10 @@
## can be incremented to build packages reliably considered "newer"
## than previously built packages with the same pcmkversion)
%global pcmkversion 2.1.7
%global specversion 1
%global specversion 2
## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
%global commit 7534cc50aefbf3c161c7ed258daa1019a94d5079
%global commit c858c13cb79431b5c8e5dda3ca44dd305fce946c
## 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.
@ -265,7 +265,8 @@ Source0: https://codeload.github.com/%{github_owner}/%{name}/tar.gz/%{arch
Source1: nagios-agents-metadata-%{nagios_hash}.tar.gz
# upstream commits
#Patch001: 001-xxxx.patch
Patch001: 001-schema-glib.patch
Patch002: 002-schema-transfer.patch
# downstream-only commits
#Patch1xx: 1xx-xxxx.patch
@ -1014,6 +1015,12 @@ exit 0
%license %{nagios_name}-%{nagios_hash}/COPYING
%changelog
* Thu Dec 14 2023 Chris Lumens <clumens@redhat.com> - 2.1.7-2
- Rebase on upstream 2.1.7-rc4 release
- Pacemaker Remote nodes can validate against later schema versions
- Resolves: RHEL-7597
- Related: RHEL-17224
* Mon Nov 27 2023 Chris Lumens <clumens@redhat.com> - 2.1.7-1
- Rebase on upstream 2.1.7-rc2 release
- Resolves: RHEL-7646

View File

@ -1,2 +1,2 @@
SHA512 (nagios-agents-metadata-105ab8a.tar.gz) = 3b8a57de69f53cee1e4c0355ccd23fda49c72d06a802c3d6dc33f0fd1823766356b44f9eb14fb00f47678e522e8679a638f3850857ed7e8123dfea525151d1d5
SHA512 (pacemaker-7534cc50a.tar.gz) = 70703c68e3249a2fcc4d88d53b78a2a990163ec59b32fb4c5c6993cb53943900279017f529f9bf29a06e59fd67bb2d631719ed5a41848b01a54497caf90e0b20
SHA512 (pacemaker-c858c13cb.tar.gz) = 67a6669bb42dd7adcde2a99155086746a95a37262a14b6ca2c4f8f2706ba572ef2a3715cc40bbeb6988ae6a8979ed8ce208c890934ea0eb5d8448d84510cf3ce