"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "t/SATest.pm" between
Mail-SpamAssassin-3.4.4.tar.bz2 and Mail-SpamAssassin-3.4.5.tar.bz2

About: SpamAssassin is a mail filter that uses a wide range of heuristic tests on mail headers and body text to identify "spam" (also known as unsolicited commercial email) incl. Bayesian (statistical) spam filter and several internet-based realtime blacklists.

SATest.pm  (Mail-SpamAssassin-3.4.4.tar.bz2):SATest.pm  (Mail-SpamAssassin-3.4.5.tar.bz2)
skipping to change at line 106 skipping to change at line 106
} }
$perl_cmd .= " \"$o\""; $perl_cmd .= " \"$o\"";
} }
$perl_cmd .= " -T" if !defined($ENV{'TEST_PERL_TAINT'}) or $ENV{'TEST_PERL_TAI NT'} ne 'no'; $perl_cmd .= " -T" if !defined($ENV{'TEST_PERL_TAINT'}) or $ENV{'TEST_PERL_TAI NT'} ne 'no';
$perl_cmd .= " -w" if !defined($ENV{'TEST_PERL_WARN'}) or $ENV{'TEST_PERL_WAR N'} ne 'no'; $perl_cmd .= " -w" if !defined($ENV{'TEST_PERL_WARN'}) or $ENV{'TEST_PERL_WAR N'} ne 'no';
$scr = $ENV{'SPAMASSASSIN_SCRIPT'}; $scr = $ENV{'SPAMASSASSIN_SCRIPT'};
$scr ||= "$perl_cmd ../spamassassin.raw"; $scr ||= "$perl_cmd ../spamassassin.raw";
$spamd = "$perl_cmd ../spamd/spamd.raw"; $spamd = $ENV{'SPAMD_SCRIPT'};
$spamd ||= "$perl_cmd ../spamd/spamd.raw";
$spamc = $ENV{'SPAMC_SCRIPT'}; $spamc = $ENV{'SPAMC_SCRIPT'};
$spamc ||= "../spamc/spamc"; $spamc ||= "../spamc/spamc";
$salearn = $ENV{'SALEARN_SCRIPT'}; $salearn = $ENV{'SALEARN_SCRIPT'};
$salearn ||= "$perl_cmd ../sa-learn.raw"; $salearn ||= "$perl_cmd ../sa-learn.raw";
$saawl = $ENV{'SAAWL_SCRIPT'};
$saawl ||= "../sa-awl";
$sacheckspamd = $ENV{'SACHECKSPAMD_SCRIPT'};
$sacheckspamd ||= "../sa-check_spamd";
$spamdlocalhost = $ENV{'SPAMD_LOCALHOST'}; $spamdlocalhost = $ENV{'SPAMD_LOCALHOST'};
if (!$spamdlocalhost) { if (!$spamdlocalhost) {
$spamdlocalhost = $have_inet4 || !$have_inet6 ? '127.0.0.1' : '::1'; $spamdlocalhost = $have_inet4 || !$have_inet6 ? '127.0.0.1' : '::1';
} }
$spamdhost = $ENV{'SPAMD_HOST'}; $spamdhost = $ENV{'SPAMD_HOST'};
$spamdhost ||= $spamdlocalhost; $spamdhost ||= $spamdlocalhost;
$spamdport = $ENV{'SPAMD_PORT'}; $spamdport = $ENV{'SPAMD_PORT'};
$spamdport ||= probably_unused_spamd_port(); $spamdport ||= probably_unused_spamd_port();
# optimisation -- don't setup spamd test parameters unless we're # optimisation -- don't setup spamd test parameters unless we're
skipping to change at line 399 skipping to change at line 406
my $test_number = test_number(); my $test_number = test_number();
untaint_system("$salearnargs > log/d.$testname/$test_number"); untaint_system("$salearnargs > log/d.$testname/$test_number");
$salearn_exitcode = ($?>>8); $salearn_exitcode = ($?>>8);
if ($salearn_exitcode != 0) { return undef; } if ($salearn_exitcode != 0) { return undef; }
&checkfile ("d.$testname/$test_number", $read_sub) if (defined $read_sub); &checkfile ("d.$testname/$test_number", $read_sub) if (defined $read_sub);
1; 1;
} }
sub saawlrun {
my $args = shift;
untaint_system("$saawl $args");
}
sub sacheckspamdrun {
my $args = shift;
untaint_system("$sacheckspamd $args");
}
sub scrun { sub scrun {
spamcrun (@_, 0); spamcrun (@_, 0);
} }
sub scrunwithstderr { sub scrunwithstderr {
spamcrun (@_, 1); spamcrun (@_, 1);
} }
sub scrunwantfail { sub scrunwantfail {
spamcrun (@_, 1, 1); spamcrun (@_, 1, 1);
} }
 End of changes. 3 change blocks. 
1 lines changed or deleted 20 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)