diff options
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/munin-main/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/munin-main/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/munin-main/files/patch-munin-limits.in | 35 | ||||
| -rw-r--r-- | sysutils/munin-master/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/munin-master/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/munin-master/files/patch-munin-limits.in | 35 |
6 files changed, 6 insertions, 76 deletions
diff --git a/sysutils/munin-main/Makefile b/sysutils/munin-main/Makefile index 1381b05fb39d..987ec943b7dc 100644 --- a/sysutils/munin-main/Makefile +++ b/sysutils/munin-main/Makefile @@ -6,7 +6,7 @@ # PORTNAME= munin -PORTVERSION= 1.2.0 +PORTVERSION= 1.2.2 CATEGORIES= sysutils perl5 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= munin diff --git a/sysutils/munin-main/distinfo b/sysutils/munin-main/distinfo index e486eb6b0c23..adf9dc7da3f2 100644 --- a/sysutils/munin-main/distinfo +++ b/sysutils/munin-main/distinfo @@ -1,2 +1,2 @@ -MD5 (munin_1.2.0.tar.gz) = bbab7bf91ac837e4c72889aaef7cf2e8 -SIZE (munin_1.2.0.tar.gz) = 318364 +MD5 (munin_1.2.2.tar.gz) = e55ff3cc8d506558f32598f639952cca +SIZE (munin_1.2.2.tar.gz) = 325356 diff --git a/sysutils/munin-main/files/patch-munin-limits.in b/sysutils/munin-main/files/patch-munin-limits.in deleted file mode 100644 index 7fc5202675d3..000000000000 --- a/sysutils/munin-main/files/patch-munin-limits.in +++ /dev/null @@ -1,35 +0,0 @@ ---- munin-1.2.0.orig/server/munin-limits.in Wed Feb 16 21:03:31 2005 -+++ munin-1.2.0/server/munin-limits.in Wed Feb 23 09:06:26 2005 -@@ -18,6 +18,12 @@ - # - # - # $Log: munin-limits.in,v $ -+# Revision 1.24.2.4 2005/02/19 16:06:14 ilmari -+# Place the munin-limits lock file in rundir, not dbdir. -+# -+# Revision 1.24.2.3 2005/02/19 16:04:03 ilmari -+# Fix the file vs. pipe check in munin-limits -+# - # Revision 1.24.2.2 2005/02/16 20:03:31 jimmyo - # yet another rewrite of munin-limits open call (SF#1115434). - # -@@ -179,8 +185,8 @@ - my $modified=0; - - logger("Starting munin-limits, checking lock"); --munin_runlock("$config->{dbdir}/munin-limits.lock"); --logger("Created lock: $config->{dbdir}/munin-limits.lock"); -+munin_runlock("$config->{rundir}/munin-limits.lock"); -+logger("Created lock: $config->{rundir}/munin-limits.lock"); - - if (!defined $config->{'contact'}->{'nagios'}->{'command'} and - defined $config->{'nsca'}) -@@ -458,7 +464,7 @@ - unshift (@cmd, "|-"); - } - logger ("Debug: opening for writing: \"" . join('" "',@cmd) . "\".") if $DEBUG; -- if ($cmd[0] == ">") -+ if ($cmd[0] eq ">") - { - if (! open ($pipe, join (' ', @cmd))) - { diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile index 1381b05fb39d..987ec943b7dc 100644 --- a/sysutils/munin-master/Makefile +++ b/sysutils/munin-master/Makefile @@ -6,7 +6,7 @@ # PORTNAME= munin -PORTVERSION= 1.2.0 +PORTVERSION= 1.2.2 CATEGORIES= sysutils perl5 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= munin diff --git a/sysutils/munin-master/distinfo b/sysutils/munin-master/distinfo index e486eb6b0c23..adf9dc7da3f2 100644 --- a/sysutils/munin-master/distinfo +++ b/sysutils/munin-master/distinfo @@ -1,2 +1,2 @@ -MD5 (munin_1.2.0.tar.gz) = bbab7bf91ac837e4c72889aaef7cf2e8 -SIZE (munin_1.2.0.tar.gz) = 318364 +MD5 (munin_1.2.2.tar.gz) = e55ff3cc8d506558f32598f639952cca +SIZE (munin_1.2.2.tar.gz) = 325356 diff --git a/sysutils/munin-master/files/patch-munin-limits.in b/sysutils/munin-master/files/patch-munin-limits.in deleted file mode 100644 index 7fc5202675d3..000000000000 --- a/sysutils/munin-master/files/patch-munin-limits.in +++ /dev/null @@ -1,35 +0,0 @@ ---- munin-1.2.0.orig/server/munin-limits.in Wed Feb 16 21:03:31 2005 -+++ munin-1.2.0/server/munin-limits.in Wed Feb 23 09:06:26 2005 -@@ -18,6 +18,12 @@ - # - # - # $Log: munin-limits.in,v $ -+# Revision 1.24.2.4 2005/02/19 16:06:14 ilmari -+# Place the munin-limits lock file in rundir, not dbdir. -+# -+# Revision 1.24.2.3 2005/02/19 16:04:03 ilmari -+# Fix the file vs. pipe check in munin-limits -+# - # Revision 1.24.2.2 2005/02/16 20:03:31 jimmyo - # yet another rewrite of munin-limits open call (SF#1115434). - # -@@ -179,8 +185,8 @@ - my $modified=0; - - logger("Starting munin-limits, checking lock"); --munin_runlock("$config->{dbdir}/munin-limits.lock"); --logger("Created lock: $config->{dbdir}/munin-limits.lock"); -+munin_runlock("$config->{rundir}/munin-limits.lock"); -+logger("Created lock: $config->{rundir}/munin-limits.lock"); - - if (!defined $config->{'contact'}->{'nagios'}->{'command'} and - defined $config->{'nsca'}) -@@ -458,7 +464,7 @@ - unshift (@cmd, "|-"); - } - logger ("Debug: opening for writing: \"" . join('" "',@cmd) . "\".") if $DEBUG; -- if ($cmd[0] == ">") -+ if ($cmd[0] eq ">") - { - if (! open ($pipe, join (' ', @cmd))) - { |