import pacemaker-2.0.4-6.el8_3.2
This commit is contained in:
CentOS Sources
Cloud User
parent
2fda2a9ec9
commit
98caf1a2ae
2309
SOURCES/017-promotion.patch
Normal file
2309
SOURCES/017-promotion.patch
Normal file
File diff suppressed because it is too large
Load Diff
167
SOURCES/018-api-schema.patch
Normal file
167
SOURCES/018-api-schema.patch
Normal file
@ -0,0 +1,167 @@
|
||||
From bd4f396f267d8ef8f9c9bcbf286a77dc78d4e1b0 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Lumens <clumens@redhat.com>
|
||||
Date: Tue, 2 Mar 2021 10:26:13 -0500
|
||||
Subject: [PATCH 1/2] Med: Generate xml/crm_mon.rng from the contents of
|
||||
xml/crm_mon*.
|
||||
|
||||
This prevents the version reference in it from getting out of sync.
|
||||
|
||||
See: rhbz#1931332
|
||||
---
|
||||
xml/Makefile.am | 28 +++++++++++++++++++++++-----
|
||||
xml/crm_mon.rng | 16 ----------------
|
||||
3 files changed, 24 insertions(+), 21 deletions(-)
|
||||
delete mode 100644 xml/crm_mon.rng
|
||||
|
||||
diff --git a/xml/Makefile.am b/xml/Makefile.am
|
||||
index cb6cfa0..c52b968 100644
|
||||
--- a/xml/Makefile.am
|
||||
+++ b/xml/Makefile.am
|
||||
@@ -76,22 +76,24 @@ CIB_abs_xsl = $(abs_srcdir)/upgrade-1.3.xsl \
|
||||
$(abs_srcdir)/upgrade-2.10.xsl \
|
||||
$(wildcard $(abs_srcdir)/upgrade-*enter.xsl) \
|
||||
$(wildcard $(abs_srcdir)/upgrade-*leave.xsl)
|
||||
-MON_abs_files = $(abs_srcdir)/crm_mon.rng
|
||||
+MON_abs_files = $(abs_srcdir)/crm_mon.rng
|
||||
API_files = $(foreach base,$(API_base),$(wildcard $(srcdir)/api/$(base)*.rng))
|
||||
CIB_files = $(foreach base,$(CIB_base),$(wildcard $(srcdir)/$(base).rng $(srcdir)/$(base)-*.rng))
|
||||
CIB_xsl = $(srcdir)/upgrade-1.3.xsl \
|
||||
$(srcdir)/upgrade-2.10.xsl \
|
||||
$(wildcard $(srcdir)/upgrade-*enter.xsl) \
|
||||
$(wildcard $(srcdir)/upgrade-*leave.xsl)
|
||||
-MON_files = $(srcdir)/crm_mon.rng
|
||||
+MON_files = $(srcdir)/crm_mon.rng
|
||||
|
||||
# Sorted lists of all numeric schema versions
|
||||
API_numeric_versions = $(call numeric_versions,${API_files})
|
||||
CIB_numeric_versions = $(call numeric_versions,${CIB_files})
|
||||
+MON_numeric_versions = $(call numeric_versions,$(wildcard $(srcdir)/api/crm_mon*.rng))
|
||||
|
||||
# The highest numeric schema version
|
||||
API_max ?= $(lastword $(API_numeric_versions))
|
||||
CIB_max ?= $(lastword $(CIB_numeric_versions))
|
||||
+MON_max ?= $(lastword $(MON_numeric_versions))
|
||||
|
||||
# Sorted lists of all schema versions (including "next")
|
||||
API_versions = next $(API_numeric_versions)
|
||||
@@ -100,11 +102,12 @@ CIB_versions = next $(CIB_numeric_versions)
|
||||
# Build tree locations of static schema files and transforms (for VPATH builds)
|
||||
API_build_copies = $(foreach f,$(API_abs_files),$(subst $(abs_srcdir),$(abs_builddir),$(f)))
|
||||
CIB_build_copies = $(foreach f,$(CIB_abs_files) $(CIB_abs_xsl),$(subst $(abs_srcdir),$(abs_builddir),$(f)))
|
||||
-MON_build_copies = $(foreach f,$(MON_abs_files),$(subst $(abs_srcdir),$(abs_builddir),$(f)))
|
||||
+MON_build_copies = $(foreach f,$(MON_abs_files),$(subst $(abs_srcdir),$(abs_builddir),$(f)))
|
||||
|
||||
# Dynamically generated schema files
|
||||
API_generated = api/api-result.rng $(foreach base,$(API_versions),api/api-result-$(base).rng)
|
||||
CIB_generated = pacemaker.rng $(foreach base,$(CIB_versions),pacemaker-$(base).rng) versions.rng
|
||||
+MON_generated = crm_mon.rng
|
||||
|
||||
CIB_version_pairs = $(call version_pairs,${CIB_numeric_versions})
|
||||
CIB_version_pairs_cnt = $(words ${CIB_version_pairs})
|
||||
@@ -112,10 +115,10 @@ CIB_version_pairs_last = $(call version_pairs_last,${CIB_version_pairs_cnt},${C
|
||||
|
||||
dist_API_DATA = $(API_files)
|
||||
dist_CIB_DATA = $(CIB_files) $(CIB_xsl)
|
||||
-dist_MON_DATA = $(MON_files)
|
||||
|
||||
nodist_API_DATA = $(API_generated)
|
||||
nodist_CIB_DATA = $(CIB_generated)
|
||||
+nodist_MON_DATA = $(MON_generated)
|
||||
|
||||
EXTRA_DIST = Readme.md \
|
||||
best-match.sh \
|
||||
@@ -162,6 +165,21 @@ api/api-result-%.rng: $(API_build_copies) best-match.sh Makefile.am
|
||||
$(AM_V_at)echo ' </start>' >> $@
|
||||
$(AM_V_SCHEMA)echo '</grammar>' >> $@
|
||||
|
||||
+crm_mon.rng: api/crm_mon-$(MON_max).rng
|
||||
+ $(AM_V_at)echo '<?xml version="1.0" encoding="UTF-8"?>' > $@
|
||||
+ $(AM_V_at)echo '<grammar xmlns="http://relaxng.org/ns/structure/1.0"' >> $@
|
||||
+ $(AM_V_at)echo ' datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">' >> $@
|
||||
+ $(AM_V_at)echo ' <start>' >> $@
|
||||
+ $(AM_V_at)echo ' <ref name="element-crm_mon-old"/>' >> $@
|
||||
+ $(AM_V_at)echo ' </start>' >> $@
|
||||
+ $(AM_V_at)echo ' <define name="element-crm_mon-old">' >> $@
|
||||
+ $(AM_V_at)echo ' <element name="crm_mon">' >> $@
|
||||
+ $(AM_V_at)echo ' <attribute name="version"> <text/> </attribute>' >> $@
|
||||
+ $(AM_V_at)echo ' <externalRef href="$(<)" />' >> $@
|
||||
+ $(AM_V_at)echo ' </element>' >> $@
|
||||
+ $(AM_V_at)echo ' </define>' >> $@
|
||||
+ $(AM_V_SCHEMA)echo '</grammar>' >> $@
|
||||
+
|
||||
# Dynamically generated top-level CIB schema
|
||||
pacemaker.rng: pacemaker-$(CIB_max).rng
|
||||
$(AM_V_SCHEMA)cp $(top_builddir)/xml/$< $@
|
||||
@@ -256,7 +274,7 @@ fulldiff: best-match.sh
|
||||
@echo "# Comparing all changes across all the subsequent increments"
|
||||
$(call version_diff,${CIB_version_pairs})
|
||||
|
||||
-CLEANFILES = $(API_generated) $(CIB_generated)
|
||||
+CLEANFILES = $(API_generated) $(CIB_generated) $(MON_generated)
|
||||
|
||||
clean-local:
|
||||
if [ "x$(srcdir)" != "x$(builddir)" ]; then \
|
||||
diff --git a/xml/crm_mon.rng b/xml/crm_mon.rng
|
||||
deleted file mode 100644
|
||||
index be87fba..0000000
|
||||
--- a/xml/crm_mon.rng
|
||||
+++ /dev/null
|
||||
@@ -1,16 +0,0 @@
|
||||
-<?xml version="1.0" encoding="UTF-8"?>
|
||||
-<grammar xmlns="http://relaxng.org/ns/structure/1.0"
|
||||
- datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
|
||||
-
|
||||
- <start>
|
||||
- <ref name="element-crm_mon-old"/>
|
||||
- </start>
|
||||
-
|
||||
- <define name="element-crm_mon-old">
|
||||
- <element name="crm_mon">
|
||||
- <attribute name="version"> <text/> </attribute>
|
||||
- <externalRef href="api/crm_mon-2.2.rng" />
|
||||
- </element>
|
||||
- </define>
|
||||
-
|
||||
-</grammar>
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
||||
From 9b6ee6eb5aa1008beebae9d9f6c3889c81c3bbb6 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Lumens <clumens@redhat.com>
|
||||
Date: Tue, 2 Mar 2021 10:58:15 -0500
|
||||
Subject: [PATCH 2/2] Med: Change the schema type of 'expected' and 'call' to
|
||||
integer.
|
||||
|
||||
Regression in 2.0.3.
|
||||
|
||||
See: rhbz#1931332
|
||||
---
|
||||
xml/api/crm_mon-2.2.rng | 4 ++--
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/xml/api/crm_mon-2.2.rng b/xml/api/crm_mon-2.2.rng
|
||||
index 88973a4..8e6792b 100644
|
||||
--- a/xml/api/crm_mon-2.2.rng
|
||||
+++ b/xml/api/crm_mon-2.2.rng
|
||||
@@ -198,7 +198,7 @@
|
||||
<attribute name="name"> <text /> </attribute>
|
||||
<attribute name="value"> <text /> </attribute>
|
||||
<optional>
|
||||
- <attribute name="expected"> <data type="nonNegativeInteger" /> </attribute>
|
||||
+ <attribute name="expected"> <data type="integer" /> </attribute>
|
||||
</optional>
|
||||
</element>
|
||||
</zeroOrMore>
|
||||
@@ -269,7 +269,7 @@
|
||||
<attribute name="exitstatus"> <text /> </attribute>
|
||||
<attribute name="exitreason"> <text /> </attribute>
|
||||
<attribute name="exitcode"> <data type="nonNegativeInteger" /> </attribute>
|
||||
- <attribute name="call"> <data type="nonNegativeInteger" /> </attribute>
|
||||
+ <attribute name="call"> <data type="integer" /> </attribute>
|
||||
<attribute name="status"> <text /> </attribute>
|
||||
<optional>
|
||||
<group>
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -227,7 +227,7 @@
|
||||
Name: pacemaker
|
||||
Summary: Scalable High-Availability cluster resource manager
|
||||
Version: %{pcmkversion}
|
||||
Release: %{pcmk_release}%{?dist}.1
|
||||
Release: %{pcmk_release}%{?dist}.2
|
||||
%if %{defined _unitdir}
|
||||
License: GPLv2+ and LGPLv2+
|
||||
%else
|
||||
@ -265,6 +265,8 @@ Patch13: 013-pacemakerd.patch
|
||||
Patch14: 014-sbd.patch
|
||||
Patch15: 015-cibsecret.patch
|
||||
Patch16: 016-CVE-2020-25654.patch
|
||||
Patch17: 017-promotion.patch
|
||||
Patch18: 018-api-schema.patch
|
||||
|
||||
# downstream-only commits
|
||||
#Patch100: xxx.patch
|
||||
@ -962,6 +964,12 @@ exit 0
|
||||
%license %{nagios_name}-%{nagios_hash}/COPYING
|
||||
|
||||
%changelog
|
||||
* Thu Mar 4 2021 Ken Gaillot <kgaillot@redhat.com> - 2.0.4-6.2
|
||||
- Avoid situation where promotion is not scheduled until next transition
|
||||
- Avoid pcs failures when Pacemaker records negative call ID in history
|
||||
- Resolves: rhbz1935240
|
||||
- Resolves: rhbz1939533
|
||||
|
||||
* Mon Oct 26 2020 Ken Gaillot <kgaillot@redhat.com> - 2.0.4-6.1
|
||||
- Prevent users from bypassing ACLs by using IPC directly (CVE-2020-25654)
|
||||
- Resolves: rhbz1891528
|
||||
|
||||
Loading…
Reference in New Issue
Block a user