[arch-commits] Commit in munin/trunk (10 files)
Dan McGee
dan at archlinux.org
Mon Jul 2 00:18:40 UTC 2012
Date: Sunday, July 1, 2012 @ 20:18:40
Author: dan
Revision: 162852
A good start to a working 2.0.x munin build process
Added:
munin/trunk/munin-use-v5-date-manip.patch
munin/trunk/munin.tmpfiles.conf
Modified:
munin/trunk/Makefile.config
munin/trunk/PKGBUILD
munin/trunk/keep-defaults.patch
munin/trunk/munin-df-linux-excludes.patch
munin/trunk/munin-node.init
munin/trunk/munin-node.install
munin/trunk/munin.install
Deleted:
munin/trunk/munin-lock-location.patch
-------------------------------+
Makefile.config | 49 ++++++++++-------------
PKGBUILD | 48 +++++++++++++---------
keep-defaults.patch | 11 -----
munin-df-linux-excludes.patch | 31 --------------
munin-lock-location.patch | 85 ----------------------------------------
munin-node.init | 4 -
munin-node.install | 6 +-
munin-use-v5-date-manip.patch | 26 ++++++++++++
munin.install | 4 -
munin.tmpfiles.conf | 1
10 files changed, 85 insertions(+), 180 deletions(-)
Modified: Makefile.config
===================================================================
--- Makefile.config 2012-07-02 00:08:48 UTC (rev 162851)
+++ Makefile.config 2012-07-02 00:18:40 UTC (rev 162852)
@@ -1,3 +1,4 @@
+# -*- makefile -*-
# This file specifies where Munin will look for things after you've
# run 'make' in the source directory. Modify it to suit your needs.
@@ -2,3 +3,3 @@
# DESTDIR is meant only for use when making Munin packages. Unless
-# you're doing packaging do NOT set it.
+# you're doing packaging do NOT set it.
# DESTDIR is empty during building, and optionally set to point to
@@ -12,7 +13,7 @@
#
# the base of the Munin installation.
-#
+#
PREFIX = $(DESTDIR)
# Where Munin keeps its configurations (server.conf, client.conf, ++)
@@ -22,7 +23,7 @@
BINDIR = $(PREFIX)/usr/bin
# Client only - where to put munin-node, munin-node-configure, and munin-run
-SBINDIR = $(PREFIX)/usr/sbin
+SBINDIR = $(PREFIX)/usr/bin
# Where to put text and html documentation
DOCDIR = $(PREFIX)/usr/share/doc/munin
@@ -37,38 +38,29 @@
HTMLDIR = $(PREFIX)/usr/share/munin/www
CGIDIR = $(PREFIX)/usr/share/munin/cgi
-# Server only - spool directory for data gathered from nodes by
-# munin-gather - experimental. Place on ramdisk to make munin
-# scale better. On many versions of Linux as well as on Solaris
-# /tmp will be a ramdisk.
+# Where to put RRD files and other internal data, both master and node
+DBDIR = $(DESTDIR)/var/lib/munin
-SSPOOLDIR = $(PREFIX)/spool
+# Client only - Where the spool files are written. Must be writable by
+# group "munin", and should be preserved between reboots
+SPOOLDIR = $(DBDIR)/spool
-# Suggested directory name for a pulic ramdisk based tmp directory.
-# SSPOOLDIR := /tmp/muninspool
-
-# Client only - Where to put RRD files and other intenal data
-DBDIR = $(DESTDIR)/var/lib/munin
-
# Client only - Where plugins should put their states. Must be writable by
# group "munin", and should be preserved between reboots
PLUGSTATE = $(DBDIR)/plugin-state
# Where Munin should place its logs.
-LOGDIR = $(DESTDIR)/var/log/munin
+LOGDIR = $(PREFIX)/var/log/munin
-# Location of PID files and other statefiles.
-STATEDIR = $(DESTDIR)/var/run/munin
+# Location of PID files and other statefiles. On the server, must be
+# writable by the user "munin".
+STATEDIR = $(DESTDIR)/run/munin
-# Location of server lock files. On the server, must be writable by the user
-# "munin".
-LOCKDIR = $(DESTDIR)/var/lock
-
# The perl interpreter to use
-PERL = /usr/bin/perl
+PERL := /usr/bin/perl
# The python interpreter to use (used by some plugins)
-PYTHON = /usr/bin/env python2
+PYTHON := /usr/bin/env python2
# The ruby interpreter to use (used by some plugins)
RUBY := /usr/bin/env ruby
@@ -77,7 +69,7 @@
JAVARUN := /usr/bin/java
# The java library dir to use (used by some plugins)
-# this is needed in order to be able to install
+# this is needed in order to be able to install
# java libraries in a custom location. Many distrubutions
# enforce a spesific location for java libraries.
JAVALIBDIR:= $(LIBDIR)
@@ -87,11 +79,11 @@
# other modern stuff is expected. On a posix-system the expression
# below will find the right shell. Most Unixes released the last 10
# years are POSIX compliant enough for this to work (he said bravely).
-#
+#
# On Linux /bin/sh, SunOS/Solaris /usr/xpg4/bin/sh or /bin/ksh
# In general: bash or ksh will work
#
-GOODSH := $(shell PATH=`getconf PATH` sh -c 'type sh | sed "s/.* //"')
+GOODSH := /bin/sh
# Path of bash for bash specific plugins
BASH := /bin/bash
@@ -122,9 +114,12 @@
# Default user to run the plugins as
PLUGINUSER := nobody
+# Default user to run the cgi as
+CGIUSER := nobody
+
# Which command to use to check if the USER and GROUP to run Munin as, exists.
GETENT := /bin/true
-CHECKUSER := /bin/true
+CHECKUSER := /bin/true
CHECKGROUP := /bin/true
CHOWN := true
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-07-02 00:08:48 UTC (rev 162851)
+++ PKGBUILD 2012-07-02 00:18:40 UTC (rev 162852)
@@ -4,31 +4,34 @@
pkgname=('munin' 'munin-node')
pkgbase=munin
-pkgver=1.4.7
-_realver=1.4.7
+pkgver=2.0.1
pkgrel=1
pkgdesc="A distributed monitoring/graphing tool"
arch=('any')
url="http://munin-monitoring.org/"
license=("GPL")
-depends=('rrdtool' 'perl' 'perl-log-log4perl' 'perl-html-template' 'perl-date-manip')
-source=(http://downloads.sourceforge.net/sourceforge/munin/munin-$_realver.tar.gz
+makedepends=('perl' 'rrdtool' 'perl-log-log4perl' 'perl-html-template'
+ 'perl-date-manip' 'perl-io-socket-inet6' 'perl-net-snmp'
+ 'perl-net-ssleay' 'perl-net-server' 'perl-file-copy-recursive'
+ 'perl-fcgi')
+source=(http://downloads.sourceforge.net/sourceforge/munin/munin-$pkgver.tar.gz
Makefile.config
keep-defaults.patch
- munin-lock-location.patch
munin-df-linux-excludes.patch
+ munin-use-v5-date-manip.patch
munin-cron-entry
munin-node.init
logrotate.munin
logrotate.munin-node
+ munin.tmpfiles.conf
08-munin-font-dir.conf)
build() {
- cd "$srcdir/munin-$_realver"
+ cd "$srcdir/munin-$pkgver"
# This build is beyond fucked, also need to report this upstream
patch -Np1 < ../keep-defaults.patch
- patch -Np1 < ../munin-lock-location.patch
patch -Np0 < ../munin-df-linux-excludes.patch
+ patch -Np1 < ../munin-use-v5-date-manip.patch
sed -i -e 's#/sbin/ip6tables#/usr/sbin/ip6tables#' plugins/node.d.linux/ip_.in
@@ -38,39 +41,46 @@
}
package_munin() {
- depends=('perl' 'rrdtool' 'perl-html-template' 'perl-date-manip' 'perl-log-log4perl' 'munin-node')
+ depends=('perl' 'rrdtool' 'perl-html-template' 'perl-date-manip'
+ 'perl-log-log4perl' 'perl-io-socket-inet6'
+ 'perl-file-copy-recursive' 'perl-fcgi' 'munin-node')
backup=(etc/munin/munin.conf etc/logrotate.d/munin)
install=munin.install
- cd "$srcdir/munin-$_realver"
+ cd "$srcdir/munin-$pkgver"
make DESTDIR="$pkgdir" install-master-prime
install -D -m644 ../munin-cron-entry "$pkgdir"/etc/munin/munin-cron-entry
install -D -m644 ../logrotate.munin "$pkgdir"/etc/logrotate.d/munin
+ install -D -m644 ../munin.tmpfiles.conf "$pkgdir"/usr/lib/tmpfiles.d/munin.conf
install -D -m644 ../08-munin-font-dir.conf "$pkgdir"/etc/fonts/conf.d/08-munin-font-dir.conf
- rm -rf "$pkgdir/var/run/"
+ rm -rf "$pkgdir/run"
}
package_munin-node() {
depends=('perl' 'perl-net-server')
optdepends=('perl-net-snmp: for SNMP plugins'
- 'perl-net-ssleay: for SSL/TLS support')
+ 'perl-net-ssleay: for SSL/TLS support'
+ 'python2: for some plugins'
+ 'ruby: for some plugins')
backup=(etc/munin/munin-node.conf etc/logrotate.d/munin-node)
install=munin-node.install
- cd "$srcdir/munin-$_realver"
+ cd "$srcdir/munin-$pkgver"
make DESTDIR="$pkgdir" install-common-prime install-node-prime install-plugins-prime
install -D -m755 ../munin-node.init "$pkgdir"/etc/rc.d/munin-node
install -D -m644 ../logrotate.munin-node "$pkgdir"/etc/logrotate.d/munin-node
- rm -rf "$pkgdir/var/run/"
+ install -D -m644 ../munin.tmpfiles.conf "$pkgdir"/usr/lib/tmpfiles.d/munin-node.conf
+ rm -rf "$pkgdir/run/"
}
-md5sums=('bb61f2022d215e8a3bbe4a7a4b77bc43'
- 'df9b86e3057b0f563149fe06e7f7b50a'
- '7d318c55b33680b14f236c5c06a0a64b'
- '97d787260f075c5edef898e6919ce871'
- '5dc77899bfb13bfc9df8a757b05ebbb2'
+md5sums=('55be49457b3401ecbacd1b6d815cb60d'
+ 'fb3cc403e298ae6b73c280c4d3af7b49'
+ '945e5cef165f60afa665aa325a1a03fe'
+ '07a62e9d1be8198c7eacc939270f90a8'
+ 'c2d187bac2b905ac7d659c3a10757df7'
'dc9c83aa2a278466fb475364462f4119'
- '683627bd0f0c0d1e146dde7d246b6b3c'
+ '24a5fc7192729484c5190ddd76a3e9ab'
'db77b53150a906256a71a9f539c7fac2'
'cdf139f2b6ae36852113f3411caa6e99'
+ 'd124f46e353a7966df093ba803235789'
'e33a45c3b80a83eecabbe5a9920c1eb6')
Modified: keep-defaults.patch
===================================================================
--- keep-defaults.patch 2012-07-02 00:08:48 UTC (rev 162851)
+++ keep-defaults.patch 2012-07-02 00:18:40 UTC (rev 162852)
@@ -1,16 +1,5 @@
--- munin-1.4.4/Makefile.old 2010-05-13 12:17:36.000000000 -0500
+++ munin-1.4.4/Makefile 2010-05-13 12:19:06.000000000 -0500
-@@ -225,9 +225,9 @@
-
- build-common-pre: common/Build
- cd common && $(PERL) Build code
-- rm -f common/blib/lib/Munin/Common/Defaults.pm
-
- common/blib/lib/Munin/Common/Defaults.pm: common/lib/Munin/Common/Defaults.pm build-common-pre
-+ rm -f common/blib/lib/Munin/Common/Defaults.pm
- $(PERL) -pe 's{(PREFIX \s+=\s).*}{\1q{$(PREFIX)};}x; \
- s{(CONFDIR \s+=\s).*}{\1q{$(CONFDIR)};}x; \
- s{(BINDIR \s+=\s).*}{\1q{$(BINDIR)};}x; \
@@ -383,9 +383,6 @@
build-%: %/Build
cd $* && $(PERL) Build
Modified: munin-df-linux-excludes.patch
===================================================================
--- munin-df-linux-excludes.patch 2012-07-02 00:08:48 UTC (rev 162851)
+++ munin-df-linux-excludes.patch 2012-07-02 00:18:40 UTC (rev 162852)
@@ -1,34 +1,3 @@
-Index: plugins/node.d.linux/df.in
-===================================================================
---- plugins/node.d.linux/df.in (revision 4638)
-+++ plugins/node.d.linux/df.in (working copy)
-@@ -14,7 +14,7 @@
- The plugin excludes per default the following special, read-only or
- dynamically allocating file systems from graphing:
-
-- none unknown iso9660 squashfs udf romfs ramfs
-+ none unknown iso9660 squashfs udf romfs ramfs debugfs simfs rootfs
-
- To change this set the environment variable "exclude" with a list of
- space separated fs types. The environment variables "warning" and
-@@ -24,7 +24,7 @@
- This configuration snipplet is an example with the defaults:
-
- [df]
-- env.exclude none unknown iso9660 squashfs udf romfs ramfs debugfs
-+ env.exclude none unknown iso9660 squashfs udf romfs ramfs debugfs simfs rootfs
- env.warning 92
- env.critical 98
-
-@@ -87,7 +87,7 @@
- # For these devices use the mount point, the device is useless
- my %usemntpt = ( tmpfs => 1, none => 1, udev => 1 );
-
--my $exclude = $ENV{'exclude'} || 'none unknown iso9660 squashfs udf romfs ramfs debugfs simfs';
-+my $exclude = $ENV{'exclude'} || 'none unknown iso9660 squashfs udf romfs ramfs debugfs simfs rootfs';
- my $dfopts = "-P -l ".join(' -x ',('',split('\s+',$exclude)));
-
- my $mode = ($ARGV[0] or "print");
Index: plugins/node.d.linux/df_inode.in
===================================================================
--- plugins/node.d.linux/df_inode.in (revision 4638)
Deleted: munin-lock-location.patch
===================================================================
--- munin-lock-location.patch 2012-07-02 00:08:48 UTC (rev 162851)
+++ munin-lock-location.patch 2012-07-02 00:18:40 UTC (rev 162852)
@@ -1,85 +0,0 @@
-diff -Naur munin-1.4.5-orig//common/lib/Munin/Common/Defaults.pm munin-1.4.5/common/lib/Munin/Common/Defaults.pm
---- munin-1.4.5-orig//common/lib/Munin/Common/Defaults.pm 2009-11-10 14:13:54.000000000 -0600
-+++ munin-1.4.5/common/lib/Munin/Common/Defaults.pm 2011-04-09 15:09:13.215722026 -0500
-@@ -30,6 +30,7 @@
- our $MUNIN_MANDIR = '';
- our $MUNIN_LOGDIR = "$COMPONENT_ROOT/log/";
- our $MUNIN_STATEDIR = '';
-+our $MUNIN_LOCKDIR = '';
- our $MUNIN_USER = getpwuid $UID;
- our $MUNIN_GROUP = getgrgid $GID;
- our $MUNIN_PLUGINUSER = getpwuid $UID;
-diff -Naur munin-1.4.5-orig//Makefile munin-1.4.5/Makefile
---- munin-1.4.5-orig//Makefile 2009-12-29 10:03:49.000000000 -0600
-+++ munin-1.4.5/Makefile 2011-04-09 15:20:44.201098440 -0500
-@@ -199,6 +199,7 @@
- -e 's|@@HTMLDIR@@|$(HTMLDIR)|g' \
- -e 's|@@DBDIR@@|$(DBDIR)|g' \
- -e 's|@@STATEDIR@@|$(STATEDIR)|g' \
-+ -e 's|@@LOCKDIR@@|$(LOCKDIR)|g' \
- -e 's|@@PERL@@|$(PERL)|g' \
- -e 's|@@PERLLIB@@|$(PERLLIB)|g' \
- -e 's|@@PYTHON@@|$(PYTHON)|g' \
-@@ -239,6 +240,7 @@
- s{(HTMLDIR \s+=\s).*}{\1q{$(HTMLDIR)};}x; \
- s{(DBDIR \s+=\s).*}{\1q{$(DBDIR)};}x; \
- s{(STATEDIR \s+=\s).*}{\1q{$(STATEDIR)};}x; \
-+ s{(LOCKDIR \s+=\s).*}{\1q{$(LOCKDIR)};}x; \
- s{(PERL \s+=\s).*}{\1q{$(PERL)};}x; \
- s{(PERLLIB \s+=\s).*}{\1q{$(PERLLIB)};}x; \
- s{(PYTHON \s+=\s).*}{\1q{$(PYTHON)};}x; \
-diff -Naur munin-1.4.5-orig//Makefile.config munin-1.4.5/Makefile.config
---- munin-1.4.5-orig//Makefile.config 2009-11-06 08:35:44.000000000 -0600
-+++ munin-1.4.5/Makefile.config 2011-04-09 15:11:15.669416316 -0500
-@@ -61,10 +61,13 @@
- # Where Munin should place its logs.
- LOGDIR = $(PREFIX)/log/munin
-
--# Location of PID files and other statefiles. On the server, must be
--# writable by the user "munin".
-+# Location of PID files and other statefiles.
- STATEDIR = $(DESTDIR)/var/run/munin
-
-+# Location of server lock files. On the server, must be writable by the user
-+# "munin".
-+LOCKDIR = $(DESTDIR)/var/lock/munin
-+
- # The perl interpreter to use
- PERL := $(shell which perl)
-
-diff -upr munin-1.4.5.orig/master/lib/Munin/Master/Config.pm munin-1.4.5/master/lib/Munin/Master/Config.pm
---- munin-1.4.5.orig/master/lib/Munin/Master/Config.pm 2011-06-20 12:08:45.000000000 +0300
-+++ munin-1.4.5/master/lib/Munin/Master/Config.pm 2011-06-20 12:09:29.000000000 +0300
-@@ -148,7 +148,7 @@ my %booleans = map {$_ => 1} qw(
- local_address => 0,
- logdir => $Munin::Common::Defaults::MUNIN_LOGDIR,
- max_processes => $MAXINT,
-- rundir => $Munin::Common::Defaults::MUNIN_STATEDIR,
-+ rundir => $Munin::Common::Defaults::MUNIN_LOCKDIR,
- timeout => 180,
- tls => 'disabled',
- tls_ca_certificate => "$Munin::Common::Defaults::MUNIN_CONFDIR/cacert.pem",
-diff -Naur munin-1.4.5-orig//master/lib/Munin/Master/Utils.pm munin-1.4.5/master/lib/Munin/Master/Utils.pm
---- munin-1.4.5-orig//master/lib/Munin/Master/Utils.pm 2009-12-18 00:25:03.000000000 -0600
-+++ munin-1.4.5/master/lib/Munin/Master/Utils.pm 2011-04-09 15:05:57.965152601 -0500
-@@ -270,7 +270,7 @@
-
- # Some important defaults before we return...
- $config->{'dropdownlimit'} ||= $Munin::Common::Defaults::DROPDOWNLIMIT;
-- $config->{'rundir'} ||= $Munin::Common::Defaults::MUNIN_STATEDIR;
-+ $config->{'rundir'} ||= $Munin::Common::Defaults::MUNIN_LOCKDIR;
- $config->{'dbdir'} ||= $Munin::Common::Defaults::MUNIN_DBDIR;
- $config->{'logdir'} ||= $Munin::Common::Defaults::MUNIN_LOGDIR;
- $config->{'tmpldir'} ||= "$Munin::Common::Defaults::MUNIN_CONFDIR/templates/";
-diff -Naur munin-1.4.5-orig//master/munin.conf.in munin-1.4.5/master/munin.conf.in
---- munin-1.4.5-orig//master/munin.conf.in 2009-11-23 06:26:36.000000000 -0600
-+++ munin-1.4.5/master/munin.conf.in 2011-04-09 15:18:04.650625378 -0500
-@@ -8,7 +8,7 @@
- # dbdir @@DBDIR@@
- # htmldir @@HTMLDIR@@
- # logdir @@LOGDIR@@
--# rundir @@STATEDIR@@
-+# rundir @@LOCKDIR@@
- #
- # Where to look for the HTML templates
- # tmpldir @@CONFDIR@@/templates
Modified: munin-node.init
===================================================================
--- munin-node.init 2012-07-02 00:08:48 UTC (rev 162851)
+++ munin-node.init 2012-07-02 00:18:40 UTC (rev 162852)
@@ -3,7 +3,7 @@
. /etc/rc.conf
. /etc/rc.d/functions
-PID=`pidof -o %PPID /usr/sbin/munin-node`
+PID=`pidof -o %PPID munin-node`
# set the path to prevent insecure path warnings from perl -T
PATH='/bin:/usr/bin:/sbin:/usr/sbin'
@@ -11,7 +11,7 @@
start)
stat_busy "Starting munin-node"
[ -d /var/run/munin ] || mkdir -p /var/run/munin
- /usr/sbin/munin-node >/dev/null
+ munin-node >/dev/null
stat_done
add_daemon munin-node
;;
Modified: munin-node.install
===================================================================
--- munin-node.install 2012-07-02 00:08:48 UTC (rev 162851)
+++ munin-node.install 2012-07-02 00:18:40 UTC (rev 162852)
@@ -5,13 +5,13 @@
useradd --system -c "Munin system monitor" -g munin -s /bin/false -d /var/lib/munin munin
# Do basic configuration
echo "==> Run the following to get a good set of default plugins:"
- echo " /usr/sbin/munin-node-configure --shell | sh"
+ echo " munin-node-configure --shell | sh"
post_upgrade
}
post_upgrade() {
# Ensure directories exist
- mkdir -p /var/{lib,log}/munin
+ mkdir -p /var/{lib,log}/munin /run/munin
# Fix permissions on necessary directories
- chown munin.munin -R /var/{lib,log}/munin
+ chown munin.munin -R /var/{lib,log}/munin /run/munin
}
Added: munin-use-v5-date-manip.patch
===================================================================
--- munin-use-v5-date-manip.patch (rev 0)
+++ munin-use-v5-date-manip.patch 2012-07-02 00:18:40 UTC (rev 162852)
@@ -0,0 +1,26 @@
+diff -ur munin-2.0.1.orig/master/_bin/munin-cgi-graph.in munin-2.0.1/master/_bin/munin-cgi-graph.in
+--- munin-2.0.1.orig/master/_bin/munin-cgi-graph.in 2012-06-16 11:05:43.000000000 +0000
++++ munin-2.0.1/master/_bin/munin-cgi-graph.in 2012-07-01 22:37:11.166756888 +0000
+@@ -27,6 +27,9 @@
+ use strict;
+ use warnings;
+ use IO::Handle;
++BEGIN {
++ $Date::Manip::Backend = 'DM5';
++}
+ use Date::Manip;
+ use POSIX qw(strftime locale_h);
+ use CGI::Fast qw(:cgi);
+diff -ur munin-2.0.1.orig/master/_bin/munin-graph.in munin-2.0.1/master/_bin/munin-graph.in
+--- munin-2.0.1.orig/master/_bin/munin-graph.in 2012-06-16 11:05:43.000000000 +0000
++++ munin-2.0.1/master/_bin/munin-graph.in 2012-07-01 22:37:34.549926610 +0000
+@@ -27,6 +27,9 @@
+ use strict;
+ use warnings;
+ use IO::Handle;
++BEGIN {
++ $Date::Manip::Backend = 'DM5';
++}
+ use Date::Manip;
+ use POSIX qw(strftime);
+ use Time::HiRes qw(gettimeofday tv_interval);
Modified: munin.install
===================================================================
--- munin.install 2012-07-02 00:08:48 UTC (rev 162851)
+++ munin.install 2012-07-02 00:18:40 UTC (rev 162852)
@@ -11,9 +11,9 @@
post_upgrade() {
# Ensure directories exist
- mkdir -p /var/{lib,log}/munin
+ mkdir -p /var/{lib,log}/munin /run/munin
# Fix permissions on necessary directories
- chown munin.munin -R /var/{lib,log}/munin
+ chown munin.munin -R /var/{lib,log}/munin /run/munin
fc-cache -fs
}
Added: munin.tmpfiles.conf
===================================================================
--- munin.tmpfiles.conf (rev 0)
+++ munin.tmpfiles.conf 2012-07-02 00:18:40 UTC (rev 162852)
@@ -0,0 +1 @@
+d /run/munin 0755 munin munin -
More information about the arch-commits
mailing list