Version in base suite: 4.2.0-2 Base version: resource-agents_4.2.0-2 Target version: resource-agents_4.2.0-2+deb10u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/r/resource-agents/resource-agents_4.2.0-2.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/r/resource-agents/resource-agents_4.2.0-2+deb10u1.dsc changelog | 8 ++++++++ patches/ethmonitor-no-addr.patch | 34 ++++++++++++++++++++++++++++++++++ patches/series | 3 ++- patches/xen-toolstack.patch | 22 ---------------------- patches/zfs-bashism.patch | 23 +++++++++++++++++++++++ 5 files changed, 67 insertions(+), 23 deletions(-) diff -Nru resource-agents-4.2.0/debian/changelog resource-agents-4.2.0/debian/changelog --- resource-agents-4.2.0/debian/changelog 2018-12-09 20:04:49.000000000 +0000 +++ resource-agents-4.2.0/debian/changelog 2019-08-04 07:59:39.000000000 +0000 @@ -1,3 +1,11 @@ +resource-agents (1:4.2.0-2+deb10u1) buster; urgency=medium + + * debian/patches: drop xen-toolstack.patch + * debian/patches: add ethmonitor-no-addr.patch (Closes: #927311) + * debian/patches: add zfs-bashism.patch (Closes: #933398) + + -- Valentin Vidic Sun, 04 Aug 2019 09:59:39 +0200 + resource-agents (1:4.2.0-2) unstable; urgency=medium * debian/rules: fix build with merged-usr (Closes: #915848) diff -Nru resource-agents-4.2.0/debian/patches/ethmonitor-no-addr.patch resource-agents-4.2.0/debian/patches/ethmonitor-no-addr.patch --- resource-agents-4.2.0/debian/patches/ethmonitor-no-addr.patch 1970-01-01 00:00:00.000000000 +0000 +++ resource-agents-4.2.0/debian/patches/ethmonitor-no-addr.patch 2019-08-04 07:59:39.000000000 +0000 @@ -0,0 +1,34 @@ +Description: ethmonitor does not list interfaces without assigned IP address + The is_interface() function in heartbeat/ethmonitor tries to match an + interface to a list obtained from the 'ip' tool. It lists interfaces + using the 'inet' family, which omits interfaces that don't have an IP + address assigned. + . + If the interface that we're looking for is e.g. a VLAN bridge that does + not have an IP address, it won't show up in the listing and + is_interface() will return false. ethmonitor will miss that interface, + and it won't be available for monitoring. +Author: Heitor Alves de Siqueira +Origin: upstream +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=927311 +Applied-Upstream: https://github.com/ClusterLabs/resource-agents/pull/1306 + https://github.com/ClusterLabs/resource-agents/pull/1322 +Reviewed-by: Valentin Vidic +Last-Update: 2019-08-04 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +diff --git a/heartbeat/ethmonitor b/heartbeat/ethmonitor +index 240eba4df..07403529f 100755 +--- a/heartbeat/ethmonitor ++++ b/heartbeat/ethmonitor +@@ -206,8 +206,8 @@ is_interface() { + # + # List interfaces but exclude FreeS/WAN ipsecN virtual interfaces + # +- local iface=`$IP2UTIL -o -f inet addr show | grep " $1 " \ +- | cut -d ' ' -f2 | sort -u | grep -v '^ipsec[0-9][0-9]*$'` ++ local iface=`$IP2UTIL -o -f link addr show | grep " $1:" \ ++ | cut -d ' ' -f2 | tr -d ':' | sort -u | grep -v '^ipsec[0-9][0-9]*$'` + [ "$iface" != "" ] + } + diff -Nru resource-agents-4.2.0/debian/patches/series resource-agents-4.2.0/debian/patches/series --- resource-agents-4.2.0/debian/patches/series 2018-12-09 20:04:33.000000000 +0000 +++ resource-agents-4.2.0/debian/patches/series 2019-08-04 07:59:39.000000000 +0000 @@ -3,7 +3,8 @@ no-dirty-version ipv6-linux-only ocft-configs.patch -xen-toolstack.patch gitignore.patch reproducible.patch var-run.patch +ethmonitor-no-addr.patch +zfs-bashism.patch diff -Nru resource-agents-4.2.0/debian/patches/xen-toolstack.patch resource-agents-4.2.0/debian/patches/xen-toolstack.patch --- resource-agents-4.2.0/debian/patches/xen-toolstack.patch 2018-10-24 09:40:00.000000000 +0000 +++ resource-agents-4.2.0/debian/patches/xen-toolstack.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -Description: Use the toolstack selected in /etc/default/xen - Xen agent should use the configured toolstack and not prefer xl. - This patch can be dropped once there is only one supported toolstack. -Author: Valentin Vidic -Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=854276 -Forwarded: not-needed -Last-Update: 2017-08-03 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/heartbeat/Xen -+++ b/heartbeat/Xen -@@ -46,8 +46,8 @@ - : ${OCF_RESKEY_autoset_utilization_cpu="false"} - : ${OCF_RESKEY_autoset_utilization_hv_memory="false"} - --# prefer xl --xentool=$(which xl 2> /dev/null || which xm) -+# use /etc/default/xen -+xentool=$(/usr/lib/xen-common/bin/xen-toolstack) - - meta_data() { - cat < +Author: Koen de Jonge +Origin: upstream +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=933398 +Applied-Upstream: https://github.com/ClusterLabs/resource-agents/pull/1372 +Reviewed-by: Valentin Vidic +Last-Update: 2019-08-04 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/heartbeat/ZFS ++++ b/heartbeat/ZFS +@@ -144,7 +144,7 @@ + # Since version 0.7.10 status can be obtained without locks + # https://github.com/zfsonlinux/zfs/pull/7563 + if [ -f /proc/spl/kstat/zfs/$OCF_RESKEY_pool/state ] ; then +- HEALTH=$(