You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by gb...@apache.org on 2020/10/07 08:28:05 UTC
svn commit: r1882297 - in /spamassassin: branches/3.4/t/SATest.pm
trunk/t/SATest.pm
Author: gbechis
Date: Wed Oct 7 08:28:05 2020
New Revision: 1882297
URL: http://svn.apache.org/viewvc?rev=1882297&view=rev
Log:
Missing files from previous commit, bz #7860
Modified:
spamassassin/branches/3.4/t/SATest.pm
spamassassin/trunk/t/SATest.pm
Modified: spamassassin/branches/3.4/t/SATest.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/SATest.pm?rev=1882297&r1=1882296&r2=1882297&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/SATest.pm (original)
+++ spamassassin/branches/3.4/t/SATest.pm Wed Oct 7 08:28:05 2020
@@ -103,7 +103,8 @@ sub sa_t_init {
$scr = $ENV{'SPAMASSASSIN_SCRIPT'};
$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 ||= "../spamc/spamc";
@@ -111,6 +112,12 @@ sub sa_t_init {
$salearn = $ENV{'SALEARN_SCRIPT'};
$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'};
if (!$spamdlocalhost) {
$spamdlocalhost = $have_inet4 || !$have_inet6 ? '127.0.0.1' : '::1';
@@ -396,6 +403,18 @@ sub salearnrun {
1;
}
+sub saawlrun {
+ my $args = shift;
+
+ untaint_system("$saawl $args");
+}
+
+sub sacheckspamdrun {
+ my $args = shift;
+
+ untaint_system("$sacheckspamd $args");
+}
+
sub scrun {
spamcrun (@_, 0);
}
Modified: spamassassin/trunk/t/SATest.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/SATest.pm?rev=1882297&r1=1882296&r2=1882297&view=diff
==============================================================================
--- spamassassin/trunk/t/SATest.pm (original)
+++ spamassassin/trunk/t/SATest.pm Wed Oct 7 08:28:05 2020
@@ -103,7 +103,8 @@ sub sa_t_init {
$scr = $ENV{'SPAMASSASSIN_SCRIPT'};
$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 ||= "../spamc/spamc";
@@ -111,6 +112,12 @@ sub sa_t_init {
$salearn = $ENV{'SALEARN_SCRIPT'};
$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'};
if (!$spamdlocalhost) {
$spamdlocalhost = $have_inet4 || !$have_inet6 ? '127.0.0.1' : '::1';
@@ -396,6 +403,18 @@ sub salearnrun {
1;
}
+sub saawlrun {
+ my $args = shift;
+
+ untaint_system("$saawl $args");
+}
+
+sub sacheckspamdrun {
+ my $args = shift;
+
+ untaint_system("$sacheckspamd $args");
+}
+
sub scrun {
spamcrun (@_, 0);
}