[arch-commits] Commit in munin/trunk (5 files)
Dan McGee
dan at archlinux.org
Tue Aug 21 14:04:40 UTC 2012
Date: Tuesday, August 21, 2012 @ 10:04:40
Author: dan
Revision: 165499
upgpkg: munin 2.0.4-1
Modified:
munin/trunk/PKGBUILD
munin/trunk/logrotate.munin
Deleted:
munin/trunk/keep-defaults.patch
munin/trunk/munin-df-linux-excludes.patch
munin/trunk/munin-use-v5-date-manip.patch
-------------------------------+
PKGBUILD | 18 ++++--------------
keep-defaults.patch | 12 ------------
logrotate.munin | 2 +-
munin-df-linux-excludes.patch | 31 -------------------------------
munin-use-v5-date-manip.patch | 26 --------------------------
5 files changed, 5 insertions(+), 84 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-08-21 12:14:05 UTC (rev 165498)
+++ PKGBUILD 2012-08-21 14:04:40 UTC (rev 165499)
@@ -4,7 +4,7 @@
pkgname=('munin' 'munin-node')
pkgbase=munin
-pkgver=2.0.1
+pkgver=2.0.4
pkgrel=1
pkgdesc="A distributed monitoring/graphing tool"
arch=('any')
@@ -12,13 +12,10 @@
license=("GPL")
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-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-df-linux-excludes.patch
- munin-use-v5-date-manip.patch
munin-cron-entry
munin-node.init
logrotate.munin
@@ -28,10 +25,6 @@
build() {
cd "$srcdir/munin-$pkgver"
- # This build is beyond fucked, also need to report this upstream
- patch -Np1 < ../keep-defaults.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
@@ -73,14 +66,11 @@
rm -rf "$pkgdir/run/"
}
-md5sums=('55be49457b3401ecbacd1b6d815cb60d'
+md5sums=('5efd93a070159f4554242a0ba38eb0b1'
'fb3cc403e298ae6b73c280c4d3af7b49'
- '945e5cef165f60afa665aa325a1a03fe'
- '07a62e9d1be8198c7eacc939270f90a8'
- 'c2d187bac2b905ac7d659c3a10757df7'
'dc9c83aa2a278466fb475364462f4119'
'24a5fc7192729484c5190ddd76a3e9ab'
- 'db77b53150a906256a71a9f539c7fac2'
+ 'eb2f1e6e746e85ce1e91111f40086be0'
'cdf139f2b6ae36852113f3411caa6e99'
'd124f46e353a7966df093ba803235789'
'e33a45c3b80a83eecabbe5a9920c1eb6')
Deleted: keep-defaults.patch
===================================================================
--- keep-defaults.patch 2012-08-21 12:14:05 UTC (rev 165498)
+++ keep-defaults.patch 2012-08-21 14:04:40 UTC (rev 165499)
@@ -1,12 +0,0 @@
---- 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
-@@ -383,9 +383,6 @@
- build-%: %/Build
- cd $* && $(PERL) Build
-
--build-common: common/Build
-- cd common && $(PERL) Build && rm -f common/blib/lib/Munin/Common/Defaults.pm && true
--
-
- # BUG: the Build script writes files under PWD when it does "install"
- # can't seem to find a way to persuade it to write otherwhere.
Modified: logrotate.munin
===================================================================
--- logrotate.munin 2012-08-21 12:14:05 UTC (rev 165498)
+++ logrotate.munin 2012-08-21 14:04:40 UTC (rev 165499)
@@ -1,4 +1,4 @@
-/var/log/munin/munin-graph.log /var/log/munin/munin-html.log /var/log/munin/munin-limits.log /var/log/munin/munin-update.log {
+/var/log/munin/munin-graph.log /var/log/munin/munin-cgi-graph.log /var/log/munin/munin-html.log /var/log/munin/munin-limits.log /var/log/munin/munin-update.log {
copytruncate
missingok
}
Deleted: munin-df-linux-excludes.patch
===================================================================
--- munin-df-linux-excludes.patch 2012-08-21 12:14:05 UTC (rev 165498)
+++ munin-df-linux-excludes.patch 2012-08-21 14:04:40 UTC (rev 165499)
@@ -1,31 +0,0 @@
-Index: plugins/node.d.linux/df_inode.in
-===================================================================
---- plugins/node.d.linux/df_inode.in (revision 4638)
-+++ plugins/node.d.linux/df_inode.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 vfat debugfs simfs nilfs2 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_inode]
-- env.exclude none unknown iso9660 squashfs udf romfs ramfs debugfs
-+ env.exclude none unknown iso9660 squashfs udf romfs ramfs vfat debugfs simfs nilfs2 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 vfat debugfs simfs';
-+my $exclude = $ENV{'exclude'} || 'none unknown iso9660 squashfs udf romfs ramfs vfat debugfs simfs nilfs2 rootfs';
- my $dfopts = "-P -l -i ".join(' -x ',('',split('\s+',$exclude)));
-
- my $mode = ($ARGV[0] or "print");
Deleted: munin-use-v5-date-manip.patch
===================================================================
--- munin-use-v5-date-manip.patch 2012-08-21 12:14:05 UTC (rev 165498)
+++ munin-use-v5-date-manip.patch 2012-08-21 14:04:40 UTC (rev 165499)
@@ -1,26 +0,0 @@
-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);
More information about the arch-commits
mailing list