Renamed patches, added some fixes in r1.

Package-Manager: portage-2.1.4.4

8 files changed, 239 insertions, 11 deletions

diff --git a/sys-cluster/cman/ChangeLog b/sys-cluster/cman/ChangeLog
index 925026e98d61..02f86db0f153 100644
--- a/sys-cluster/cman/ChangeLog
+++ b/sys-cluster/cman/ChangeLog
@@ -1,6 +1,19 @@
 # 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.43 2008/11/22 00:36:09 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/ChangeLog,v 1.44 2008/11/22 13:47:02 xmerlin Exp $
+
+*cman-2.03.09-r1 (22 Nov 2008)
+
+  22 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org>
+  -files/cman-2.02.39-RH_bug_457107.patch,
+  -files/cman-2.02.39-qdisk-fix-block-size-check-RH_bug_470533.patch,
+  +files/cman-2.03.09-RH_bug_457107.patch,
+  +files/cman-2.03.09-add_votes_to_transition_message.patch,
+  +files/cman-2.03.09-fix_signatures_of_cman_get_privdata_and_cman_set_privd
+  ata.patch,
+  +files/cman-2.03.09-qdisk-fix-block-size-check-RH_bug_470533.patch,
+  cman-2.03.09.ebuild, +cman-2.03.09-r1.ebuild:
+  Renamed patches, added some fixes in r1.
 
   22 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org>
   +files/cman-2.02.39-RH_bug_457107.patch,
diff --git a/sys-cluster/cman/Manifest b/sys-cluster/cman/Manifest
index 8a7f9fadf493..5bc435d77601 100644
--- a/sys-cluster/cman/Manifest
+++ b/sys-cluster/cman/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-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.03.09-RH_bug_457107.patch 718 RMD160 7d20034211ea0a8cb5500876b57aed76a8396768 SHA1 ff0666752ede6706411efdbcf337a13cd87ea098 SHA256 44b825e2a8be1d9363b6906008dea197adf18e86b11dc9e316143fad0e744e35
+AUX cman-2.03.09-add_votes_to_transition_message.patch 2470 RMD160 6d7fba2d9811c777e385ed4a3f83ecf6e0c62b03 SHA1 365739706360a19a34f9d6f6239a45c9196ac3f0 SHA256 38a5eb14b672c96c459be564e0e6245dbd0ae68fcdeec3e0ef18a44786833d76
+AUX cman-2.03.09-fix_signatures_of_cman_get_privdata_and_cman_set_privdata.patch 1767 RMD160 1e6fbdfcd9003adfeac4109799d0ec5a5beab24a SHA1 8e076335ad4add675b61077304054ca73c3440f5 SHA256 dba7ca54e90cd6fb8e3271cefb19e84426ef45bea2abc0a55fe86b1157764db8
+AUX cman-2.03.09-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 2566 RMD160 5d6401287b2e4b5e1b5ac6a7271a39afdb34c6d8 SHA1 207c0152defac783c83f307ea80832ceb9ecc284 SHA256 667dccc2f60b4e944e4625e289feee348811733a24cc65cb4a756886ee40b2fd
-MISC ChangeLog 6372 RMD160 92d356d884c2d295a42cce23862c2e0b68118fba SHA1 52a55b9d8a5a7aa624ebdf1ba9bb04cebc38702d SHA256 3a61669e45747800d905c3ca330efa4b4e974515d86c36660a8a299dfeb2ed63
+EBUILD cman-2.03.09-r1.ebuild 2724 RMD160 b4ceb7c0c499297ca1a1a129d1697dbe465e6cfd SHA1 29591f3458a6c4e7c083c4839362353bbcae2794 SHA256 12753852c2e4120b6f49718f448cd2f02f50d5f041b184eac14b4e2493be5d9f
+EBUILD cman-2.03.09.ebuild 2550 RMD160 e553db5797a10e2a6018c4a4395a03182fbeae15 SHA1 11d62e5042691519e5ee155b361a5ea394fb25de SHA256 c32b59251ada66e40293b9844bb55e05508d9421a81cf7e825ba8b8e057c2dfd
+MISC ChangeLog 6927 RMD160 caa38a4c831566e3af126498c26a06a1464dbac0 SHA1 5f92379a59f05811dc13d51ff71805be28db2e16 SHA256 474d2260d24b03ac11566e17eb2abb15c15af87d48c2094691ad5f98f3f45831
 MISC metadata.xml 229 RMD160 4dcf17b88c5f4db2e817f473f3e8269b0bff2e6e SHA1 e6315be43241c55bdc0d12a42fa05632c5ff9b79 SHA256 49e13d2d49bef7298e3bb665ebeceeff9b0880fae5ff639cb8405993504f244f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkknYiQACgkQgMUyd/cdjWsplwCfcuL7W09ZypQlKKfytyfcdYGQ
