From d9d35bb587eab5c2425773101912882da01e8119 Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Mon, 16 Feb 2026 14:58:25 +0100 Subject: [PATCH] - IPsrcaddr: fix grep expression, so it doesnt log "stray \ before white space" with newer versions of grep Resolves: RHEL-149738 --- ...p-expression-for-newer-grep-versions.patch | 23 +++++++++++++++++++ resource-agents.spec | 10 +++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 RHEL-149738-IPsrcaddr-fix-grep-expression-for-newer-grep-versions.patch diff --git a/RHEL-149738-IPsrcaddr-fix-grep-expression-for-newer-grep-versions.patch b/RHEL-149738-IPsrcaddr-fix-grep-expression-for-newer-grep-versions.patch new file mode 100644 index 0000000..44e8fa1 --- /dev/null +++ b/RHEL-149738-IPsrcaddr-fix-grep-expression-for-newer-grep-versions.patch @@ -0,0 +1,23 @@ +From fcefa56677aac98a20c741698887446d51a0c9ce Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Mon, 16 Feb 2026 14:27:14 +0100 +Subject: [PATCH] IPsrcaddr: fix grep expression, so it doesnt log "stray \ + before white space" with newer versions of grep + +--- + heartbeat/IPsrcaddr | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/heartbeat/IPsrcaddr b/heartbeat/IPsrcaddr +index 58d89a280..31c9f2663 100755 +--- a/heartbeat/IPsrcaddr ++++ b/heartbeat/IPsrcaddr +@@ -434,7 +434,7 @@ find_interface_solaris() { + # is an (aliased) interface name (e.g., "eth0" and "eth0:0"). + # + find_interface_generic() { +- local iface=`$IP2UTIL -o -f $FAMILY addr show | grep "\ $BASEIP" \ ++ local iface=`$IP2UTIL -o -f $FAMILY addr show | grep " $BASEIP" \ + | cut -d ' ' -f2 | grep -v '^ipsec[0-9][0-9]*$'` + if [ -z "$iface" ]; then + return $OCF_ERR_GENERIC diff --git a/resource-agents.spec b/resource-agents.spec index 1dcc745..ed11c50 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: 52%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 53%{?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 @@ -117,6 +117,7 @@ Patch64: RHEL-50380-powervs-subnet-wait-for-IP.patch Patch65: RHEL-143524-powervs-move-ip-powervs-subnet-fix-error-logging.patch Patch66: RHEL-116149-RHEL-116152-4-check-correct-binary-during-validate-all.patch Patch67: RHEL-145622-podman-etcd-enhance-etcd-data-backup-with-snapshots-and-retention.patch +Patch68: RHEL-149738-IPsrcaddr-fix-grep-expression-for-newer-grep-versions.patch # bundled ha-cloud-support libs Patch500: ha-cloud-support-aliyun.patch @@ -355,6 +356,7 @@ exit 1 %patch -p1 -P 65 %patch -p1 -P 66 %patch -p1 -P 67 +%patch -p1 -P 68 # bundled ha-cloud-support libs %patch -p1 -P 500 @@ -687,6 +689,12 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog +* Mon Feb 16 2026 Oyvind Albrigtsen - 4.16.0-53 +- IPsrcaddr: fix grep expression, so it doesnt log "stray \ before + white space" with newer versions of grep + + Resolves: RHEL-149738 + * Wed Feb 4 2026 Oyvind Albrigtsen - 4.16.0-52 - podman-etcd: enhance etcd data backup with snapshots and retention