From 63ab74e8b3128f9e7130f9de377f5a7638b58128 Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Wed, 10 Sep 2014 23:47:52 -0700 Subject: [PATCH] fix POD error in Setup/Test version bump to 5.48 --- .gitignore | 1 + Changes | 4 ++++ lib/Mail/Toaster.pm | 2 +- lib/Mail/Toaster/Apache.pm | 2 +- lib/Mail/Toaster/Base.pm | 2 +- lib/Mail/Toaster/DNS.pm | 2 +- lib/Mail/Toaster/Darwin.pm | 2 +- lib/Mail/Toaster/Ezmlm.pm | 2 +- lib/Mail/Toaster/FreeBSD.pm | 2 +- lib/Mail/Toaster/Logs.pm | 2 +- lib/Mail/Toaster/Mysql.pm | 4 ++-- lib/Mail/Toaster/Qmail.pm | 2 +- lib/Mail/Toaster/Setup.pm | 2 +- lib/Mail/Toaster/Setup/Config.pm | 2 +- lib/Mail/Toaster/Setup/Maildrop.pm | 2 +- lib/Mail/Toaster/Setup/Simscan.pm | 2 +- lib/Mail/Toaster/Setup/Test.pm | 13 ++++++++----- lib/Mail/Toaster/Setup/Vpopmail.pm | 2 +- lib/Mail/Toaster/Utility.pm | 2 +- 19 files changed, 30 insertions(+), 22 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..56ca459 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +MYMETA.* diff --git a/Changes b/Changes index 034d875..86be385 100644 --- a/Changes +++ b/Changes @@ -1,4 +1,8 @@ Mail Toaster Changes + 5.48 - Sep 10, 2014 + fix POD error in Mail/Toaster/Setup/Test + bump version number + 5.47 - May 20, 2014 fix for qpop3d not having service symlink installed added CHKUSER_MBXQUOTA to tcp.smtp diff --git a/lib/Mail/Toaster.pm b/lib/Mail/Toaster.pm index 1614e54..104732a 100755 --- a/lib/Mail/Toaster.pm +++ b/lib/Mail/Toaster.pm @@ -3,7 +3,7 @@ package Mail::Toaster; use strict; use warnings; -our $VERSION = '5.47'; +our $VERSION = '5.48'; use Carp; use Cwd; diff --git a/lib/Mail/Toaster/Apache.pm b/lib/Mail/Toaster/Apache.pm index e39a287..5646fd2 100755 --- a/lib/Mail/Toaster/Apache.pm +++ b/lib/Mail/Toaster/Apache.pm @@ -3,7 +3,7 @@ package Mail::Toaster::Apache; use strict; use warnings; -our $VERSION = '5.44'; +our $VERSION = '5.48'; use Carp; use English qw( -no_match_vars ); diff --git a/lib/Mail/Toaster/Base.pm b/lib/Mail/Toaster/Base.pm index eb459e4..d1f6193 100644 --- a/lib/Mail/Toaster/Base.pm +++ b/lib/Mail/Toaster/Base.pm @@ -2,7 +2,7 @@ package Mail::Toaster::Base; use strict; use warnings; -our $VERSION = '5.44'; +our $VERSION = '5.48'; use Carp; use Params::Validate ':all'; diff --git a/lib/Mail/Toaster/DNS.pm b/lib/Mail/Toaster/DNS.pm index e67bb69..a2e26f4 100755 --- a/lib/Mail/Toaster/DNS.pm +++ b/lib/Mail/Toaster/DNS.pm @@ -2,7 +2,7 @@ package Mail::Toaster::DNS; use strict; use warnings; -our $VERSION = '5.44'; +our $VERSION = '5.48'; use Params::Validate ':all'; diff --git a/lib/Mail/Toaster/Darwin.pm b/lib/Mail/Toaster/Darwin.pm index 958d253..0368aae 100755 --- a/lib/Mail/Toaster/Darwin.pm +++ b/lib/Mail/Toaster/Darwin.pm @@ -2,7 +2,7 @@ package Mail::Toaster::Darwin; use strict; use warnings; -our $VERSION = '5.44'; +our $VERSION = '5.48'; use Carp; use Params::Validate ':all'; diff --git a/lib/Mail/Toaster/Ezmlm.pm b/lib/Mail/Toaster/Ezmlm.pm index 92078f1..92c00fa 100755 --- a/lib/Mail/Toaster/Ezmlm.pm +++ b/lib/Mail/Toaster/Ezmlm.pm @@ -1,7 +1,7 @@ use strict; use warnings; -our $VERSION = '5.44'; +our $VERSION = '5.48'; package Mail::Toaster::Ezmlm; diff --git a/lib/Mail/Toaster/FreeBSD.pm b/lib/Mail/Toaster/FreeBSD.pm index 4f2d850..9ac33be 100755 --- a/lib/Mail/Toaster/FreeBSD.pm +++ b/lib/Mail/Toaster/FreeBSD.pm @@ -2,7 +2,7 @@ package Mail::Toaster::FreeBSD; use strict; use warnings; -our $VERSION = '5.47'; +our $VERSION = '5.48'; use Carp; use File::Copy; diff --git a/lib/Mail/Toaster/Logs.pm b/lib/Mail/Toaster/Logs.pm index 7b0ac9c..e698e6d 100755 --- a/lib/Mail/Toaster/Logs.pm +++ b/lib/Mail/Toaster/Logs.pm @@ -2,7 +2,7 @@ package Mail::Toaster::Logs; use strict; use warnings; -our $VERSION = 5.44; +our $VERSION = 5.48; # the output of warnings and diagnostics should not be enabled in production. # the SNMP daemon depends on the output of maillogs, so we need to return diff --git a/lib/Mail/Toaster/Mysql.pm b/lib/Mail/Toaster/Mysql.pm index 3a92972..943b102 100755 --- a/lib/Mail/Toaster/Mysql.pm +++ b/lib/Mail/Toaster/Mysql.pm @@ -2,7 +2,7 @@ package Mail::Toaster::Mysql; use strict; use warnings; -our $VERSION = '5.44'; +our $VERSION = '5.48'; use Carp; #use DBI; # eval'ed in connect @@ -94,7 +94,7 @@ sub connect { my $dsn = "DBI:$dbv->{'driver'}:database=$dbv->{'db'};" . "host=$dbv->{'host'};port=$dbv->{'port'}"; - eval "use DBI"; + eval "use DBI"; ## no critic ( ProhibitStringyEval ) return $self->error($@) if $@; $dbh = DBI->connect( $dsn, $dbv->{'user'}, $dbv->{'pass'}, diff --git a/lib/Mail/Toaster/Qmail.pm b/lib/Mail/Toaster/Qmail.pm index 5b09c77..97bb146 100755 --- a/lib/Mail/Toaster/Qmail.pm +++ b/lib/Mail/Toaster/Qmail.pm @@ -2,7 +2,7 @@ package Mail::Toaster::Qmail; use strict; use warnings; -our $VERSION = '5.47'; +our $VERSION = '5.48'; use Carp; use English qw( -no_match_vars ); diff --git a/lib/Mail/Toaster/Setup.pm b/lib/Mail/Toaster/Setup.pm index 022cc66..71c77ab 100755 --- a/lib/Mail/Toaster/Setup.pm +++ b/lib/Mail/Toaster/Setup.pm @@ -2,7 +2,7 @@ package Mail::Toaster::Setup; use strict; use warnings; -our $VERSION = '5.47'; +our $VERSION = '5.48'; use Carp; use Config; diff --git a/lib/Mail/Toaster/Setup/Config.pm b/lib/Mail/Toaster/Setup/Config.pm index 3eb8d4d..2a33ddb 100755 --- a/lib/Mail/Toaster/Setup/Config.pm +++ b/lib/Mail/Toaster/Setup/Config.pm @@ -2,7 +2,7 @@ package Mail::Toaster::Setup::Config; use strict; use warnings; -our $VERSION = '5.44'; +our $VERSION = '5.48'; #use Carp; #use Config; diff --git a/lib/Mail/Toaster/Setup/Maildrop.pm b/lib/Mail/Toaster/Setup/Maildrop.pm index d64a361..59022d1 100755 --- a/lib/Mail/Toaster/Setup/Maildrop.pm +++ b/lib/Mail/Toaster/Setup/Maildrop.pm @@ -2,7 +2,7 @@ package Mail::Toaster::Setup::Maildrop; use strict; use warnings; -our $VERSION = '5.44'; +our $VERSION = '5.48'; use English '-no_match_vars'; use Params::Validate ':all'; diff --git a/lib/Mail/Toaster/Setup/Simscan.pm b/lib/Mail/Toaster/Setup/Simscan.pm index bf9a9ad..b2772db 100755 --- a/lib/Mail/Toaster/Setup/Simscan.pm +++ b/lib/Mail/Toaster/Setup/Simscan.pm @@ -2,7 +2,7 @@ package Mail::Toaster::Setup::Simscan; use strict; use warnings; -our $VERSION = '5.44'; +our $VERSION = '5.48'; use Carp; #use Config; diff --git a/lib/Mail/Toaster/Setup/Test.pm b/lib/Mail/Toaster/Setup/Test.pm index bab13c4..5b3b3ae 100755 --- a/lib/Mail/Toaster/Setup/Test.pm +++ b/lib/Mail/Toaster/Setup/Test.pm @@ -2,7 +2,7 @@ package Mail::Toaster::Setup::Test; use strict; use warnings; -our $VERSION = '5.44'; +our $VERSION = '5.48'; use Carp; use English '-no_match_vars'; @@ -34,7 +34,7 @@ sub email_send { }; foreach ( qw/ clean spam eicar attach clam / ) { - open(my $INJECT, "| $ibin -a -f \"\" $email" ) or + open(my $INJECT, "|", "$ibin -a -f \"\" $email" ) or return $self->error( "couldn't send using qmail-inject!"); my $method = 'email_send_' . $_; $self->$method( $INJECT, $email ); @@ -230,7 +230,7 @@ sub imap_auth_nossl { return; }; - eval "use Mail::IMAPClient"; + eval "use Mail::IMAPClient"; ## no critic ( ProhibitStringyEval ) if ( $EVAL_ERROR ) { $self->audit("unable to load Mail::IMAPClient"); return; @@ -326,7 +326,7 @@ sub pop3_auth { my $r = $self->util->install_module( "Mail::POP3Client", verbose => 0,); $self->pretty("checking Mail::POP3Client", $r ); - eval "use Mail::POP3Client"; + eval "use Mail::POP3Client"; ## no critic ( ProhibitStringyEval ) if ( $EVAL_ERROR ) { print "unable to load Mail::POP3Client, skipping POP3 tests\n"; return; @@ -394,7 +394,7 @@ sub smtp_auth { my @modules = ('IO::Socket::INET', 'IO::Socket::SSL', 'Net::SSLeay', 'Socket qw(:DEFAULT :crlf)','Net::SMTP_auth'); foreach ( @modules ) { - eval "use $_"; + eval "use $_"; ## no critic ( ProhibitStringyEval ) die $@ if $@; $self->pretty( "loading $_", 'ok' ); }; @@ -899,6 +899,7 @@ sub ucspi { __END__; +=over 4 =item email_send @@ -952,4 +953,6 @@ Sends an email message with the Eicar virus inline. It should trigger the AV eng Sends a sample spam message that SpamAssassin should block. +=back + =cut diff --git a/lib/Mail/Toaster/Setup/Vpopmail.pm b/lib/Mail/Toaster/Setup/Vpopmail.pm index 51e75f4..8fdc521 100755 --- a/lib/Mail/Toaster/Setup/Vpopmail.pm +++ b/lib/Mail/Toaster/Setup/Vpopmail.pm @@ -2,7 +2,7 @@ package Mail::Toaster::Setup::Vpopmail; use strict; use warnings; -our $VERSION = '5.44'; +our $VERSION = '5.48'; use Carp; use English '-no_match_vars'; diff --git a/lib/Mail/Toaster/Utility.pm b/lib/Mail/Toaster/Utility.pm index 525f07a..7f87cdb 100755 --- a/lib/Mail/Toaster/Utility.pm +++ b/lib/Mail/Toaster/Utility.pm @@ -4,7 +4,7 @@ package Mail::Toaster::Utility; use strict; use warnings; -our $VERSION = '5.44'; +our $VERSION = '5.48'; use Cwd; use Carp;