From: Alexander Wirt Date: Thu, 7 Dec 2006 10:36:35 +0000 (+0100) Subject: SpamAssassin plugin: Reclicense again und remove debugging die X-Git-Tag: collectd-3.11.0~23 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=168e6943a105245b96fd816bdd889b1b898e8a10;p=collectd.git SpamAssassin plugin: Reclicense again und remove debugging die Due to some misunderstanding Artistic was not the right license so I should GPL now instead of Artistic. Additionally I removed a debugging "die" that should never have been checked in into my svn repo (Thanks tokkee). Signed-off-by: Alexander Wirt --- diff --git a/contrib/SpamAssassin/Collectd.pm b/contrib/SpamAssassin/Collectd.pm index 6f1c0dc7..efc356f2 100644 --- a/contrib/SpamAssassin/Collectd.pm +++ b/contrib/SpamAssassin/Collectd.pm @@ -55,8 +55,7 @@ Alexander Wirt or - b) the "Artistic License" which comes with perl - (http://www.perl.com/pub/a/language/misc/Artistic.html) + b) the GPL (http://www.gnu.org/copyleft/gpl.html) use whatever you like more. @@ -122,7 +121,7 @@ sub check_end { #create new connection to our socket eval { local $SIG{ALRM} = sub { die "alarm\n" }; # NB: \n required - die "alarm\n"; + #generate a timeout alarm $self->{main}->{conf}->{collectd_timeout};