-qpIAn3ElDPo8hhFB7KjLz8KrB3pTBskg
-=okEW
+iEYEARECAAYFAkkoG4YACgkQgMUyd/cdjWu4ewCgj3VWzyrJNt3NYjwwFT49qHfY
+dtMAoJGzQqgAV1Ul8HULE935jjLeBzdN
+=p6eI
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/cman/cman-2.03.09-r1.ebuild b/sys-cluster/cman/cman-2.03.09-r1.ebuild
new file mode 100644
index 000000000000..dd2be96c770e
--- /dev/null
+++ b/sys-cluster/cman/cman-2.03.09-r1.ebuild
@@ -0,0 +1,100 @@
+# 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-r1.ebuild,v 1.1 2008/11/22 13:47:02 xmerlin Exp $
+
+inherit eutils versionator
+
+CLUSTER_RELEASE="${PV}"
+MY_P="cluster-${CLUSTER_RELEASE}"
+
+MAJ_PV="$(get_major_version)"
+MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)"
+
+DESCRIPTION="general-purpose symmetric cluster manager"
+HOMEPAGE="http://sources.redhat.com/cluster/wiki/"
+SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=sys-kernel/linux-headers-2.6.23
+	=sys-cluster/openais-0.80.3*
+	=sys-cluster/ccs-${CLUSTER_RELEASE}*
+	=sys-cluster/cman-lib-${CLUSTER_RELEASE}*
+	!sys-cluster/cman-headers
+	!sys-cluster/cman-kernel
+	!sys-cluster/dlm-headers
+	!sys-cluster/magma
+	!sys-cluster/magma-plugins
+	"
+
+RDEPEND="${DEPEND}"
+
+PDEPEND="=sys-cluster/dlm-${CLUSTER_RELEASE}*
+	=sys-cluster/fence-${CLUSTER_RELEASE}*"
+
+S="${WORKDIR}/${MY_P}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-RH_bug_457107.patch || die
+	epatch "${FILESDIR}"/${P}-qdisk-fix-block-size-check-RH_bug_470533.patch || die
+
+	epatch "${FILESDIR}"/${P}-add_votes_to_transition_message.patch || die
+	epatch "${FILESDIR}"/${P}-fix_signatures_of_cman_get_privdata_and_cman_set_privdata.patch || die
+
+	# fix the manual pages have executable bit
+	sed -i -e '
+		/\tinstall -d/s/install/& -m 0755/; t
+		/\tinstall/s/install/& -m 0644/' \
+		man/Makefile || die "failed patching man pages permission"
+
+}
+
+src_compile() {
+	(cd "${WORKDIR}"/${MY_P};
+		./configure \
+			--cc=$(tc-getCC) \
+			--cflags="-Wall" \
+			--disable_kernel_check \
+			--somajor="$MAJ_PV" \
+			--sominor="$MIN_PV" \
+			--cmanlibdir=/usr/lib \
+			--cmanincdir=/usr/include \
+	) || die "configure problem"
+
+	emake clean
+	emake -C cman_tool || die "compile problem"
+	emake -C daemon || die "compile problem"
+	env -u CFLAGS emake -C qdisk || die "compile problem"
+	emake -C init.d || die "compile problem"
+	emake -C man || die "compile problem"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install problem"
+
+	# These were installed by cman-lib.
+	rm "${D}"/usr/lib/libcman.so.${PV} \
+		"${D}"/usr/lib/libcman.a \
+		"${D}"/usr/include/libcman.h \
+		"${D}"/usr/lib/libcman.so.2 \
+		"${D}"/usr/lib/libcman.so \
+		|| die "failed to cleanup extra files"
+
+	newinitd "${FILESDIR}"/${PN}-2.0x.rc ${PN} || die
+	newconfd "${FILESDIR}"/${PN}-2.0x.conf ${PN} || die
+	newinitd "${FILESDIR}"/qdiskd-2.0x.rc qdiskd || die
+
+	keepdir /etc/cluster || die
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "Please add a cluster.conf in /etc/cluster/"
+	einfo ""
+}
diff --git a/sys-cluster/cman/cman-2.03.09.ebuild b/sys-cluster/cman/cman-2.03.09.ebuild
index e431788c62f6..762bf5cb189f 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.3 2008/11/22 00:36:09 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-2.03.09.ebuild,v 1.4 2008/11/22 13:47:02 xmerlin Exp $
 
 inherit eutils versionator
 
