Version bump along with new Cluster Suite deployment.

Package-Manager: portage-2.1.10.14/cvs/Linux x86_64

diff --git a/sys-cluster/rgmanager-agents/Manifest b/sys-cluster/rgmanager-agents/Manifest
new file mode 100644 (file)
index 0000000..c08e6b0
--- /dev/null
+++ b/sys-cluster/rgmanager-agents/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST rgmanager-agents-3.9.2.tar.gz 1103104 RMD160 caad45e5b5a44810ab39c9988b894c2a66ab922c SHA1 2b300d589056bab3f5144964d81c3572f98f1750 SHA256 e62cedf54cdfec0e1532a6ca08a1b4d6e1686586001bd695e45c28eed0c4a887
+EBUILD rgmanager-agents-3.9.2.ebuild 1812 RMD160 6c1862793b61b8a51b256cbf01a5b9d90935d802 SHA1 6c3774eebd2139c4de94136187ae71f1981ee4e6 SHA256 6eb423f3eb4abe7e798e60be588ed7fbcfb4834f3af0dc2d8b24219bf958a213
+MISC ChangeLog 383 RMD160 7f89722cf0cf72b7455bd0ed2d217f7938245749 SHA1 26dd210484dea6b31e45aca96ce24953c09e7daf SHA256 218ea521f4763562fab8690e3df6e39de149e06ddcdd7e352bbe43208be11756
+MISC metadata.xml 221 RMD160 d9131a5ffe0c05968b112077a6ada3d050efc437 SHA1 cbc9d261471accd40b1ecf138a4df36225df3848 SHA256 75e9b4e5495c8434278878b573b7966ab4f1eb0ebcaecba7bcfd4dd4e8fbc906
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk5whzoACgkQKiQSS7ZY+hOmXgEA3kMNRpsUhYMkmKCD+JvwTBMp
+NIIdyeTMyGk+6ynlGNkBAMvB9SbDX+3ogRdf1c8yAce6eUj2dM5s6J9FQKz0DU7w
+=T2vV
+-----END PGP SIGNATURE-----

diff --git a/sys-cluster/rgmanager/ChangeLog b/sys-cluster/rgmanager/ChangeLog
index 90fc77c9ca57ffff1fd767f570c272c9819333f2..dacfbc76999948cf939af373646e37eb094a8866 100644 (file)
--- a/sys-cluster/rgmanager/ChangeLog
+++ b/sys-cluster/rgmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/rgmanager
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/ChangeLog,v 1.18 2011/05/17 07:52:33 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/ChangeLog,v 1.19 2011/09/14 10:47:36 ultrabug Exp $
+
+*rgmanager-3.1.5 (14 Sep 2011)
+
+  14 Sep 2011; Ultrabug <ultrabug@gentoo.org> +rgmanager-3.1.5.ebuild,
+  +files/rgmanager-3.1.5-fix_libxml2.patch, +files/rgmanager.confd,
+  +files/rgmanager.initd:
+  Version bump along with new Cluster Suite deployment.
 
   17 May 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   rgmanager-2.03.09-r1.ebuild:

diff --git a/sys-cluster/rgmanager/Manifest b/sys-cluster/rgmanager/Manifest
index e5304d4f3e30f66a342eb6c0b40c8fbbb506b4a0..d8542b67c649438cdd709c9dc283ec53bebede78 100644 (file)
--- a/sys-cluster/rgmanager/Manifest
+++ b/sys-cluster/rgmanager/Manifest
@@ -1,18 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX rgmanager-2.03.09-CVE-2010-3389.patch 1404 RMD160 c2422311a70fc4fdc17f51607d6856398c675c83 SHA1 666e69d2706035aa16d855f8fac5a69bd4e19f38 SHA256 cd7c3ef38d317531c807768f195bb2eb64c1943aec9b114c47d557067171eb3e
 AUX rgmanager-2.0x.conf 245 RMD160 d13382433c60ebf4a23884a745c84735b7c1ee46 SHA1 33c833f4479b73fc47ff62f742f9aed86d126aee SHA256 1b97548dac4f78fc1689298835373c224730c2f5020c3ce0996402ec950f5ece
 AUX rgmanager-2.0x.rc 1991 RMD160 e770fd8805afee61e13f5fb8851b77c22258b1cc SHA1 79a5c9c6d26df07c2f085b61782cbcc10f965c89 SHA256 2cd70711935077ad1020de0f8072cc4add1470ce8052ee493e2a2da4b465e542
