rpms/pacemaker
6
0
Fork 0
Code Issues Pull Requests Releases Activity

* Thu Aug 19 2021 Klaus Wenninger <kwenning@redhat.com> - 2.1.1-0.5.rc3

Browse Source 
- Fix malformed xml in fence_watchdog metadata
This commit is contained in:
Klaus Wenninger 2021-08-20 01:22:00 +02:00
parent b2569f82a6
commit a74f8cfffa
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
0007-Fix-fence_watchdog-fix-malformed-xml-in-metadata.patch Normal file
View File

@ -0,0 +1,25 @@
From 46dd1118cae948649e000b2159e8e92623520ad9 Mon Sep 17 00:00:00 2001
From: Klaus Wenninger <klaus.wenninger@aon.at>
Date: Thu, 19 Aug 2021 09:28:54 +0200
Subject: [PATCH] Fix: fence_watchdog: fix malformed xml in metadata
---
daemons/fenced/fence_watchdog.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/daemons/fenced/fence_watchdog.in b/daemons/fenced/fence_watchdog.in
index 700065e..eefa739 100755
--- a/daemons/fenced/fence_watchdog.in
+++ b/daemons/fenced/fence_watchdog.in
@@ -124,7 +124,7 @@ def metadata(avail_opt, options):
for option, dummy in sorted_options(avail_opt):
if "shortdesc" in ALL_OPT[option]:
print(' <parameter name="' + option +
- 'required="' + ALL_OPT[option]["required"] + '">')
+ '" required="' + ALL_OPT[option]["required"] + '">')
default = ""
default_name_arg = "-" + ALL_OPT[option]["getopt"][:-1]
--
1.8.3.1

6
pacemaker.spec
View File

@ -32,7 +32,7 @@
## can be incremented to build packages reliably considered "newer" ## can be incremented to build packages reliably considered "newer"
## than previously built packages with the same pcmkversion) ## than previously built packages with the same pcmkversion)
%global pcmkversion 2.1.1 %global pcmkversion 2.1.1
%global specversion 0.4.rc3 %global specversion 0.5.rc3
## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build ## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
%global commit c6a4f6e6cdcedf08e0bfd81248b86812c2a571b2 %global commit c6a4f6e6cdcedf08e0bfd81248b86812c2a571b2
@ -221,6 +221,7 @@ Patch2: 0003-Fix-fence_watchdog-fix-version-output-needed-for-hel.patch
Patch3: 0004-Build-rpm-package-fence_watchdog-in-base-package.patch Patch3: 0004-Build-rpm-package-fence_watchdog-in-base-package.patch
Patch4: 0005-Fix-tools-make-exit-code-stdout-stderr-consistent-wi.patch Patch4: 0005-Fix-tools-make-exit-code-stdout-stderr-consistent-wi.patch
Patch5: 0006-Build-manpages-using-help2man-check-exit-code-of-too.patch Patch5: 0006-Build-manpages-using-help2man-check-exit-code-of-too.patch
Patch6: 0007-Fix-fence_watchdog-fix-malformed-xml-in-metadata.patch
# upstream commits # upstream commits
@ -829,6 +830,9 @@ exit 0
%license %{nagios_name}-%{nagios_hash}/COPYING %license %{nagios_name}-%{nagios_hash}/COPYING
%changelog %changelog
* Thu Aug 19 2021 Klaus Wenninger <kwenning@redhat.com> - 2.1.1-0.5.rc3
- Fix malformed xml in fence_watchdog metadata
* Tue Aug 17 2021 Klaus Wenninger <kwenning@redhat.com> - 2.1.1-0.4.rc3 * Tue Aug 17 2021 Klaus Wenninger <kwenning@redhat.com> - 2.1.1-0.4.rc3
- Update for new upstream tarball for release candidate: Pacemaker-2.1.1-rc3, - Update for new upstream tarball for release candidate: Pacemaker-2.1.1-rc3,
for full details, see included ChangeLog file or for full details, see included ChangeLog file or