@@ -41,8 +41,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	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
+	epatch "${FILESDIR}"/${P}-RH_bug_457107.patch || die
+	epatch "${FILESDIR}"/${P}-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.03.09-RH_bug_457107.patch
index 40a4159a16a3..40a4159a16a3 100644
--- a/sys-cluster/cman/files/cman-2.02.39-RH_bug_457107.patch
+++ b/sys-cluster/cman/files/cman-2.03.09-RH_bug_457107.patch
diff --git a/sys-cluster/cman/files/cman-2.03.09-add_votes_to_transition_message.patch b/sys-cluster/cman/files/cman-2.03.09-add_votes_to_transition_message.patch
new file mode 100644
index 000000000000..6ea26166d141
--- /dev/null
+++ b/sys-cluster/cman/files/cman-2.03.09-add_votes_to_transition_message.patch
@@ -0,0 +1,63 @@
+From: Christine Caulfield <ccaulfie@redhat.com>
+Date: Thu, 6 Nov 2008 11:53:14 +0000 (+0000)
+Subject: cman: add votes to transition message
+X-Git-Url: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff_plain;h=2a983d103349d8aa1da2a7332bec334b849b0e3e
+
+cman: add votes to transition message
+
+This uses a previously unused field in this message to help provide
+forward-compatibility with cluster3 systems which need the node votes
+to be provided by the node itself, rather than the global configuration
+system.
+
+Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>
+---
+
+diff --git a/cman/daemon/cnxman-private.h b/cman/daemon/cnxman-private.h
+index 0e433a6..27a3c2e 100644
+--- a/cman/daemon/cnxman-private.h
++++ b/cman/daemon/cnxman-private.h
+@@ -59,7 +59,7 @@ struct cl_transmsg {
+ 	unsigned char cmd;
+ 	unsigned char first_trans;
+ 	uint16_t cluster_id;
+-	int high_nodeid;
++	int votes;
+ 	int expected_votes;
+ 
+ 	unsigned int   major_version;	/* Not backwards compatible */
+diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c
+index 519a10d..00cdb65 100644
+--- a/cman/daemon/commands.c
++++ b/cman/daemon/commands.c
+@@ -1538,7 +1538,7 @@ void send_transition_msg(int last_memb_count, int first_trans)
+ 	P_MEMB("sending TRANSITION message. cluster_name = %s\n", cluster_name);
+ 	msg->cmd = CLUSTER_MSG_TRANSITION;
+ 	msg->first_trans = first_trans;
+-	msg->high_nodeid = get_highest_nodeid();
++	msg->votes = us->votes;
+ 	msg->expected_votes = us->expected_votes;
+ 	msg->cluster_id = cluster_id;
+ 	msg->major_version = CNXMAN_MAJOR_VERSION;
+@@ -1588,7 +1588,7 @@ static void byteswap_internal_message(char *data, int len)
+ 	case CLUSTER_MSG_TRANSITION:
+ 		transmsg = (struct cl_transmsg *)data;
+ 		transmsg->cluster_id = swab16(transmsg->cluster_id);
+-		transmsg->high_nodeid = swab32(transmsg->high_nodeid);
++		transmsg->votes = swab32(transmsg->votes);
+ 		transmsg->expected_votes = swab32(transmsg->expected_votes);
+ 		transmsg->major_version = swab32(transmsg->major_version);
+ 		transmsg->minor_version = swab32(transmsg->minor_version);
+diff --git a/cman/daemon/cnxman-private.h b/cman/daemon/cnxman-private.h
+index 27a3c2e..345242d 100644
+--- a/cman/daemon/cnxman-private.h
++++ b/cman/daemon/cnxman-private.h
+@@ -5,7 +5,7 @@
+ 
+ /* Protocol Version triplet */
+ #define CNXMAN_MAJOR_VERSION 6
+-#define CNXMAN_MINOR_VERSION 1
++#define CNXMAN_MINOR_VERSION 2
+ #define CNXMAN_PATCH_VERSION 0
+ 
+ /* How we announce ourself in console events */
diff --git a/sys-cluster/cman/files/cman-2.03.09-fix_signatures_of_cman_get_privdata_and_cman_set_privdata.patch b/sys-cluster/cman/files/cman-2.03.09-fix_signatures_of_cman_get_privdata_and_cman_set_privdata.patch
new file mode 100644
index 000000000000..b1fea587ee87
--- /dev/null
+++ b/sys-cluster/cman/files/cman-2.03.09-fix_signatures_of_cman_get_privdata_and_cman_set_privdata.patch
@@ -0,0 +1,49 @@
+From: Christine Caulfield <ccaulfie@redhat.com>
+Date: Wed, 19 Nov 2008 11:16:30 +0000 (+0000)
+Subject: cman: fix signatures of cman_get_privdata & cman_set_privdata
+X-Git-Url: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff_plain;h=6f11a5cb225a9547a18440e9129410c32aa2be3f
+
+cman: fix signatures of cman_get_privdata & cman_set_privdata
+
+They do NOT take a pointer to a handle.
+
+Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>
+---
+
+diff --git a/cman/lib/libcman.c b/cman/lib/libcman.c
+index cee0147..9465412 100644
+--- a/cman/lib/libcman.c
++++ b/cman/lib/libcman.c
+@@ -346,7 +346,7 @@ int cman_finish(cman_handle_t handle)
+ 	return 0;
+ }
+ 
+-int cman_setprivdata(cman_handle_t *handle, void *privdata)
++int cman_setprivdata(cman_handle_t handle, void *privdata)
+ {
+ 	struct cman_handle *h = (struct cman_handle *)handle;
+ 	VALIDATE_HANDLE(h);
+@@ -355,7 +355,7 @@ int cman_setprivdata(cman_handle_t *handle, void *privdata)
+ 	return 0;
+ }
+ 
+-int cman_getprivdata(cman_handle_t *handle, void **privdata)
++int cman_getprivdata(cman_handle_t handle, void **privdata)
+ {
+ 	struct cman_handle *h = (struct cman_handle *)handle;
+ 	VALIDATE_HANDLE(h);
+diff --git a/cman/lib/libcman.h b/cman/lib/libcman.h
+index 3771176..b4fb4e4 100644
+--- a/cman/lib/libcman.h
++++ b/cman/lib/libcman.h
+@@ -196,8 +196,8 @@ cman_handle_t cman_admin_init(void *privdata);
+ int cman_finish(cman_handle_t handle);
+ 
+ /* Update/retrieve the private data */
+-int cman_setprivdata(cman_handle_t *h, void *privdata);
+-int cman_getprivdata(cman_handle_t *h, void **privdata);
++int cman_setprivdata(cman_handle_t h, void *privdata);
++int cman_getprivdata(cman_handle_t h, void **privdata);
+ 
+ /*
+  * Notification of membership change events. Note that these are sent after
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.03.09-qdisk-fix-block-size-check-RH_bug_470533.patch
index 072951bce205..072951bce205 100644
--- 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.03.09-qdisk-fix-block-size-check-RH_bug_470533.patch