From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Oct 4 16:00:28 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 42FCB1065674 for ; Thu, 4 Oct 2012 16:00:28 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 1AB708FC12 for ; Thu, 4 Oct 2012 16:00:28 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q94G0Rgp080834 for ; Thu, 4 Oct 2012 16:00:27 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q94G0R9P080833; Thu, 4 Oct 2012 16:00:27 GMT (envelope-from gnats) Resent-Date: Thu, 4 Oct 2012 16:00:27 GMT Resent-Message-Id: <201210041600.q94G0R9P080833@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Steven Kreuzer Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2505C1065670 for ; Thu, 4 Oct 2012 15:57:21 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 0ED318FC17 for ; Thu, 4 Oct 2012 15:57:21 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q94FvKVq025144 for ; Thu, 4 Oct 2012 15:57:20 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id q94FvKkK025143; Thu, 4 Oct 2012 15:57:20 GMT (envelope-from nobody) Message-Id: <201210041557.q94FvKkK025143@red.freebsd.org> Date: Thu, 4 Oct 2012 15:57:20 GMT From: Steven Kreuzer To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/172327: sysutils/ganglia-monitor-core: Update to 3.4.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Oct 2012 16:00:28 -0000 >Number: 172327 >Category: ports >Synopsis: sysutils/ganglia-monitor-core: Update to 3.4.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Oct 04 16:00:27 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Steven Kreuzer >Release: 8.2-RELEASE-p9 >Organization: >Environment: FreeBSD clamps.exit2shell.com 8.2-RELEASE-p9 FreeBSD 8.2-RELEASE-p9 #0: Mon Jun 11 22:27:05 UTC 2012 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: - Update port to 3.4.0 - Take maintainership >How-To-Repeat: >Fix: Patch attached with submission follows: Index: distinfo =================================================================== --- distinfo (revision 305137) +++ distinfo (working copy) @@ -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 Index: files/patch-gmetad_conf.c.in =================================================================== --- files/patch-gmetad_conf.c.in (revision 305137) +++ files/patch-gmetad_conf.c.in (working copy) @@ -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; Index: files/pkg-install.in =================================================================== --- files/pkg-install.in (revision 305137) +++ files/pkg-install.in (working copy) @@ -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 Index: files/patch-libmetrics_freebsd_metrics.c =================================================================== --- files/patch-libmetrics_freebsd_metrics.c (revision 305137) +++ files/patch-libmetrics_freebsd_metrics.c (working copy) @@ -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 Index: files/patch-gmond_modules_python_Makefile.in =================================================================== --- files/patch-gmond_modules_python_Makefile.in (revision 305137) +++ files/patch-gmond_modules_python_Makefile.in (working copy) @@ -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: Index: files/patch-gmetad_Makefile.in =================================================================== --- files/patch-gmetad_Makefile.in (revision 305137) +++ files/patch-gmetad_Makefile.in (working copy) @@ -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: Index: files/patch-lib_default__conf.h.in =================================================================== --- files/patch-lib_default__conf.h.in (revision 305137) +++ files/patch-lib_default__conf.h.in (working copy) @@ -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\ + " + Index: files/patch-gmond_modules_conf.d_modpython.conf.in =================================================================== --- files/patch-gmond_modules_conf.d_modpython.conf.in (revision 305137) +++ files/patch-gmond_modules_conf.d_modpython.conf.in (working copy) @@ -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") Index: pkg-plist =================================================================== --- pkg-plist (revision 305137) +++ pkg-plist (working copy) @@ -9,13 +9,14 @@ %%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 Index: Makefile =================================================================== --- Makefile (revision 305137) +++ Makefile (working copy) @@ -6,8 +6,7 @@ # PORTNAME= monitor-core -PORTVERSION= 3.1.7 -PORTREVISION= 4 +PORTVERSION= 3.4.0 CATEGORIES= sysutils net parallel MASTER_SITES= SF/ganglia/ganglia%20monitoring%20core/${PORTVERSION} PKGNAMEPREFIX= ganglia- @@ -16,12 +15,13 @@ .endif DISTNAME= ganglia-${PORTVERSION} -MAINTAINER= brooks@FreeBSD.org +MAINTAINER= skreuzer@FreeBSD.org 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 @@ -37,6 +37,11 @@ CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +USERS= ganglia +GROUPS= ganglia + +PLIST_SUB+= PORTVERSION=${PORTVERSION} + SUB_FILES= pkg-install .if defined (GMETAD_CONF) @@ -76,7 +81,7 @@ MAN1= gmetric.1 gmond.1 gstat.1 .if defined (WITH_GMETAD) -MAN1+= gmetad.1 +MAN1+= gmetad.1 gmetad.py.1 .endif MAN5= gmond.conf.5 >Release-Note: >Audit-Trail: >Unformatted: