diff options
Diffstat (limited to 'sys-cluster/ganglia')
| -rw-r--r-- | sys-cluster/ganglia/ChangeLog | 12 | ||||
| -rw-r--r-- | sys-cluster/ganglia/files/ganglia-3.1.1-process_path-overflow.patch | 39 | ||||
| -rw-r--r-- | sys-cluster/ganglia/ganglia-3.1.1-r1.ebuild | 200 |
3 files changed, 249 insertions, 2 deletions
diff --git a/sys-cluster/ganglia/ChangeLog b/sys-cluster/ganglia/ChangeLog index 7b70fc035696..cf12f7009d0f 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.20 2008/11/19 17:11:16 jsbronder Exp $ +# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.21 2009/01/18 21:12:50 jsbronder Exp $ + +*ganglia-3.1.1-r1 (18 Jan 2009) + + 18 Jan 2009; Justin Bronder <jsbronder@gentoo.org> + +files/ganglia-3.1.1-process_path-overflow.patch, + +ganglia-3.1.1-r1.ebuild: + Bump ganglia-3.1.1-r1. Patch added to prevent a buffer overflow. Gentoo + #255366, Ganglia #223. 19 Nov 2008; Justin Bronder <jsbronder@gentoo.org> -ganglia-3.0.6-r1.ebuild, -ganglia-3.0.7.ebuild, -ganglia-3.1.0.ebuild: diff --git a/sys-cluster/ganglia/files/ganglia-3.1.1-process_path-overflow.patch b/sys-cluster/ganglia/files/ganglia-3.1.1-process_path-overflow.patch new file mode 100644 index 000000000000..8b79511b2e56 --- /dev/null +++ b/sys-cluster/ganglia/files/ganglia-3.1.1-process_path-overflow.patch @@ -0,0 +1,39 @@ +Index: gmetad/server.c +=================================================================== +--- gmetad/server.c (revision 1949) ++++ gmetad/server.c (working copy) +@@ -370,14 +370,13 @@ + + /* sacerdoti: This function does a tree walk while respecting the filter path. + * Will return valid XML even if we have chosen a subtree. Since tree depth is +- * bounded, this function guarantees O(1) search time. The recursive structure +- * does not require any memory allocations. ++ * bounded, this function guarantees O(1) search time. + */ + static int + process_path (client_t *client, char *path, datum_t *myroot, datum_t *key) + { + char *p, *q, *pathend; +- char element[256]; ++ char *element; + int rc, len; + datum_t *found; + datum_t findkey; +@@ -419,6 +418,9 @@ + if (!q) q=pathend; + + len = q-p; ++ element = malloc(len + 1); ++ if ( element == NULL ) ++ return 1; + strncpy(element, p, len); + element[len] = '\0'; + +@@ -440,6 +442,7 @@ + { + rc = process_path(client, 0, myroot, NULL); + } ++ free(element); + } + if (rc) return 1; + diff --git a/sys-cluster/ganglia/ganglia-3.1.1-r1.ebuild b/sys-cluster/ganglia/ganglia-3.1.1-r1.ebuild new file mode 100644 index 000000000000..4d6159199471 --- /dev/null +++ b/sys-cluster/ganglia/ganglia-3.1.1-r1.ebuild @@ -0,0 +1,200 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ganglia-3.1.1-r1.ebuild,v 1.1 2009/01/18 21:12:50 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 ) + !dev-db/firebird" + +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}"/${P}-ctype-c99.patch + epatch "${FILESDIR}"/${P}-multidisk-group.patch + # Shouldn't be needed for 3.1.2 + # http://bugzilla.ganglia.info/cgi-bin/bugzilla/show_bug.cgi?id=223 + epatch "${FILESDIR}"/${P}-process_path-overflow.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 + + # Sadly, there is no install target for any of this. + if use python; then + # We install the multidisk module, but not the configuration + # as this needs to be generated later. See pkg_config + local gmond_py="disk/multidisk network/tcpconn" + local gmond_py_conf="tcpconn" + newdoc gmond/modules/python/README README.python_modules + insinto /etc/ganglia/conf.d + doins gmond/modules/conf.d/modpython.conf + for i in ${gmond_py_conf}; do + doins gmond/python_modules/conf.d/${i}.pyconf + done + dodir /usr/$(get_libdir)/ganglia/python_modules + insinto /usr/$(get_libdir)/ganglia/python_modules + for i in ${gmond_py}; do + doins gmond/python_modules/${i}.py + done + + 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" + elog + elog "If you require disk {usage,total} statistics, please run" + elog " emerge --config ${PN}" + elog "then check ${ROOT}etc/ganglia/conf.d/diskusage.pyconf" + elog "for correctness." + + 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 2>/dev/null +} + +pkg_config() { + local disk_used_metrics disk_total_metrics i + local disk_pyconf="${ROOT}"etc/ganglia/conf.d/diskusage.pyconf + + if ! use python; then + einfo "No configuration necessary :)" + exit 0 + fi + + if [ ! -w ${disk_pyconf} ]; then + eerror "Cannot write to ${disk_pyconf}" + exit 1 + fi + + ebegin "Generating disk used/total metric configuration to ${disk_pyconf}" + disk_used_metrics=$(${ROOT}/usr/sbin/gmond -m | awk '/-disk_used/{print $1}') + disk_total_metrics=$(${ROOT}/usr/sbin/gmond -m | awk '/-disk_total/{print $1}') + cat > ${disk_pyconf} <<-EOF + #/* Disk usage collection groups for + # multidisk python module */ + # + # Autogenerated by pkg_config in the Gentoo ganglia ebuild. + + modules { + module { + name = "multidisk" + language = "python" + } + } + + collection_group { + collect_every = 10 + time_threshold = 50 + EOF + for i in ${disk_used_metrics}; do + printf \ + "\n metric {\n name = \"%s\"\n value_threshold = 1.0\n }" \ + ${i} >> ${disk_pyconf} + done + printf "\n}\n\n" >> ${disk_pyconf} + + # Get the disk total metrics. + cat >> ${disk_pyconf} <<-EOF + collection_group { + collect_once = yes + time_threshold = 20 + EOF + for i in ${disk_total_metrics}; do + printf \ + "\n metric {\n name = \"%s\"\n }" \ + ${i} >> ${disk_pyconf} + done + printf "\n}\n" >> ${disk_pyconf} +} |