+AUX rgmanager-3.1.5-fix_libxml2.patch 731 RMD160 ba4eb0c6301abe1f408840fbfb14b45c337d3cbf SHA1 a7d56a71e72c7e0d433e84571701d5a374eb1bbe SHA256 b939dec463869b3b3c21b4a9dfad61f14eee57e0cd006e661387c408a0537ced
+AUX rgmanager.confd 277 RMD160 0c7718c000ca42b0636fbb239e343b2861086a28 SHA1 c561ffba945b2c03885e4fe7c4cbf95efda93454 SHA256 3f454a76d9ead242592ab0776aaa1bfa35adc140465db60176f988b93076f983
+AUX rgmanager.initd 753 RMD160 e7cc9ec86228fe2b8c10d4c5c797ee3c2e4d7c37 SHA1 6967fffa6322d2ed1e007863fc829524b2724401 SHA256 113ba86ce496b5ba6df70db9b0d4c724a97f093796f1ca8a1b552563b0dd9448
 DIST cluster-2.03.09.tar.gz 1784357 RMD160 9ac5c3fd0fece8ec17bd31d116c43b33612741d0 SHA1 c2cdbc657da2a9efde4b1e6d2657170e1c09b5b8 SHA256 b6d6f35f58b2f8628c369391e0fd01b1803af40029ec1e6ef88865dda38b855f
+DIST cluster-3.1.5.tar.gz 651449 RMD160 c12dbf38c3e24cbdac23dbfdce6cb96da5c722ff SHA1 884d153ad9545d8abd225744dff5a905e19a6702 SHA256 95be1b484f9c58af3c47a9d46dc2802d37f1b2b9028053f243a2c8bd1f07623e
 EBUILD rgmanager-2.03.09-r1.ebuild 1665 RMD160 16dd7413383b99283322baf4a746acd3a5b81d1b SHA1 df497edfad288bce83ee27ce9fc0dd13440ace9e SHA256 44a9747ae4f0f104eb0d833bfe726a0df37899c6b70813271af7fc48476f80e9
 EBUILD rgmanager-2.03.09.ebuild 1655 RMD160 554b92b660db890dbf79e9b4832b39bfd4cdbfe1 SHA1 2967c81ceb981c5c6850e32488ff9b2a418298a8 SHA256 a9b0dde9ccd7c551c7792a7e9442c922bfb5005905745063a6088dbc2b505e93
-MISC ChangeLog 3367 RMD160 fc13f4be34be8b4c3ea7de7830a54e69cd0fe412 SHA1 f40059094f75bf6947f64703e4f6b312b93c0bdf SHA256 3b067478eefa10d1757f9d25b1278b9b627ec5d16f669c724e269571418a004b
+EBUILD rgmanager-3.1.5.ebuild 1521 RMD160 0a0c3a76666206f6e93a943bc093c2dae5567dd8 SHA1 8f2f739736beec0862c1f0bb2e0ebb9139edaf89 SHA256 d0e166ee5a940ea537ebdf4d7b29d7da97bd4f532db4f1bef6ba6a3bffb3effa
+MISC ChangeLog 3619 RMD160 0cf8bc02460a216aabecd280b1718afa40c74ff8 SHA1 4ee9b4fdbe8f4c65fa861450de357385568556e7 SHA256 b1e13e34205591a6ff23a1e5c20718ab483279e99a48fb26fbc1aa819b80efe6
 MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk3SKUUACgkQuUQtlDBCeQIE3gCfVE4Nh1rnH7ps2+kG3QQzJmRw
-0rAAnjWXDD4JwMyBur/k9PIOeNA0hGUj
-=bJ6e
+iF4EAREIAAYFAk5whlEACgkQKiQSS7ZY+hOSVQEAvOMEpN8aF81n6EkKqdzMc2G8
+tgaFiPLecHXLQo57hCEBAKZLx3dRxuNETqrqLGO1DEy7MMYs4Ds25Lg4UqXxDxxb
+=eCK9
 -----END PGP SIGNATURE-----

