From 435ead435b736e84d5422e16c94803c175705abe Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 24 2023 09:47:56 +0000
Subject: import resource-agents-4.1.1-61.el7_9.18


---

diff --git a/SOURCES/bz1940097-awsvip-dont-partially-match-IPs.patch b/SOURCES/bz1940097-awsvip-dont-partially-match-IPs.patch
new file mode 100644
index 0000000..1a0e86e
--- /dev/null
+++ b/SOURCES/bz1940097-awsvip-dont-partially-match-IPs.patch
@@ -0,0 +1,23 @@
+From 3491a6ad30830a8545defa5a417a7db46b093904 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Wed, 17 Mar 2021 12:39:10 +0100
+Subject: [PATCH] awsvip: dont partially match similar IPs during
+ monitor-action
+
+---
+ heartbeat/awsvip | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/heartbeat/awsvip b/heartbeat/awsvip
+index 7d0bf35b6..044d049c6 100755
+--- a/heartbeat/awsvip
++++ b/heartbeat/awsvip
+@@ -172,7 +172,7 @@ awsvip_monitor() {
+             --instance-id "${INSTANCE_ID}" \
+             --query 'Reservations[].Instances[].NetworkInterfaces[].PrivateIpAddresses[].PrivateIpAddress[]' \
+             --output text | \
+-            grep -q "${SECONDARY_PRIVATE_IP}"
++            grep -qE "(^|\s)${SECONDARY_PRIVATE_IP}(\s|$)"
+     RET=$?
+ 
+     if [ $RET -ne 0 ]; then
diff --git a/SOURCES/bz2127477-db2-add-PRIMARY-REMOTE_CATCHUP_PENDING-CONNECTED.patch b/SOURCES/bz2127477-db2-add-PRIMARY-REMOTE_CATCHUP_PENDING-CONNECTED.patch
new file mode 100644
index 0000000..59fb0ef
--- /dev/null
+++ b/SOURCES/bz2127477-db2-add-PRIMARY-REMOTE_CATCHUP_PENDING-CONNECTED.patch
@@ -0,0 +1,23 @@
+From dd5394180267c652d0928db8c5508d9977893fe5 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Thu, 18 Mar 2021 16:23:10 +0100
+Subject: [PATCH] db2: add PRIMARY/REMOTE_CATCHUP_PENDING/CONNECTED status to
+ promote-check
+
+---
+ heartbeat/db2 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/heartbeat/db2 b/heartbeat/db2
+index a57fd2bb6..459136cbd 100755
+--- a/heartbeat/db2
++++ b/heartbeat/db2
+@@ -767,7 +767,7 @@ db2_promote() {
+             return $OCF_SUCCESS
+             ;;
+ 
+-            PRIMARY/PEER/*|PRIMARY/REMOTE_CATCHUP/*|Primary/Peer)
++            PRIMARY/PEER/*|PRIMARY/REMOTE_CATCHUP/*|PRIMARY/REMOTE_CATCHUP_PENDING/CONNECTED|Primary/Peer)
+             # nothing to do, only update pacemaker's view
+             echo MASTER > $STATE_FILE
+             return $OCF_SUCCESS
diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec
index 09165bb..7ee50d9 100644
--- a/SPECS/resource-agents.spec
+++ b/SPECS/resource-agents.spec
@@ -99,7 +99,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.1.1
-Release:	61%{?dist}.15
+Release:	61%{?dist}.18
 License:	GPLv2+ and LGPLv2+ and ASL 2.0
 URL:		https://github.com/ClusterLabs/resource-agents
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -255,6 +255,8 @@ Patch129:	bz1939282-aws-vpc-move-ip-add-ENI-lookup.patch
 Patch130:	bz1935798-gcp-pd-move-fix-partially-matched-disk_name.patch
 Patch131:	bz2042070-1-gcp-pd-move-gcp-vpc-move-route-dont-fail-1st-try.patch
 Patch132:	bz2042070-2-gcp-vpc-move-vip-add-retries.patch
+Patch133:	bz1940097-awsvip-dont-partially-match-IPs.patch
+Patch134:	bz2127477-db2-add-PRIMARY-REMOTE_CATCHUP_PENDING-CONNECTED.patch
 
 # SAPHana*
 Patch500:	bz1855888-SAPHana-use-actual-mode.patch
@@ -452,7 +454,7 @@ SAP instances to be managed in a cluster environment.
 License:	GPLv2+
 Summary:	SAP HANA Scale-Out cluster resource agents
 Version:	0.164.0
-Release:	6%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.15
+Release:	6%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.18
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
 Group:		System Environment/Base
 %else
@@ -472,7 +474,7 @@ environment.
 License:	GPLv2+
 Summary:	SAP cluster connector script
 Version:	3.0.1
-Release:	37%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.15
+Release:	37%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.18
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
 Group:		System Environment/Base
 %else
@@ -629,6 +631,8 @@ exit 1
 %patch130 -p1
 %patch131 -p1 -F1
 %patch132 -p1
+%patch133 -p1
+%patch134 -p1
 
 # add SAPHana agents to Makefile.am
 mv %{saphana_prefix}-%{saphana_version}/ra/SAPHana* heartbeat
@@ -1290,6 +1294,16 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %endif
 
 %changelog
+* Thu Oct 20 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.1.1-61.18
+- db2: add PRIMARY/REMOTE_CATCHUP_PENDING/CONNECTED status to promote-check
+
+  Resolves: rhbz#2127477
+
+* Fri Oct  7 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.1.1-61.17
+- awsvip: dont partially match similar IPs during monitor-action
+
+  Resolves: rhbz#1940097
+
 * Tue Jan 25 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.1.1-61.15
 - gcp-pd-move/gcp-vpc-move-route/gcp-vpc-move-vip: dont fail with
   configuration rc when it might be a network hickup