Update to 2.4.2

From CHANGES:

* added strict to both wrappers and fixed some followup errors -- tobi

* kill taint error in Smokeping.pm -- tobi

* better master/slave secrets documentation -- tobi

* do not load :sys_wait_h from POSIX perl module since this seems to
  be missing in some linux distros and we can do alright without.

6 files changed, 30 insertions, 27 deletions

diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile
index 31c48d81e903..0480950b53aa 100644
--- a/net-mgmt/smokeping/Makefile
+++ b/net-mgmt/smokeping/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	smokeping
-PORTVERSION=	2.4.1
+PORTVERSION=	2.4.2
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	http://oss.oetiker.ch/smokeping/pub/ \
 		http://smokeping.cs.pu.edu.tw/pub/
diff --git a/net-mgmt/smokeping/distinfo b/net-mgmt/smokeping/distinfo
index 21aecfa5f4ce..616e3c9618b2 100644
--- a/net-mgmt/smokeping/distinfo
+++ b/net-mgmt/smokeping/distinfo
@@ -1,3 +1,3 @@
-MD5 (smokeping-2.4.1.tar.gz) = b7cda5c04c04cbccd9639160470b57f8
-SHA256 (smokeping-2.4.1.tar.gz) = fc02bdea6841fd9f94eb6b8af182270e42e2ac47ec667c08dfd5ca68e6130e33
-SIZE (smokeping-2.4.1.tar.gz) = 913176
+MD5 (smokeping-2.4.2.tar.gz) = eb8e7679fcad35e59d7c51f2328250a2
+SHA256 (smokeping-2.4.2.tar.gz) = ed8680d1b3fdb2b1efde3aa14b37bf7e9aee2c992c5814061dbd78e6eea00d49
+SIZE (smokeping-2.4.2.tar.gz) = 909514
diff --git a/net-mgmt/smokeping/files/patch-bin-smokeping.dist b/net-mgmt/smokeping/files/patch-bin-smokeping.dist
index fe277a4a7732..ecc67190a4dc 100644
--- a/net-mgmt/smokeping/files/patch-bin-smokeping.dist
+++ b/net-mgmt/smokeping/files/patch-bin-smokeping.dist
@@ -1,15 +1,16 @@
---- bin/smokeping.dist.orig	Mon Sep 26 22:15:57 2005
-+++ bin/smokeping.dist	Thu Oct  6 10:37:31 2005
-@@ -1,12 +1,12 @@
--#!/usr/sepp/bin/perl-5.8.4 -w
+--- ./bin/smokeping.dist.orig	2008-10-29 15:03:35.000000000 +0100
++++ ./bin/smokeping.dist	2008-10-29 15:05:17.000000000 +0100
+@@ -1,13 +1,13 @@
+-#!/usr/bin/perl -w
 +#!%%PERL%% -w
  # -*-perl-*-
  
--use lib qw(/usr/pack/rrdtool-1.2.23-mo/lib/perl);
+-use lib qw(/usr/pack/rrdtool-1.3.0-rp/lib/perl);
 -use lib qw(lib);
 +use lib qw(%%PREFIX%%/smokeping/lib);
- 
- use Smokeping 2.004000;
+ use strict;
+ use warnings;
+ use Smokeping 2.004002;
   
 -Smokeping::main("etc/config.dist");
 +$0 = "%%PREFIX%%/bin/smokeping";
@@ -17,7 +18,7 @@
  
  =head1 NAME
  
-@@ -112,22 +111,8 @@
+@@ -127,22 +127,8 @@ Please refer to L<the installation docum
  
  =head1 SETUP
  
diff --git a/net-mgmt/smokeping/files/patch-bin-tSmoke.dist b/net-mgmt/smokeping/files/patch-bin-tSmoke.dist
index b3f0d2999a07..383881886030 100644
--- a/net-mgmt/smokeping/files/patch-bin-tSmoke.dist
+++ b/net-mgmt/smokeping/files/patch-bin-tSmoke.dist
@@ -1,22 +1,22 @@
---- bin/tSmoke.dist.orig	Mon Sep 19 00:50:50 2005
-+++ bin/tSmoke.dist	Mon Sep 19 00:54:58 2005
+--- ./bin/tSmoke.dist.orig	2008-10-29 15:06:25.000000000 +0100
++++ ./bin/tSmoke.dist	2008-10-29 15:07:53.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl
 +#!%%PERL%%
  #
  #-----------------------------------------------
  # tSmoke.pl
