From 3857c4de58c523a3475e0955faa0c8189d44117f Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Tue, 23 Jul 2024 07:57:33 +0200 Subject: [PATCH] - gcp-pd-move: fix TLS_VERSION_1 issue Resolves: RHEL-50041 --- 7-gcp-bundled.patch | 23 +++++++++++++++++------ resource-agents.spec | 7 ++++++- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/7-gcp-bundled.patch b/7-gcp-bundled.patch index 4e983ef..287875e 100644 --- a/7-gcp-bundled.patch +++ b/7-gcp-bundled.patch @@ -1,6 +1,17 @@ +diff --color -uNr a/heartbeat/gcp-pd-move.in b/heartbeat/gcp-pd-move.in +--- a/heartbeat/gcp-pd-move.in 2024-07-22 10:59:42.170483160 +0200 ++++ b/heartbeat/gcp-pd-move.in 2024-07-22 11:01:51.455543850 +0200 +@@ -32,6 +32,7 @@ + from ocf import logger + + try: ++ sys.path.insert(0, '/usr/lib/resource-agents/bundled/gcp') + import googleapiclient.discovery + except ImportError: + pass diff --color -uNr a/heartbeat/gcp-vpc-move-ip.in b/heartbeat/gcp-vpc-move-ip.in ---- a/heartbeat/gcp-vpc-move-ip.in 2022-06-16 09:45:21.419090782 +0200 -+++ b/heartbeat/gcp-vpc-move-ip.in 2022-06-16 10:11:22.978648598 +0200 +--- a/heartbeat/gcp-vpc-move-ip.in 2024-07-22 10:59:42.170483160 +0200 ++++ b/heartbeat/gcp-vpc-move-ip.in 2024-07-22 11:01:18.010752081 +0200 @@ -36,7 +36,7 @@ . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs @@ -11,8 +22,8 @@ diff --color -uNr a/heartbeat/gcp-vpc-move-ip.in b/heartbeat/gcp-vpc-move-ip.in OCF_RESKEY_vpc_network_default="default" OCF_RESKEY_interface_default="eth0" diff --color -uNr a/heartbeat/gcp-vpc-move-route.in b/heartbeat/gcp-vpc-move-route.in ---- a/heartbeat/gcp-vpc-move-route.in 2022-06-16 09:45:21.420090788 +0200 -+++ b/heartbeat/gcp-vpc-move-route.in 2022-06-16 10:11:22.978648598 +0200 +--- a/heartbeat/gcp-vpc-move-route.in 2024-07-22 10:59:42.170483160 +0200 ++++ b/heartbeat/gcp-vpc-move-route.in 2024-07-22 11:01:18.011752105 +0200 @@ -45,6 +45,7 @@ from ocf import * @@ -22,8 +33,8 @@ diff --color -uNr a/heartbeat/gcp-vpc-move-route.in b/heartbeat/gcp-vpc-move-rou import pyroute2 try: diff --color -uNr a/heartbeat/gcp-vpc-move-vip.in b/heartbeat/gcp-vpc-move-vip.in ---- a/heartbeat/gcp-vpc-move-vip.in 2022-06-16 09:45:21.420090788 +0200 -+++ b/heartbeat/gcp-vpc-move-vip.in 2022-06-16 10:11:22.979648603 +0200 +--- a/heartbeat/gcp-vpc-move-vip.in 2024-07-22 10:59:42.170483160 +0200 ++++ b/heartbeat/gcp-vpc-move-vip.in 2024-07-22 11:01:18.012752128 +0200 @@ -29,6 +29,7 @@ from ocf import * diff --git a/resource-agents.spec b/resource-agents.spec index 74f5304..2d0ca65 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -73,7 +73,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.9.0 -Release: 54%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.2 +Release: 54%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.3 License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/resource-agents %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} @@ -999,6 +999,11 @@ ccs_update_schema > /dev/null 2>&1 ||: %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog +* Tue Jul 23 2024 Oyvind Albrigtsen - 4.9.0-54.3 +- gcp-pd-move: fix TLS_VERSION_1 issue + + Resolves: RHEL-50041 + * Wed Jun 26 2024 Oyvind Albrigtsen - 4.9.0-54.2 - bundled urllib3: fix CVE-2024-37891