From 7fb13ff7d87a38e0a54b638ae212bfb640a0ec26 Mon Sep 17 00:00:00 2001 From: Jeremy Olexa Date: Fri, 15 Oct 2010 16:16:54 +0000 Subject: remove old versions (Portage version: 2.1.9.12/cvs/Linux x86_64) --- net-analyzer/munin/ChangeLog | 18 ++- net-analyzer/munin/files/munin-1.3.2-plugins.conf | 68 ---------- .../files/munin-1.3.3-fw_conntrack_plugins.patch | 104 --------------- .../munin/files/munin-1.3.4-Makefile.patch | 69 ---------- .../files/munin-1.3.4-no-html-if-no-input.patch | 19 --- .../files/munin-1.3.4-parallel-make-fix.patch | 23 ---- .../munin/files/munin-1.3.4-plugin-cleanup.patch | 25 ---- .../munin/files/munin-1.3.4-rrdtool-1.3.patch | 45 ------- .../munin/files/munin-1.3.4-samba-plugin.patch | 16 --- .../files/munin-1.3.4-terser-munin-graph.patch | 18 --- .../munin/files/munin-1.4.3-Makefile.patch | 75 ----------- .../files/munin-1.4.3-fw_conntrack_plugins.patch | 32 ----- .../munin/files/munin-1.4.3-ping6_fix.patch | 11 -- .../munin/files/munin-1.4.3-plugin-cleanup.patch | 25 ---- net-analyzer/munin/files/munin-init.d | 26 ---- net-analyzer/munin/munin-1.3.4-r2.ebuild | 144 --------------------- 16 files changed, 17 insertions(+), 701 deletions(-) delete mode 100644 net-analyzer/munin/files/munin-1.3.2-plugins.conf delete mode 100644 net-analyzer/munin/files/munin-1.3.3-fw_conntrack_plugins.patch delete mode 100644 net-analyzer/munin/files/munin-1.3.4-Makefile.patch delete mode 100644 net-analyzer/munin/files/munin-1.3.4-no-html-if-no-input.patch delete mode 100644 net-analyzer/munin/files/munin-1.3.4-parallel-make-fix.patch delete mode 100644 net-analyzer/munin/files/munin-1.3.4-plugin-cleanup.patch delete mode 100644 net-analyzer/munin/files/munin-1.3.4-rrdtool-1.3.patch delete mode 100644 net-analyzer/munin/files/munin-1.3.4-samba-plugin.patch delete mode 100644 net-analyzer/munin/files/munin-1.3.4-terser-munin-graph.patch delete mode 100644 net-analyzer/munin/files/munin-1.4.3-Makefile.patch delete mode 100644 net-analyzer/munin/files/munin-1.4.3-fw_conntrack_plugins.patch delete mode 100644 net-analyzer/munin/files/munin-1.4.3-ping6_fix.patch delete mode 100644 net-analyzer/munin/files/munin-1.4.3-plugin-cleanup.patch delete mode 100644 net-analyzer/munin/files/munin-init.d delete mode 100644 net-analyzer/munin/munin-1.3.4-r2.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog index 6e404638f7e5..86882f92ce46 100644 --- a/net-analyzer/munin/ChangeLog +++ b/net-analyzer/munin/ChangeLog @@ -1,6 +1,22 @@ # ChangeLog for net-analyzer/munin # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.45 2010/10/12 15:48:43 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.46 2010/10/15 16:16:54 darkside Exp $ + + 15 Oct 2010; Jeremy Olexa + -files/munin-1.3.2-plugins.conf, + -files/munin-1.3.3-fw_conntrack_plugins.patch, -munin-1.3.4-r2.ebuild, + -files/munin-1.3.4-Makefile.patch, + -files/munin-1.3.4-no-html-if-no-input.patch, + -files/munin-1.3.4-parallel-make-fix.patch, + -files/munin-1.3.4-plugin-cleanup.patch, + -files/munin-1.3.4-rrdtool-1.3.patch, + -files/munin-1.3.4-samba-plugin.patch, + -files/munin-1.3.4-terser-munin-graph.patch, + -files/munin-1.4.3-Makefile.patch, + -files/munin-1.4.3-fw_conntrack_plugins.patch, + -files/munin-1.4.3-ping6_fix.patch, + -files/munin-1.4.3-plugin-cleanup.patch, -files/munin-init.d: + remove old versions 12 Oct 2010; Raúl Porcel munin-1.4.5.ebuild: sparc stable wrt #327501 diff --git a/net-analyzer/munin/files/munin-1.3.2-plugins.conf b/net-analyzer/munin/files/munin-1.3.2-plugins.conf deleted file mode 100644 index c988c5b63cbe..000000000000 --- a/net-analyzer/munin/files/munin-1.3.2-plugins.conf +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-1.3.2-plugins.conf,v 1.3 2009/08/26 23:47:01 robbat2 Exp $ -# -# This file contains configuration options for the plugins. Three -# options are understood by munin-node itself: -# -# user # Set the user to run the plugin as -# group # Set the group to run the plugin as -# command # Run instead of the plugin. %c -# expands to what would normally be run. -# env. # Sets in the plugin's environment, see the -# individual plugins to find out which variables they -# care about. -# -# - -[smart_*] -user root -group disk - -# Example for a 3ware 8000-series card, with 2 disks -# use /dev/twe0 as the actual device -# and replicate this entry for each drive, increasing the number in -d -#[smart_3ware-0_twe0] -#user root -#group root -#env.smartargs -H -i -c -l error -l selftest -l selective -a -d 3ware,0 -#[smart_3ware-1_twe0] -#user root -#group root -#env.smartargs -H -i -c -l error -l selftest -l selective -a -d 3ware,1 - -[bind9*] -user root - -[iostat*] -user munin -group munin - -[iostat_ios] -user root -group disk - -[vlan*] -user root - -[postfix*] -user root -env.logfile maillog - -[sendmail*] -env.mspqueue /var/spool/clientmqueue - -[mysql*] -#env.mysqlopts -u someuser - -[exim*] -group mail - -[cps*] -user root - -# More 3ware examples -#[hddtemp_smartctl] -#env.drives twe0_0 twe0_1 hda -#env.type_twe0_0 3ware,0 -#env.type_twe0_1 3ware,1 diff --git a/net-analyzer/munin/files/munin-1.3.3-fw_conntrack_plugins.patch b/net-analyzer/munin/files/munin-1.3.3-fw_conntrack_plugins.patch deleted file mode 100644 index 5d77c508efaf..000000000000 --- a/net-analyzer/munin/files/munin-1.3.3-fw_conntrack_plugins.patch +++ /dev/null @@ -1,104 +0,0 @@ -From: Krzysztof Kozlowski -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 - ---- 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" } --' - -diff -Nuar munin-1.3.4.orig/server/munin-html.in munin-1.3.4/server/munin-html.in ---- munin-1.3.4.orig/server/munin-html.in 2008-03-07 17:42:40.000000000 -0800 -+++ munin-1.3.4/server/munin-html.in 2008-06-09 14:30:23.000000000 -0700 -@@ -154,6 +154,10 @@ - $groups = $groups->{"groups"}; # root->groups - } - -+if(scalar(keys(%$groups)) == 0) { -+ die "No data available from munin-update yet"; -+} -+ - # Draw main index - my $template = HTML::Template->new(filename => "$config->{tmpldir}/munin-overview.tmpl", - die_on_bad_params => 0, diff --git a/net-analyzer/munin/files/munin-1.3.4-parallel-make-fix.patch b/net-analyzer/munin/files/munin-1.3.4-parallel-make-fix.patch deleted file mode 100644 index 539885fa7bd5..000000000000 --- a/net-analyzer/munin/files/munin-1.3.4-parallel-make-fix.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Nuar munin-1.3.4.orig/Makefile munin-1.3.4/Makefile ---- munin-1.3.4.orig/Makefile 2008-03-08 06:50:16.000000000 +0000 -+++ munin-1.3.4/Makefile 2009-08-26 23:22:44.819138158 +0000 -@@ -104,9 +104,11 @@ - echo Undone. - - install-node-snmp: build -+ mkdir -p $(SBINDIR) - $(INSTALL) -m 0755 build/node/munin-node-configure-snmp $(SBINDIR)/ - - install-munindoc: build -+ mkdir -p $(BINDIR) - $(INSTALL) -m 0755 build/node/munindoc $(BINDIR)/ - - uninstall-node-snmp: build -@@ -149,6 +151,7 @@ - - # Some HP-UX plugins needs *.adv support files in LIBDIR - install-node-plugins: build $(PLUGINS) Makefile Makefile.config -+ mkdir -p $(LIBDIR)/plugins/ - for p in build/node/node.d/* build/node/node.d.$(OSTYPE)/* ; do \ - if test -f "$$p" ; then \ - family=`sed -n 's/^#%# family=\(.*\)$$/\1/p' $$p`; \ diff --git a/net-analyzer/munin/files/munin-1.3.4-plugin-cleanup.patch b/net-analyzer/munin/files/munin-1.3.4-plugin-cleanup.patch deleted file mode 100644 index ddeb90da8ebe..000000000000 --- a/net-analyzer/munin/files/munin-1.3.4-plugin-cleanup.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- 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; - } diff --git a/net-analyzer/munin/files/munin-1.3.4-rrdtool-1.3.patch b/net-analyzer/munin/files/munin-1.3.4-rrdtool-1.3.patch deleted file mode 100644 index 7dcf6c0f336e..000000000000 --- a/net-analyzer/munin/files/munin-1.3.4-rrdtool-1.3.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- server/munin-graph.in.orig 2009-08-10 22:11:39.509065533 +0200 -+++ server/munin-graph.in 2009-08-10 22:14:47.181388829 +0200 -@@ -29,6 +29,7 @@ - use Digest::MD5; - use Getopt::Long; - use Time::HiRes; -+if ($RRDs::VERSION >= 1.3) { use Encode; } - - my $graph_time= Time::HiRes::time; - my $DEBUG = 0; -@@ -826,8 +827,16 @@ - - my @complete = (); - if ($RRDkludge) { -- push (@complete, -- '--font' ,'LEGEND:7:@@LIBDIR@@/VeraMono.ttf', -+ # since rrdtool 1.3 with libpango the LEGEND column alignment -+ # only works with monospace fonts -+ if ( $RRDs::VERSION >= 1.3 ) { -+ push (@complete, -+ '--font' ,'LEGEND:7:monospace'); -+ } else { -+ push (@complete, -+ '--font' ,'LEGEND:7:@@LIBDIR@@/VeraMono.ttf'); -+ } -+ push (@complete, - '--font' ,'UNIT:7:@@LIBDIR@@/VeraMono.ttf', - '--font' ,'AXIS:7:@@LIBDIR@@/VeraMono.ttf'); - } -@@ -852,6 +861,15 @@ - print "\n\nrrdtool \"graph\" \"", - join ("\"\n\t\"",@complete), "\"\n" if $DEBUG; - -+ # Since version 1.3 rrdtool uses libpango which needs its input -+ # as utf8 string. So we assume that every input is in latin1 -+ # and decode it to perl's internal representation and then to utf8. -+ if ( $RRDs::VERSION >= 1.3 ) { -+ @complete = map { -+ $_ = encode("utf8", (decode("latin1", $_))); -+ } @complete; -+ } -+ - # Make sure directory exists - munin_mkdir_p ($picdirname, 0777); - diff --git a/net-analyzer/munin/files/munin-1.3.4-samba-plugin.patch b/net-analyzer/munin/files/munin-1.3.4-samba-plugin.patch deleted file mode 100644 index 185b20e83f4a..000000000000 --- a/net-analyzer/munin/files/munin-1.3.4-samba-plugin.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- node/node.d/samba.in.old 2008-11-25 15:08:27.000000000 +0100 -+++ node/node.d/samba.in 2008-11-25 15:09:45.000000000 +0100 -@@ -41,8 +41,11 @@ - echo 'proc.label processes' - echo 'lock.label locked files' - echo 'share.label Open shares' -- echo 'max.warning 900' -- echo 'max.critical 960' -+ # Bug - we do not have a 'max' value! -+ # samba;max;unknown Value is unknown. -+ # samba;max;state unknown -+ #echo 'max.warning 900' -+ #echo 'max.critical 960' - exit 0 - fi - diff --git a/net-analyzer/munin/files/munin-1.3.4-terser-munin-graph.patch b/net-analyzer/munin/files/munin-1.3.4-terser-munin-graph.patch deleted file mode 100644 index 694fc12cd413..000000000000 --- a/net-analyzer/munin/files/munin-1.3.4-terser-munin-graph.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Nuar munin-1.3.4.orig/server/munin-graph.in munin-1.3.4/server/munin-graph.in ---- munin-1.3.4.orig/server/munin-graph.in 2009-08-26 23:10:11.942546516 +0000 -+++ munin-1.3.4/server/munin-graph.in 2009-08-26 23:37:53.639047143 +0000 -@@ -476,12 +476,12 @@ - my $graphable = munin_get ($service, "graphable", 0);; - if (!$graphable) { - foreach my $field (@{munin_get_field_order ($service)}) { -- logger ("DEBUG: single_value: Checking field \"$field\"."); -+ logger ("DEBUG: single_value: Checking field \"$field\".") if $DEBUG; - $graphable++ if munin_draw_field ($service->{$field}); - } - munin_set_var_loc ($service, ["graphable"], $graphable); - } -- logger ("Debug: service ". join (' :: ', @{munin_get_node_loc ($service)}) ." has $graphable elements."); -+ logger ("Debug: service ". join (' :: ', @{munin_get_node_loc ($service)}) ." has $graphable elements.") if $DEBUG; - return ($graphable == 1); - } - diff --git a/net-analyzer/munin/files/munin-1.4.3-Makefile.patch b/net-analyzer/munin/files/munin-1.4.3-Makefile.patch deleted file mode 100644 index 7d8cdf0917d6..000000000000 --- a/net-analyzer/munin/files/munin-1.4.3-Makefile.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- 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) diff --git a/net-analyzer/munin/files/munin-1.4.3-fw_conntrack_plugins.patch b/net-analyzer/munin/files/munin-1.4.3-fw_conntrack_plugins.patch deleted file mode 100644 index 8161cd64174f..000000000000 --- a/net-analyzer/munin/files/munin-1.4.3-fw_conntrack_plugins.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- 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" } --' > ${S}/build/node/munin-node.conf \ - || die "Fixing munin-node.conf Failed!" - echo "tls disabled" >> ${S}/build/server/munin.conf \ - || die "Fixing munin.conf Failed!" - fi - -} - -src_install() { - local dirs - dirs="/var/log/munin/ /var/lib/munin/" - dirs="${dirs} /var/lib/munin/plugin-state/" - dirs="${dirs} /var/run/munin/plugin-state/" - dirs="${dirs} /etc/munin/plugin-conf.d/" - dirs="${dirs} /etc/munin/plugins/" - keepdir ${dirs} - - emake DESTDIR="${D}" install-main install-man install-node install-node-plugins || die "install failed" - fowners munin:munin ${dirs} - - insinto /etc/munin/plugin-conf.d/ - newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node - - # make sure we've got everything in the correct directory - insinto /var/lib/munin - newins "${FILESDIR}"/${PN}-1.3.3-crontab crontab - newinitd "${FILESDIR}"/munin-node_init.d_1.3.3-r1 munin-node - newconfd "${FILESDIR}"/munin-node_conf.d_1.3.3-r1 munin-node - dodoc README ChangeLog INSTALL logo.eps logo.svg build/resources/apache* - - # bug 254968 - insinto /etc/logrotate.d/ - newins "${FILESDIR}"/logrotate.d-munin munin -} - -pkg_config() { - einfo "Press enter to install the default crontab for the munin master" - einfo "installation from /var/lib/munin/crontab" - einfo "If you have a large site, you may wish to customize it." - read - # dcron is very fussy about syntax - # the following is the only form that works in BOTH dcron and vixie-cron - crontab - -u munin