Bug#521394: Pre-approval for heartbeat stable-proposed-updates upload (2.1.3-6lenny3)
Hi,
I would like to upload a(nother) fresh version of heartbeat to fix
a but in the o2cf resource. Without the simple fix suggested
by Michel, the script is completely broken - though I should
not that the script was first deprecated and more recently
removed from upstream.
The fix itself is as follows:
--- heartbeat-2.1.3.orig/resources/OCF/o2cb
+++ heartbeat-2.1.3/resources/OCF/o2cb
@@ -311,7 +311,7 @@
;;
esac
-RCO2CB=INITDIR/o2cb
+RCO2CB=$INITDIR/o2cb
# RCO2CB=/etc/init.d/o2cb
if [ ! -x $RCO2CB ]; then
This problem is being tracked as #521394
The debdiff below is between 2.1.3-6lenny1 (the current version in lenny)
and the most recent proposed version, 2.1.3-6lenny3. 2.1.3-6lenny2 was
proposed, but I don't think that it was ever uploaded. It change
still appears to be worthy to me.
The packages are available for anyone who is intersted at
http://packages.vergenet.net/stable-proposed-updates/heartbeat/
Debdiff:
diff -u heartbeat-2.1.3/version.Debian heartbeat-2.1.3/version.Debian
--- heartbeat-2.1.3/version.Debian
+++ heartbeat-2.1.3/version.Debian
@@ -1 +1 @@
-2.1.3-6lenny1
+2.1.3-6lenny3
diff -u heartbeat-2.1.3/debian/changelog heartbeat-2.1.3/debian/changelog
--- heartbeat-2.1.3/debian/changelog
+++ heartbeat-2.1.3/debian/changelog
@@ -1,3 +1,20 @@
+heartbeat (2.1.3-6lenny3) stable-proposed-updates; urgency=low
+
+ * Fix syntax error in o2cb which prevented it from working
+ Upstream-status: o2cb has been removed from upstream
+ (closes: #521394)
+
+ -- Simon Horman <horms@debian.org> Tue, 14 Apr 2009 18:55:26 +1000
+
+heartbeat (2.1.3-6lenny2) stable-proposed-updates; urgency=low
+
+ * IPv6addr: Fix handling of /64 prefixes
+ Upstream-Status: commit 6d5f0f600c0b2147490af0c5e592fc995336902a
+ "IPv6addr fails on /64 prefixes"
+ (closes: #515662)
+
+ -- Simon Horman <horms@debian.org> Fri, 20 Feb 2009 02:34:29 +0000
+
heartbeat (2.1.3-6lenny1) stable-proposed-updates; urgency=low
* dopd: fix basic failover; fix hb message corruption by fprintf(stderr)
only in patch2:
unchanged:
--- heartbeat-2.1.3.orig/resources/OCF/o2cb
+++ heartbeat-2.1.3/resources/OCF/o2cb
@@ -311,7 +311,7 @@
;;
esac
-RCO2CB=INITDIR/o2cb
+RCO2CB=$INITDIR/o2cb
# RCO2CB=/etc/init.d/o2cb
if [ ! -x $RCO2CB ]; then
only in patch2:
unchanged:
--- heartbeat-2.1.3.orig/resources/OCF/IPv6addr.c
+++ heartbeat-2.1.3/resources/OCF/IPv6addr.c
@@ -487,7 +487,10 @@
n = plen / 32;
memset(mask.s6_addr32 + n + 1, 0, (3 - n) * 4);
s = 32 - plen % 32;
- mask.s6_addr32[n] = 0xffffffff << s;
+ if (s == 32)
+ mask.s6_addr32[n] = 0x0;
+ else
+ mask.s6_addr32[n] = 0xffffffff << s;
mask.s6_addr32[n] = htonl(mask.s6_addr32[n]);
}
only in patch2:
unchanged:
--- heartbeat-2.1.3.orig/debian/patches/o2cb-INITDIR.patch
+++ heartbeat-2.1.3/debian/patches/o2cb-INITDIR.patch
@@ -0,0 +1,144 @@
+From horms Sun Mar 29 21:28:35 2009
+Return-Path: <bounces+20090327-horms=debian.org@packages.qa.debian.org>
+X-Spam-Checker-Version: SpamAssassin 3.2.5-kirsty.vergenet.net_2007012401
+ (2008-06-10) on kirsty.vergenet.net
+X-Spam-Level:
+X-Spam-Status: No, score=-3.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW
+ autolearn=ham version=3.2.5-kirsty.vergenet.net_2007012401
+X-Original-To: horms@verge.net.au
+Delivered-To: horms@vergenet.net
+Received: from mail.au.vergenet.net [202.4.237.240]
+ by yukiko.kent.sydney.vergenet.net with POP3 (fetchmail-6.3.9-rc2)
+ for <horms@localhost> (single-drop); Mon, 30 Mar 2009 08:28:35 +1100 (EST)
+Received: from master.debian.org (master.debian.org [70.103.162.29])
+ by kirsty.vergenet.net (Postfix) with ESMTP id A38DD24060
+ for <horms@verge.net.au>; Fri, 27 Mar 2009 21:06:11 +1100 (EST)
+Received: from qa by master.debian.org with local (Exim 4.69)
+ (envelope-from <bounces+20090327-horms=debian.org@packages.qa.debian.org>)
+ id 1Ln8x0-0000TZ-48; Fri, 27 Mar 2009 10:06:10 +0000
+Received: from rietz.debian.org ([140.211.166.43]) by master.debian.org
+ with esmtp (Exim 4.69) (envelope-from <debbugs@rietz.debian.org>) id
+ 1Ln8wz-0000TK-N2 for heartbeat@packages.qa.debian.org; Fri, 27 Mar 2009
+ 10:06:09 +0000
+Received: from debbugs by rietz.debian.org with local (Exim 4.63)
+ (envelope-from <debbugs@rietz.debian.org>) id 1Ln8r6-0004Ok-JC; Fri,
+ 27 Mar 2009 10:00:04 +0000
+X-Loop: owner@bugs.debian.org
+Subject: Bug#521394: heartbeat: ocf resources script o2cb doesn't work
+Reply-To: Michel Rode <rmichel@devnu11.net>, 521394@bugs.debian.org
+Resent-From: Michel Rode <rmichel@devnu11.net>
+Resent-To: debian-bugs-dist@lists.debian.org
+Resent-CC: Simon Horman <horms@debian.org>
+Resent-Date: Fri, 27 Mar 2009 10:00:02 +0000
+Resent-Message-ID: <handler.521394.B.123814779814011@bugs.debian.org>
+X-Debian-PR-Message: report 521394
+X-Debian-PR-Package: heartbeat
+X-Debian-PR-Keywords: patch
+X-Debian-PR-Source: heartbeat
+Received: via spool by submit@bugs.debian.org id=B.123814779814011 (code B
+ ref -1); Fri, 27 Mar 2009 10:00:02 +0000
+Received: (at submit) by bugs.debian.org; 27 Mar 2009 09:56:38 +0000
+Received: from gryps51.uni-greifswald.de ([141.53.8.24]) by
+ rietz.debian.org with esmtp (Exim 4.63) (envelope-from
+ <rmichel@devnu11.net>) id 1Ln8nl-0003d5-OV for submit@bugs.debian.org; Fri,
+ 27 Mar 2009 09:56:37 +0000
+Received: from xen1.azubi.uni-greifswald.de (unverified) by
+ gryps51.uni-greifswald.de (Clearswift SMTPRS 5.2.9) with ESMTP id
+ <T8d53fb523f8d3508181580@gryps51.uni-greifswald.de>; Fri, 27 Mar 2009
+ 10:56:08 +0100
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+From: Michel Rode <rmichel@devnu11.net>
+To: Debian Bug Tracking System <submit@bugs.debian.org>
+Message-ID: <20090327095630.3482.63165.reportbug@xen1.azubi.uni-greifswald.de>
+X-Mailer: reportbug 3.48
+Date: Fri, 27 Mar 2009 10:56:30 +0100
+Delivered-To: submit@bugs.debian.org
+Resent-Date: Fri, 27 Mar 2009 10:00:04 +0000
+Delivered-To: heartbeat@packages.qa.debian.org
+Precedence: list
+X-Loop: heartbeat@packages.qa.debian.org
+X-Debian: PTS
+X-Debian-Package: heartbeat
+X-PTS-Package: heartbeat
+X-PTS-Keyword: bts
+List-Unsubscribe: <mailto:pts@qa.debian.org?body=unsubscribe+heartbeat>
+Resent-Sender: Debian QA <qa@master.debian.org>
+X-Loop: oathstix_finish by kirsty.vergenet.net
+X-Loop: oathstix_finish by yukiko.kent.sydney.vergenet.net
+Status: RO
+X-Status: A
+Content-Length: 3160
+Lines: 70
+
+Package: heartbeat
+Version: 2.1.3-6lenny0
+Severity: critical
+Tags: patch
+Justification: breaks the whole system
+
+
+ocf resources script doe't start because there is a missing $ in line 314.
+
+-- System Information:
+Debian Release: 5.0
+ APT prefers stable
+ APT policy: (500, 'stable')
+Architecture: i386 (i686)
+
+Kernel: Linux 2.6.26-1-xen-686 (SMP w/1 CPU core)
+Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
+Shell: /bin/sh linked to /bin/bash
+
+Versions of packages heartbeat depends on:
+ii adduser 3.110 add and remove users and groups
+ii gawk 1:3.1.5.dfsg-4.1 GNU awk, a pattern scanning and pr
+ii iproute 20080725-2 networking and traffic control too
+ii iputils-ping 3:20071127-1 Tools to test the reachability of
+ii libbz2-1.0 1.0.5-1 high-quality block-sorting file co
+ii libc6 2.7-18 GNU C Library: Shared libraries
+ii libcurl3 7.18.2-8lenny2 Multi-protocol file transfer libra
+ii libglib2.0-0 2.16.6-1+lenny1 The GLib library of C routines
+ii libgnutls26 2.4.2-6 the GNU TLS library - runtime libr
+ii libltdl3 1.5.26-4 A system independent dlopen wrappe
+ii libncurses5 5.7+20081213-1 shared libraries for terminal hand
+ii libnet1 1.1.2.1-2 library for the construction and h
+ii libopenhpi2 2.12.0-1 OpenHPI libraries (runtime and sup
+ii libpam-runtime 1.0.1-5 Runtime support for the PAM librar
+ii libpam0g 1.0.1-5 Pluggable Authentication Modules l
+ii libsnmp15 5.4.1~dfsg-12 SNMP (Simple Network Management Pr
+ii libssl0.9.8 0.9.8g-15 SSL shared libraries
+ii libuuid1 1.41.3-1 universally unique id library
+ii libwrap0 7.6.q-16 Wietse Venema's TCP wrappers libra
+ii libxml2 2.6.32.dfsg-5 GNOME XML library
+ii libxml2-utils 2.6.32.dfsg-5 XML utilities
+ii mawk 1.3.3-11.1 a pattern scanning and text proces
+ii psmisc 22.6-1 Utilities that use the proc filesy
+ii python 2.5.2-3 An interactive high-level object-o
+ii python-central 0.6.8 register and build utility for Pyt
+ii zlib1g 1:1.2.3.3.dfsg-12 compression library - runtime
+
+Versions of packages heartbeat recommends:
+ii iptables 1.4.2-6 administration tools for packet fi
+ii logrotate 3.7.1-5 Log rotation utility
+ii rsyslog [system-log-daemon] 3.18.6-4 enhanced multi-threaded syslogd
+
+heartbeat suggests no packages.
+
+-- no debconf information
+
+*** /tmp/test/ocf_o2cd.patch
+--- a/resources/OCF/o2cb 2009-01-22 06:58:49.000000000 +0100
++++ a/resources/OCF/o2cb 2009-03-24 15:56:28.000000000 +0100
+@@ -311,7 +311,7 @@
+ ;;
+ esac
+
+-RCO2CB=INITDIR/o2cb
++RCO2CB=$INITDIR/o2cb
+ # RCO2CB=/etc/init.d/o2cb
+
+ if [ ! -x $RCO2CB ]; then
+
+
only in patch2:
unchanged:
--- heartbeat-2.1.3.orig/debian/patches/IPv6addr-64.patch
+++ heartbeat-2.1.3/debian/patches/IPv6addr-64.patch
@@ -0,0 +1,75 @@
+# HG changeset patch
+# User Philipp Kolmann <philipp@kolmann.at>
+# Date 1235094639 -39600
+# Node ID 6d5f0f600c0b2147490af0c5e592fc995336902a
+# Parent 4a4773bb2ea42046e24f6d6c3b6ff2eb6f105c41
+IPv6addr fails on /64 prefixes
+
+Hi Simon,
+
+it seems I am the one unlucky guy who uses heartbeat with IPv6....
+
+I started updateing my cluster today to lenny and IPv6addr fails again:
+
+scs1:/etc/heartbeat/resource.d# ./IPv6addr 2001:629:3800:33:0:0:0:122 start
+2009/02/16_20:19:50 ERROR: Generic error
+ERROR: Generic error
+
+
+I dug into the source of IPv6addr.c and it seems that the mask is too long
+and therefore the scan_if isn't matching.
+
+I have a 2001:629:3800:33::/64 subnet but it seems from my debug output
+that IPv6addr tries to match /96 bits of the IP address which fails.
+
+My C knowledge is sadly too little to fix this myself.
+
+I would greatly be happy if you could help me with that.
+
+------------------------------------------------------------------------------
+
+Hi,
+
+we found some discussion about this issue here:
+
+http://www.velocityreviews.com/forums/t283343-shifting-bits-shift-32-bits-on-32-bit-int.html
+
+In post #4 it reads:
+The behaviour of shifts defined only if the value of the right operand
+is less than the number of bits in the left operand. So shifting a
+32-bit value by 32 or more is undefined...
+
+further info in #7:
+
+Better yet, read the first part of section 5.8 of the ISO/IEC 14882:2003
+standard:
+
+The behavior is undefined if the right operand is negative,
+or greater than or equal to the length in bits of the
+promoted left operand.
+
+So it seems that my patch is the proper fix in the end after all.
+Attached as file, since BT distroyed the formatting.
+
+-------------------------------------------------------------------------------
+
+This bug was reported as Debian bug #515662
+http://bugs.debian.org/515662
+
+Signed-off-by: Simon Horman <horms@verge.net.au>
+
+diff -r 4a4773bb2ea4 -r 6d5f0f600c0b resources/OCF/IPv6addr.c
+--- a/resources/OCF/IPv6addr.c Tue Feb 17 13:34:34 2009 +0100
++++ b/resources/OCF/IPv6addr.c Fri Feb 20 12:50:39 2009 +1100
+@@ -499,7 +499,10 @@
+ n = plen / 32;
+ memset(mask.s6_addr32 + n + 1, 0, (3 - n) * 4);
+ s = 32 - plen % 32;
+- mask.s6_addr32[n] = 0xffffffff << s;
++ if (s == 32)
++ mask.s6_addr32[n] = 0x0;
++ else
++ mask.s6_addr32[n] = 0xffffffff << s;
+ mask.s6_addr32[n] = htonl(mask.s6_addr32[n]);
+ }
+
only in patch2:
unchanged:
--- heartbeat-2.1.3.orig/debian/patches/series/2.1.3-6lenny3
+++ heartbeat-2.1.3/debian/patches/series/2.1.3-6lenny3
@@ -0,0 +1 @@
++ o2cb-INITDIR.patch
only in patch2:
unchanged:
--- heartbeat-2.1.3.orig/debian/patches/series/2.1.3-6lenny2
+++ heartbeat-2.1.3/debian/patches/series/2.1.3-6lenny2
@@ -0,0 +1 @@
++ IPv6addr-64.patch
Reply to: