[gentoo-commits] gentoo-x86 commit in net-analyzer/munin/files: munin-1.4.3-plugin-cleanup.patch munin-1.4.3-Makefile.patch munin-1.4.3-ping6_fix.patch munin-1.4.3-fw_conntrack_plugins.patch munin-1.3.2-plugin-cleanup.patch munin-1.3.2-rrdtool-comments.patch munin-1.3.3-Makefile.patch

[Jeremy Olexa (darkside)]

darkside    10/02/03 15:17:55

  Added:                munin-1.4.3-plugin-cleanup.patch
                        munin-1.4.3-Makefile.patch
                        munin-1.4.3-ping6_fix.patch
                        munin-1.4.3-fw_conntrack_plugins.patch
  Removed:              munin-1.3.2-plugin-cleanup.patch
                        munin-1.3.2-rrdtool-comments.patch
                        munin-1.3.3-Makefile.patch
  Log:
  Version bump to 1.4.3, many thanks to all the contributors on bug 300171. Include ping6 fix from bug 294722. Include QA fix for perl site-dir, bug 298528. Remove old versions and unused patches
  (Portage version: 2.1.6.13/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-analyzer/munin/files/munin-1.4.3-plugin-cleanup.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/munin/files/munin-1.4.3-plugin-cleanup.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/munin/files/munin-1.4.3-plugin-cleanup.patch?rev=1.1&content-type=text/plain

Index: munin-1.4.3-plugin-cleanup.patch
===================================================================
--- munin-1.4.3/plugins/node.d.linux/iostat_ios.in.bak	2008-04-13 15:29:37.000000000 +0100
+++ munin-1.4.3/plugins/node.d.linux/iostat_ios.in	2008-04-13 15:30:59.000000000 +0100
@@ -59,12 +59,16 @@
 
 sub filter {
     my ($major, $minor, $tmpnam) = @_;
-    return 0 if ($major ==   1); # RAM devices
-    return 0 if ($major ==   9); # MD devices
-    return 0 if ($major ==  58); # LVM devices
-    return 0 if ($major == 254); # LVM2 devices
-    return 0 if ($tmpnam =~ /part\d+$/);
-    return 0 if ($tmpnam =~ /^\s*(?:sd|hd)[a-z]\d+\s*$/);
+    if(defined($major)) {
+        return 0 if ($major ==   1); # RAM devices
+        return 0 if ($major ==   9); # MD devices
+        return 0 if ($major ==  58); # LVM devices
+        return 0 if ($major == 254); # LVM2 devices
+    }
+    if(defined($tmpnam)) {
+        return 0 if ($tmpnam =~ /part\d+$/);
+        return 0 if ($tmpnam =~ /^\s*(?:sd|hd)[a-z]\d+\s*$/);
+    }
 
     return 1;
 }



1.1                  net-analyzer/munin/files/munin-1.4.3-Makefile.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/munin/files/munin-1.4.3-Makefile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/munin/files/munin-1.4.3-Makefile.patch?rev=1.1&content-type=text/plain

Index: munin-1.4.3-Makefile.patch
===================================================================
--- munin-1.4.3/Makefile.config.org	2009-12-30 13:55:56.000000000 +0100
+++ munin-1.4.3/Makefile.config	2010-01-18 19:34:37.000000000 +0100
@@ -17,10 +17,10 @@
 #
 # the base of the Munin installation.
 # 
-PREFIX     = $(DESTDIR)/opt/munin
+PREFIX     = $(DESTDIR)/usr
 
 # Where Munin keeps its configurations (server.conf, client.conf, ++)
-CONFDIR    = $(DESTDIR)/etc/opt/munin
+CONFDIR    = $(DESTDIR)/etc/munin
 
 # Server only - where to put munin-cron
 BINDIR     = $(PREFIX)/bin
@@ -29,37 +29,37 @@
 SBINDIR    = $(PREFIX)/sbin
 
 # Where to put text and html documentation
-DOCDIR     = $(PREFIX)/doc
+DOCDIR     = $(PREFIX)/share/doc/munin-$(VERSION)
 
 # Where to put man pages
-MANDIR     = $(PREFIX)/man
+MANDIR     = $(PREFIX)/share/man
 
 # Where to put internal binaries and plugin repository
-LIBDIR     = $(PREFIX)/lib
+LIBDIR     = $(PREFIX)/libexec/munin
 
 # Server only - Output directory
-HTMLDIR    = $(PREFIX)/www/docs
-CGIDIR     = $(PREFIX)/www/cgi
+HTMLDIR    = $(PREFIX)/var/www/localhost/htdocs/munin
+CGIDIR     = $(PREFIX)/var/www/localhost/cgi-bin
 
 # 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.
 
-SSPOOLDIR  = $(PREFIX)/spool
+SSPOOLDIR  = $(DESTDIR)/var/run/munin/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/opt/munin
+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     = $(PREFIX)/log/munin
+LOGDIR     = $(DESTDIR)/var/log/munin
 
 # Location of PID files and other statefiles. On the server, must be
 # writable by the user "munin".
@@ -98,11 +98,11 @@
 BASH       := /bin/bash
 
 # Server only - Where to install the perl libraries
-PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2)
+PERLSITELIB := $(shell $(PERL) -V:vendorlib | cut -d"'" -f2)
 PERLLIB    = $(DESTDIR)$(PERLSITELIB)
 
 # Client only - Install plugins for this architecture
