diff options
author | Christian Zoffoli <xmerlin@gentoo.org> | 2005-09-01 23:07:25 +0000 |
---|---|---|
committer | Christian Zoffoli <xmerlin@gentoo.org> | 2005-09-01 23:07:25 +0000 |
commit | 477c51eb0d47a51cd66092fede3617866fd1c609 (patch) | |
tree | 2b9b0d64235da1a5cebba50136f51b31f5cd496c /sys-cluster/heartbeat | |
parent | add musicbrainz dep (diff) | |
download | gentoo-2-477c51eb0d47a51cd66092fede3617866fd1c609.tar.gz gentoo-2-477c51eb0d47a51cd66092fede3617866fd1c609.tar.bz2 gentoo-2-477c51eb0d47a51cd66092fede3617866fd1c609.zip |
fixed bug #103793
(Portage version: 2.0.51.19)
Diffstat (limited to 'sys-cluster/heartbeat')
-rw-r--r-- | sys-cluster/heartbeat/ChangeLog | 7 | ||||
-rw-r--r-- | sys-cluster/heartbeat/Manifest | 14 | ||||
-rw-r--r-- | sys-cluster/heartbeat/heartbeat-1.2.3-r1.ebuild | 5 | ||||
-rw-r--r-- | sys-cluster/heartbeat/heartbeat-1.2.3-r2.ebuild | 5 |
4 files changed, 16 insertions, 15 deletions
diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog index cab4a6dc395b..a985266a8568 100644 --- a/sys-cluster/heartbeat/ChangeLog +++ b/sys-cluster/heartbeat/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-cluster/heartbeat # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.35 2005/08/01 13:34:25 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.36 2005/09/01 23:07:25 xmerlin Exp $ + + 02 Sep 2005; Christian Zoffoli <xmerlin@gentoo.org> + heartbeat-1.2.3-r1.ebuild, heartbeat-1.2.3-r2.ebuild: + fixed bug #103793, thanks to Matthew Marlowe <mattm@gentoo.org> for reporting + the problem. *heartbeat-1.2.3-r2 (01 Aug 2005) diff --git a/sys-cluster/heartbeat/Manifest b/sys-cluster/heartbeat/Manifest index fdaaf43d0141..35adba1952c2 100644 --- a/sys-cluster/heartbeat/Manifest +++ b/sys-cluster/heartbeat/Manifest @@ -1,21 +1,11 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 282362c9cf1b10e21648b0073f74fd0a ChangeLog 5746 MD5 469a4f6cad0c54b4faed31a2852af816 metadata.xml 339 -MD5 1e34e710d62a791c69a3d307ac7b43cf heartbeat-1.2.3-r1.ebuild 1985 +MD5 0ce42cad820da2101a797881f1fd24a8 heartbeat-1.2.3-r1.ebuild 2094 MD5 72cd506bc581948c4a68e28017430c64 heartbeat-1.2.3.ebuild 1875 -MD5 d191f1ab52f525e575dbc013933998fe heartbeat-1.2.3-r2.ebuild 2039 +MD5 9a18c662d21ec41ab39702f3c7c10093 heartbeat-1.2.3-r2.ebuild 2155 MD5 6cf2ecfcee6a47d187e99cc1fa3081f0 files/digest-heartbeat-1.2.3 68 MD5 343f80e3711eec80114c5ca01d38b8b0 files/heartbeat-init 821 MD5 6cf2ecfcee6a47d187e99cc1fa3081f0 files/digest-heartbeat-1.2.3-r1 68 MD5 4382b0b2d64b5483957114b7123e4a94 files/heartbeat-1.2.3-lvm.patch 1660 MD5 30657e79d1e3630eed837297364fe17c files/heartbeat-1.2.3-misc_security_fixes.patch 7756 MD5 6cf2ecfcee6a47d187e99cc1fa3081f0 files/digest-heartbeat-1.2.3-r2 68 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFC7iW/gMUyd/cdjWsRAnHNAJ9w7wHo51LggERphpTXFxtEm82gPACfQbWe -RFUlC3mZ8O8O4z1dJNd+rlo= -=BNfp ------END PGP SIGNATURE----- diff --git a/sys-cluster/heartbeat/heartbeat-1.2.3-r1.ebuild b/sys-cluster/heartbeat/heartbeat-1.2.3-r1.ebuild index 0bda2075aa58..00f99b442901 100644 --- a/sys-cluster/heartbeat/heartbeat-1.2.3-r1.ebuild +++ b/sys-cluster/heartbeat/heartbeat-1.2.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.2.3-r1.ebuild,v 1.2 2005/08/01 13:34:25 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.2.3-r1.ebuild,v 1.3 2005/09/01 23:07:25 xmerlin Exp $ inherit flag-o-matic @@ -61,6 +61,8 @@ src_install() { keepdir /etc/ha.d/conf + dosym /usr/sbin/ldirectord /etc/ha.d/resource.d/ldirectord || die + # if ! USE="ldirectord" then don't install it if ! use ldirectord ; then rm ${D}/etc/init.d/ldirectord @@ -69,6 +71,7 @@ src_install() { rm ${D}/usr/man/man8/ldirectord.8 rm ${D}/usr/sbin/ldirectord rm ${D}/usr/sbin/supervise-ldirectord-config + rm ${D}/etc/ha.d/resource.d/ldirectord fi exeinto /etc/init.d diff --git a/sys-cluster/heartbeat/heartbeat-1.2.3-r2.ebuild b/sys-cluster/heartbeat/heartbeat-1.2.3-r2.ebuild index ad8cc938accd..4d1c1adb3bea 100644 --- a/sys-cluster/heartbeat/heartbeat-1.2.3-r2.ebuild +++ b/sys-cluster/heartbeat/heartbeat-1.2.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.2.3-r2.ebuild,v 1.1 2005/08/01 13:34:25 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.2.3-r2.ebuild,v 1.2 2005/09/01 23:07:25 xmerlin Exp $ inherit flag-o-matic @@ -62,6 +62,8 @@ src_install() { keepdir /etc/ha.d/conf + dosym /usr/sbin/ldirectord /etc/ha.d/resource.d/ldirectord || die + # if ! USE="ldirectord" then don't install it if ! use ldirectord ; then rm ${D}/etc/init.d/ldirectord @@ -70,6 +72,7 @@ src_install() { rm ${D}/usr/man/man8/ldirectord.8 rm ${D}/usr/sbin/ldirectord rm ${D}/usr/sbin/supervise-ldirectord-config + rm ${D}/etc/ha.d/resource.d/ldirectord fi exeinto /etc/init.d |