Add correct patch on top of rebase
- Resolves: rhbz1936023
This commit is contained in:
Ken Gaillot
parent
6acb138bce
commit
250166d985
|
|
@ -0,0 +1,161 @@
|
|||
From 7c5ec862fbc2bcf18de08fad716cd266e721d5a7 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Gaillot <kgaillot@redhat.com>
|
||||
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 <clumens@redhat.com>
|
||||
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 @@
|
||||
+<?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-digests"/>
|
||||
+ </start>
|
||||
+
|
||||
+ <define name="element-digests">
|
||||
+ <attribute name="resource"> <text/> </attribute>
|
||||
+ <attribute name="node"> <text/> </attribute>
|
||||
+ <attribute name="task"> <text/> </attribute>
|
||||
+ <attribute name="interval"> <text/> </attribute>
|
||||
+ <zeroOrMore>
|
||||
+ <ref name="element-digest"/>
|
||||
+ </zeroOrMore>
|
||||
+ </define>
|
||||
+
|
||||
+ <define name="element-digest">
|
||||
+ <attribute name="type"> <text/> </attribute>
|
||||
+ <attribute name="hash"> <text/> </attribute>
|
||||
+ <optional>
|
||||
+ <element name="parameters">
|
||||
+ <zeroOrMore>
|
||||
+ <attribute>
|
||||
+ <anyName/>
|
||||
+ <text/>
|
||||
+ </attribute>
|
||||
+ </zeroOrMore>
|
||||
+ </element>
|
||||
+ </optional>
|
||||
+ </define>
|
||||
+</grammar>
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
||||
From 03b320202761fa6617231680b8a6433f645b0449 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Lumens <clumens@redhat.com>
|
||||
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 @@
|
||||
</start>
|
||||
|
||||
<define name="element-digests">
|
||||
- <attribute name="resource"> <text/> </attribute>
|
||||
- <attribute name="node"> <text/> </attribute>
|
||||
- <attribute name="task"> <text/> </attribute>
|
||||
- <attribute name="interval"> <text/> </attribute>
|
||||
- <zeroOrMore>
|
||||
- <ref name="element-digest"/>
|
||||
- </zeroOrMore>
|
||||
+ <element name="digests">
|
||||
+ <attribute name="resource"> <text/> </attribute>
|
||||
+ <attribute name="node"> <text/> </attribute>
|
||||
+ <attribute name="task"> <text/> </attribute>
|
||||
+ <attribute name="interval"> <text/> </attribute>
|
||||
+ <zeroOrMore>
|
||||
+ <ref name="element-digest"/>
|
||||
+ </zeroOrMore>
|
||||
+ </element>
|
||||
</define>
|
||||
|
||||
<define name="element-digest">
|
||||
- <attribute name="type"> <text/> </attribute>
|
||||
- <attribute name="hash"> <text/> </attribute>
|
||||
- <optional>
|
||||
- <element name="parameters">
|
||||
- <zeroOrMore>
|
||||
- <attribute>
|
||||
- <anyName/>
|
||||
- <text/>
|
||||
- </attribute>
|
||||
- </zeroOrMore>
|
||||
- </element>
|
||||
- </optional>
|
||||
+ <element name="digest">
|
||||
+ <attribute name="type"> <text/> </attribute>
|
||||
+ <attribute name="hash"> <text/> </attribute>
|
||||
+ <optional>
|
||||
+ <element name="parameters">
|
||||
+ <zeroOrMore>
|
||||
+ <attribute>
|
||||
+ <anyName/>
|
||||
+ <text/>
|
||||
+ </attribute>
|
||||
+ </zeroOrMore>
|
||||
+ </element>
|
||||
+ </optional>
|
||||
+ </element>
|
||||
</define>
|
||||
</grammar>
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -235,7 +235,7 @@ 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-header-guard.patch
|
||||
Patch1: 001-rollup.patch
|
||||
Patch2: 002-ping-agent.patch
|
||||
Patch3: 003-pacemakerd-options.patch
|
||||
Patch4: 004-pacemakerd-output.patch
|
||||
|
|
|
|||
Loading…
Reference in New Issue