diff --git a/sys-cluster/rgmanager/files/rgmanager-3.1.5-fix_libxml2.patch b/sys-cluster/rgmanager/files/rgmanager-3.1.5-fix_libxml2.patch
new file mode 100644 (file)
index 0000000..eff23ef
--- /dev/null
+++ b/sys-cluster/rgmanager/files/rgmanager-3.1.5-fix_libxml2.patch
@@ -0,0 +1,23 @@
+* Use double underline as header-protectors to avoid collision with icu's platform.h 
+* (pulled in via libxml2 when built with icu support) resulting in int64_t defined twice 
+* (once in icu's ptypes.h and once in stdint.h)
+* patch by Tiziano Mueller <dev-zero@gentoo.org>
+--- a/rgmanager/include/platform.h     2011-03-07 19:58:22.000000000 +0100
++++ b/rgmanager/include/platform.h     2011-03-08 15:59:36.773871936 +0100
+@@ -1,8 +1,8 @@
+ /** @file
+  * Defines for byte-swapping
+  */
+-#ifndef _PLATFORM_H
+-#define _PLATFORM_H
++#ifndef __PLATFORM_H
++#define __PLATFORM_H
+ 
+ #include <endian.h>
+ #include <sys/param.h>
+@@ -56,4 +56,4 @@
+ #define PACKED __attribute__((packed))
+ #endif
+ 
+-#endif /* _PLATFORM_H */
++#endif /* __PLATFORM_H */

diff --git a/sys-cluster/rgmanager/files/rgmanager.confd b/sys-cluster/rgmanager/files/rgmanager.confd
new file mode 100644 (file)
index 0000000..cad0c51
--- /dev/null
+++ b/sys-cluster/rgmanager/files/rgmanager.confd
@@ -0,0 +1,8 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/files/rgmanager.confd,v 1.1 2011/09/14 10:47:36 ultrabug Exp $
+
+PIDFILE="/var/run/rgmanager.pid"
+
+RGMGR_OPTS=""
+

diff --git a/sys-cluster/rgmanager/files/rgmanager.initd b/sys-cluster/rgmanager/files/rgmanager.initd
new file mode 100644 (file)
index 0000000..2e3d25c
--- /dev/null
+++ b/sys-cluster/rgmanager/files/rgmanager.initd
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Adaption of the original RedHat script
+# Original Copyright (C) 2003 Red Hat, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/files/rgmanager.initd,v 1.1 2011/09/14 10:47:36 ultrabug Exp $
+
+depend() {
+       use net
+#      need cman
+}
+
+start() {
+       ebegin "Starting cluster resource manager"
+
+       # recreate run-directory
+       mkdir -p /var/run/cluster
+
+       start-stop-daemon \
+               --start \
+               --quiet \
+               --exec "/usr/sbin/rgmanager" \
+               --pidfile "${PIDFILE}" \
+               -- ${RGMGR_OPTS}
+       eend $ret
+}
+
+stop() {
+       ebegin "Shutting down cluster resource manager"
+       start-stop-daemon \
+               --stop \
+               --pidfile "${PIDFILE}" \
+               --retry 0
+       eend $?
+}

diff --git a/sys-cluster/rgmanager/rgmanager-3.1.5.ebuild b/sys-cluster/rgmanager/rgmanager-3.1.5.ebuild
new file mode 100644 (file)
index 0000000..fa57512
--- /dev/null
+++ b/sys-cluster/rgmanager/rgmanager-3.1.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/rgmanager-3.1.5.ebuild,v 1.1 2011/09/14 10:47:36 ultrabug Exp $
+
+EAPI=4
+
+inherit eutils multilib versionator
+
+CLUSTER_RELEASE="${PV}"
+MY_P="cluster-${CLUSTER_RELEASE}"
+
+MAJ_PV="$(get_major_version)"
+MIN_PV="$(get_version_component_range 2-3)"
+
+DESCRIPTION="Clustered resource group manager"
+HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
+SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus"
+
+DEPEND="~sys-cluster/libcman-${PV}
+       ~sys-cluster/liblogthread-${PV}
+       ~sys-cluster/libccs-${PV}
+       ~sys-cluster/libdlm-${PV}
+       dev-libs/libxml2
+       =sys-libs/slang-2*
+       dbus? ( sys-apps/dbus )"
+RDEPEND="${DEPEND}
+       ~sys-cluster/cman-${PV}"
+
+S=${WORKDIR}/${MY_P}/${PN}
+
+src_prepare() {
+       epatch "${FILESDIR}/${P}-fix_libxml2.patch"
+}
+
+src_configure() {
+       local myopts=""
+       use dbus || myopts="--disable_dbus"
+       cd "${WORKDIR}"/${MY_P}
+       ./configure \
+               --cc="$(tc-getCC)" \
+               --cflags="-Wall" \
+               --libdir=/usr/$(get_libdir) \
+               --disable_kernel_check \
+               --somajor="$MAJ_PV" \
+               --sominor="$MIN_PV" \
+               --dlmlibdir=/usr/$(get_libdir) \
+               --dlmincdir=/usr/include \
+               --cmanlibdir=/usr/$(get_libdir) \
+               --cmanincdir=/usr/include \
+               ${myopts} \
+               || die "configure problem"
+}
+
+src_install() {
+       default
+
+       newinitd "${FILESDIR}"/${PN}.initd ${PN}
+       newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}