fixed bug #103793
authorChristian Zoffoli <xmerlin@gentoo.org>
Thu, 1 Sep 2005 23:07:25 +0000 (23:07 +0000)
committerChristian Zoffoli <xmerlin@gentoo.org>
Thu, 1 Sep 2005 23:07:25 +0000 (23:07 +0000)
Package-Manager: portage-2.0.51.19

sys-cluster/heartbeat/ChangeLog
sys-cluster/heartbeat/Manifest
sys-cluster/heartbeat/heartbeat-1.2.3-r1.ebuild
sys-cluster/heartbeat/heartbeat-1.2.3-r2.ebuild

index cab4a6dc395bc4ede0898f1f487e19582760af19..a985266a8568ea7564a12d1333cbb50403eb169f 100644 (file)
@@ -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)
 
index fdaaf43d0141f611b080dee82f4e06c49f9b08f4..2d6de356c9768992ba43fec1b757d75a8cb3a5e1 100644 (file)
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 282362c9cf1b10e21648b0073f74fd0a ChangeLog 5746
+MD5 4f349fbfe004424dc715a7ba7fcbce0a ChangeLog 5952
 MD5 469a4f6cad0c54b4faed31a2852af816 metadata.xml 339
-MD5 1e34e710d62a791c69a3d307ac7b43cf heartbeat-1.2.3-r1.ebuild 1985
+MD5 43e3cb324e0096306884c5c68f7ea4ce 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 6e0ce7550962b424bbdb16edff62a295 heartbeat-1.2.3-r2.ebuild 2148
 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
@@ -15,7 +15,7 @@ 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
+iD8DBQFDF4n9gMUyd/cdjWsRAgCTAJ4hhJHzKW9vtdr6N8pwHJ55XT4K4gCbB0cK
+3VTW2zzGnb3K3b+ABDkk4xc=
+=p/jS
 -----END PGP SIGNATURE-----
index 0bda2075aa58b27333169c2fb32b6a5e9252299e..00f99b44290186c8531b64533771829e84813514 100644 (file)
@@ -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
index ad8cc938accd2827ee5f5d8c2677345ae9184672..4d1c1adb3bead025b842770158eab01067b17a60 100644 (file)
@@ -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