[arch-commits] Commit in munin/trunk (Makefile.config PKGBUILD)

[Dan McGee]

    Date: Sunday, September 18, 2016 @ 18:33:31
  Author: dan
Revision: 276684

upgpkg: munin 2.0.26-2

Modified:
  munin/trunk/Makefile.config
  munin/trunk/PKGBUILD

-----------------+
 Makefile.config |    7 +++++--
 PKGBUILD        |    5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

Modified: Makefile.config
===================================================================
--- Makefile.config	2016-09-18 18:13:02 UTC (rev 276683)
+++ Makefile.config	2016-09-18 18:33:31 UTC (rev 276684)
@@ -38,9 +38,12 @@
 HTMLDIR    = $(PREFIX)/usr/share/munin/www
 CGIDIR     = $(PREFIX)/usr/share/munin/cgi
 
-# Where to put RRD files and other internal data, both master and node
+# Where to put internal data for master (RRD, internal files, ...)
 DBDIR      = $(DESTDIR)/var/lib/munin
 
+# Where to put internal data for node (plugin state, ...)
+DBDIRNODE  = $(DESTDIR)/var/lib/munin
+
 # Client only - Where the spool files are written. Must be writable by
 # group "munin", and should be preserved between reboots
 SPOOLDIR   = $(DBDIR)/spool
@@ -47,7 +50,7 @@
 
 # Client only - Where plugins should put their states. Must be writable by
 # group "munin", and should be preserved between reboots
-PLUGSTATE  = $(DBDIR)/plugin-state
+PLUGSTATE  = $(DBDIRNODE)/plugin-state
 
 # Where Munin should place its logs.
 LOGDIR     = $(PREFIX)/var/log/munin

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-18 18:13:02 UTC (rev 276683)
+++ PKGBUILD	2016-09-18 18:33:31 UTC (rev 276684)
@@ -5,7 +5,7 @@
 pkgname=('munin' 'munin-node')
 pkgbase=munin
 pkgver=2.0.26
-pkgrel=1
+pkgrel=2
 pkgdesc="A distributed monitoring/graphing tool"
 arch=('any')
 url="http://munin-monitoring.org/"
@@ -34,6 +34,7 @@
 	cp ../Makefile.config .
 	# multithreading wrecks havoc on the build, should probably report this
 	make -j1 PREFIX=''
+	make -j1 PREFIX='' common/blib/lib/Munin/Common/Defaults.pm
 }
 
 package_munin() {
@@ -77,7 +78,7 @@
 }
 
 md5sums=('a9914c5c0fe1d00dc4059402d1db9f8d'
-         'fb3cc403e298ae6b73c280c4d3af7b49'
+         'e453f18d0c1a4d9b06abfbcaacad2be4'
          'dc9c83aa2a278466fb475364462f4119'
          'eb2f1e6e746e85ce1e91111f40086be0'
          'cdf139f2b6ae36852113f3411caa6e99'