diff options
Diffstat (limited to 'sys-cluster/heartbeat')
| -rw-r--r-- | sys-cluster/heartbeat/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-cluster/heartbeat/Manifest | 30 | ||||
| -rw-r--r-- | sys-cluster/heartbeat/files/heartbeat-init | 15 | ||||
| -rw-r--r-- | sys-cluster/heartbeat/heartbeat-2.0.8.ebuild | 16 |
4 files changed, 43 insertions, 24 deletions
diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog index 3dcd95af8ea9..338c410e215d 100644 --- a/sys-cluster/heartbeat/ChangeLog +++ b/sys-cluster/heartbeat/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-cluster/heartbeat # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.62 2007/02/28 17:48:39 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.63 2007/03/01 00:48:11 xmerlin Exp $ + + 01 Mar 2007; Christian Zoffoli <xmerlin@gentoo.org> files/heartbeat-init, + heartbeat-2.0.8.ebuild: + Merged some fixes. 28 Feb 2007; Christian Zoffoli <xmerlin@gentoo.org> -heartbeat-2.0.7-r1.ebuild: diff --git a/sys-cluster/heartbeat/Manifest b/sys-cluster/heartbeat/Manifest index ec6d76861f13..64297dfc7fcb 100644 --- a/sys-cluster/heartbeat/Manifest +++ b/sys-cluster/heartbeat/Manifest @@ -9,10 +9,10 @@ AUX heartbeat-2.0.8-crm-leaks.patch 16011 RMD160 f5cd30e246a36329d2fb81d798c0c07 MD5 bc9813d5a2e18db81d538a2d9a719ea8 files/heartbeat-2.0.8-crm-leaks.patch 16011 RMD160 f5cd30e246a36329d2fb81d798c0c07b21a71645 files/heartbeat-2.0.8-crm-leaks.patch 16011 SHA256 559d192f47de95288d7a09c4d669801b623ab47b1ad39104ddde6d2d86b9bba0 files/heartbeat-2.0.8-crm-leaks.patch 16011 -AUX heartbeat-init 1616 RMD160 2a76f26e572b0b466fa860f8eab0fad5fcb6e29f SHA1 9c20eff23ee59434b1d9f222adb587c1bc7a7e26 SHA256 98e34d2e9d6fde5e8dedb1b4d934fa39b502f2d4e603e9faa7a86b66cd0e0437 -MD5 74949e88062a20f9c6c20dd01c20533b files/heartbeat-init 1616 -RMD160 2a76f26e572b0b466fa860f8eab0fad5fcb6e29f files/heartbeat-init 1616 -SHA256 98e34d2e9d6fde5e8dedb1b4d934fa39b502f2d4e603e9faa7a86b66cd0e0437 files/heartbeat-init 1616 +AUX heartbeat-init 1770 RMD160 583e9081777c7143b0376a04150f1e125e63cd69 SHA1 2f6b3d17a335b99bc64eedf945490eb40c44fc23 SHA256 18c4dce7af12445ff207fabab83c70665b9724da224cb75b56d27a057ebb2f26 +MD5 366f24d5c12cfd8ac1b0f3fada43201c files/heartbeat-init 1770 +RMD160 583e9081777c7143b0376a04150f1e125e63cd69 files/heartbeat-init 1770 +SHA256 18c4dce7af12445ff207fabab83c70665b9724da224cb75b56d27a057ebb2f26 files/heartbeat-init 1770 DIST heartbeat-1.2.5.tar.gz 2107371 RMD160 0e94fa64339b9b77e11ffe92cffa66fef4f4f2b0 SHA1 eeea454bcf0e12dd1135f6544c95584fa2e66770 SHA256 46f88a69324012317a4426dc93654ab28947b77675826686624d15cd5a4e357f DIST heartbeat-2.0.7.tar.gz 3327126 RMD160 8fe70e64fc6714fef4e501ae0b240d870a51cf75 SHA1 c0caf848b90d2fc76e0a390aaf59352d580d714a SHA256 008214f51fd0c49e168d1bb262cb5c967bc166f99d0c8ff3a2623c8ba51a0ab3 DIST heartbeat-2.0.8.tar.gz 3502095 RMD160 76f3a56cbbafac8c35a87266b73d46a86de86feb SHA1 1805fc4c6218f05006c506d532728c6664d5a35c SHA256 b8425098e1243976f1e9deedfbf763fd42f0461bdd8933b0b8a94f0626912c91 @@ -28,14 +28,14 @@ EBUILD heartbeat-2.0.7-r2.ebuild 3128 RMD160 a3dde1723ded736bbe654141e0a57a053ee 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.8.ebuild 3126 RMD160 00786494cedfdf61997603335ac337eac335bcc2 SHA1 0767f5c27b7aef2ac444966f49d51f3d35d06cfd SHA256 8ec998f6b663ca229e8ffd47eead5a44a350a6adb30ad9fb298ef732630d31f9 -MD5 b270e315f83bacf3ac8339429b03b61c heartbeat-2.0.8.ebuild 3126 -RMD160 00786494cedfdf61997603335ac337eac335bcc2 heartbeat-2.0.8.ebuild 3126 -SHA256 8ec998f6b663ca229e8ffd47eead5a44a350a6adb30ad9fb298ef732630d31f9 heartbeat-2.0.8.ebuild 3126 -MISC ChangeLog 10301 RMD160 d8087763130f961e573b065a47b6788682a8ae81 SHA1 6dc6c01b591c25ce662837829dbc1223ecc60a23 SHA256 12e973ecee315867d11a48c7cf6cee049833d3a553376a40878773a5cf95b6e0 -MD5 ebd58155a6583da9b53cf50c6f8ce869 ChangeLog 10301 -RMD160 d8087763130f961e573b065a47b6788682a8ae81 ChangeLog 10301 -SHA256 12e973ecee315867d11a48c7cf6cee049833d3a553376a40878773a5cf95b6e0 ChangeLog 10301 +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 +SHA256 274e3f5a6b072184c97eabfaa89c40b476dc21c2238644d39ffff2d93087c46a heartbeat-2.0.8.ebuild 3569 +MISC ChangeLog 10425 RMD160 1fcc7cad0b38b4817da5035b12cc83da88840dad SHA1 8e2f391aeed23845fadf83b0acd15b7f485479d8 SHA256 b04bb67a0c7d42e7c5249b9f0515a097b766252a288597b859b1e9f5d42f6c82 +MD5 c18f0cc11c4aa85e26f83a0b8ef116a6 ChangeLog 10425 +RMD160 1fcc7cad0b38b4817da5035b12cc83da88840dad ChangeLog 10425 +SHA256 b04bb67a0c7d42e7c5249b9f0515a097b766252a288597b859b1e9f5d42f6c82 ChangeLog 10425 MISC metadata.xml 339 RMD160 503ff4e79821bcf9851a8a6f8df0d43b3be8aa99 SHA1 7af6b38347db8330de0f27dbe2677156b524ebf9 SHA256 bb453c6b308cf1dfcbd818320ea43b654620a2b28dc24296c35367d803062635 MD5 469a4f6cad0c54b4faed31a2852af816 metadata.xml 339 RMD160 503ff4e79821bcf9851a8a6f8df0d43b3be8aa99 metadata.xml 339 @@ -55,7 +55,7 @@ SHA256 0564a282436fc080d1109032099efc547911dfc0f572e61e64d78c9c163f493d files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFF5cDKgMUyd/cdjWsRArp/AJ9/0mszPNwk75jTsD9fTL6lGu3/cwCdHjr8 -Ggg+bT43bmBZ9tgca68+7Ts= -=x5p/ +iD8DBQFF5iLUgMUyd/cdjWsRAut3AJ9+amBrNic2UvESYhtc9JuJMrA/FQCeNwVK +JAfKzJPHXk71iQmnQGkIdxI= +=Wu9u -----END PGP SIGNATURE----- diff --git a/sys-cluster/heartbeat/files/heartbeat-init b/sys-cluster/heartbeat/files/heartbeat-init index a3ae6192bb29..5a81a21ce818 100644 --- a/sys-cluster/heartbeat/files/heartbeat-init +++ b/sys-cluster/heartbeat/files/heartbeat-init @@ -1,9 +1,10 @@ #!/sbin/runscript # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/files/heartbeat-init,v 1.6 2006/07/13 12:52:23 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/files/heartbeat-init,v 1.7 2007/03/01 00:48:11 xmerlin Exp $ HA_DIR=/etc/ha.d +. $HA_DIR/shellfuncs depend() { use logger @@ -30,12 +31,13 @@ start() { . $HA_DIR/shellfuncs # start the log subsystem - /usr/lib/heartbeat/ha_logd -s &>/dev/null && \ - /usr/lib/heartbeat/ha_logd -d + CheckBool "`ha_parameter use_logd`" && \ + ( /usr/lib/heartbeat/ha_logd -s &>/dev/null || \ + /usr/lib/heartbeat/ha_logd -d -c /etc/ha.d/ha_logd.cf) RunStartStop pre-start - CheckBool "`ha_parameter crm`" && \ + CheckBool "`ha_parameter crm`" || \ /usr/lib/heartbeat/ResourceManager verifyallidle /usr/lib/heartbeat/heartbeat &>/dev/null @@ -57,8 +59,9 @@ stop() { RunStartStop post-stop ${ret} # stop log subsystem - /usr/lib/heartbeat/ha_logd -s &>/dev/null || \ - /usr/lib/heartbeat/ha_logd -k &>/dev/null + CheckBool "`ha_parameter use_logd`" && \ + ( /usr/lib/heartbeat/ha_logd -s &>/dev/null && \ + /usr/lib/heartbeat/ha_logd -k &>/dev/null ) eend ${ret} } diff --git a/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild b/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild index 2b94095bb187..c6e648ec3eb0 100644 --- a/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild +++ b/sys-cluster/heartbeat/heartbeat-2.0.8.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.8.ebuild,v 1.1 2007/02/28 17:29:28 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild,v 1.2 2007/03/01 00:48:11 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 +} |