From owner-svn-ports-all@freebsd.org Thu Oct 1 18:00:59 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5114042F5C9; Thu, 1 Oct 2020 18:00:59 +0000 (UTC) (envelope-from jwb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C2LXC1SHcz4Tcr; Thu, 1 Oct 2020 18:00:59 +0000 (UTC) (envelope-from jwb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 156AA14C45; Thu, 1 Oct 2020 18:00:59 +0000 (UTC) (envelope-from jwb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 091I0w3b080839; Thu, 1 Oct 2020 18:00:58 GMT (envelope-from jwb@FreeBSD.org) Received: (from jwb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 091I0vPV080831; Thu, 1 Oct 2020 18:00:57 GMT (envelope-from jwb@FreeBSD.org) Message-Id: <202010011800.091I0vPV080831@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jwb set sender to jwb@FreeBSD.org using -f From: "Jason W. Bacon" Date: Thu, 1 Oct 2020 18:00:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r550854 - in head/sysutils/ganglia-monitor-core: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jwb X-SVN-Commit-Paths: in head/sysutils/ganglia-monitor-core: . files X-SVN-Commit-Revision: 550854 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Oct 2020 18:00:59 -0000 Author: jwb Date: Thu Oct 1 18:00:56 2020 New Revision: 550854 URL: https://svnweb.freebsd.org/changeset/ports/550854 Log: sysutils/ganglia-monitor-core: Upgrade to 3.7.2, disable python modules Ganglia python modules require python 2.x, which is being removed from the ports tree. Ganglia is no longer being developed upstream and upgrading to python 3 appears to be fairly involved. Hence, I'm disabling python modules in order to keep the port alive through the python 2 removal. PR: 249772 Reported by: swills Modified: head/sysutils/ganglia-monitor-core/Makefile head/sysutils/ganglia-monitor-core/distinfo head/sysutils/ganglia-monitor-core/files/patch-gmetad_Makefile.in head/sysutils/ganglia-monitor-core/files/patch-gmetad_conf.c.in head/sysutils/ganglia-monitor-core/files/patch-gmond_modules_conf.d_modpython.conf.in head/sysutils/ganglia-monitor-core/files/patch-gmond_modules_python_Makefile.in head/sysutils/ganglia-monitor-core/files/patch-lib_default__conf.h.in head/sysutils/ganglia-monitor-core/files/patch-libmetrics_freebsd_metrics.c head/sysutils/ganglia-monitor-core/pkg-plist Modified: head/sysutils/ganglia-monitor-core/Makefile ============================================================================== --- head/sysutils/ganglia-monitor-core/Makefile Thu Oct 1 17:57:06 2020 (r550853) +++ head/sysutils/ganglia-monitor-core/Makefile Thu Oct 1 18:00:56 2020 (r550854) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= monitor-core -PORTVERSION= 3.7.1 -PORTREVISION= 2 +PORTVERSION= 3.7.2 CATEGORIES= sysutils net MASTER_SITES= SF/ganglia/ganglia%20monitoring%20core/${PORTVERSION} PKGNAMEPREFIX= ganglia- @@ -22,15 +21,11 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 \ libpcre.so:devel/pcre \ libexpat.so:textproc/expat2 -OPTIONS_DEFINE= GMETAD -OPTIONS_DEFAULT= GMETAD -GMETAD_DESC= include gmetad +USES= libtool pkgconfig -USES= libtool pkgconfig python:2.7 - GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-setuid=ganglia --enable-setgid=ganglia \ - --with-python=${PYTHON_CMD} + --disable-python CONFIGURE_ENV= GANGLIA_ACK_SYSCONFDIR=1 CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -38,6 +33,10 @@ LDFLAGS+= -L${LOCALBASE}/lib USERS= ganglia GROUPS= ganglia +OPTIONS_DEFINE= GMETAD +OPTIONS_DEFAULT= GMETAD +GMETAD_DESC= include gmetad + PLIST_SUB+= PORTVERSION=${PORTVERSION} SUB_FILES+= pkg-message @@ -71,25 +70,24 @@ MODULES= modcpu.so \ modmulticpu.so \ modnet.so \ modproc.so \ - modpython.so \ modsys.so # gmond.conf.5 and gmond.conf.html can be generated from conf.pod, but # doing so requires perl installed in the build stage. -post-patch: - ${REINPLACE_CMD} \ +pre-configure: + @${REINPLACE_CMD} \ -e "s|/etc/ganglia/\(gm[a-z]*d.conf\)|${PREFIX}/etc/\1|g" \ ${WRKSRC}/README \ ${WRKSRC}/mans/gmetad.1 \ ${WRKSRC}/mans/gmond.1 - ${REINPLACE_CMD} -e "s|nobody|ganglia|g" \ + @${REINPLACE_CMD} -e "s|nobody|ganglia|g" \ ${WRKSRC}/gmetad/gmetad.conf.in \ ${WRKSRC}/gmond/conf.pod \ ${WRKSRC}/gmond/gmond.conf.5 \ ${WRKSRC}/gmond/gmond.conf.html post-build: - ${WRKSRC}/gmond/gmond -t > ${WRKDIR}/gmond.conf + @${WRKSRC}/gmond/gmond -t > ${WRKDIR}/gmond.conf post-install: ${INSTALL_DATA} ${WRKDIR}/gmond.conf \ @@ -110,6 +108,6 @@ post-install: ${INSTALL_MAN} ${WRKSRC}/gmond/gmond.conf.5 \ ${STAGEDIR}${MANPREFIX}/man/man5 ${MKDIR} ${STAGEDIR}/var/db/ganglia/rrds - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/ganglia/python_modules + @${CHMOD} -R a+rX ${STAGEDIR}/var/db/ganglia .include Modified: head/sysutils/ganglia-monitor-core/distinfo ============================================================================== --- head/sysutils/ganglia-monitor-core/distinfo Thu Oct 1 17:57:06 2020 (r550853) +++ head/sysutils/ganglia-monitor-core/distinfo Thu Oct 1 18:00:56 2020 (r550854) @@ -1,3 +1,3 @@ -TIMESTAMP = 1470747673 -SHA256 (ganglia-3.7.1.tar.gz) = e735a6218986a0ff77c737e5888426b103196c12dc2d679494ca9a4269ca69a3 -SIZE (ganglia-3.7.1.tar.gz) = 1311019 +TIMESTAMP = 1601485985 +SHA256 (ganglia-3.7.2.tar.gz) = 042dbcaf580a661b55ae4d9f9b3566230b2232169a0898e91a797a4c61888409 +SIZE (ganglia-3.7.2.tar.gz) = 1302320 Modified: head/sysutils/ganglia-monitor-core/files/patch-gmetad_Makefile.in ============================================================================== --- head/sysutils/ganglia-monitor-core/files/patch-gmetad_Makefile.in Thu Oct 1 17:57:06 2020 (r550853) +++ head/sysutils/ganglia-monitor-core/files/patch-gmetad_Makefile.in Thu Oct 1 18:00:56 2020 (r550854) @@ -1,6 +1,6 @@ ---- gmetad/Makefile.in.orig 2013-05-07 09:39:40.000000000 -0500 -+++ gmetad/Makefile.in 2014-10-14 15:31:54.000000000 -0500 -@@ -659,8 +659,6 @@ +--- gmetad/Makefile.in.orig 2015-07-01 19:49:35 UTC ++++ gmetad/Makefile.in +@@ -713,8 +713,6 @@ gmetad.service: gmetad.service.in $(FIXCONFIG) $(FIXCONFIG) gmetad.service.in install-data-hook: gmetad.conf Modified: head/sysutils/ganglia-monitor-core/files/patch-gmetad_conf.c.in ============================================================================== --- head/sysutils/ganglia-monitor-core/files/patch-gmetad_conf.c.in Thu Oct 1 17:57:06 2020 (r550853) +++ head/sysutils/ganglia-monitor-core/files/patch-gmetad_conf.c.in Thu Oct 1 18:00:56 2020 (r550854) @@ -1,11 +1,11 @@ ---- gmetad/conf.c.in.orig 2013-05-07 09:39:40.000000000 -0500 -+++ gmetad/conf.c.in 2014-10-14 15:31:54.000000000 -0500 -@@ -374,7 +374,7 @@ +--- gmetad/conf.c.in.orig 2015-07-01 19:49:35 UTC ++++ gmetad/conf.c.in +@@ -475,7 +475,7 @@ set_defaults (gmetad_config_t *config) 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->rrdcached_addrstr = NULL; + memset(&config->rrdcached_address, 0, sizeof (config->rrdcached_address)); Modified: head/sysutils/ganglia-monitor-core/files/patch-gmond_modules_conf.d_modpython.conf.in ============================================================================== --- head/sysutils/ganglia-monitor-core/files/patch-gmond_modules_conf.d_modpython.conf.in Thu Oct 1 17:57:06 2020 (r550853) +++ head/sysutils/ganglia-monitor-core/files/patch-gmond_modules_conf.d_modpython.conf.in Thu Oct 1 18:00:56 2020 (r550854) @@ -1,6 +1,6 @@ ---- gmond/modules/conf.d/modpython.conf.in.orig 2013-05-07 09:39:40.000000000 -0500 -+++ gmond/modules/conf.d/modpython.conf.in 2014-10-14 15:31:54.000000000 -0500 -@@ -9,8 +9,8 @@ +--- gmond/modules/conf.d/modpython.conf.in.orig 2015-07-01 19:49:35 UTC ++++ gmond/modules/conf.d/modpython.conf.in +@@ -9,8 +9,8 @@ modules { module { name = "python_module" path = "modpython.so" Modified: head/sysutils/ganglia-monitor-core/files/patch-gmond_modules_python_Makefile.in ============================================================================== --- head/sysutils/ganglia-monitor-core/files/patch-gmond_modules_python_Makefile.in Thu Oct 1 17:57:06 2020 (r550853) +++ head/sysutils/ganglia-monitor-core/files/patch-gmond_modules_python_Makefile.in Thu Oct 1 18:00:56 2020 (r550854) @@ -1,6 +1,6 @@ ---- gmond/modules/python/Makefile.in.orig 2013-05-07 09:39:40.000000000 -0500 -+++ gmond/modules/python/Makefile.in 2014-10-14 15:31:54.000000000 -0500 -@@ -601,8 +601,8 @@ +--- gmond/modules/python/Makefile.in.orig 2015-07-01 19:49:35 UTC ++++ gmond/modules/python/Makefile.in +@@ -639,8 +639,8 @@ README: README.in $(FIXCONFIG) # 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 Modified: head/sysutils/ganglia-monitor-core/files/patch-lib_default__conf.h.in ============================================================================== --- head/sysutils/ganglia-monitor-core/files/patch-lib_default__conf.h.in Thu Oct 1 17:57:06 2020 (r550853) +++ head/sysutils/ganglia-monitor-core/files/patch-lib_default__conf.h.in Thu Oct 1 18:00:56 2020 (r550854) @@ -1,6 +1,6 @@ ---- lib/default_conf.h.in.orig 2013-05-07 09:39:40.000000000 -0500 -+++ lib/default_conf.h.in 2014-10-14 15:31:54.000000000 -0500 -@@ -397,7 +397,7 @@ +--- lib/default_conf.h.in.orig 2015-07-01 19:49:35 UTC ++++ lib/default_conf.h.in +@@ -393,7 +393,7 @@ collection_group {\n\ }\n\ }\n\ \n\ Modified: head/sysutils/ganglia-monitor-core/files/patch-libmetrics_freebsd_metrics.c ============================================================================== --- head/sysutils/ganglia-monitor-core/files/patch-libmetrics_freebsd_metrics.c Thu Oct 1 17:57:06 2020 (r550853) +++ head/sysutils/ganglia-monitor-core/files/patch-libmetrics_freebsd_metrics.c Thu Oct 1 18:00:56 2020 (r550854) @@ -1,6 +1,6 @@ ---- libmetrics/freebsd/metrics.c.orig 2013-05-07 09:39:40.000000000 -0500 -+++ libmetrics/freebsd/metrics.c 2014-10-14 15:32:43.000000000 -0500 -@@ -461,6 +461,17 @@ +--- libmetrics/freebsd/metrics.c.orig 2015-07-01 19:49:35 UTC ++++ libmetrics/freebsd/metrics.c +@@ -461,6 +461,17 @@ cpu_sintr_func ( void ) return val; } Modified: head/sysutils/ganglia-monitor-core/pkg-plist ============================================================================== --- head/sysutils/ganglia-monitor-core/pkg-plist Thu Oct 1 17:57:06 2020 (r550853) +++ head/sysutils/ganglia-monitor-core/pkg-plist Thu Oct 1 18:00:56 2020 (r550854) @@ -1,7 +1,6 @@ bin/ganglia-config bin/gmetric bin/gstat -etc/gmond.conf.d/modpython.conf @sample etc/gmond.conf.sample %%GMETAD%%@sample etc/gmetad.conf.sample include/ganglia.h @@ -19,7 +18,6 @@ lib/ganglia/modmem.so lib/ganglia/modmulticpu.so lib/ganglia/modnet.so lib/ganglia/modproc.so -lib/ganglia/modpython.so lib/ganglia/modsys.so lib/libganglia.so.0 lib/libganglia.so.0.0.0 @@ -34,6 +32,5 @@ man/man5/gmond.conf.5.gz %%GMETAD%%sbin/gmetad %%GMETAD%%sbin/gmetasnap sbin/gmond -@dir lib/ganglia/python_modules @dir(ganglia,ganglia,) /var/db/ganglia/rrds @dir(ganglia,ganglia,) /var/db/ganglia