From 755b87f94be522f38f9a8d671180c13c92a5a87b Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Wed, 3 Jan 2024 12:32:55 +0100 Subject: [PATCH] - fence_zvmip: document required user permissions in metadata/manpage Resolves: RHEL-14344 --- ...ce_zvmip-1-document-user-permissions.patch | 0 ...fence_zvmip-2-fix-manpage-formatting.patch | 41 +++++++++++++++++++ fence-agents.spec | 14 ++++--- 3 files changed, 49 insertions(+), 6 deletions(-) rename RHEL-14344-fence_zvmip-document-user-permissions.patch => RHEL-14344-fence_zvmip-1-document-user-permissions.patch (100%) create mode 100644 RHEL-14344-fence_zvmip-2-fix-manpage-formatting.patch diff --git a/RHEL-14344-fence_zvmip-document-user-permissions.patch b/RHEL-14344-fence_zvmip-1-document-user-permissions.patch similarity index 100% rename from RHEL-14344-fence_zvmip-document-user-permissions.patch rename to RHEL-14344-fence_zvmip-1-document-user-permissions.patch diff --git a/RHEL-14344-fence_zvmip-2-fix-manpage-formatting.patch b/RHEL-14344-fence_zvmip-2-fix-manpage-formatting.patch new file mode 100644 index 0000000..e650b0f --- /dev/null +++ b/RHEL-14344-fence_zvmip-2-fix-manpage-formatting.patch @@ -0,0 +1,41 @@ +From adac1d81c5758235b6df46d0a91f1e948655848a Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Wed, 3 Jan 2024 10:17:50 +0100 +Subject: [PATCH] fence_zvmip: fix manpage formatting + +--- + agents/zvm/fence_zvmip.py | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/agents/zvm/fence_zvmip.py b/agents/zvm/fence_zvmip.py +index f1cea2652..bd8273c49 100644 +--- a/agents/zvm/fence_zvmip.py ++++ b/agents/zvm/fence_zvmip.py +@@ -210,12 +210,12 @@ def main(): + The NAMELIST entry assigns all the required functions to one nick and should + look similar to this: + +-:nick.ZVM_FENCE +-:list. +-IMAGE_ACTIVATE +-IMAGE_DEACTIVATE +-IMAGE_STATUS_QUERY +-CHECK_AUTHENTICATION ++:nick.ZVM_FENCE\n.br\n\ ++:list.\n.br\n\ ++IMAGE_ACTIVATE\n.br\n\ ++IMAGE_DEACTIVATE\n.br\n\ ++IMAGE_STATUS_QUERY\n.br\n\ ++CHECK_AUTHENTICATION\n.br\n\ + IMAGE_NAME_QUERY_DM + + +@@ -224,7 +224,7 @@ def main(): + + Column 1 Column 66 Column 131 + +-| | | ++| | |\n.br\n\ + V V V + + XXXXXXXX ALL ZVM_FENCE diff --git a/fence-agents.spec b/fence-agents.spec index ae7b52e..b4a4021 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -59,7 +59,7 @@ Name: fence-agents Summary: Set of unified programs capable of host isolation ("fencing") Version: 4.10.0 -Release: 60%{?alphatag:.%{alphatag}}%{?dist} +Release: 61%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/fence-agents Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.gz @@ -238,9 +238,10 @@ Patch45: bz2221643-fence_ibm_powervs-performance-improvements.patch Patch46: bz2224267-fence_ipmilan-fix-typos-in-metadata.patch Patch47: RHEL-5396-fence_scsi-1-fix-ISID-reg-handling.patch Patch48: RHEL-5396-fence_scsi-2-fix-ISID-reg-handling-off.patch -Patch49: RHEL-14344-fence_zvmip-document-user-permissions.patch +Patch49: RHEL-14344-fence_zvmip-1-document-user-permissions.patch Patch50: RHEL-14030-1-all-agents-metadata-update-IO-Power-Network.patch Patch51: RHEL-14030-2-fence_cisco_mds-undo-metadata-change.patch +Patch52: RHEL-14344-fence_zvmip-2-fix-manpage-formatting.patch ### HA support libs/utils ### # all archs @@ -411,6 +412,7 @@ BuildRequires: %{systemd_units} %patch -p1 -P 49 %patch -p1 -P 50 %patch -p1 -P 51 +%patch -p1 -P 52 # prevent compilation of something that won't get used anyway sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac @@ -1489,15 +1491,15 @@ are located on corosync cluster nodes. %endif %changelog +* Wed Jan 3 2024 Oyvind Albrigtsen - 4.10.0-61 +- fence_zvmip: document required user permissions in metadata/manpage + Resolves: RHEL-14344 + * Mon Oct 23 2023 Oyvind Albrigtsen - 4.10.0-60 - all agents: update metadata in non-I/O agents to Power or Network fencing Resolves: RHEL-14030 -* Fri Oct 20 2023 Oyvind Albrigtsen - 4.10.0-59 -- fence_zvmip: document required user permissions in metadata/manpage - Resolves: RHEL-14344 - * Wed Oct 11 2023 Oyvind Albrigtsen - 4.10.0-57 - bundled urllib3: fix CVE-2023-43804 Resolves: RHEL-11999