diff --git a/RHEL-235765-powervs-subnet-fix-plaintext-token-file-support.patch b/RHEL-235765-powervs-subnet-fix-plaintext-token-file-support.patch new file mode 100644 index 0000000..df95059 --- /dev/null +++ b/RHEL-235765-powervs-subnet-fix-plaintext-token-file-support.patch @@ -0,0 +1,24 @@ +From f75a1bb59fe729b9de65fc3c4436e9edaf8f8f41 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Wed, 30 Apr 2025 16:09:50 +0200 +Subject: [PATCH] powervs-subnet: fix plaintext token file support + +--- + heartbeat/powervs-subnet.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/heartbeat/powervs-subnet.in b/heartbeat/powervs-subnet.in +index b8f3864e9a..a90bc73c6b 100755 +--- a/heartbeat/powervs-subnet.in ++++ b/heartbeat/powervs-subnet.in +@@ -378,8 +378,9 @@ class PowerCloudAPI: + api_key = keys.get("Apikey", "") + if not api_key: + api_key = keys.get("apikey", "") ++ # data is text, return as is + except ValueError: +- # data is text, return as is ++ f.seek(0) + api_key = f.read().strip() + except FileNotFoundError: + raise PowerCloudAPIError( diff --git a/resource-agents.spec b/resource-agents.spec index 8f9b3c7..1651efc 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -45,7 +45,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.16.0 -Release: 73%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 74%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: GPL-2.0-or-later AND LGPL-2.1-or-later URL: https://github.com/ClusterLabs/resource-agents Source0: %{upstream_prefix}-%{upstream_version}.tar.gz @@ -146,6 +146,7 @@ Patch93: RHEL-183131-portblock-fix-IPv6-rule-detection-in-the-iptables-backend.p Patch94: RHEL-166371-db2-avoid-promoting-in-standby_remote_catchup_pending-state.patch Patch95: RHEL-224054-1-Route-update-destination-parameter-to-non-unique.patch Patch96: RHEL-224054-2-Route-update-destination-description-and-add-warning-message.patch +Patch97: RHEL-235765-powervs-subnet-fix-plaintext-token-file-support.patch # bundled ha-cloud-support libs Patch500: ha-cloud-support-aliyun.patch @@ -413,6 +414,7 @@ exit 1 %patch -p1 -P 94 %patch -p1 -P 95 %patch -p1 -P 96 +%patch -p1 -P 97 # bundled ha-cloud-support libs %patch -p1 -P 500 @@ -745,6 +747,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog +* Mon Aug 17 2026 Oyvind Albrigtsen - 4.16.0-74 +- powervs-subnet: fix plaintext token file support + + Resolves: RHEL-235765 + * Tue Aug 04 2026 Arslan Ahmad - 4.16.0-73 - Route: update 'destination' description and add warning message when 'default' destination is used