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

Bug#933839: marked as done (buster-pu: package resource-agents/1:4.2.0-2+deb10u1)

Your message dated Sat, 09 May 2020 11:53:52 +0100
with message-id <fd7fa4d56896c35aab49a5a51cb69727dc60e87a.camel@adam-barratt.org.uk>
and subject line Closing requests included in 10.4 point release
has caused the Debian Bug report #933839,
regarding buster-pu: package resource-agents/1:4.2.0-2+deb10u1
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.)


-- 
933839: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=933839
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu

Hi,

Please allow this buster update for the resource-agents package
fixing problems with some included scripts:

 * ethmonitor: does not list interfaces without assigned IP address
 * ZFS: monitoring action broken by a bashism bug
 * Xen: toolstack detection generates warnings in the logs

Kind regards,
Valentin
 
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 21:04:49.000000000 +0100
+++ resource-agents-4.2.0/debian/changelog	2019-08-04 09:59:39.000000000 +0200
@@ -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 <vvidic@debian.org>  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 01:00:00.000000000 +0100
+++ resource-agents-4.2.0/debian/patches/ethmonitor-no-addr.patch	2019-08-04 09:54:06.000000000 +0200
@@ -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 <halves@canonical.com>
+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 <vvidic@debian.org>
+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 21:04:33.000000000 +0100
+++ resource-agents-4.2.0/debian/patches/series	2019-08-04 09:57:56.000000000 +0200
@@ -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 11:40:00.000000000 +0200
+++ resource-agents-4.2.0/debian/patches/xen-toolstack.patch	1970-01-01 01:00:00.000000000 +0100
@@ -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 <Valentin.Vidic@CARNet.hr>
-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 <<END
diff -Nru resource-agents-4.2.0/debian/patches/zfs-bashism.patch resource-agents-4.2.0/debian/patches/zfs-bashism.patch
--- resource-agents-4.2.0/debian/patches/zfs-bashism.patch	1970-01-01 01:00:00.000000000 +0100
+++ resource-agents-4.2.0/debian/patches/zfs-bashism.patch	2019-08-04 09:49:20.000000000 +0200
@@ -0,0 +1,23 @@
+Description: Fix bashism in ZFS agent
+ The VAR=(< filename) syntax does not work in all situations (i.e. not on
+ debian 10), changing it to VAR=(cat filename) does work.  <long description
+ that can span multiple lines, optional>
+Author: Koen de Jonge <koen@procolix.com>
+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 <vvidic@debian.org>
+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=$(</proc/spl/kstat/zfs/$OCF_RESKEY_pool/state)
++		HEALTH=$(cat /proc/spl/kstat/zfs/$OCF_RESKEY_pool/state)
+ 	else
+ 		HEALTH=$(zpool list -H -o health "$OCF_RESKEY_pool")
+ 	fi

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

Hi,

Each of the uploads referred to by these bugs was included in today's
stable point release.

Regards,

Adam

--- End Message ---
Reply to: