diff options
Diffstat (limited to 'sysutils/munin-common')
| -rw-r--r-- | sysutils/munin-common/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/munin-common/files/patch-Makefile | 16 | ||||
| -rw-r--r-- | sysutils/munin-common/files/patch-Makefile.config | 2 | ||||
| -rw-r--r-- | sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in | 8 | ||||
| -rw-r--r-- | sysutils/munin-common/files/patch-plugins_node.d.freebsd_memory.in | 8 | ||||
| -rw-r--r-- | sysutils/munin-common/munin.mk | 2 |
6 files changed, 22 insertions, 20 deletions
diff --git a/sysutils/munin-common/distinfo b/sysutils/munin-common/distinfo index 9a5a08c9da18..b4faf23903ae 100644 --- a/sysutils/munin-common/distinfo +++ b/sysutils/munin-common/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1522752589 -SHA256 (munin-2.0.37.tar.gz) = aa93bd3415fc52e4c3b1c2fff58ec078e5d42fdc7202d38a8546bef97fcbd5b4 -SIZE (munin-2.0.37.tar.gz) = 2242442 +TIMESTAMP = 1530519300 +SHA256 (munin-2.0.38.tar.gz) = ee44c8c5e0a0a08c0378a7bd324b3bfa50bf84eef77760d2c20c21059fdb3099 +SIZE (munin-2.0.38.tar.gz) = 2246848 diff --git a/sysutils/munin-common/files/patch-Makefile b/sysutils/munin-common/files/patch-Makefile index b9907103e0f0..2286984fcace 100644 --- a/sysutils/munin-common/files/patch-Makefile +++ b/sysutils/munin-common/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2017-03-03 00:02:39 UTC +--- Makefile.orig 2018-06-29 00:50:01 UTC +++ Makefile @@ -68,60 +68,47 @@ install: install-master-prime install-co @@ -88,7 +88,7 @@ # Not ready to be installed yet # $(INSTALL) -m 0755 build/master/_bin/munin-gather $(LIBDIR)/ -@@ -139,33 +126,29 @@ endif +@@ -131,36 +118,30 @@ install-node-plugins: install-plugins-pr install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config @$(CHECKGROUP) @@ -105,6 +105,8 @@ + mkdir -p $(DESTDIR)$(LIBDIR)/plugins + mkdir -p $(DESTDIR)$(PLUGSTATE) + @# Process the OS specific plugins at the end. Otherwise they would be overridden by the + @# generic ones. for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \ if test -f "$$p" ; then \ echo Installing $$p; \ @@ -112,10 +114,10 @@ + $(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/; \ fi \ done -- $(HPUXONLY) mv $(LIBDIR)/plugins/*.adv $(LIBDIR) +- @# Some HP-UX plugins need *.adv support files in LIBDIR +- if [ "$(OSTYPE)" = "hp-ux" ]; then mv $(LIBDIR)/plugins/*.adv $(LIBDIR); done - $(INSTALL) -m 0644 build/plugins/plugins.history $(LIBDIR)/plugins/ - $(INSTALL) -m 0644 build/plugins/plugin.sh $(LIBDIR)/plugins/ -+ $(HPUXONLY) mv $(DESTDIR)$(LIBDIR)/plugins/*.adv $(DESTDIR)$(LIBDIR) + $(INSTALL) -m 0644 build/plugins/plugins.history $(DESTDIR)$(LIBDIR)/plugins/ + $(INSTALL) -m 0644 build/plugins/plugin.sh $(DESTDIR)$(LIBDIR)/plugins/ @@ -134,7 +136,7 @@ fi \ done -@@ -176,14 +159,14 @@ install-plugins-java: build-plugins-java +@@ -171,14 +152,14 @@ install-plugins-java: build-plugins-java install-async-prime: install-async install-async: @@ -153,7 +155,7 @@ install-common-prime: build-common install-common -@@ -449,7 +432,7 @@ t/install: +@@ -444,7 +425,7 @@ t/install: # This builds */Build from Build.PL %/Build: %/Build.PL @@ -162,7 +164,7 @@ build-%: %/Build cd $* && $(PERL) Build -@@ -466,6 +449,7 @@ install-%: %/Build +@@ -461,6 +442,7 @@ install-%: %/Build --install_path sbin=$(SBINDIR) \ --install_path bindoc=$(MANDIR)/man1 \ --install_path libdoc=$(MANDIR)/man3 \ diff --git a/sysutils/munin-common/files/patch-Makefile.config b/sysutils/munin-common/files/patch-Makefile.config index bfdb4c2416dd..70b559a96d43 100644 --- a/sysutils/munin-common/files/patch-Makefile.config +++ b/sysutils/munin-common/files/patch-Makefile.config @@ -69,7 +69,7 @@ +PERL := /usr/local/bin/perl # The python interpreter to use (used by some plugins) --PYTHON := /usr/bin/env python +-PYTHON := /usr/bin/env python3 +PYTHON := /usr/local/bin/python # The ruby interpreter to use (used by some plugins) diff --git a/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in b/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in index 5e7a37322b00..0dd0ad477553 100644 --- a/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in +++ b/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in @@ -1,11 +1,11 @@ ---- plugins/node.d.freebsd/df.in.orig 2016-12-04 19:34:49 UTC +--- plugins/node.d.freebsd/df.in.orig 2018-06-29 00:50:01 UTC +++ plugins/node.d.freebsd/df.in @@ -24,7 +24,7 @@ if [ "$1" = "autoconf" ]; then exit 0 fi --EXCLUDEDFS="-t noprocfs,devfs,fdescfs,linprocfs,linsysfs,nfs,nullfs" -+EXCLUDEDFS="-t noprocfs,devfs,fdescfs,linprocfs,linsysfs,nfs,nullfs,autofs" +-EXCLUDEDFS="-t noprocfs,devfs,fdescfs,linprocfs,linsysfs,sysfs,nfs,nullfs" ++EXCLUDEDFS="-t noprocfs,devfs,fdescfs,linprocfs,linsysfs,sysfs,nfs,nullfs,autofs" if [ $(uname -s) = "GNU/kFreeBSD" ]; then - EXCLUDEDFS=$(echo $EXCLUDEDFS | sed 's/^-t /-x /; s/,/ -x /g') + # Debian ships df from GNU coreutils diff --git a/sysutils/munin-common/files/patch-plugins_node.d.freebsd_memory.in b/sysutils/munin-common/files/patch-plugins_node.d.freebsd_memory.in index 6646d436d225..b5fa589a6c63 100644 --- a/sysutils/munin-common/files/patch-plugins_node.d.freebsd_memory.in +++ b/sysutils/munin-common/files/patch-plugins_node.d.freebsd_memory.in @@ -1,8 +1,8 @@ ---- plugins/node.d.freebsd/memory.in.orig 2014-11-24 21:46:24 UTC +--- plugins/node.d.freebsd/memory.in.orig 2018-06-29 00:50:01 UTC +++ plugins/node.d.freebsd/memory.in -@@ -74,4 +74,4 @@ echo wired.value $(($WIRED_COUNT*$PAGESI - echo buffers.value $(($BUFFERS_COUNT)) - echo cached.value $(($CACHE_COUNT*$PAGESIZE)) +@@ -93,4 +93,4 @@ if [ -n "$LAUNDRY_COUNT" ]; then + echo "laundry.value $(( LAUNDRY_COUNT * PAGESIZE ))" + fi echo free.value $(($FREE_COUNT*$PAGESIZE)) -echo swap.value $(swapinfo -k | awk '{sum += $3}; END {print sum * 1024}') +echo swap.value $(swapinfo -k | awk '!/^Total/ && !/^Device/ {sum += $3}; END {print sum * 1024}') diff --git a/sysutils/munin-common/munin.mk b/sysutils/munin-common/munin.mk index c9f4b7865894..c3fa5ff5671c 100644 --- a/sysutils/munin-common/munin.mk +++ b/sysutils/munin-common/munin.mk @@ -1,6 +1,6 @@ LICENSE= GPLv2 -MUNIN_VERSION= 2.0.37 +MUNIN_VERSION= 2.0.38 MUNIN_SITES= http://downloads.munin-monitoring.org/munin/stable/${MUNIN_VERSION}/ DISTINFO_FILE= ${.CURDIR}/../../sysutils/munin-common/distinfo PATCHDIR= ${.CURDIR}/../../sysutils/munin-common/files |