From e1c19706138fe9d986b7c06c84320f18302c444e Mon Sep 17 00:00:00 2001 From: Ken Gaillot Date: Fri, 20 Aug 2021 09:10:40 -0500 Subject: [PATCH] Fix XML issue with fence_watchdog meta-data - Resolves: rhbz1988568 --- 020-fence_watchdog.patch | 25 +++++++++++++++++++++++++ pacemaker.spec | 7 ++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 020-fence_watchdog.patch diff --git a/020-fence_watchdog.patch b/020-fence_watchdog.patch new file mode 100644 index 0000000..76abe27 --- /dev/null +++ b/020-fence_watchdog.patch @@ -0,0 +1,25 @@ +From 46dd1118cae948649e000b2159e8e92623520ad9 Mon Sep 17 00:00:00 2001 +From: Klaus Wenninger +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 700065e0e..eefa7395e 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(' ') ++ '" required="' + ALL_OPT[option]["required"] + '">') + + default = "" + default_name_arg = "-" + ALL_OPT[option]["getopt"][:-1] +-- +2.27.0 + diff --git a/pacemaker.spec b/pacemaker.spec index 4b5f500..b493a07 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -36,7 +36,7 @@ ## can be incremented to build packages reliably considered "newer" ## than previously built packages with the same pcmkversion) %global pcmkversion 2.1.0 -%global specversion 10 +%global specversion 11 ## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build %global commit 7c3f660707a495a1331716ad32cd3ac9d9f8ff58 @@ -261,6 +261,7 @@ Patch16: 016-cts.patch Patch17: 017-watchdog-fixes.patch Patch18: 018-controller.patch Patch19: 019-crm_resource.patch +Patch20: 020-fence_watchdog.patch Requires: resource-agents Requires: %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release} @@ -863,6 +864,10 @@ exit 0 %license %{nagios_name}-%{nagios_hash}/COPYING %changelog +* Fri Aug 20 2021 Ken Gaillot - 2.1.0-11 +- Fix XML issue with fence_watchdog meta-data +- Resolves: rhbz1988568 + * Thu Aug 12 2021 Ken Gaillot - 2.1.0-10 - Fix minor issue with crm_resource error message change - Resolves: rhbz1983196