Package: ganglia-monitor
Version: 3.1.7-2+b1
I recently updated the OpenCSW packages from 3.1.7 to 3.2.0
The gar packaging manifest provides clues about what needed to be
changed, the main issue being the new dwoo directory and config options
I've attached a diff with all the changes that were needed on OpenCSW -
the PROTOTYPE_FILTER lines are about permissions/owners
Index: files/conf.php
===================================================================
--- files/conf.php (revision 16329)
+++ files/conf.php (revision 16629)
@@ -21,6 +21,13 @@
$gmetad_root = "/var/opt/csw/ganglia";
$rrds = "$gmetad_root/rrds";
+# Where Dwoo (PHP templating engine) store compiled templates
+$dwoo_compiled_dir = "$gmetad_root/dwoo";
+
+# Where to find filter configuration files, if not set filtering
+# will be disabled
+#$filter_dir = "$gmetad_root/filters";
+
# Leave this alone if rrdtool is installed in $gmetad_root,
# otherwise, change it if it is installed elsewhere (like /usr/bin)
define("RRDTOOL", "/opt/csw/bin/rrdtool");
@@ -36,6 +43,9 @@
# Location for modular-graph files.
$graphdir='./graph.d';
+# Display statistical values on RRD graphs; i.e.: average, min, max
+$graphreport_stats = true;
+
#
# If you want to grab data from a different ganglia source specify it here.
# Although, it would be strange to alter the IP since the Round-Robin
Index: checksums
===================================================================
--- checksums (revision 16329)
+++ checksums (revision 16629)
@@ -1,6 +1 @@
-f3436682e339279357aa98473a9f2b8a CSWgangliaweb.postinstall
-c4c333a46db391464e372ad8ede4993c CSWgangliaweb.preremove
-25d302948e25837bf17757d5e23e4955 cswgmetad
-c6bb96c949dbb989d06ebb36b6af885d cswgmond
-6aa5e2109c2cc8007a6def0799cf1b4c ganglia-3.1.7.tar.gz
-2ff504ecb546aca2cdd6ee09af9a417e httpd-ganglia.conf.CSW
+4fbc028ab6a9b085703a9cff8e0d26c0 ganglia-3.2.0.tar.gz
Index: Makefile
===================================================================
--- Makefile (revision 16329)
+++ Makefile (revision 16629)
@@ -84,7 +84,7 @@
CONFIGURE_ARGS = $(DIRPATHS)
# For compatibility on Solaris 10
-CONFIGURE_ARGS += CFLAGS="-xc99"
+#CONFIGURE_ARGS += CFLAGS="-xc99"
# Don't build gmetad (not tested yet on Solaris, more deps required to build)
#CONFIGURE_ARGS += --without-gmetad
@@ -158,22 +158,41 @@
PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modsys.so
PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modcpu.so
PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modnet.so
-PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modmulticpu.so
+# this version is only for Linux users, get the package
+# ganglia-modules-solaris for the Solaris modmulticpu.so
+#PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modmulticpu.so
PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modmem.so
PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modload.so
PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/moddisk.so
PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modproc.so
PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modgstatus.so
-PKGFILES_CSWlibganglia0 += $(call pkgfiles_lib,libganglia-3.2.0.so.0)
+PKGFILES_CSWlibganglia0 += $(call pkgfiles_lib,libganglia-3.2.0.0.so.0)
-CHECKPKG_OVERRIDES_CSWlibganglia0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libganglia-3.2.0.so.0.0.0|soname=libganglia-3.2.0.so.0|pkgname=CSWlibganglia0|expected=CSWlibganglia3-2-0-0
+CHECKPKG_OVERRIDES_CSWlibganglia0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libganglia-3.2.0.0.so.0.0.0|soname=libganglia-3.2.0.0.so.0|pkgname=CSWlibganglia0|expected=CSWlibganglia3-2-0-0-0
PKGFILES_CSWgangliamodpython = .*python.*
-PKGFILES_CSWganglia-dev = .*/include/.*.h .*/bin/ganglia-config $(libdir)/libganglia.so
-PKGFILES_CSWgangliagmetad = .*/sbin/gmetad .*/gmetad.conf.CSW /var/opt/csw/ganglia/rrds /etc/opt/csw/init.d/cswgmetad .*/gmetad.1
-PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW
+PKGFILES_CSWganglia-dev = /opt/csw/include/ganglia.h
+PKGFILES_CSWganglia-dev += /opt/csw/include/ganglia_gexec.h
+PKGFILES_CSWganglia-dev += /opt/csw/include/gm_metric.h
+PKGFILES_CSWganglia-dev += /opt/csw/include/gm_mmn.h
+PKGFILES_CSWganglia-dev += /opt/csw/include/gm_msg.h
+PKGFILES_CSWganglia-dev += /opt/csw/include/gm_protocol.h
+PKGFILES_CSWganglia-dev += /opt/csw/include/gm_value.h
+PKGFILES_CSWganglia-dev += /opt/csw/bin/ganglia-config
+PKGFILES_CSWganglia-dev += $(libdir)/libganglia.so
+
+PKGFILES_CSWgangliagmetad = /opt/csw/sbin/gmetad
+PKGFILES_CSWgangliagmetad += /etc/opt/csw/ganglia/gmetad.conf.CSW
+PKGFILES_CSWgangliagmetad += /etc/opt/csw/init.d/cswgmetad
+PKGFILES_CSWgangliagmetad += /var/opt/csw/ganglia/rrds
+PKGFILES_CSWgangliagmetad += /opt/csw/share/man/man1/gmetad.1
+
+PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.*
+PKGFILES_CSWgangliaweb += /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW
+PKGFILES_CSWgangliaweb += /var/opt/csw/ganglia/dwoo
+
PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf
PRESERVECONF += /etc/opt/csw/ganglia/gmond.conf
PRESERVECONF += /etc/opt/csw/ganglia/gmetad.conf
@@ -190,6 +209,9 @@
$$$$3 ~ /\/var\/opt\/csw\/ganglia\/rrds/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \
{ print }'
+PROTOTYPE_FILTER_CSWgangliaweb = awk '\
+$$$$3 ~ /\/var\/opt\/csw\/ganglia\/dwoo/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \
+{ print }'
#ARCHALL_CSWganglia-dev = 1
ARCHALL_CSWgangliaweb = 1
@@ -204,6 +226,7 @@
@ginstall -D $(DOWNLOADDIR)/cswgmetad \
$(PKGROOT)/etc/opt/csw/init.d/cswgmetad
@ginstall -d $(DESTDIR)$(WWWGANGLIA)
+ @find $(WORKSRC)/web -name .gitignore -exec rm '{}' \;
@cd $(WORKSRC)/web; \
cp -R * $(DESTDIR)$(WWWGANGLIA)
@rm -rf $(DESTDIR)$(WWWGANGLIA)/conf.php
@@ -231,6 +254,7 @@
@rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf.CSW
endif
@ginstall -d $(DESTDIR)/var/opt/csw/ganglia/rrds
+ @ginstall -d $(DESTDIR)/var/opt/csw/ganglia/dwoo
@ginstall -D $(WORKSRC)/gmond/gmond.conf.5 $(DESTDIR)$(mandir)/man5/gmond.conf.5
@ginstall -D $(WORKSRC)/mans/gmetad.1 $(DESTDIR)$(mandir)/man1/gmetad.1
@ginstall -D $(WORKSRC)/mans/gmond.1 $(DESTDIR)$(mandir)/man1/gmond.1
