[gentoo-commits] gentoo-x86 commit in net-analyzer/munin/files: munin-1.3.3-fw_conntrack_plugins.patch munin-1.3.4-plugin-cleanup.patch munin-1.3.4-Makefile.patch

[Robin H. Johnson (robbat2)]

robbat2     08/05/31 21:10:41

  Added:                munin-1.3.3-fw_conntrack_plugins.patch
                        munin-1.3.4-plugin-cleanup.patch
                        munin-1.3.4-Makefile.patch
  Log:
  Bug #214152, version bump. Includes fw_conntrack fixes per bug 195964.
  (Portage version: 2.1.5.2)

Revision  Changes    Path
1.1                  net-analyzer/munin/files/munin-1.3.3-fw_conntrack_plugins.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/munin/files/munin-1.3.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.3.3-fw_conntrack_plugins.patch?rev=1.1&content-type=text/plain

Index: munin-1.3.3-fw_conntrack_plugins.patch
===================================================================
From: Krzysztof Kozlowski <krzysztof.kozlowski@×××××××××.pl>
Subject: Conntrack fixes for new 2.6 kernels
URL: http://bugs.gentoo.org/show_bug.cgi?id=195964
Gentoo-bug-id: 195964
Signed-off-by: Robin H. Johnson <robbat2@g.o>

--- node/node.d.linux/fw_conntrack.in.old	2007-10-15 18:26:54.000000000 +0200
+++ node/node.d.linux/fw_conntrack.in	2007-10-15 18:30:28.000000000 +0200
@@ -78,7 +78,7 @@
         exit 0
 	;;
     autoconf)
-        if [ -f /proc/net/ip_conntrack ] ; then
+        if [ -f /proc/net/ip_conntrack -o -f /proc/net/nf_conntrack ] ; then
 	    echo yes
 	    exit 0
 	else
@@ -89,14 +89,17 @@
 
 # Do the work, perform the deed
 
-# INPUT:
+# INPUT /proc/net/ip_conntrack:
 # tcp      6 225790 ESTABLISHED src=10.0.0.4 dst=198.144.194.12 sport=48580 dport=6667 src=198.144.194.12 dst=80.111.68.163 sport=6667 dport=48580 [ASSURED] use=1
 # tcp      6 431918 ESTABLISHED src=10.0.0.2 dst=209.58.150.153 sport=33018 dport=6667 src=209.58.150.153 dst=80.111.68.163 sport=6667 dport=33018 [ASSURED] use=1
 # tcp      6 123109 ESTABLISHED src=10.0.0.5 dst=198.144.194.12 sport=33846 dport=6667 [UNREPLIED] src=198.144.194.12 dst=80.111.68.163 sport=6667 dport=33846 use=1
 # udp      17 53 src=80.111.68.163 dst=62.179.100.29 sport=34153 dport=53 src=62.179.100.29 dst=80.111.68.163 sport=53 dport=34153 [ASSURED] use=1
 #
+# INPUT /proc/net/nf_conntrack:
+# ipv4     2 tcp      6 424416 ESTABLISHED src=192.168.1.53 dst=196.203.198.11 sport=1584 dport=22146 packets=13659 bytes=5426603 src=196.203.198.11 dst=83.24.222.252 sport=22146 dport=1584 packets=14757 bytes=15342572 [ASSURED] mark=0 use=1
 
-cat /proc/net/ip_conntrack | awk '
+if [ -f /proc/net/ip_conntrack ]; then
+  cat /proc/net/ip_conntrack | awk '
   BEGIN  { STATE["ESTABLISHED"]=STATE["FIN_WAIT"]=STATE["TIME_WAIT"]=0;
 	   ASSURED=NOREPLY=NATED=STATE["SYN_SENT"]=STATE["UDP"]=0; }
   /^tcp/ { STATE[$4]++; }
@@ -117,6 +120,29 @@
 	   print "nated.value " NATED;
 	   print "total.value " TOTAL;
 	 }'
