From 806c5ed2da58d1db2c2d915cb42893729028ea78 Mon Sep 17 00:00:00 2001 From: Christian Zoffoli Date: Sat, 22 Nov 2008 00:36:09 +0000 Subject: Renamed patch, fixed qdisk block size check RH bug #470533. Package-Manager: portage-2.1.4.4 --- sys-cluster/cman/ChangeLog | 9 +++++- sys-cluster/cman/Manifest | 13 +++++---- sys-cluster/cman/cman-2.03.09.ebuild | 5 ++-- .../cman/files/cman-2.02.39-RH_bug_457107.patch | 12 ++++++++ .../cman/files/cman-2.02.39-bug457107.patch | 12 -------- ...-qdisk-fix-block-size-check-RH_bug_470533.patch | 33 ++++++++++++++++++++++ 6 files changed, 63 insertions(+), 21 deletions(-) create mode 100644 sys-cluster/cman/files/cman-2.02.39-RH_bug_457107.patch delete mode 100644 sys-cluster/cman/files/cman-2.02.39-bug457107.patch create mode 100644 sys-cluster/cman/files/cman-2.02.39-qdisk-fix-block-size-check-RH_bug_470533.patch (limited to 'sys-cluster/cman') 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 + +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 files/cman-2.0x.rc, files/qdiskd-2.0x.rc, +files/cman-2.02.39-bug457107.patch, diff --git a/sys-cluster/cman/Manifest b/sys-cluster/cman/Manifest index c5aa715c2b7f..8a7f9fadf493 100644 --- a/sys-cluster/cman/Manifest +++ b/sys-cluster/cman/Manifest @@ -1,18 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX cman-2.02.39-bug457107.patch 718 RMD160 7d20034211ea0a8cb5500876b57aed76a8396768 SHA1 ff0666752ede6706411efdbcf337a13cd87ea098 SHA256 44b825e2a8be1d9363b6906008dea197adf18e86b11dc9e316143fad0e744e35 +AUX cman-2.02.39-RH_bug_457107.patch 718 RMD160 7d20034211ea0a8cb5500876b57aed76a8396768 SHA1 ff0666752ede6706411efdbcf337a13cd87ea098 SHA256 44b825e2a8be1d9363b6906008dea197adf18e86b11dc9e316143fad0e744e35 +AUX cman-2.02.39-qdisk-fix-block-size-check-RH_bug_470533.patch 1038 RMD160 b09d7039fac01cf884aed3b2e0138d6d2cf7fb18 SHA1 041b5ba169663156ea67ae50400686bb5b3f3db7 SHA256 28e7c331180fc964ec0ec6d7f1cad9e58d9e946e581b8428ac19653cc2cb8dc0 AUX cman-2.0x.conf 1068 RMD160 94ee01b8380a69f76bc281ffed64060a16c65f23 SHA1 adb51284a2d943697f8dd15eff8415197c84ef49 SHA256 474c5a2f2d4613c52292d42ccd3a1b3baec7e5cab3dc73dc1e1adfb8225db473 AUX cman-2.0x.rc 7849 RMD160 1fbe269d2deecd63bb18b66232872736cba0db61 SHA1 9ae9c9cd9436650c4b9352fedd7cd4b218aeee25 SHA256 29b8cacd53a8de44081120d4130798357f72301af819db245b058d1e0377c42a AUX qdiskd-2.0x.rc 595 RMD160 3f083e4efea60616604a7a81406f719c48c03260 SHA1 da5ee9731f4d0902395eecd1920136e1cf5456c5 SHA256 1ca52a4dc6bd7475d3c7d3511e83629b2fb92b287577bf11fe7f608a21f30e6d DIST cluster-2.03.09.tar.gz 1784357 RMD160 9ac5c3fd0fece8ec17bd31d116c43b33612741d0 SHA1 c2cdbc657da2a9efde4b1e6d2657170e1c09b5b8 SHA256 b6d6f35f58b2f8628c369391e0fd01b1803af40029ec1e6ef88865dda38b855f -EBUILD cman-2.03.09.ebuild 2473 RMD160 68a23ce4102ae68a4386ee9f8b09c8e84a8906bf SHA1 6b073a694207f6f9182536c865c1c3a59800a874 SHA256 5149726c063982704c70f996a691790fdcaaff4f6f35fbdf198b9d7a75f67e89 -MISC ChangeLog 6080 RMD160 5400afb964367cdfdc2ffbfee2bcea21634e7987 SHA1 c053478f87611b227528543eed19e2ef8de15b21 SHA256 834e48e8c1e858ed95373ca9e9bd7a4e4ffad297843c5b86fb3069f4d9b32455 +EBUILD cman-2.03.09.ebuild 2566 RMD160 5d6401287b2e4b5e1b5ac6a7271a39afdb34c6d8 SHA1 207c0152defac783c83f307ea80832ceb9ecc284 SHA256 667dccc2f60b4e944e4625e289feee348811733a24cc65cb4a756886ee40b2fd +MISC ChangeLog 6372 RMD160 92d356d884c2d295a42cce23862c2e0b68118fba SHA1 52a55b9d8a5a7aa624ebdf1ba9bb04cebc38702d SHA256 3a61669e45747800d905c3ca330efa4b4e974515d86c36660a8a299dfeb2ed63 MISC metadata.xml 229 RMD160 4dcf17b88c5f4db2e817f473f3e8269b0bff2e6e SHA1 e6315be43241c55bdc0d12a42fa05632c5ff9b79 SHA256 49e13d2d49bef7298e3bb665ebeceeff9b0880fae5ff639cb8405993504f244f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkknRBQACgkQgMUyd/cdjWsFOQCfYtHvCjk3JCxajYyGF+fjNVmJ -1+oAn3Hattc6t9cVWOAMywpnTEElEtDM -=G3/7 +iEYEARECAAYFAkknYiQACgkQgMUyd/cdjWsplwCfcuL7W09ZypQlKKfytyfcdYGQ +qpIAn3ElDPo8hhFB7KjLz8KrB3pTBskg +=okEW -----END PGP SIGNATURE----- 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-RH_bug_457107.patch b/sys-cluster/cman/files/cman-2.02.39-RH_bug_457107.patch new file mode 100644 index 000000000000..40a4159a16a3 --- /dev/null +++ b/sys-cluster/cman/files/cman-2.02.39-RH_bug_457107.patch @@ -0,0 +1,12 @@ +--- cluster-2.03.09/cman/daemon/commands.c.orig 2008-11-18 14:59:52.000000000 +0100 ++++ cluster-2.03.09/cman/daemon/commands.c 2008-11-18 15:00:27.000000000 +0100 +@@ -1729,8 +1729,7 @@ + + /* Newer nodes 6.1.0 onwards, set the DIRTY flag if they have state. If the new node has been down + and has state then we mark it disallowed because we cannot merge stateful nodes */ +- if ( (msg->flags & NODE_FLAGS_DIRTY && (node->flags & NODE_FLAGS_BEENDOWN)) || +- (msg->flags & NODE_FLAGS_DIRTY && msg->first_trans && !node->us)) { ++ if ( msg->flags & NODE_FLAGS_DIRTY && (node->flags & NODE_FLAGS_BEENDOWN)) { + /* Don't duplicate messages */ + if (node->state != NODESTATE_AISONLY) { + if (cluster_is_quorate) { diff --git a/sys-cluster/cman/files/cman-2.02.39-bug457107.patch b/sys-cluster/cman/files/cman-2.02.39-bug457107.patch deleted file mode 100644 index 40a4159a16a3..000000000000 --- a/sys-cluster/cman/files/cman-2.02.39-bug457107.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- cluster-2.03.09/cman/daemon/commands.c.orig 2008-11-18 14:59:52.000000000 +0100 -+++ cluster-2.03.09/cman/daemon/commands.c 2008-11-18 15:00:27.000000000 +0100 -@@ -1729,8 +1729,7 @@ - - /* Newer nodes 6.1.0 onwards, set the DIRTY flag if they have state. If the new node has been down - and has state then we mark it disallowed because we cannot merge stateful nodes */ -- if ( (msg->flags & NODE_FLAGS_DIRTY && (node->flags & NODE_FLAGS_BEENDOWN)) || -- (msg->flags & NODE_FLAGS_DIRTY && msg->first_trans && !node->us)) { -+ if ( msg->flags & NODE_FLAGS_DIRTY && (node->flags & NODE_FLAGS_BEENDOWN)) { - /* Don't duplicate messages */ - if (node->state != NODESTATE_AISONLY) { - if (cluster_is_quorate) { 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 +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; + } -- cgit v1.2.3-65-gdbad