-@@ -50,8 +50,7 @@
+@@ -51,8 +51,7 @@ use warnings;
  # -- Getopt::Long
  #
  # Point the lib variables to your implementation
 -use lib qw(lib);
--use lib "/usr/local/rrdtool-1.0.39/lib/perl";
+-use lib qw(/usr/local/rrdtool-1.0.39/lib/perl);
 +use lib qw(%%PREFIX%%/smokeping/lib);
  
- use Smokeping 2.004001;
+ use Smokeping 2.004002;
  use Net::SMTP;
-@@ -60,7 +59,7 @@
+@@ -61,7 +60,7 @@ use Pod::Usage;
  use RRDs;
  
  # Point to your Smokeping config file
@@ -25,7 +25,7 @@
  
  # global variables
  my $cfg;
-@@ -479,33 +478,8 @@
+@@ -482,33 +481,8 @@ Typical crontab used to invoke this are
  
  =head1 SETUP
  
diff --git a/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist b/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist
index de4900adf1d9..972fd817debb 100644
--- a/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist
+++ b/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist
@@ -1,18 +1,22 @@
 --- htdocs/smokeping.cgi.dist.orig	Mon Sep 26 22:15:57 2005
 +++ htdocs/smokeping.cgi.dist	Thu Oct  6 10:40:18 2005
-@@ -1,13 +1,12 @@
--#!/usr/sepp/bin/speedy -w
+@@ -1,17 +1,16 @@
+-#!/usr/bin/speedy
 +#!%%PREFIX%%/bin/speedy -w
  # -*-perl-*-
  
--use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl);
--use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib);
+ use strict;
+ use warnings;
+
+-use lib qw(/usr/pack/rrdtool-1.3.0-rp/lib/perl);
+-use lib qw(/home/oetiker/checkouts/smokeping/trunk/software/lib);
 +use lib qw(%%PREFIX%%/smokeping/lib);
+
  use CGI::Carp qw(fatalsToBrowser);
  
- use Smokeping 2.004000;
+ use Smokeping 2.004002;
  
--Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config");
+-Smokeping::cgi("/home/oetiker/checkouts/smokeping/trunk/software/etc/config.dist");
 +Smokeping::cgi("%%PREFIX%%/etc/smokeping/config");
  
  =head1 NAME
diff --git a/net-mgmt/smokeping/pkg-plist b/net-mgmt/smokeping/pkg-plist
index 1e7ff5a600c3..c952f8cf63d4 100644
--- a/net-mgmt/smokeping/pkg-plist
+++ b/net-mgmt/smokeping/pkg-plist
@@ -129,7 +129,6 @@ smokeping/htdocs/resource/qx/icon/CrystalClear/16/actions/view-refresh.png
 smokeping/htdocs/resource/qx/icon/Nuvola/16/actions/view-refresh.png
 smokeping/htdocs/resource/qx/static/image/blank.gif
 smokeping/htdocs/resource/qx/static/image/dotted_white.gif
-smokeping/htdocs/resource/qx/static/log/log.html
 smokeping/htdocs/resource/qx/widget/Windows/arrows/down.gif
 smokeping/htdocs/resource/qx/widget/Windows/arrows/down_small.gif
 smokeping/htdocs/resource/qx/widget/Windows/arrows/next.gif
@@ -248,7 +247,6 @@ smokeping/lib/Smokeping/sorters/base.pm
 @dirrm smokeping/htdocs/resource/qx/widget/Windows/arrows
 @dirrm smokeping/htdocs/resource/qx/widget/Windows
 @dirrm smokeping/htdocs/resource/qx/widget
-@dirrm smokeping/htdocs/resource/qx/static/log
 @dirrm smokeping/htdocs/resource/qx/static/image
 @dirrm smokeping/htdocs/resource/qx/static
 @dirrm smokeping/htdocs/resource/qx/icon/Nuvola/16/actions