From 42e5189dc5425f18aede2a47ebc2b4da1921c483 Mon Sep 17 00:00:00 2001 From: Christian Zoffoli Date: Wed, 21 Mar 2007 13:25:47 +0000 Subject: [PATCH] Fixed bug #171572. Package-Manager: portage-2.1.2-r9 --- sys-cluster/heartbeat/ChangeLog | 6 ++++- sys-cluster/heartbeat/Manifest | 26 +++++++++++-------- .../files/heartbeat-2.0.8-delay.patch | 8 ++++++ sys-cluster/heartbeat/heartbeat-2.0.8.ebuild | 3 ++- 4 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 sys-cluster/heartbeat/files/heartbeat-2.0.8-delay.patch diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog index 338c410e215d..8cb4edd573eb 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.63 2007/03/01 00:48:11 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.64 2007/03/21 13:25:47 xmerlin Exp $ + + 21 Mar 2007; Christian Zoffoli + +files/heartbeat-2.0.8-delay.patch: + Fixed bug #171572. 01 Mar 2007; Christian Zoffoli files/heartbeat-init, heartbeat-2.0.8.ebuild: diff --git a/sys-cluster/heartbeat/Manifest b/sys-cluster/heartbeat/Manifest index a7ac04dc8634..26104f8bb753 100644 --- a/sys-cluster/heartbeat/Manifest +++ b/sys-cluster/heartbeat/Manifest @@ -9,6 +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-2.0.8-delay.patch 328 RMD160 fa5b28027ee1ddaed4b3938326bf33ea156b1b6e SHA1 ec5f8f59390644e12c6f1f93e96871a6887f1596 SHA256 65afacc1a2b73170cd0167cee14eb280128de1dbcb5c59249d40be81737c024c +MD5 8fca6f3b6e2936c713deadc16939664b files/heartbeat-2.0.8-delay.patch 328 +RMD160 fa5b28027ee1ddaed4b3938326bf33ea156b1b6e files/heartbeat-2.0.8-delay.patch 328 +SHA256 65afacc1a2b73170cd0167cee14eb280128de1dbcb5c59249d40be81737c024c files/heartbeat-2.0.8-delay.patch 328 AUX heartbeat-init 1770 RMD160 583e9081777c7143b0376a04150f1e125e63cd69 SHA1 2f6b3d17a335b99bc64eedf945490eb40c44fc23 SHA256 18c4dce7af12445ff207fabab83c70665b9724da224cb75b56d27a057ebb2f26 MD5 366f24d5c12cfd8ac1b0f3fada43201c files/heartbeat-init 1770 RMD160 583e9081777c7143b0376a04150f1e125e63cd69 files/heartbeat-init 1770 @@ -28,14 +32,14 @@ EBUILD heartbeat-2.0.7-r2.ebuild 3571 RMD160 9a321f7465b3563d6ef804e19d09a14ad67 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 -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 +EBUILD heartbeat-2.0.8.ebuild 3613 RMD160 81a78a1b149b10f13f9bc8d386cfc21044f7c158 SHA1 8812760886a4c799e7bbed246ea78ce69e914017 SHA256 e1f817f421c1492a03ef222932fcd7bbe508d9dd8f566787168491a79dd3cb01 +MD5 c92bff938f1689984ce660cf2e2b2d2e heartbeat-2.0.8.ebuild 3613 +RMD160 81a78a1b149b10f13f9bc8d386cfc21044f7c158 heartbeat-2.0.8.ebuild 3613 +SHA256 e1f817f421c1492a03ef222932fcd7bbe508d9dd8f566787168491a79dd3cb01 heartbeat-2.0.8.ebuild 3613 +MISC ChangeLog 10539 RMD160 8e78a95722657aedc1bf9906145c3b70fdad699c SHA1 e07845a6ccd1eb5df9fb9927bebbeebd8006f811 SHA256 d2ccb8c6c0b25bd1a9d2830fcf734f5c7db4e2a9d2f46832128c9d8cd3ccd391 +MD5 1946d6e02ec6f95a333d45beb2a6dba7 ChangeLog 10539 +RMD160 8e78a95722657aedc1bf9906145c3b70fdad699c ChangeLog 10539 +SHA256 d2ccb8c6c0b25bd1a9d2830fcf734f5c7db4e2a9d2f46832128c9d8cd3ccd391 ChangeLog 10539 MISC metadata.xml 339 RMD160 503ff4e79821bcf9851a8a6f8df0d43b3be8aa99 SHA1 7af6b38347db8330de0f27dbe2677156b524ebf9 SHA256 bb453c6b308cf1dfcbd818320ea43b654620a2b28dc24296c35367d803062635 MD5 469a4f6cad0c54b4faed31a2852af816 metadata.xml 339 RMD160 503ff4e79821bcf9851a8a6f8df0d43b3be8aa99 metadata.xml 339 @@ -55,7 +59,7 @@ SHA256 0564a282436fc080d1109032099efc547911dfc0f572e61e64d78c9c163f493d files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFF5iObgMUyd/cdjWsRAmjHAJ9n05zjqo/bO+s5A1i4e+oH0rM2GgCeNdub -YyWBQd4VCTKwGQPIm0EDMBw= -=Nkr7 +iD8DBQFGATJlgMUyd/cdjWsRAjIXAJwPN9We1F7VgL7nkiQ0mUxztY86LQCfTLs9 +suODOaJ1Nq4wep51Zk9UURM= +=Sv0o -----END PGP SIGNATURE----- diff --git a/sys-cluster/heartbeat/files/heartbeat-2.0.8-delay.patch b/sys-cluster/heartbeat/files/heartbeat-2.0.8-delay.patch new file mode 100644 index 000000000000..b6f1e60169f8 --- /dev/null +++ b/sys-cluster/heartbeat/files/heartbeat-2.0.8-delay.patch @@ -0,0 +1,8 @@ +--- heartbeat-2.0.8/resources/heartbeat/Delay.in.orig 2007-03-21 14:16:48.000000000 +0100 ++++ heartbeat-2.0.8/resources/heartbeat/Delay.in 2007-03-21 14:16:52.000000000 +0100 +@@ -39,4 +39,4 @@ + OCF_RESOURCE_INSTANCE=${OCF_TYPE}_${OCF_RESKEY_startdelay} + export OCF_TYPE OCF_RESOURCE_INSTANCE + +-ra_execocf $op;; ++ra_execocf $op diff --git a/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild b/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild index c6e648ec3eb0..0804191696a3 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.2 2007/03/01 00:48:11 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild,v 1.3 2007/03/21 13:25:47 xmerlin Exp $ inherit flag-o-matic eutils @@ -48,6 +48,7 @@ src_unpack() { cd ${S} #epatch ${FILESDIR}/${P}-update-resources-failcount.patch || die epatch ${FILESDIR}/${P}-crm-leaks.patch || die + epatch ${FILESDIR}/${P}-delay.patch || die } src_compile() { -- 2.26.2