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

redhat-cluster 2.20081102-1.1



Hi,
I'd like to push above package into the next Lenny point release.
Without that patch rgmanager is completely useless since resource
failover doesn't work:

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=553166

Martin Waite found the fix and tested the package. O.k. to upload to
stable-proposed-updates?
Cheers,
 -- Guido
diff -u redhat-cluster-2.20081102/debian/changelog redhat-cluster-2.20081102/debian/changelog
--- redhat-cluster-2.20081102/debian/changelog
+++ redhat-cluster-2.20081102/debian/changelog
@@ -1,3 +1,11 @@
+redhat-cluster (2.20081102-1.1) stable-proposed-updates; urgency=low
+
+  * Non-maintainer upload.
+  * [af1e653] Cherry-pick upstream fix for failing resource failover
+    (Closes: #553166) - thanks a lot to Martin Waite
+
+ -- Guido Günther <agx@sigxcpu.org>  Thu, 19 Nov 2009 14:07:30 +0100
+
 redhat-cluster (2.20081102-1) unstable; urgency=medium
 
   * New upstream release version 2.03.09.
diff -u redhat-cluster-2.20081102/debian/patches/00list redhat-cluster-2.20081102/debian/patches/00list
--- redhat-cluster-2.20081102/debian/patches/00list
+++ redhat-cluster-2.20081102/debian/patches/00list
@@ -2,0 +3 @@
+05_fix_resource_failover.dpatch
only in patch2:
unchanged:
--- redhat-cluster-2.20081102.orig/debian/patches/05_fix_resource_failover.dpatch
+++ redhat-cluster-2.20081102/debian/patches/05_fix_resource_failover.dpatch
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Cherry-pick upstream fix for failing resource failover
+## DP: X-Git-Url: http://git.fedorahosted.org/git/?p=cluster.git;a=blobdiff_plain;f=fence%2Ffenced%2Fagent.c;h=dd3ef2b569b18aa359cb28dd66e2b7837b7a6a47;hp=a41dd0344d8fc211413e6d2707d3a223fd4ed398;hb=aee97b180e80c9f8b90b8fca63004afe3b289962;hpb=05985c63592e45d3df24186e59768a5eccf485d6
+
+@DPATCH@
+diff --git a/fence/fenced/agent.c b/fence/fenced/agent.c
+index a41dd03..dd3ef2b 100644
+--- a/fence/fenced/agent.c
++++ b/fence/fenced/agent.c
+@@ -354,8 +354,6 @@ int dispatch_fence_agent(char *victim, int force)
+ 
+ 		if (device)
+ 			free(device);
+-		if (victim_nodename)
+-			free(victim_nodename);
+ 		free(method);
+ 
+ 		if (!error) {
+@@ -364,6 +362,9 @@ int dispatch_fence_agent(char *victim, int force)
+ 		}
+ 	}
+ 
++	if (victim_nodename)
++		free(victim_nodename);
++
+ 	ccs_disconnect(cd);
+ 
+ 	return error;

Reply to: