diff options
Diffstat (limited to 'sysutils/ganglia-monitor-core')
13 files changed, 42 insertions, 124 deletions
diff --git a/sysutils/ganglia-monitor-core/Makefile b/sysutils/ganglia-monitor-core/Makefile index 8127fa551fb5..3d2109a07649 100644 --- a/sysutils/ganglia-monitor-core/Makefile +++ b/sysutils/ganglia-monitor-core/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= monitor-core -PORTVERSION= 3.1.7 -PORTREVISION= 5 +PORTVERSION= 3.4.0 CATEGORIES= sysutils net parallel MASTER_SITES= SF/ganglia/ganglia%20monitoring%20core/${PORTVERSION} PKGNAMEPREFIX= ganglia- @@ -16,7 +15,8 @@ COMMENT= Ganglia cluster monitor, monitoring daemon LIB_DEPENDS= apr-1:${PORTSDIR}/devel/apr1 \ confuse:${PORTSDIR}/devel/libconfuse \ - pcre:${PORTSDIR}/devel/pcre + pcre:${PORTSDIR}/devel/pcre \ + expat:${PORTSDIR}/textproc/expat2 PKGINSTALL= ${WRKDIR}/pkg-install @@ -34,6 +34,11 @@ CONFIGURE_ENV= GANGLIA_ACK_SYSCONFDIR=1 "LDFLAGS=${LDFLAGS}" CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +USERS= ganglia +GROUPS= ganglia + +PLIST_SUB+= PORTVERSION=${PORTVERSION} + SUB_FILES= pkg-install .if defined (GMETAD_CONF) @@ -71,7 +76,7 @@ USE_LDCONFIG= yes MAN1= gmetric.1 gmond.1 gstat.1 .if ${PORT_OPTIONS:MGMETAD} -MAN1+= gmetad.1 +MAN1+= gmetad.1 gmetad.py.1 .endif MAN5= gmond.conf.5 diff --git a/sysutils/ganglia-monitor-core/distinfo b/sysutils/ganglia-monitor-core/distinfo index 87fc48a1a64c..d004eec5fd5f 100644 --- a/sysutils/ganglia-monitor-core/distinfo +++ b/sysutils/ganglia-monitor-core/distinfo @@ -1,2 +1,2 @@ -SHA256 (ganglia-3.1.7.tar.gz) = bb1a4953d72e7dace76010a30d6d332e4ac0991d1371dbbcbcc7b048e0a7e4bf -SIZE (ganglia-3.1.7.tar.gz) = 1278023 +SHA256 (ganglia-3.4.0.tar.gz) = 036838b17621c10383daa98f705bb01a10d44031eeb6f310c3685a9ec2dbe800 +SIZE (ganglia-3.4.0.tar.gz) = 1156001 diff --git a/sysutils/ganglia-monitor-core/files/gmetad.in b/sysutils/ganglia-monitor-core/files/gmetad.in index 77f42fc6bfb2..cfa91f64a6b0 100644 --- a/sysutils/ganglia-monitor-core/files/gmetad.in +++ b/sysutils/ganglia-monitor-core/files/gmetad.in @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD$ +# $FreeBSD: head/sysutils/ganglia-monitor-core/files/gmetad.in 302141 2012-08-05 23:19:36Z dougb $ # PROVIDE: gmetad # REQUIRE: gmond diff --git a/sysutils/ganglia-monitor-core/files/gmetasnap.sh b/sysutils/ganglia-monitor-core/files/gmetasnap.sh index a0c413bde8b5..3fbbe73ec2b1 100644 --- a/sysutils/ganglia-monitor-core/files/gmetasnap.sh +++ b/sysutils/ganglia-monitor-core/files/gmetasnap.sh @@ -2,7 +2,7 @@ # # gmetasnapshot - Ganglia gmetad snapshot manager # -# $FreeBSD$ +# $FreeBSD: head/sysutils/ganglia-monitor-core/files/gmetasnap.sh 300897 2012-07-14 14:29:18Z beat $ command=`basename $0` diff --git a/sysutils/ganglia-monitor-core/files/gmond.in b/sysutils/ganglia-monitor-core/files/gmond.in index a8f6dbe139de..a6e8ebfe1876 100644 --- a/sysutils/ganglia-monitor-core/files/gmond.in +++ b/sysutils/ganglia-monitor-core/files/gmond.in @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD$ +# $FreeBSD: head/sysutils/ganglia-monitor-core/files/gmond.in 302141 2012-08-05 23:19:36Z dougb $ # PROVIDE: gmond # REQUIRE: DAEMON diff --git a/sysutils/ganglia-monitor-core/files/patch-gmetad_Makefile.in b/sysutils/ganglia-monitor-core/files/patch-gmetad_Makefile.in index dcb7d57c3cd8..8cc5e64dbabb 100644 --- a/sysutils/ganglia-monitor-core/files/patch-gmetad_Makefile.in +++ b/sysutils/ganglia-monitor-core/files/patch-gmetad_Makefile.in @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- gmetad/Makefile.in.orig -+++ gmetad/Makefile.in -@@ -539,8 +539,6 @@ +--- gmetad.orig/Makefile.in 2012-10-01 18:24:48.000000000 +0000 ++++ gmetad/Makefile.in 2012-10-01 18:38:55.000000000 +0000 +@@ -591,8 +591,6 @@ $(FIXCONFIG) gmetad.conf.in install-data-hook: gmetad.conf - mkdir -p $(DESTDIR)$(sysconfdir) && \ - $(INSTALL_DATA) gmetad.conf $(DESTDIR)$(sysconfdir)/gmetad.conf + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/sysutils/ganglia-monitor-core/files/patch-gmetad_conf.c.in b/sysutils/ganglia-monitor-core/files/patch-gmetad_conf.c.in index 9564fabb410d..45f0acc2e4c6 100644 --- a/sysutils/ganglia-monitor-core/files/patch-gmetad_conf.c.in +++ b/sysutils/ganglia-monitor-core/files/patch-gmetad_conf.c.in @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- gmetad/conf.c.in.orig -+++ gmetad/conf.c.in -@@ -274,7 +274,7 @@ +--- gmetad/conf.c.in.orig 2012-10-01 18:44:59.000000000 +0000 ++++ gmetad/conf.c.in 2012-10-01 18:45:20.000000000 +0000 +@@ -330,7 +330,7 @@ config->trusted_hosts = NULL; config->debug_level = 0; config->should_setuid = 1; - config->setuid_username = "nobody"; + config->setuid_username = SETUID_USER; config->rrd_rootdir = "@varstatedir@/ganglia/rrds"; + config->write_rrds = 1; config->scalable_mode = 1; - config->all_trusted = 0; diff --git a/sysutils/ganglia-monitor-core/files/patch-gmond_modules_conf.d_modpython.conf.in b/sysutils/ganglia-monitor-core/files/patch-gmond_modules_conf.d_modpython.conf.in index cf290d63ac92..d02655a5fe46 100644 --- a/sysutils/ganglia-monitor-core/files/patch-gmond_modules_conf.d_modpython.conf.in +++ b/sysutils/ganglia-monitor-core/files/patch-gmond_modules_conf.d_modpython.conf.in @@ -1,13 +1,8 @@ - -$FreeBSD$ - ---- gmond/modules/conf.d/modpython.conf.in.orig -+++ gmond/modules/conf.d/modpython.conf.in -@@ -13,6 +13,6 @@ +--- gmond/modules/conf.d/modpython.conf.in.orig 2012-10-01 18:52:02.000000000 +0000 ++++ gmond/modules/conf.d/modpython.conf.in 2012-10-01 18:52:22.000000000 +0000 +@@ -13,4 +13,4 @@ } } --include ('@sysconfdir@/conf.d/*.pyconf') -+include ('@sysconfdir@/%%GMONDCONFDIR%%/*.pyconf') - - +-include ("@sysconfdir@/conf.d/*.pyconf") ++include ("@sysconfdir@/%%GMONDCONFDIR%%/*.pyconf") diff --git a/sysutils/ganglia-monitor-core/files/patch-gmond_modules_python_Makefile.in b/sysutils/ganglia-monitor-core/files/patch-gmond_modules_python_Makefile.in index a0cfb946357c..9ecda2ecb011 100644 --- a/sysutils/ganglia-monitor-core/files/patch-gmond_modules_python_Makefile.in +++ b/sysutils/ganglia-monitor-core/files/patch-gmond_modules_python_Makefile.in @@ -1,16 +1,13 @@ - -$FreeBSD$ - ---- gmond/modules/python/Makefile.in.orig -+++ gmond/modules/python/Makefile.in -@@ -538,8 +538,8 @@ +--- gmond/modules/python/Makefile.in.orig 2012-10-01 19:01:51.000000000 +0000 ++++ gmond/modules/python/Makefile.in 2012-10-01 19:03:40.000000000 +0000 +@@ -588,8 +588,8 @@ # Note that README is listed as a dependency to be generated, but it # is not currently installed anywhere install-exec-hook: ../conf.d/modpython.conf README - mkdir -p $(DESTDIR)$(sysconfdir)/conf.d && \ - $(INSTALL_DATA) ../conf.d/modpython.conf $(DESTDIR)$(sysconfdir)/conf.d/modpython.conf + mkdir -p $(DESTDIR)$(sysconfdir)/%%GMONDCONFDIR%% && \ -+ $(INSTALL_DATA) ../conf.d/modpython.conf $(DESTDIR)$(sysconfdir)/%%GMONDCONFDIR%%/modpython.conf ++ $(INSTALL_DATA) ../conf.d/modpython.conf $(DESTDIR)$(sysconfdir)/%%GMONDCONFDIR%%/modpython.conf + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/sysutils/ganglia-monitor-core/files/patch-lib_default__conf.h.in b/sysutils/ganglia-monitor-core/files/patch-lib_default__conf.h.in index db94196198c1..6b5744eb1d83 100644 --- a/sysutils/ganglia-monitor-core/files/patch-lib_default__conf.h.in +++ b/sysutils/ganglia-monitor-core/files/patch-lib_default__conf.h.in @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- lib/default_conf.h.in.orig -+++ lib/default_conf.h.in -@@ -111,7 +111,7 @@ +--- lib/default_conf.h.in.orig 2012-10-01 19:06:52.000000000 +0000 ++++ lib/default_conf.h.in 2012-10-01 19:08:01.000000000 +0000 +@@ -381,7 +381,7 @@ }\n\ }\n\ \n\ --include ('" SYSCONFDIR "/conf.d/*.conf')\n\ -+include ('" SYSCONFDIR "/%%GMONDCONFDIR%%/*.conf')\n\ +-include (\"" SYSCONFDIR "/conf.d/*.conf\")\n\ ++include (\"" SYSCONFDIR "/%%GMONDCONFDIR%%/*.conf\")\n\ \n\ - /* The old internal 2.5.x metric array has been replaced by the following\n\ - collection_group directives. What follows is the default behavior for\n\ + " + diff --git a/sysutils/ganglia-monitor-core/files/patch-libmetrics_freebsd_metrics.c b/sysutils/ganglia-monitor-core/files/patch-libmetrics_freebsd_metrics.c deleted file mode 100644 index 1c94d6f172c4..000000000000 --- a/sysutils/ganglia-monitor-core/files/patch-libmetrics_freebsd_metrics.c +++ /dev/null @@ -1,46 +0,0 @@ - -$FreeBSD$ - ---- libmetrics/freebsd/metrics.c.orig -+++ libmetrics/freebsd/metrics.c -@@ -170,9 +170,21 @@ - size_t len; - uint32_t freq = 0, tmpfreq; - uint64_t tscfreq; -+ unsigned int cpu_freq; - - /* -- * If the system supports it, the cpufreq driver provides the best -+ * Try the portable sysctl (introduced on ia64). -+ */ -+ cpu_freq = 0; -+ len = sizeof(cpu_freq); -+ if (sysctlbyname("hw.freq.cpu", &cpu_freq, &len, NULL, 0) != -1 && -+ cpu_freq != 0) { -+ freq = cpu_freq; -+ goto done; -+ } -+ -+ /* -+ * If the system supports it, the cpufreq driver provides - * access to CPU frequency. Since we want a constant value, we're - * looking for the maximum frequency, not the current one. We - * don't know what order the driver will report values in so we -@@ -529,6 +541,17 @@ - goto output; - - for (i = 0; i < nentries; kp++, i++) { -+ /* This is a per-CPU idle thread. */ /* idle thread */ -+ if ((kp->ki_tdflags & TDF_IDLETD) != 0) -+ continue; -+ /* Ignore during load avg calculations. */ /* swi or idle thead */ -+#ifdef TDF_NOLOAD -+ /* Introduced in FreeBSD 8.3 */ -+ if ((kp->ki_tdflags & TDF_NOLOAD) != 0) -+#else -+ if ((kp->ki_flag & P_NOLOAD) != 0) -+#endif -+ continue; - #ifdef KINFO_PROC_SIZE - state = kp->ki_stat; - #else diff --git a/sysutils/ganglia-monitor-core/files/pkg-install.in b/sysutils/ganglia-monitor-core/files/pkg-install.in index 9a111f010c7e..659e2b965a1b 100644 --- a/sysutils/ganglia-monitor-core/files/pkg-install.in +++ b/sysutils/ganglia-monitor-core/files/pkg-install.in @@ -2,35 +2,10 @@ u=ganglia g=ganglia -ugid=102 -homedir=/nonexistent -shell=/sbin/nologin rrd_rootdir=/var/db/ganglia/rrds case $2 in POST-INSTALL) - if pw group show "${g}" >/dev/null 2>&1; then - echo "Using existing group \"${g}\"." - else - echo "Creating group \"${g}\", (gid: ${ugid})." - pw groupadd ${g} -g ${ugid} - if [ $? != 0 ]; then - echo "Failed to add group \"${g}\"." - exit 1 - fi - fi - if pw user show "${u}" >/dev/null 2>&1; then - echo "Using existing user \"${u}\"." - else - echo "Creating user \"${u}\", (uid: ${ugid})." - pw useradd ${u} -u ${ugid} -g ${ugid} -h - \ - -d ${homedir} -s ${shell} -c "Ganglia User" - if [ $? != 0 ]; then - echo "Failed to add user \"${u}\"." - exit 1 - fi - fi - if [ ! -f %%PREFIX%%/etc/gmond.conf ]; then cp %%PREFIX%%/etc/gmond.conf.sample %%PREFIX%%/etc/gmond.conf fi diff --git a/sysutils/ganglia-monitor-core/pkg-plist b/sysutils/ganglia-monitor-core/pkg-plist index ee2bc012b987..b6649ff94479 100644 --- a/sysutils/ganglia-monitor-core/pkg-plist +++ b/sysutils/ganglia-monitor-core/pkg-plist @@ -9,13 +9,14 @@ etc/gmond.conf.sample %%GMETAD%%etc/gmetad.conf.sample include/ganglia.h include/ganglia_gexec.h +include/gm_file.h include/gm_mmn.h include/gm_metric.h include/gm_msg.h include/gm_protocol.h include/gm_value.h -lib/libganglia-3.1.7.so -lib/libganglia-3.1.7.so.0 +lib/libganglia-%%PORTVERSION%%.so +lib/libganglia-%%PORTVERSION%%.so.0 lib/libganglia.a lib/libganglia.la lib/libganglia.so |