From: Christian Zoffoli <xmerlin@gentoo.org>
Date: Thu, 1 Mar 2007 00:51:27 +0000 (+0000)
Subject: Merged some fixes in 2.0.7.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0a7ff01c092fc18bf76235e063802a28eaf2259d;p=gentoo.git

Merged some fixes in 2.0.7.
Package-Manager: portage-2.1.2-r9
---

diff --git a/sys-cluster/heartbeat/Manifest b/sys-cluster/heartbeat/Manifest
index 64297dfc7fcb..a7ac04dc8634 100644
--- a/sys-cluster/heartbeat/Manifest
+++ b/sys-cluster/heartbeat/Manifest
@@ -24,10 +24,10 @@ EBUILD heartbeat-1.2.5.ebuild 1986 RMD160 b25871073d61edada88a167eaf37a4de2b552d
 MD5 f58c89bbad4b79cf45813b8425371891 heartbeat-1.2.5.ebuild 1986
 RMD160 b25871073d61edada88a167eaf37a4de2b552d6a heartbeat-1.2.5.ebuild 1986
 SHA256 66e711596a2b2dad696930abe7ccde73340e6742a09499a65795236fa1e425c0 heartbeat-1.2.5.ebuild 1986
-EBUILD heartbeat-2.0.7-r2.ebuild 3128 RMD160 a3dde1723ded736bbe654141e0a57a053eed9c55 SHA1 61a1656262f8a412015660d6c08a2534716ab0b8 SHA256 1086614c3b0f08b100521264328366be495226837b71c091f640bff28dc2e2a6
-MD5 5e7cc1f69f30bb0cf9b8b3f36c6f407e heartbeat-2.0.7-r2.ebuild 3128
-RMD160 a3dde1723ded736bbe654141e0a57a053eed9c55 heartbeat-2.0.7-r2.ebuild 3128
-SHA256 1086614c3b0f08b100521264328366be495226837b71c091f640bff28dc2e2a6 heartbeat-2.0.7-r2.ebuild 3128
+EBUILD heartbeat-2.0.7-r2.ebuild 3571 RMD160 9a321f7465b3563d6ef804e19d09a14ad6728fc9 SHA1 7c94655814a13e0d807efc3769eaa13678151c23 SHA256 df80a19483f1dfec3b2ea656c19afe07e8dd467b4a38aa2780ab15f32bdc5e92
+MD5 950196abce236a1cbc85163848c2152d heartbeat-2.0.7-r2.ebuild 3571
+RMD160 9a321f7465b3563d6ef804e19d09a14ad6728fc9 heartbeat-2.0.7-r2.ebuild 3571
+SHA256 df80a19483f1dfec3b2ea656c19afe07e8dd467b4a38aa2780ab15f32bdc5e92 heartbeat-2.0.7-r2.ebuild 3571
 EBUILD heartbeat-2.0.8.ebuild 3569 RMD160 9a8c625fddb9278984aca08056be3224dc7fa1fb SHA1 22f0f2f292987f2e0bb24903295cdf34630715b1 SHA256 274e3f5a6b072184c97eabfaa89c40b476dc21c2238644d39ffff2d93087c46a
 MD5 82a76c0ffd7ab69195e117fe630bb7cf heartbeat-2.0.8.ebuild 3569
 RMD160 9a8c625fddb9278984aca08056be3224dc7fa1fb heartbeat-2.0.8.ebuild 3569
@@ -55,7 +55,7 @@ SHA256 0564a282436fc080d1109032099efc547911dfc0f572e61e64d78c9c163f493d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF5iLUgMUyd/cdjWsRAut3AJ9+amBrNic2UvESYhtc9JuJMrA/FQCeNwVK
-JAfKzJPHXk71iQmnQGkIdxI=
-=Wu9u
+iD8DBQFF5iObgMUyd/cdjWsRAmjHAJ9n05zjqo/bO+s5A1i4e+oH0rM2GgCeNdub
+YyWBQd4VCTKwGQPIm0EDMBw=
+=Nkr7
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/heartbeat/heartbeat-2.0.7-r2.ebuild b/sys-cluster/heartbeat/heartbeat-2.0.7-r2.ebuild
index 57932fd152e7..bbc086e74b04 100644
--- a/sys-cluster/heartbeat/heartbeat-2.0.7-r2.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-2.0.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.7-r2.ebuild,v 1.3 2007/02/28 17:29:28 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.7-r2.ebuild,v 1.4 2007/03/01 00:51:27 xmerlin Exp $
 
 inherit flag-o-matic eutils
 
@@ -25,7 +25,7 @@ DEPEND="
 			dev-perl/Net-DNS
 			dev-perl/libwww-perl
 			dev-perl/perl-ldap
-			perl-core/libnet
+			virtual/perl-libnet
 			dev-perl/Crypt-SSLeay
 			dev-perl/HTML-Parser
 			dev-perl/perl-ldap
@@ -110,6 +110,8 @@ src_install() {
 		rm ${D}/usr/sbin/supervise-ldirectord-config
 	fi
 
+	dodir /var/lib/heartbeat/cores/cluster
+	keepdir /var/lib/heartbeat/cores/cluster
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/heartbeat-init heartbeat
 
@@ -118,3 +120,13 @@ src_install() {
 		dodoc README doc/*.txt doc/AUTHORS doc/COPYING  || die
 	fi
 }
+
+pkg_postinst() {
+	# Change wrong permissions
+	chown -R cluster:cluster /var/run/heartbeat/ccm
+	chown -R cluster:cluster /var/run/heartbeat/crm
+	chown -R cluster:cluster /var/lib/heartbeat/cores
+	chown -R cluster:cluster /var/lib/heartbeat/crm
+	chown -R cluster:cluster /var/lib/heartbeat/pengine
+	chown -R cluster:cluster /var/lib/heartbeat/cores/cluster
+}