-OSTYPE     := $(shell uname | tr '[A-Z]' '[a-z]')
+OSTYPE     := $(shell uname | LANG=C tr '[A-Z]' '[a-z]')
 
 # How to figure out the hostname. (Only used in default configuration
 # files)



1.1                  net-analyzer/munin/files/munin-1.4.3-ping6_fix.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/munin/files/munin-1.4.3-ping6_fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/munin/files/munin-1.4.3-ping6_fix.patch?rev=1.1&content-type=text/plain

Index: munin-1.4.3-ping6_fix.patch
===================================================================
Upstream report: http://munin.projects.linpro.no/ticket/854
Downstream report: https://bugs.gentoo.org/show_bug.cgi?id=294722
--- munin-1.4.3/plugins/node.d/ping_.in.orig	2009-11-26 15:47:44.283833343 +0100
+++ munin-1.4.3/plugins/node.d/ping_.in	2009-11-26 13:09:28.648828197 +0100
@@ -71,5 +71,5 @@
 fi
 
 
-${ping:-ping} ${ping_args:-'-c 2'} ${host} ${ping_args2} | perl -n -e 'print "ping.value ", $1 / 1000, "\n" if m@min/avg/max.*\s\d+(?:\.\d+)?/(\d+(?:\.\d+)?)/\d+(?:\.\d+)?@; print "packetloss.value $1\n" if /(\d+)% packet loss/;'
+${PING:-ping} ${ping_args:-'-c 2'} ${host} ${ping_args2} | perl -n -e 'print "ping.value ", $1 / 1000, "\n" if m@min/avg/max.*\s\d+(?:\.\d+)?/(\d+(?:\.\d+)?)/\d+(?:\.\d+)?@; print "packetloss.value $1\n" if /(\d+)% packet loss/;'
 



1.1                  net-analyzer/munin/files/munin-1.4.3-fw_conntrack_plugins.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/munin/files/munin-1.4.3-fw_conntrack_plugins.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/munin/files/munin-1.4.3-fw_conntrack_plugins.patch?rev=1.1&content-type=text/plain

Index: munin-1.4.3-fw_conntrack_plugins.patch
===================================================================
--- plugins/node.d.linux/fw_forwarded_local.in.bak	2010-01-08 11:23:26.000000000 -0800
+++ plugins/node.d.linux/fw_forwarded_local.in	2010-01-08 11:24:24.000000000 -0800
@@ -32,7 +32,7 @@
 =cut
 
 if [ "$1" = "autoconf" ]; then
-	if [ -r /proc/net/ip_conntrack ]
+	if [ -r /proc/net/ip_conntrack -o -r /proc/net/nf_conntrack ]
 	then
 		echo yes
 	else
@@ -53,6 +53,13 @@
 	exit 0
 fi
 
+if [ -r /proc/net/ip_conntrack ]; then
+	_conntrack_file=/proc/net/ip_conntrack
+else
+	_conntrack_file=/proc/net/nf_conntrack
+fi
+
+
 perl -ne '
     BEGIN { $forward=0; $local=0; }
 
@@ -65,5 +72,5 @@
        }
     }
     END { print "forward.value $forward\nlocal.value $local\n" }
-' </proc/net/ip_conntrack
+' <_conntrack_file