+else
+  cat /proc/net/nf_conntrack | awk '
+  BEGIN  { STATE["ESTABLISHED"]=STATE["FIN_WAIT"]=STATE["TIME_WAIT"]=0;
+	   ASSURED=NOREPLY=NATED=STATE["SYN_SENT"]=STATE["UDP"]=0; }
+  / tcp / { STATE[$6]++; }
+  / udp / { STATE["UDP"]++; }
+  /ASSURED/ { ASSURED++; }
+  {
+      TOTAL++;
+      src1 = substr($7, 5); src2 = substr($14, 5);
+      dst1 = substr($8, 5); dst2 = substr($15, 5);
+      if (src1 != dst2 || dst1 != src2) NATED++;
+  }
+  END    { print "established.value " STATE["ESTABLISHED"];
+           print "fin_wait.value " STATE["FIN_WAIT"];
+	   print "time_wait.value " STATE["TIME_WAIT"];
+	   print "syn_sent.value " STATE["SYN_SENT"];
+	   print "udp.value " STATE["UDP"];
+	   print "assured.value " ASSURED;
+	   print "nated.value " NATED;
+	   print "total.value " TOTAL;
+	 }'
+fi
 
 # Hum, the total.value should be possible to do as a cdef.
 
--- node/node.d.linux/fw_forwarded_local.in.old	2007-10-15 18:53:37.000000000 +0200
+++ node/node.d.linux/fw_forwarded_local.in	2007-10-15 18:57:26.000000000 +0200
@@ -22,13 +22,13 @@
 
 
 if [ "$1" = "autoconf" ]; then
-	if ( cat /proc/net/ip_conntrack 2>/dev/null >/dev/null ); then
+	if [ -f /proc/net/ip_conntrack -o -f /proc/net/nf_conntrack ] ; then
 		echo yes
 		exit 0
 	else
 		if [ $? -eq 127 ]
 		then
-			echo "no (ipconntrack not found)"
+			echo "no (ip_conntrack or nf_conntrack not found)"
 			exit 1
 		else
 			echo no
@@ -50,6 +50,11 @@
 	exit 0
 fi
 
+if [ -f /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; }
 
@@ -62,5 +67,5 @@
        }
     }
     END { print "forward.value $forward\nlocal.value $local\n" }
-' </proc/net/ip_conntrack
+' < $_conntrack_file
 



1.1                  net-analyzer/munin/files/munin-1.3.4-plugin-cleanup.patch

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

Index: munin-1.3.4-plugin-cleanup.patch
===================================================================
--- munin-1.3.4/node/node.d.linux/iostat_ios.in.bak	2008-04-13 15:29:37.000000000 +0100
+++ munin-1.3.4/node/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.3.4-Makefile.patch

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

Index: munin-1.3.4-Makefile.patch
===================================================================
--- munin-1.3.3.orig/Makefile.config	2006-11-10 04:39:31.000000000 -0800
+++ munin-1.3.3/Makefile.config	2007-02-25 02:08:46.000000000 -0800
@@ -9,10 +9,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
@@ -21,31 +21,31 @@
 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)/var/www
-CGIDIR     = $(HTMLDIR)/cgi
+HTMLDIR    = $(DESTDIR)/var/www/localhost/htdocs/munin
+CGIDIR     = $(DESTDIR)/var/www/localhost/cgi-bin
 
 # 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     = $(DESTDIR)/var/log/munin
+LOGDIR     = $(DESTDIR)/var/log/munin
 
 # Location of PID files and other statefiles. On the server, must be
 # writable by the user "munin".
-STATEDIR   = $(DESTDIR)/var/run/munin
+STATEDIR   = $(DESTDIR)/var/run/munin
 
 # The perl interpreter to use
 PERL       = $(shell which perl)
@@ -67,10 +67,11 @@
 BASH       = /bin/bash
 
 # Server only - Where to install the perl libraries
-PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2)
+PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2)
 
 # Client only - Install plugins for this architecture
-OSTYPE     = $(shell uname | tr '[A-Z]' '[a-z]')
+# LANG=C is because some locales are a bit different in their alphabet (eg ee_EE).
+OSTYPE     = $(shell uname | LANG=C tr '[A-Z]' '[a-z]')
 
 # How to figure out the hostname. (Only used in default configuration
 # files)



-- 
gentoo-commits@l.g.o mailing list