Renamed patch, fixed qdisk block size check RH bug #470533.

(Portage version: 2.1.4.4)

4 files changed, 44 insertions, 3 deletions

diff --git a/sys-cluster/cman/ChangeLog b/sys-cluster/cman/ChangeLog
index a98fc9e81ec8..925026e98d61 100644
--- a/sys-cluster/cman/ChangeLog
+++ b/sys-cluster/cman/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/cman
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/ChangeLog,v 1.42 2008/11/21 22:27:54 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/ChangeLog,v 1.43 2008/11/22 00:36:09 xmerlin Exp $
+
+  22 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org>
+  +files/cman-2.02.39-RH_bug_457107.patch,
+  -files/cman-2.02.39-bug457107.patch,
+  +files/cman-2.02.39-qdisk-fix-block-size-check-RH_bug_470533.patch,
+  cman-2.03.09.ebuild:
+  Renamed patch, fixed qdisk block size check RH bug #470533.
 
   21 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org> files/cman-2.0x.rc,
   files/qdiskd-2.0x.rc, +files/cman-2.02.39-bug457107.patch,
diff --git a/sys-cluster/cman/cman-2.03.09.ebuild b/sys-cluster/cman/cman-2.03.09.ebuild
index bca62b3383b7..e431788c62f6 100644
--- a/sys-cluster/cman/cman-2.03.09.ebuild
+++ b/sys-cluster/cman/cman-2.03.09.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-2.03.09.ebuild,v 1.2 2008/11/21 22:27:54 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-2.03.09.ebuild,v 1.3 2008/11/22 00:36:09 xmerlin Exp $
 
 inherit eutils versionator
 
@@ -41,7 +41,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/cman-2.02.39-bug457107.patch || die
+	epatch "${FILESDIR}"/cman-2.02.39-RH_bug_457107.patch || die
+	epatch "${FILESDIR}"/cman-2.02.39-qdisk-fix-block-size-check-RH_bug_470533.patch || die
 
 	# fix the manual pages have executable bit
 	sed -i -e '
diff --git a/sys-cluster/cman/files/cman-2.02.39-bug457107.patch b/sys-cluster/cman/files/cman-2.02.39-RH_bug_457107.patch
index 40a4159a16a3..40a4159a16a3 100644
--- a/sys-cluster/cman/files/cman-2.02.39-bug457107.patch
+++ b/sys-cluster/cman/files/cman-2.02.39-RH_bug_457107.patch
diff --git a/sys-cluster/cman/files/cman-2.02.39-qdisk-fix-block-size-check-RH_bug_470533.patch b/sys-cluster/cman/files/cman-2.02.39-qdisk-fix-block-size-check-RH_bug_470533.patch
new file mode 100644
index 000000000000..072951bce205
--- /dev/null
+++ b/sys-cluster/cman/files/cman-2.02.39-qdisk-fix-block-size-check-RH_bug_470533.patch
@@ -0,0 +1,33 @@
+From: Lon Hohberger <lhh@redhat.com>
+Date: Fri, 7 Nov 2008 17:53:51 +0000 (-0500)
+Subject: qdisk: fix block size check
+X-Git-Url: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff_plain;h=c90643c8824ff2f12e2debc05f32f981facfcbd3
+
+qdisk: fix block size check
+
+When using device="" instead of label="", this check was causing
+qdiskd to incorrectly exit.
+
+Resolves: #470533
+---
+
+diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c
+index 0e27cb7..e26e1fc 100644
+--- a/cman/qdisk/main.c
++++ b/cman/qdisk/main.c
+@@ -1491,12 +1491,12 @@ main(int argc, char **argv)
+ 		}
+ 
+ 		if (qh.qh_version == VERSION_MAGIC_V2 &&
+-                    qh.qh_blksz != rv) {
++		    qh.qh_blksz != qh.qh_kernsz) {
+ 			clulog(LOG_CRIT,
+-			       "Specified device %s does match kernel's "
++			       "Specified device %s does not match kernel's "
+ 			       "reported sector size (%d != %d)\n",
+ 			       ctx.qc_device,
+-			       ctx.qc_disk.d_blksz, rv);
++			       qh.qh_blksz, qh.qh_kernsz);
+ 			check_stop_cman(&ctx);
+ 			goto out;
+ 		}