[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1111972: marked as done (trixie-pu: package resource-agents/1:4.16.0-3+deb13u1)

Your message dated Sat, 06 Sep 2025 12:14:57 +0100
with message-id <165032e5317517556dd7fd8cf24843112a3fb6ac.camel@adam-barratt.org.uk>
and subject line Closing p-u requests for fixes included in 13.1
has caused the Debian Bug report #1111972,
regarding trixie-pu: package resource-agents/1:4.16.0-3+deb13u1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1111972: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1111972
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
Tags: trixie
User: release.debian.org@packages.debian.org
Usertags: pu
X-Debbugs-Cc: resource-agents@packages.debian.org
Control: affects -1 + src:resource-agents

[ Reason ]
Include upstream fix for a bug that was reported for the
package version included in trixie.

[ Impact ]
resource-agents would not work correctly in some cases as
described in bug #1109925.

[ Tests ]
Package tests run without errors for the updated package.

[ Risks ]
Risk should be low as the fix was approved upstream and it
only affects some agents in the package.

[ Checklist ]
  [x] *all* changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in (old)stable
  [x] the issue is verified as fixed in unstable

[ Changes ]
Include upstream fix for handling special case of duplicate routes.


diff -Nru resource-agents-4.16.0/debian/changelog resource-agents-4.16.0/debian/changelog
--- resource-agents-4.16.0/debian/changelog	2025-02-28 22:52:53.000000000 +0100
+++ resource-agents-4.16.0/debian/changelog	2025-08-24 17:03:01.000000000 +0200
@@ -1,3 +1,9 @@
+resource-agents (1:4.16.0-3+deb13u1) trixie; urgency=medium
+
+  * debian/patches: fix to avoid duplicate route issues (Closes: #1109925)
+
+ -- Valentin Vidic <vvidic@debian.org>  Sun, 24 Aug 2025 17:03:01 +0200
+
 resource-agents (1:4.16.0-3) unstable; urgency=medium
 
   * debian/tests: mark mysql and pgsql as flaky (Closes: #1096025)
diff -Nru resource-agents-4.16.0/debian/patches/duplicate-route.patch resource-agents-4.16.0/debian/patches/duplicate-route.patch
--- resource-agents-4.16.0/debian/patches/duplicate-route.patch	1970-01-01 01:00:00.000000000 +0100
+++ resource-agents-4.16.0/debian/patches/duplicate-route.patch	2025-08-24 17:02:40.000000000 +0200
@@ -0,0 +1,37 @@
+From d0d2a0ff92dd23ee36cb57324c1eeaa3daed65bc Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Tue, 4 Feb 2025 16:13:27 +0100
+Subject: [PATCH] findif.sh: fix to avoid duplicate route issues
+
+---
+ heartbeat/findif.sh | 14 +++++---------
+ 1 file changed, 5 insertions(+), 9 deletions(-)
+
+diff --git a/heartbeat/findif.sh b/heartbeat/findif.sh
+index 2ae91e958..6fb47110c 100644
+--- a/heartbeat/findif.sh
++++ b/heartbeat/findif.sh
+@@ -217,18 +217,14 @@ findif()
+   fi
+   if [ -n "$nic" ] ; then
+     # NIC supports more than two.
+-    routematch=$(ip -o -f $family route list match $match $proto $scope | grep -v "^\(unreachable\|prohibit\|blackhole\)" | grep "dev $nic " | sed -e 's,^\([0-9.]\+\) ,\1/32 ,;s,^\([0-9a-f:]\+\) ,\1/128 ,' | sort -t/ -k2,2nr)
++    routematch=$(ip -o -f $family route list match $match $proto $scope | grep "dev $nic " | sed -e 's,^\([0-9.]\+\) ,\1/32 ,;s,^\([0-9a-f:]\+\) ,\1/128 ,' | sort -t/ -k2,2nr)
+   else
+-    routematch=$(ip -o -f $family route list match $match $proto $scope | grep -v "^\(unreachable\|prohibit\|blackhole\)" | sed -e 's,^\([0-9.]\+\) ,\1/32 ,;s,^\([0-9a-f:]\+\) ,\1/128 ,' | sort -t/ -k2,2nr)
+-  fi
+-  if [ "$family" = "inet6" ]; then
+-    routematch=$(echo "$routematch" | grep -v "^default")
++    routematch=$(ip -o -f $family route list match $match $proto $scope | sed -e 's,^\([0-9.]\+\) ,\1/32 ,;s,^\([0-9a-f:]\+\) ,\1/128 ,' | sort -t/ -k2,2nr)
+   fi
+ 
+-  if [ $(echo "$routematch" | wc -l) -gt 1 ]; then
+-    ocf_exit_reason "More than 1 routes match $match. Unable to decide which route to use."
+-    return $OCF_ERR_GENERIC
+-  fi
++  # ignore matches from unrelated tables, and sort by metric to get the route with the lowest metric
++  routematch=$(echo "$routematch" | awk '!/^(default|unreachable|prohibit|blackhole)/{match($0, /metric ([^ ]+)/, arr); print arr[1], $0}' | sort -k 1n -u | cut -d" " -f 2- | head -1)
++
+   set -- $routematch
+   if [ $# = 0 ] ; then
+     case $OCF_RESKEY_ip in
diff -Nru resource-agents-4.16.0/debian/patches/series resource-agents-4.16.0/debian/patches/series
--- resource-agents-4.16.0/debian/patches/series	2024-11-10 19:26:33.000000000 +0100
+++ resource-agents-4.16.0/debian/patches/series	2025-08-24 17:03:01.000000000 +0200
@@ -6,3 +6,4 @@
 gitignore.patch
 reproducible.patch
 var-run.patch
+duplicate-route.patch

--- End Message ---
--- Begin Message --- 
Package: release.debian.org
Version: 13.1

Hi,

Each of the updates referenced by these requests was included in
today's 13.1 point release for trixie.

Regards,

Adam

--- End Message ---
Reply to: