diff options
author | Justin Bronder <jsbronder@gentoo.org> | 2008-08-11 18:37:05 +0000 |
---|---|---|
committer | Justin Bronder <jsbronder@gentoo.org> | 2008-08-11 18:37:05 +0000 |
commit | 7e26da1fbd23f715a57ffb3f53ca442b2c3f90b3 (patch) | |
tree | a74b5c94484b83b399f79187fa2bd9339d57fd2a /sys-cluster | |
parent | Sparc stable, all tests good (part of Bug #231675). (diff) | |
download | historical-7e26da1fbd23f715a57ffb3f53ca442b2c3f90b3.tar.gz historical-7e26da1fbd23f715a57ffb3f53ca442b2c3f90b3.tar.bz2 historical-7e26da1fbd23f715a57ffb3f53ca442b2c3f90b3.zip |
Patch ganglia to resolve a crash when gmetad is pulling from another gmetad >= 3.1.0. Thanks to Carlo Marcelo Arenas Belon for the report and patch. #234238.
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'sys-cluster')
-rw-r--r-- | sys-cluster/ganglia/ChangeLog | 10 | ||||
-rw-r--r-- | sys-cluster/ganglia/Manifest | 10 | ||||
-rw-r--r-- | sys-cluster/ganglia/files/ganglia-3.1.0-gmetad-hierarchical.patch | 17 | ||||
-rw-r--r-- | sys-cluster/ganglia/ganglia-3.1.0-r1.ebuild | 128 |
4 files changed, 160 insertions, 5 deletions
diff --git a/sys-cluster/ganglia/ChangeLog b/sys-cluster/ganglia/ChangeLog index 6f2b365c0183..cac95393d622 100644 --- a/sys-cluster/ganglia/ChangeLog +++ b/sys-cluster/ganglia/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-cluster/ganglia # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.16 2008/08/04 23:17:11 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.17 2008/08/11 18:37:04 jsbronder Exp $ + +*ganglia-3.1.0-r1 (11 Aug 2008) + + 11 Aug 2008; Justin Bronder <jsbronder@gentoo.org> + +files/ganglia-3.1.0-gmetad-hierarchical.patch, +ganglia-3.1.0-r1.ebuild: + Patch ganglia to resolve a crash when gmetad is pulling from another gmetad + >= 3.1.0. Thanks to Carlo Marcelo Arenas Belon for the report and patch. + #234238. *ganglia-3.1.0 (04 Aug 2008) diff --git a/sys-cluster/ganglia/Manifest b/sys-cluster/ganglia/Manifest index 81aabaabed2f..22e11d121eb5 100644 --- a/sys-cluster/ganglia/Manifest +++ b/sys-cluster/ganglia/Manifest @@ -2,6 +2,7 @@ Hash: SHA1 AUX ganglia-3.1-gmond-python-tcpconn-concurrency.patch 1714 RMD160 fa0b5602420ff96743cdce0252d4091700855cc1 SHA1 f75b60c84ed11052e960dd7ebad98d34c30a7aa2 SHA256 068429c839ddddcf8a1d149ba1bd7eea8938c765a2673e9b3875df9cb88bcfb3 +AUX ganglia-3.1.0-gmetad-hierarchical.patch 481 RMD160 a5293da532de60ca4d1c80538cffa1b0c435955f SHA1 6dd26d86eccc6798fd0f53eb1f29de1d6410022b SHA256 e87656c3e89fba7dd17920274aba0e3d19dae6c2d6b90fb49256e45b6ab93d0e AUX gmetad.rc 328 RMD160 bfe287d90db7f26cd13978c99eabc6f7783b7073 SHA1 73d49ca4f669d914c87e2cdd9a4ad74bf1a75eb5 SHA256 c25c3dac00012f83e45819d6d0fb79bcf4e1ec773ad705b38127aade7c2a08c7 AUX gmond.rc 322 RMD160 98ac6011a603e3286ffe5c2368620ae0630a013f SHA1 d304b1849ea1abf14360915b3978e781b8e0cbed SHA256 ea3bd50fe4bfc18254fdfb69c81ec0bfad0c552a2f9a3d3aee4732f644695d7d DIST ganglia-3.0.6.tar.gz 2854746 RMD160 ef3b29af23bc3e30b58736e0e6c08f4047b6eb70 SHA1 5dd3cc3fe2eade8ae012bbafd65e40a7d29bc995 SHA256 590c0c5e1b7b7a27cc1234093cf8caaac6b000f8035d9985459aaa7dcf2c2cb5 @@ -10,13 +11,14 @@ DIST ganglia-3.1.0.tar.gz 1175129 RMD160 92fee8fc2ffe6d058be2dc73bba6697dc2a226d EBUILD ganglia-3.0.6-r1.ebuild 1929 RMD160 d3705cfd952646528e6f3839b994ab2e03d6eec1 SHA1 add04b2bb3d8033ed63c18da577b2ea34aa5e6bb SHA256 0e3ad3c8742d07dc0ba4305b17818a4acb189ac78211d3ca89a4d57ec13a2776 EBUILD ganglia-3.0.6.ebuild 1670 RMD160 484bd6f1791715ed2a53cb3ba5a2573f5e8a914d SHA1 a451b6df6038a415b612beccfce8aec67e82478c SHA256 f1eb7f602202c3ab97c33f5349007aa2bbc3daa4f567221601a487ec5b346645 EBUILD ganglia-3.0.7.ebuild 1910 RMD160 9ca0ce32d5b9add2ded72f656ae4122503f9d260 SHA1 0822924e212f37092c79cea4642a102302136a21 SHA256 a7209cb20c2ee1688caefd192ad5e0fb0f8d7a8d2b2c41b826cb2191b4b833e3 +EBUILD ganglia-3.1.0-r1.ebuild 3503 RMD160 4517fb6df8a8e9a261444c40bcce223ab25fa13f SHA1 5a0febb7795c387bec6aa5eb0e315b51bd0c6d17 SHA256 a504768fa1357db42413f0985c6acb1b791c32fdb8c2a908474dfac040bf30a4 EBUILD ganglia-3.1.0.ebuild 3447 RMD160 924080569a7215614281551c83309a21d99dd111 SHA1 79a9b7a2705443780d5891a6a95adc2cfad1e48f SHA256 1fdc551a709c355a23248b104296f1540039db0c193bd8e47a8ece5b68411fee -MISC ChangeLog 4014 RMD160 253c1663f016ec0b35359a2b2186a7768ced6003 SHA1 51dc399f27cf23b69bbac992a108804e7bbc2456 SHA256 230f6b440b085a5aa48a203f762f57b3314376faace2f4826e8047f91fae7bf4 +MISC ChangeLog 4341 RMD160 50d14ac2ac99328c5e91a1603a0ad9f75fd1490d SHA1 b27191a2299c2fca7d328322e7d9d67fee76ee9b SHA256 5572cc9e3db318c304f280a01353b846080e3df8a0fd4bea0a4e3dd9bb16f0ae MISC metadata.xml 163 RMD160 ea1530cd45b9e04e8693261b9a94b5988e4b09a1 SHA1 443b7a3d8fb76c8d20647b165032ad358bfa3b6a SHA256 5a03bf3074b07158dffe793af69f7b0cd1e5c785537574713f9a7978032363a3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkiXjOoACgkQ4MrvBE1wQ8mgNgCgqqwpPHuMUNCd44DL2k6jTnlI -lNoAniyukYJDpt0lxbsUEZJ3pGW2qJ+e -=fGbf +iEYEARECAAYFAkightwACgkQ4MrvBE1wQ8knlgCeO1wsVJ3NxzlggOgsO1Q3UzZY +w5YAnjG/bpXrpJecTaH86iBFJ69BfYlL +=1aTO -----END PGP SIGNATURE----- diff --git a/sys-cluster/ganglia/files/ganglia-3.1.0-gmetad-hierarchical.patch b/sys-cluster/ganglia/files/ganglia-3.1.0-gmetad-hierarchical.patch new file mode 100644 index 000000000000..1f367e6c7368 --- /dev/null +++ b/sys-cluster/ganglia/files/ganglia-3.1.0-gmetad-hierarchical.patch @@ -0,0 +1,17 @@ +Index: gmetad/process_xml.c +=================================================================== +--- gmetad/process_xml.c (revision 1634) ++++ gmetad/process_xml.c (working copy) +@@ -724,7 +724,11 @@ + + if (!xmldata->host_alive) + return 0; +- ++ ++ /* Only keep extra element details if we are the authority on this cluster. */ ++ if (!authority_mode(xmldata)) ++ return 0; ++ + hashkey.data = (void*) name; + hashkey.size = strlen(name) + 1; + diff --git a/sys-cluster/ganglia/ganglia-3.1.0-r1.ebuild b/sys-cluster/ganglia/ganglia-3.1.0-r1.ebuild new file mode 100644 index 000000000000..c81c58f895ed --- /dev/null +++ b/sys-cluster/ganglia/ganglia-3.1.0-r1.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ganglia-3.1.0-r1.ebuild,v 1.1 2008/08/11 18:37:04 jsbronder Exp $ + +WEBAPP_OPTIONAL="yes" +inherit multilib webapp depend.php python + +DESCRIPTION="A scalable distributed monitoring system for clusters and grids" +HOMEPAGE="http://ganglia.sourceforge.net/" +SRC_URI="mirror://sourceforge/ganglia/${P}.tar.gz" +LICENSE="BSD" + +WEBAPP_MANUAL_SLOT="yes" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="minimal vhosts python" + +DEPEND=" + dev-libs/confuse + dev-libs/expat + >=dev-libs/apr-1.0 + python? ( >=dev-lang/python-2.3 )" + +RDEPEND=" + ${DEPEND} + !minimal? ( net-analyzer/rrdtool + ${WEBAPP_DEPEND} + =virtual/httpd-php-5* )" + +pkg_setup() { + if ! use minimal ; then + require_gd + require_php_with_use xml ctype + webapp_pkg_setup + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/ganglia-3.1-gmond-python-tcpconn-concurrency.patch + epatch "${FILESDIR}"/${P}-gmetad-hierarchical.patch +} + +src_compile() { + econf \ + --enable-gexec \ + $(use_enable python) \ + $(use_with !minimal gmetad) || die "econf failed" + + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + newinitd "${FILESDIR}"/gmond.rc gmond + doman mans/{gmetric.1,gmond.1,gstat.1} + doman gmond/gmond.conf.5 + dodoc AUTHORS ChangeLog INSTALL NEWS README + dodir /etc/ganglia/conf.d + gmond/gmond -t > "${D}"/etc/ganglia/gmond.conf + + if use python; then + # Sadly, there is no install target for any of this. + mv gmond/modules/python/README "${T}"/README.python_modules + dodoc "${T}"/README.python_modules + insinto /etc/ganglia/conf.d + # multidisk/diskusage python metric skipped until fixed for gentoo + doins gmond/modules/conf.d/modpython.conf + doins gmond/python_modules/conf.d/tcpconn.pyconf + dodir /usr/$(get_libdir)/ganglia/python_modules + insinto /usr/$(get_libdir)/ganglia/python_modules + doins gmond/python_modules/network/tcpconn.py + fi + + insinto /etc/ganglia + if ! use minimal; then + doins gmetad/gmetad.conf + doman mans/gmetad.1 + keepdir /var/lib/ganglia/rrds + fowners nobody:nobody /var/lib/ganglia/rrds + newinitd "${FILESDIR}"/gmetad.rc gmetad + + webapp_src_preinst + insinto "${MY_HTDOCSDIR}" + doins -r web/* + + webapp_configfile "${MY_HTDOCSDIR}"/conf.php + webapp_src_install + fi +} + +pkg_preinst() { + if has_version '<sys-cluster/ganglia-3.1.0'; then + elog "Previous ganglia installation detected." + elog "Copying gmetad configuration to /etc/ganglia" + elog "You may have to remove /etc/gmond.conf yourself." + mkdir -p "${D}"/etc/ganglia + [ -f "${ROOT}"etc/gmetad.conf ] \ + && cp "${ROOT}"etc/gmetad.conf "${D}"/etc/ganglia + fi +} + +pkg_postinst() { + elog "A default configuration file for gmond has been generated" + elog "for you as a template by running:" + elog " /usr/sbin/gmond -t > /etc/ganglia/gmond.conf" + elog "customize it from there or provide your own but be aware" + elog "the format has changed since 3.0 and so you won't be able" + elog "to use your current configuration (if you generated any)" + elog "in /etc/gmond.conf directly" + + use minimal || webapp_pkg_postinst + + use python && \ + python_mod_optimize /usr/$(get_libdir)/ganglia/python_modules/ +} + +pkg_prerm() { + use minimal || webapp_pkg_prerm +} + +pkg_postrm() { + use python && \ + python_mod_cleanup /usr/$(get_libdir)/ganglia/python_modules/ + [ -d /usr/$(get_libdir)/ganglia ] && rmdir /usr/$(get_libdir)/ganglia +} |