You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2019/06/22 16:00:45 UTC

svn commit: r1861877 [2/4] - in /spamassassin: branches/3.4/t/ branches/3.4/xt/ trunk/t/ trunk/xt/

Modified: spamassassin/branches/3.4/t/spamc_c_stdout_closed.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamc_c_stdout_closed.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamc_c_stdout_closed.t (original)
+++ spamassassin/branches/3.4/t/spamc_c_stdout_closed.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamc_c_stdout_closed");

Modified: spamassassin/branches/3.4/t/spamc_cf.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamc_cf.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamc_cf.t (original)
+++ spamassassin/branches/3.4/t/spamc_cf.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamc_cf");

Modified: spamassassin/branches/3.4/t/spamc_headers.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamc_headers.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamc_headers.t (original)
+++ spamassassin/branches/3.4/t/spamc_headers.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamc_headers");

Modified: spamassassin/branches/3.4/t/spamc_l.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamc_l.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamc_l.t (original)
+++ spamassassin/branches/3.4/t/spamc_l.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamc_l");

Modified: spamassassin/branches/3.4/t/spamc_optC.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamc_optC.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamc_optC.t (original)
+++ spamassassin/branches/3.4/t/spamc_optC.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamc_optC");

Modified: spamassassin/branches/3.4/t/spamc_optL.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamc_optL.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamc_optL.t (original)
+++ spamassassin/branches/3.4/t/spamc_optL.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamc_optL");

Modified: spamassassin/branches/3.4/t/spamc_x_E_R.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamc_x_E_R.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamc_x_E_R.t (original)
+++ spamassassin/branches/3.4/t/spamc_x_E_R.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamc_x_E_R");

Modified: spamassassin/branches/3.4/t/spamc_x_e.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamc_x_e.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamc_x_e.t (original)
+++ spamassassin/branches/3.4/t/spamc_x_e.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamc_x_e");

Modified: spamassassin/branches/3.4/t/spamc_y.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamc_y.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamc_y.t (original)
+++ spamassassin/branches/3.4/t/spamc_y.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamc_y");

Modified: spamassassin/branches/3.4/t/spamc_z.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamc_z.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamc_z.t (original)
+++ spamassassin/branches/3.4/t/spamc_z.t Sat Jun 22 16:00:42 2019
@@ -1,11 +1,11 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use constant HAVE_ZLIB => eval { require Compress::Zlib; };
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamc_z");
 
-system("$spamc -z < /dev/null");
+untaint_system("$spamc -z < /dev/null");
 my $SPAMC_Z_AVAILABLE = ($? >> 8 == 0);
 
 use Test::More;

Modified: spamassassin/branches/3.4/t/spamd.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd.t (original)
+++ spamassassin/branches/3.4/t/spamd.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd");

Modified: spamassassin/branches/3.4/t/spamd_allow_user_rules.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_allow_user_rules.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_allow_user_rules.t (original)
+++ spamassassin/branches/3.4/t/spamd_allow_user_rules.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_allow_user_rules");

Modified: spamassassin/branches/3.4/t/spamd_client.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_client.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_client.t (original)
+++ spamassassin/branches/3.4/t/spamd_client.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 BEGIN {
   if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ...

Modified: spamassassin/branches/3.4/t/spamd_hup.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_hup.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_hup.t (original)
+++ spamassassin/branches/3.4/t/spamd_hup.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_hup");

Modified: spamassassin/branches/3.4/t/spamd_kill_restart.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_kill_restart.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_kill_restart.t (original)
+++ spamassassin/branches/3.4/t/spamd_kill_restart.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_kill_restart");

Modified: spamassassin/branches/3.4/t/spamd_kill_restart_rr.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_kill_restart_rr.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_kill_restart_rr.t (original)
+++ spamassassin/branches/3.4/t/spamd_kill_restart_rr.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_kill_restart_rr");

Modified: spamassassin/branches/3.4/t/spamd_ldap.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_ldap.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_ldap.t (original)
+++ spamassassin/branches/3.4/t/spamd_ldap.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 #
 # NOTE: requires setup as per ldap/README.testing in advance
 

Modified: spamassassin/branches/3.4/t/spamd_maxchildren.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_maxchildren.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_maxchildren.t (original)
+++ spamassassin/branches/3.4/t/spamd_maxchildren.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_maxchildren");

Modified: spamassassin/branches/3.4/t/spamd_maxsize.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_maxsize.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_maxsize.t (original)
+++ spamassassin/branches/3.4/t/spamd_maxsize.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_maxsize");

Modified: spamassassin/branches/3.4/t/spamd_parallel.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_parallel.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_parallel.t (original)
+++ spamassassin/branches/3.4/t/spamd_parallel.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_parallel");

Modified: spamassassin/branches/3.4/t/spamd_plugin.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_plugin.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_plugin.t (original)
+++ spamassassin/branches/3.4/t/spamd_plugin.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_plugin");

Modified: spamassassin/branches/3.4/t/spamd_port.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_port.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_port.t (original)
+++ spamassassin/branches/3.4/t/spamd_port.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_port");

Modified: spamassassin/branches/3.4/t/spamd_prefork_stress.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_prefork_stress.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_prefork_stress.t (original)
+++ spamassassin/branches/3.4/t/spamd_prefork_stress.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 #
 # Warning: do not run this test on a live server; it will kill your
 # spamd children ;)
@@ -24,7 +24,7 @@ plan skip_all => "No pkill available - $
 plan skip_all => "No pgrep available - $note" unless $pgrep;
 plan tests => 14;
 
-system($pgrep, "spamd child");
+untaint_system($pgrep, "spamd child");
 if ($? >> 8 == 0) {
   die "not running test: existing 'spamd child' processes would be killed.\n";
 }
@@ -50,7 +50,7 @@ ok_all_patterns();
 my $i = 0;
 for ($i = 0; $i < 1999; $i++) {
   print "killing [$i]\n";
-  system ($pkill, "-f", "spamd child");
+  untaint_system ($pkill, "-f", "spamd child");
 }
 
 clear_pattern_counters();

Modified: spamassassin/branches/3.4/t/spamd_prefork_stress_2.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_prefork_stress_2.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_prefork_stress_2.t (original)
+++ spamassassin/branches/3.4/t/spamd_prefork_stress_2.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 #
 # Warning: do not run this test on a live server; it will kill your
 # spamd children ;)
@@ -22,7 +22,7 @@ plan skip_all => "No pgrep available - $
 
 plan tests => 14;
 
-system($pgrep, "spamd child");
+untaint_system($pgrep, "spamd child");
 if ($? >> 8 == 0) {
   die "not running test: existing 'spamd child' processes would be killed.\n";
 }
@@ -48,7 +48,7 @@ ok_all_patterns();
 my $i = 0;
 for ($i = 0; $i < 1999; $i++) {
   print "killing [$i]\n";
-  system ($pkill, "-f", "spamd child");
+  untaint_system ($pkill, "-f", "spamd child");
 }
 
 sleep 1;        # give it time to start a new one

Modified: spamassassin/branches/3.4/t/spamd_prefork_stress_3.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_prefork_stress_3.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_prefork_stress_3.t (original)
+++ spamassassin/branches/3.4/t/spamd_prefork_stress_3.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_prefork_stress_3");

Modified: spamassassin/branches/3.4/t/spamd_prefork_stress_4.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_prefork_stress_4.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_prefork_stress_4.t (original)
+++ spamassassin/branches/3.4/t/spamd_prefork_stress_4.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_prefork_stress_4");

Modified: spamassassin/branches/3.4/t/spamd_protocol_10.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_protocol_10.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_protocol_10.t (original)
+++ spamassassin/branches/3.4/t/spamd_protocol_10.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_protocol_10");

Modified: spamassassin/branches/3.4/t/spamd_report.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_report.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_report.t (original)
+++ spamassassin/branches/3.4/t/spamd_report.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_report");

Modified: spamassassin/branches/3.4/t/spamd_report_ifspam.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_report_ifspam.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_report_ifspam.t (original)
+++ spamassassin/branches/3.4/t/spamd_report_ifspam.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_report_ifspam");

Modified: spamassassin/branches/3.4/t/spamd_sql_prefs.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_sql_prefs.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_sql_prefs.t (original)
+++ spamassassin/branches/3.4/t/spamd_sql_prefs.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_sql_prefs");

Modified: spamassassin/branches/3.4/t/spamd_ssl.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_ssl.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_ssl.t (original)
+++ spamassassin/branches/3.4/t/spamd_ssl.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_ssl");

Modified: spamassassin/branches/3.4/t/spamd_ssl_accept_fail.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_ssl_accept_fail.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_ssl_accept_fail.t (original)
+++ spamassassin/branches/3.4/t/spamd_ssl_accept_fail.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 # bug 4107
 
 use lib '.'; use lib 't';

Modified: spamassassin/branches/3.4/t/spamd_stop.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_stop.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_stop.t (original)
+++ spamassassin/branches/3.4/t/spamd_stop.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_stop");

Modified: spamassassin/branches/3.4/t/spamd_symbols.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_symbols.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_symbols.t (original)
+++ spamassassin/branches/3.4/t/spamd_symbols.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_symbols");

Modified: spamassassin/branches/3.4/t/spamd_syslog.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_syslog.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_syslog.t (original)
+++ spamassassin/branches/3.4/t/spamd_syslog.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_syslog");

Modified: spamassassin/branches/3.4/t/spamd_unix.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_unix.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_unix.t (original)
+++ spamassassin/branches/3.4/t/spamd_unix.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_unix");

Modified: spamassassin/branches/3.4/t/spamd_unix_and_tcp.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_unix_and_tcp.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_unix_and_tcp.t (original)
+++ spamassassin/branches/3.4/t/spamd_unix_and_tcp.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_unix_and_tcp");

Modified: spamassassin/branches/3.4/t/spamd_user_rules_leak.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_user_rules_leak.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_user_rules_leak.t (original)
+++ spamassassin/branches/3.4/t/spamd_user_rules_leak.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 # bug 4179
 
 use lib '.'; use lib 't';

Modified: spamassassin/branches/3.4/t/spamd_utf8.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_utf8.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_utf8.t (original)
+++ spamassassin/branches/3.4/t/spamd_utf8.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_utf8");
@@ -11,6 +11,7 @@ BEGIN {
   $testlocale = 'en_US.UTF-8';
 
   my $havelocale = 1;
+  local $ENV{'PATH'} = '/bin:/usr/bin:/usr/local/bin';  # must not be tainted
   open (IN, "LANG=$testlocale perl -e 'exit 0' 2>&1 |");
   while (<IN>) {
     /Please check that your locale settings/ and ($havelocale = 0);

Modified: spamassassin/branches/3.4/t/spamd_whitelist_leak.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spamd_whitelist_leak.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spamd_whitelist_leak.t (original)
+++ spamassassin/branches/3.4/t/spamd_whitelist_leak.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 # bug 4179
 
 use lib '.'; use lib 't';

Modified: spamassassin/branches/3.4/t/spf.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spf.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spf.t (original)
+++ spamassassin/branches/3.4/t/spf.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spf");

Modified: spamassassin/branches/3.4/t/sql_based_whitelist.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/sql_based_whitelist.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/sql_based_whitelist.t (original)
+++ spamassassin/branches/3.4/t/sql_based_whitelist.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest;

Modified: spamassassin/branches/3.4/t/stop_always_matching_regexps.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/stop_always_matching_regexps.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/stop_always_matching_regexps.t (original)
+++ spamassassin/branches/3.4/t/stop_always_matching_regexps.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 BEGIN {
   if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ...

Modified: spamassassin/branches/3.4/t/strip2.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/strip2.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/strip2.t (original)
+++ spamassassin/branches/3.4/t/strip2.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("strip2");
@@ -120,7 +120,7 @@ ok(!compare_text($input,$d_output))
 sub diffwarn {
   my ($f1, $f2) = @_;
   print "# Diff is as follows:\n";
-  system "diff -u $f1 $f2";
+  untaint_system "diff -u $f1 $f2";
   print "\n\n";
 }
 

Modified: spamassassin/branches/3.4/t/strip_no_subject.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/strip_no_subject.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/strip_no_subject.t (original)
+++ spamassassin/branches/3.4/t/strip_no_subject.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("strip_no_subject");

Modified: spamassassin/branches/3.4/t/stripmarkup.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/stripmarkup.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/stripmarkup.t (original)
+++ spamassassin/branches/3.4/t/stripmarkup.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("stripmarkup");

Modified: spamassassin/branches/3.4/t/tainted_msg.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/tainted_msg.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/tainted_msg.t (original)
+++ spamassassin/branches/3.4/t/tainted_msg.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 BEGIN {
   if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ...

Modified: spamassassin/branches/3.4/t/text_bad_ctype.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/text_bad_ctype.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/text_bad_ctype.t (original)
+++ spamassassin/branches/3.4/t/text_bad_ctype.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("text_bad_ctype");

Modified: spamassassin/branches/3.4/t/timeout.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/timeout.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/timeout.t (original)
+++ spamassassin/branches/3.4/t/timeout.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 BEGIN {
   if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ...

Modified: spamassassin/branches/3.4/t/trust_path.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/trust_path.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/trust_path.t (original)
+++ spamassassin/branches/3.4/t/trust_path.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 BEGIN {
   if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ...

Modified: spamassassin/branches/3.4/t/uri.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/uri.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/uri.t (original)
+++ spamassassin/branches/3.4/t/uri.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl -w -T
 
 BEGIN {
   if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ...

Modified: spamassassin/branches/3.4/t/uri_html.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/uri_html.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/uri_html.t (original)
+++ spamassassin/branches/3.4/t/uri_html.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl -w -T
 
 # test URI redirecton patterns
 

Modified: spamassassin/branches/3.4/t/uri_list.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/uri_list.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/uri_list.t (original)
+++ spamassassin/branches/3.4/t/uri_list.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 # Tests for Bug #7591, which is actually a bug seen in the EL7 build of Perl.
 # The real root cause is obscure, so we test for the bug not the Perl version.

Modified: spamassassin/branches/3.4/t/uri_text.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/uri_text.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/uri_text.t (original)
+++ spamassassin/branches/3.4/t/uri_text.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl -w -T
 
 # test URIs as grabbed from text/plain messages
 

Modified: spamassassin/branches/3.4/t/uribl.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/uribl.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/uribl.t (original)
+++ spamassassin/branches/3.4/t/uribl.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("uribl");

Modified: spamassassin/branches/3.4/t/uribl_all_types.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/uribl_all_types.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/uribl_all_types.t (original)
+++ spamassassin/branches/3.4/t/uribl_all_types.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 #
 # bug 6335: ensure that both domains_only and ips_only URIDNSBL rules can coexist
 

Modified: spamassassin/branches/3.4/t/uribl_domains_only.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/uribl_domains_only.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/uribl_domains_only.t (original)
+++ spamassassin/branches/3.4/t/uribl_domains_only.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 # bug 6335: domains_only URIDNSBL rules
 
 use lib '.'; use lib 't';

Modified: spamassassin/branches/3.4/t/uribl_ips_only.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/uribl_ips_only.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/uribl_ips_only.t (original)
+++ spamassassin/branches/3.4/t/uribl_ips_only.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 # bug 6335: ips_only URIDNSBL rules
 
 use lib '.'; use lib 't';

Modified: spamassassin/branches/3.4/t/urilocalbl_geoip.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/urilocalbl_geoip.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/urilocalbl_geoip.t (original)
+++ spamassassin/branches/3.4/t/urilocalbl_geoip.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 BEGIN {
   if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ...

Modified: spamassassin/branches/3.4/t/utf8.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/utf8.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/utf8.t (original)
+++ spamassassin/branches/3.4/t/utf8.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("utf8");

Modified: spamassassin/branches/3.4/t/util_wrap.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/util_wrap.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/util_wrap.t (original)
+++ spamassassin/branches/3.4/t/util_wrap.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 BEGIN {
   if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ...

Modified: spamassassin/branches/3.4/t/whitelist_addrs.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/whitelist_addrs.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/whitelist_addrs.t (original)
+++ spamassassin/branches/3.4/t/whitelist_addrs.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("whitelist_addrs");

Modified: spamassassin/branches/3.4/t/whitelist_from.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/whitelist_from.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/whitelist_from.t (original)
+++ spamassassin/branches/3.4/t/whitelist_from.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("whitelist_from");

Modified: spamassassin/branches/3.4/t/whitelist_subject.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/whitelist_subject.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/whitelist_subject.t (original)
+++ spamassassin/branches/3.4/t/whitelist_subject.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("whitelist_subject");

Modified: spamassassin/branches/3.4/t/whitelist_to.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/whitelist_to.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/whitelist_to.t (original)
+++ spamassassin/branches/3.4/t/whitelist_to.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("whitelist_to");

Modified: spamassassin/branches/3.4/t/zz_cleanup.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/zz_cleanup.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/zz_cleanup.t (original)
+++ spamassassin/branches/3.4/t/zz_cleanup.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("zz_cleanup");

Modified: spamassassin/branches/3.4/xt/20_saw_ampersand.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/20_saw_ampersand.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/20_saw_ampersand.t (original)
+++ spamassassin/branches/3.4/xt/20_saw_ampersand.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 # detect use of dollar-ampersand somewhere in the perl interpreter;
 # once it is used once, it slows down every regexp match thereafter.
@@ -165,7 +165,7 @@ tryone (0, "");
 print "\ntrying net with all default non-local rule plugins\n";
 
 # TODO: unportable
-system "perl -pi.bak -e 's/^###loadplugin/loadplugin/g' ".
+untaint_system "perl -pi.bak -e 's/^###loadplugin/loadplugin/g' ".
                 " log/localrules.tmp/*.pre log/test_rules_copy/*.pre";
 
 ($? >> 8 != 0) and die "perl failed";

Modified: spamassassin/branches/3.4/xt/50_bayesbdb.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_bayesbdb.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_bayesbdb.t (original)
+++ spamassassin/branches/3.4/xt/50_bayesbdb.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,6 @@
-
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/bayesbdb.t",
+  system( "$^X", "-T", "t/bayesbdb.t",
         "--override", "run_long_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_bayesdbm.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_bayesdbm.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_bayesdbm.t (original)
+++ spamassassin/branches/3.4/xt/50_bayesdbm.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,6 @@
-
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/bayesdbm.t",
+  system( "$^X", "-T", "t/bayesdbm.t",
         "--override", "run_long_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_bayesdbm_flock.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_bayesdbm_flock.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_bayesdbm_flock.t (original)
+++ spamassassin/branches/3.4/xt/50_bayesdbm_flock.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,6 @@
-
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/bayesdbm_flock.t",
+  system( "$^X", "-T", "t/bayesdbm_flock.t",
         "--override", "run_long_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_bayessdbm.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_bayessdbm.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_bayessdbm.t (original)
+++ spamassassin/branches/3.4/xt/50_bayessdbm.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,6 @@
-
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/bayessdbm.t",
+  system( "$^X", "-T", "t/bayessdbm.t",
         "--override", "run_long_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_bayessdbm_seen_delete.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_bayessdbm_seen_delete.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_bayessdbm_seen_delete.t (original)
+++ spamassassin/branches/3.4/xt/50_bayessdbm_seen_delete.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/bayessdbm_seen_delete.t",
+  system( "$^X", "-T", "t/bayessdbm_seen_delete.t",
         "--override", "run_long_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_db_based_whitelist.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_db_based_whitelist.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_db_based_whitelist.t (original)
+++ spamassassin/branches/3.4/xt/50_db_based_whitelist.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/db_based_whitelist.t",
+  system( "$^X", "-T", "t/db_based_whitelist.t",
         "--override", "run_long_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_db_based_whitelist_ips.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_db_based_whitelist_ips.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_db_based_whitelist_ips.t (original)
+++ spamassassin/branches/3.4/xt/50_db_based_whitelist_ips.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/db_based_whitelist_ips.t",
+  system( "$^X", "-T", "t/db_based_whitelist_ips.t",
         "--override", "run_long_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_dcc.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_dcc.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_dcc.t (original)
+++ spamassassin/branches/3.4/xt/50_dcc.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/dcc.t",
+  system( "$^X", "-T", "t/dcc.t",
         "--override", "run_dcc_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_debug.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_debug.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_debug.t (original)
+++ spamassassin/branches/3.4/xt/50_debug.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/debug.t",
+  system( "$^X", "-T", "t/debug.t",
         "--override", "run_long_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_dkim.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_dkim.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_dkim.t (original)
+++ spamassassin/branches/3.4/xt/50_dkim.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/dkim.t",
+  system( "$^X", "-T", "t/dkim.t",
         "--override", "run_net_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_dnsbl.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_dnsbl.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_dnsbl.t (original)
+++ spamassassin/branches/3.4/xt/50_dnsbl.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/dnsbl.t",
+  system( "$^X", "-T", "t/dnsbl.t",
         "--override", "run_net_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_dnsbl_sc_meta.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_dnsbl_sc_meta.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_dnsbl_sc_meta.t (original)
+++ spamassassin/branches/3.4/xt/50_dnsbl_sc_meta.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/dnsbl_sc_meta.t",
+  system( "$^X", "-T", "t/dnsbl_sc_meta.t",
         "--override", "run_net_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_lang_lint.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_lang_lint.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_lang_lint.t (original)
+++ spamassassin/branches/3.4/xt/50_lang_lint.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/lang_lint.t",
+  system( "$^X", "-T", "t/lang_lint.t",
         "--override", "run_long_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_line_endings.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_line_endings.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_line_endings.t (original)
+++ spamassassin/branches/3.4/xt/50_line_endings.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/line_endings.t",
+  system( "$^X", "-T", "t/line_endings.t",
         "--override", "run_long_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_razor2.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_razor2.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_razor2.t (original)
+++ spamassassin/branches/3.4/xt/50_razor2.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/razor2.t",
+  system( "$^X", "-T", "t/razor2.t",
         "--override", "run_net_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_root_spamd.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_root_spamd.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_root_spamd.t (original)
+++ spamassassin/branches/3.4/xt/50_root_spamd.t Sat Jun 22 16:00:42 2019
@@ -1,9 +1,9 @@
 #!/usr/bin/perl
 
   (-d "../t") and chdir "..";
-  system("sudo",  "$^X", "t/root_spamd.t",
+  system("sudo", "-n",  "$^X", "-T", "t/root_spamd.t",
         "--override", "run_root_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
 
   my $uid = (stat("t"))[4];
-  system("sudo chown -R $uid t/log") if $uid;
+  system("sudo -n chown -R $uid t/log") if $uid;

Modified: spamassassin/branches/3.4/xt/50_root_spamd_tell.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_root_spamd_tell.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_root_spamd_tell.t (original)
+++ spamassassin/branches/3.4/xt/50_root_spamd_tell.t Sat Jun 22 16:00:42 2019
@@ -1,10 +1,10 @@
 #!/usr/bin/perl
 
   (-d "../t") and chdir "..";
-  system("sudo",  "$^X", "t/root_spamd_tell.t",
+  system("sudo", "-n", "$^X", "-T", "t/root_spamd_tell.t",
         "--override", "run_root_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
 
   my $uid = (stat("t"))[4];
-  system("sudo chown -R $uid t/log") if $uid;
+  system("sudo -n chown -R $uid t/log") if $uid;
 

Modified: spamassassin/branches/3.4/xt/50_root_spamd_tell_paranoid.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_root_spamd_tell_paranoid.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_root_spamd_tell_paranoid.t (original)
+++ spamassassin/branches/3.4/xt/50_root_spamd_tell_paranoid.t Sat Jun 22 16:00:42 2019
@@ -1,10 +1,10 @@
 #!/usr/bin/perl
 
   (-d "../t") and chdir "..";
-  system("sudo",  "$^X", "t/root_spamd_tell_paranoid.t",
+  system("sudo", "-n", "$^X", "-T", "t/root_spamd_tell_paranoid.t",
         "--override", "run_root_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
 
   my $uid = (stat("t"))[4];
-  system("sudo chown -R $uid t/log") if $uid;
+  system("sudo -n chown -R $uid t/log") if $uid;
 

Modified: spamassassin/branches/3.4/xt/50_root_spamd_tell_x.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_root_spamd_tell_x.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_root_spamd_tell_x.t (original)
+++ spamassassin/branches/3.4/xt/50_root_spamd_tell_x.t Sat Jun 22 16:00:42 2019
@@ -1,9 +1,9 @@
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system("sudo",  "$^X", "t/root_spamd_tell_x.t",
+  system("sudo", "-n", "$^X", "-T", "t/root_spamd_tell_x.t",
         "--override", "run_root_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
 
   my $uid = (stat("t"))[4];
-  system("sudo chown -R $uid t/log") if $uid;
+  system("sudo -n chown -R $uid t/log") if $uid;
 

Modified: spamassassin/branches/3.4/xt/50_root_spamd_tell_x_paranoid.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_root_spamd_tell_x_paranoid.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_root_spamd_tell_x_paranoid.t (original)
+++ spamassassin/branches/3.4/xt/50_root_spamd_tell_x_paranoid.t Sat Jun 22 16:00:42 2019
@@ -1,10 +1,10 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system("sudo",  "$^X", "t/root_spamd_tell_x_paranoid.t",
+  system("sudo", "-n", "$^X", "-T", "t/root_spamd_tell_x_paranoid.t",
         "--override", "run_root_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
 
   my $uid = (stat("t"))[4];
-  system("sudo chown -R $uid t/log") if $uid;
+  system("sudo -n chown -R $uid t/log") if $uid;
 

Modified: spamassassin/branches/3.4/xt/50_root_spamd_u.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_root_spamd_u.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_root_spamd_u.t (original)
+++ spamassassin/branches/3.4/xt/50_root_spamd_u.t Sat Jun 22 16:00:42 2019
@@ -1,9 +1,9 @@
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system("sudo",  "$^X", "t/root_spamd_u.t",
+  system("sudo", "-n", "$^X", "-T", "t/root_spamd_u.t",
         "--override", "run_root_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
 
   my $uid = (stat("t"))[4];
-  system("sudo chown -R $uid t/log") if $uid;
+  system("sudo -n chown -R $uid t/log") if $uid;
 

Modified: spamassassin/branches/3.4/xt/50_root_spamd_u_dcc.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_root_spamd_u_dcc.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_root_spamd_u_dcc.t (original)
+++ spamassassin/branches/3.4/xt/50_root_spamd_u_dcc.t Sat Jun 22 16:00:42 2019
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/root_spamd_u_dcc.t",
+  system( "$^X", "-T", "t/root_spamd_u_dcc.t",
         "--override", "run_dcc_tests:run_root_tests", "1:1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_root_spamd_virtual.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_root_spamd_virtual.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_root_spamd_virtual.t (original)
+++ spamassassin/branches/3.4/xt/50_root_spamd_virtual.t Sat Jun 22 16:00:42 2019
@@ -1,9 +1,9 @@
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system("sudo",  "$^X", "t/root_spamd_virtual.t",
+  system("sudo", "-n", "$^X", "-T", "t/root_spamd_virtual.t",
         "--override", "run_root_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
 
   my $uid = (stat("t"))[4];
-  system("sudo chown -R $uid t/log") if $uid;
+  system("sudo -n chown -R $uid t/log") if $uid;
 

Modified: spamassassin/branches/3.4/xt/50_root_spamd_x.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_root_spamd_x.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_root_spamd_x.t (original)
+++ spamassassin/branches/3.4/xt/50_root_spamd_x.t Sat Jun 22 16:00:42 2019
@@ -1,10 +1,10 @@
 #!/usr/bin/perl
 
   (-d "../t") and chdir "..";
-  system("sudo",  "$^X", "t/root_spamd_x.t",
+  system("sudo", "-n", "$^X", "-T", "t/root_spamd_x.t",
         "--override", "run_root_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
 
   my $uid = (stat("t"))[4];
-  system("sudo chown -R $uid t/log") if $uid;
+  system("sudo -n chown -R $uid t/log") if $uid;
 

Modified: spamassassin/branches/3.4/xt/50_root_spamd_x_paranoid.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_root_spamd_x_paranoid.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_root_spamd_x_paranoid.t (original)
+++ spamassassin/branches/3.4/xt/50_root_spamd_x_paranoid.t Sat Jun 22 16:00:42 2019
@@ -1,9 +1,9 @@
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system("sudo",  "$^X", "t/root_spamd_x_paranoid.t",
+  system("sudo", "-n", "$^X", "-T", "t/root_spamd_x_paranoid.t",
         "--override", "run_root_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
 
   my $uid = (stat("t"))[4];
-  system("sudo chown -R $uid t/log") if $uid;
+  system("sudo -n chown -R $uid t/log") if $uid;
 

Modified: spamassassin/branches/3.4/xt/50_root_spamd_x_u.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_root_spamd_x_u.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_root_spamd_x_u.t (original)
+++ spamassassin/branches/3.4/xt/50_root_spamd_x_u.t Sat Jun 22 16:00:42 2019
@@ -1,10 +1,10 @@
 #!/usr/bin/perl
 
   (-d "../t") and chdir "..";
-  system("sudo",  "$^X", "t/root_spamd_x_u.t",
+  system("sudo", "-n", "$^X", "-T", "t/root_spamd_x_u.t",
         "--override", "run_root_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
 
   my $uid = (stat("t"))[4];
-  system("sudo chown -R $uid t/log") if $uid;
+  system("sudo -n chown -R $uid t/log") if $uid;
 

Modified: spamassassin/branches/3.4/xt/50_sa_compile.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_sa_compile.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_sa_compile.t (original)
+++ spamassassin/branches/3.4/xt/50_sa_compile.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/sa_compile.t",
+  system( "$^X", "-T", "t/sa_compile.t",
         "--override", "run_long_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_spamc_H.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_spamc_H.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_spamc_H.t (original)
+++ spamassassin/branches/3.4/xt/50_spamc_H.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/spamc_H.t",
+  system( "$^X", "-T", "t/spamc_H.t",
         "--override", "run_net_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_spamc_x_E_R.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_spamc_x_E_R.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_spamc_x_E_R.t (original)
+++ spamassassin/branches/3.4/xt/50_spamc_x_E_R.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/spamc_x_E_R.t",
+  system( "$^X", "-T", "t/spamc_x_E_R.t",
         "--override", "run_long_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_spamd_client.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_spamd_client.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_spamd_client.t (original)
+++ spamassassin/branches/3.4/xt/50_spamd_client.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/spamd_client.t",
+  system( "$^X", "-T", "t/spamd_client.t",
         "--override", "run_long_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_spamd_hup.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_spamd_hup.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_spamd_hup.t (original)
+++ spamassassin/branches/3.4/xt/50_spamd_hup.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/spamd_hup.t",
+  system( "$^X", "-T", "t/spamd_hup.t",
         "--override", "run_long_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_spamd_kill_restart.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_spamd_kill_restart.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_spamd_kill_restart.t (original)
+++ spamassassin/branches/3.4/xt/50_spamd_kill_restart.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/spamd_kill_restart.t",
+  system( "$^X", "-T", "t/spamd_kill_restart.t",
         "--override", "run_long_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_spamd_kill_restart_rr.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_spamd_kill_restart_rr.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_spamd_kill_restart_rr.t (original)
+++ spamassassin/branches/3.4/xt/50_spamd_kill_restart_rr.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/spamd_kill_restart_rr.t",
+  system( "$^X", "-T", "t/spamd_kill_restart_rr.t",
         "--override", "run_long_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_spamd_prefork_stress.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_spamd_prefork_stress.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_spamd_prefork_stress.t (original)
+++ spamassassin/branches/3.4/xt/50_spamd_prefork_stress.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/spamd_prefork_stress.t",
+  system( "$^X", "-T", "t/spamd_prefork_stress.t",
         "--override", "run_spamd_prefork_stress_test", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_spamd_prefork_stress_2.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_spamd_prefork_stress_2.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_spamd_prefork_stress_2.t (original)
+++ spamassassin/branches/3.4/xt/50_spamd_prefork_stress_2.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/spamd_prefork_stress_2.t",
+  system( "$^X", "-T", "t/spamd_prefork_stress_2.t",
         "--override", "run_spamd_prefork_stress_test", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_spamd_prefork_stress_3.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_spamd_prefork_stress_3.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_spamd_prefork_stress_3.t (original)
+++ spamassassin/branches/3.4/xt/50_spamd_prefork_stress_3.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
   (-d "../t") and chdir "..";
-  system( "$^X", "t/spamd_prefork_stress_3.t",
+  system( "$^X", "-T", "t/spamd_prefork_stress_3.t",
         "--override", "run_long_tests:run_spamd_prefork_stress_test", "1:1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_spamd_prefork_stress_4.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_spamd_prefork_stress_4.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_spamd_prefork_stress_4.t (original)
+++ spamassassin/branches/3.4/xt/50_spamd_prefork_stress_4.t Sat Jun 22 16:00:42 2019
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/spamd_prefork_stress_4.t",
+  system( "$^X", "-T", "t/spamd_prefork_stress_4.t",
         "--override", "run_long_tests:run_spamd_prefork_stress_test", "1:1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_spf.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_spf.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_spf.t (original)
+++ spamassassin/branches/3.4/xt/50_spf.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
   (-d "../t") and chdir "..";
-  system( "$^X", "t/spf.t", "--override", "run_long_tests:run_net_tests", "1:1", @ARGV);
+  system( "$^X", "-T", "t/spf.t", "--override", "run_long_tests:run_net_tests", "1:1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   
 

Modified: spamassassin/branches/3.4/xt/50_strip2.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_strip2.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_strip2.t (original)
+++ spamassassin/branches/3.4/xt/50_strip2.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/strip2.t",
+  system( "$^X", "-T", "t/strip2.t",
         "--override", "run_long_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_strip_no_subject.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_strip_no_subject.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_strip_no_subject.t (original)
+++ spamassassin/branches/3.4/xt/50_strip_no_subject.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/strip_no_subject.t",
+  system( "$^X", "-T", "t/strip_no_subject.t",
         "--override", "run_long_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_trust_path.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_trust_path.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_trust_path.t (original)
+++ spamassassin/branches/3.4/xt/50_trust_path.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/trust_path.t",
+  system( "$^X", "-T", "t/trust_path.t",
         "--override", "run_long_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_uribl.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_uribl.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_uribl.t (original)
+++ spamassassin/branches/3.4/xt/50_uribl.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/uribl.t",
+  system( "$^X", "-T", "t/uribl.t",
         "--override", "run_net_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_whitelist_addrs.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_whitelist_addrs.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_whitelist_addrs.t (original)
+++ spamassassin/branches/3.4/xt/50_whitelist_addrs.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/whitelist_addrs.t",
+  system( "$^X", "-T", "t/whitelist_addrs.t",
         "--override", "run_long_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/branches/3.4/xt/50_whitelist_from.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/xt/50_whitelist_from.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/branches/3.4/xt/50_whitelist_from.t (original)
+++ spamassassin/branches/3.4/xt/50_whitelist_from.t Sat Jun 22 16:00:42 2019
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
   (-d "../t") and chdir "..";
-  system( "$^X", "t/whitelist_from.t",
+  system( "$^X", "-T", "t/whitelist_from.t",
         "--override", "run_long_tests", "1", @ARGV);
   ($? >> 8 == 0) or die "exec failed";
   

Modified: spamassassin/trunk/t/README
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/README?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/README (original)
+++ spamassassin/trunk/t/README Sat Jun 22 16:00:42 2019
@@ -41,7 +41,7 @@ The wildcard syntax does not work with s
 shells.
 
 You can also run individual test scripts directly, from the "t" directory,
-like so:
+like so (note that it uses hardcoded #!/usr/bin/perl):
 
  cd t
  ./spamc.t

Modified: spamassassin/trunk/t/SATest.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/SATest.pm?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/SATest.pm (original)
+++ spamassassin/trunk/t/SATest.pm Sat Jun 22 16:00:42 2019
@@ -164,8 +164,8 @@ sub sa_t_init {
                        ($RUNNING_ON_WINDOWS && !$ENV{'SPAMD_HOST'})); 
     $SSL_AVAILABLE = ((!$SKIP_SPAMC_TESTS) &&  # no SSL test if no spamc
                     (!$SKIP_SPAMD_TESTS) &&  # or if no local spamd
-                    (`$spamc -V` =~ /with SSL support/) &&
-                    (`$spamd --version` =~ /with SSL support/));
+                    (untaint_cmd("$spamc -V") =~ /with SSL support/) &&
+                    (untaint_cmd("$spamd --version") =~ /with SSL support/));
   }
   # do not remove prior test results!
   # rmtree ("log");
@@ -176,7 +176,7 @@ sub sa_t_init {
   chmod (0755, "log"); # set in case log already exists with wrong permissions
 
   if (!$RUNNING_ON_WINDOWS) {
-    system("chacl -B log 2>/dev/null || setfacl -b log 2>/dev/null"); # remove acls that confuse test
+    untaint_system("chacl -B log 2>/dev/null || setfacl -b log 2>/dev/null"); # remove acls that confuse test
   }
 
   rmtree ("log/user_state");
@@ -348,7 +348,7 @@ sub sarun {
   
   my $test_number = test_number();
 
-  system ("$scrargs > log/d.$testname/$test_number $post_redir");
+  untaint_system("$scrargs > log/d.$testname/$test_number $post_redir");
   $sa_exitcode = ($?>>8);
   if ($sa_exitcode != 0) { return undef; }
   &checkfile ("d.$testname/$test_number", $read_sub) if (defined $read_sub);
@@ -385,7 +385,7 @@ sub salearnrun {
 
   my $test_number = test_number();
 
-  system ("$salearnargs > log/d.$testname/$test_number");
+  untaint_system("$salearnargs > log/d.$testname/$test_number");
   $salearn_exitcode = ($?>>8);
   if ($salearn_exitcode != 0) { return undef; }
   &checkfile ("d.$testname/$test_number", $read_sub) if (defined $read_sub);
@@ -433,9 +433,9 @@ sub spamcrun {
   my $test_number = test_number();
 
   if ($capture_stderr) {
-    system ("$spamcargs > log/d.$testname/out.$test_number 2>&1");
+    untaint_system ("$spamcargs > log/d.$testname/out.$test_number 2>&1");
   } else {
-    system ("$spamcargs > log/d.$testname/out.$test_number");
+    untaint_system ("$spamcargs > log/d.$testname/out.$test_number");
   }
 
   $sa_exitcode = ($?>>8);
@@ -477,7 +477,7 @@ sub spamcrun_background {
   (-d "log/d.$testname") or mkdir ("log/d.$testname", 0755);
   
   my $test_number = test_number();
-  system ("$spamcargs > log/d.$testname/bg.$test_number &") and return 0;
+  untaint_system ("$spamcargs > log/d.$testname/bg.$test_number &") and return 0;
 
   1;
 }
@@ -582,7 +582,7 @@ sub start_spamd {
   unlink ($spamd_stdout, $spamd_stderr, $spamd_stdlog, $spamd_pidfile);
   print ("\t${spamd_cmd}\n");
   my $startat = time;
-  system ($spamd_cmd);
+  untaint_system ($spamd_cmd);
 
   $spamd_pid = 0;
   # Find the PID, either in the pidfile or the log... 
@@ -593,7 +593,7 @@ sub start_spamd {
   sleep $wait ;
   while ($spamd_pid <= 0) {
     my $spamdlog = '';
-    my $pidstr = `cat $spamd_pidfile 2>/dev/null` ;
+    my $pidstr = untaint_cmd("cat $spamd_pidfile 2>/dev/null");
     if ($pidstr) {
        chomp $pidstr;
        $spamd_pid = $pidstr;
@@ -638,6 +638,7 @@ sub stop_spamd {
   die "NO_SPAMD_REQUIRED in stop_spamd! oops" if $NO_SPAMD_REQUIRED;
 
   $spamd_pid ||= 0;
+  $spamd_pid = untaint_var($spamd_pid);
   if ( $spamd_pid <= 1) {
     print ("Invalid spamd pid: $spamd_pid. Spamd not started/crashed?\n");
     return 0;
@@ -999,6 +1000,7 @@ sub read_from_pidfile {
     $npid = <PID>;
     if (defined $npid) { chomp $npid; }
     close(PID);
+    $npid = untaint_var($npid);
 
     if (!$npid || $npid < 1) {
       warn "failed to read anything sensible from $f, retrying read";
@@ -1018,7 +1020,7 @@ sub read_from_pidfile {
 sub system_or_die {
   my $cmd = $_[0];
   print ("\t$cmd\n");
-  system($cmd);
+  untaint_system($cmd);
   $? == 0  or die "'$cmd' failed: ".exit_status_str($?,0);
 }
 
@@ -1107,4 +1109,31 @@ sub test_number {
   return Test::More->builder->current_test;
 }
 
+# Simple version of untaint_var for internal use
+sub untaint_var {
+    local($1);
+    $_[0] =~ /^(.*)\z/s;
+    return $1;
+}
+
+# untainted system()
+sub untaint_system {
+    local $ENV{'PATH'} = '/bin:/usr/bin:/usr/local/bin';  # must not be tainted
+    my @args;
+    push @args, untaint_var($_) foreach (@_);
+    return system(@args);
+}
+
+# untainted version of `shell command`
+sub untaint_cmd {
+    local $ENV{'PATH'} = '/bin:/usr/bin:/usr/local/bin';  # must not be tainted
+    if (open(CMD, untaint_var($_[0])."|")) {
+      my $stdout = do { local($/); <CMD> };
+      close CMD;
+      return $stdout;
+    } else {
+      return "";
+    }
+}
+
 1;

Modified: spamassassin/trunk/t/all_modules.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/all_modules.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/all_modules.t (original)
+++ spamassassin/trunk/t/all_modules.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; 
 use lib 't';

Modified: spamassassin/trunk/t/authres.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/authres.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/authres.t (original)
+++ spamassassin/trunk/t/authres.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; 
 use lib 't';

Modified: spamassassin/trunk/t/autolearn.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/autolearn.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/autolearn.t (original)
+++ spamassassin/trunk/t/autolearn.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("autolearn");

Modified: spamassassin/trunk/t/autolearn_force.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/autolearn_force.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/autolearn_force.t (original)
+++ spamassassin/trunk/t/autolearn_force.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("autolearn_force");

Modified: spamassassin/trunk/t/autolearn_force_fail.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/autolearn_force_fail.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/autolearn_force_fail.t (original)
+++ spamassassin/trunk/t/autolearn_force_fail.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("autolearn_force_fail");

Modified: spamassassin/trunk/t/basic_lint.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/basic_lint.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/basic_lint.t (original)
+++ spamassassin/trunk/t/basic_lint.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("basic_lint");

Modified: spamassassin/trunk/t/basic_lint_without_sandbox.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/basic_lint_without_sandbox.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/basic_lint_without_sandbox.t (original)
+++ spamassassin/trunk/t/basic_lint_without_sandbox.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 #
 # ensure the rules files work without rules/70_sandbox.cf
 

Modified: spamassassin/trunk/t/basic_meta.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/basic_meta.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/basic_meta.t (original)
+++ spamassassin/trunk/t/basic_meta.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl -w -T
 
 BEGIN {
   if (-e 't/test_dir') { # if we are running "t/rule_names.t", kluge around ...
@@ -41,7 +41,7 @@ for (my $scoreset = 0; $scoreset < 4; $s
   unlink $output || die;
   %rules = ();
   %scores = ();
-  if (system("$perl_path $prefix/build/parse-rules-for-masses -o $output -d \"$prefix/rules\" -s $scoreset -x")) {
+  if (untaint_system("$perl_path $prefix/build/parse-rules-for-masses -o $output -d \"$prefix/rules\" -s $scoreset -x")) {
     warn "parse-rules-for-masses failed!";
   }
   eval {

Modified: spamassassin/trunk/t/basic_meta2.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/basic_meta2.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/basic_meta2.t (original)
+++ spamassassin/trunk/t/basic_meta2.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; 
 use lib 't';

Modified: spamassassin/trunk/t/basic_obj_api.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/basic_obj_api.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/basic_obj_api.t (original)
+++ spamassassin/trunk/t/basic_obj_api.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 BEGIN {
   if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ...

Modified: spamassassin/trunk/t/bayesbdb.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/bayesbdb.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/bayesbdb.t (original)
+++ spamassassin/trunk/t/bayesbdb.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use Data::Dumper;
 use lib '.'; use lib 't';

Modified: spamassassin/trunk/t/bayesdbm.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/bayesdbm.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/bayesdbm.t (original)
+++ spamassassin/trunk/t/bayesdbm.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use Data::Dumper;
 use lib '.'; use lib 't';

Modified: spamassassin/trunk/t/bayesdbm_flock.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/bayesdbm_flock.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/bayesdbm_flock.t (original)
+++ spamassassin/trunk/t/bayesdbm_flock.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use Data::Dumper;
 use lib '.'; use lib 't';

Modified: spamassassin/trunk/t/bayessdbm.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/bayessdbm.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/bayessdbm.t (original)
+++ spamassassin/trunk/t/bayessdbm.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use Data::Dumper;
 use lib '.'; use lib 't';

Modified: spamassassin/trunk/t/bayessdbm_seen_delete.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/bayessdbm_seen_delete.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/bayessdbm_seen_delete.t (original)
+++ spamassassin/trunk/t/bayessdbm_seen_delete.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use Data::Dumper;
 use lib '.'; use lib 't';

Modified: spamassassin/trunk/t/bayessql.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/bayessql.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/bayessql.t (original)
+++ spamassassin/trunk/t/bayessql.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest;

Modified: spamassassin/trunk/t/blacklist_autolearn.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/blacklist_autolearn.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/blacklist_autolearn.t (original)
+++ spamassassin/trunk/t/blacklist_autolearn.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("blacklist_autolearn");

Modified: spamassassin/trunk/t/body_mod.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/body_mod.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/body_mod.t (original)
+++ spamassassin/trunk/t/body_mod.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl -w -T
 
 BEGIN {
   if (-e 't/test_dir') { # if we are running "t/body_mod.t", kluge around ...

Modified: spamassassin/trunk/t/check_implemented.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/check_implemented.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/check_implemented.t (original)
+++ spamassassin/trunk/t/check_implemented.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 # detect use of dollar-ampersand somewhere in the perl interpreter;
 # once it is used once, it slows down every regexp match thereafter.
@@ -35,6 +35,7 @@ require Mail::SpamAssassin;
 foreach my $file 
         (<log/localrules.tmp/*.pre>, <log/test_rules_copy/*.pre>) #*/
 {
+  $file = main::untaint_var($file);
   rename $file, "$file.bak" or die "rename $file failed";
   open IN, "<$file.bak" or die "cannot read $file.bak";
   open OUT, ">$file" or die "cannot write $file";

Modified: spamassassin/trunk/t/cidrs.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/cidrs.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/cidrs.t (original)
+++ spamassassin/trunk/t/cidrs.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 BEGIN {
   if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ...

Modified: spamassassin/trunk/t/config_errs.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/config_errs.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/config_errs.t (original)
+++ spamassassin/trunk/t/config_errs.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl -w -T
 
 use Test::More;
 

Modified: spamassassin/trunk/t/config_text.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/config_text.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/config_text.t (original)
+++ spamassassin/trunk/t/config_text.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("config_text");

Modified: spamassassin/trunk/t/cpp_comments_in_spamc.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/cpp_comments_in_spamc.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/cpp_comments_in_spamc.t (original)
+++ spamassassin/trunk/t/cpp_comments_in_spamc.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("cpp_comments_in_spamc");

Modified: spamassassin/trunk/t/cross_user_config_leak.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/cross_user_config_leak.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/cross_user_config_leak.t (original)
+++ spamassassin/trunk/t/cross_user_config_leak.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 BEGIN {
   if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ...

Modified: spamassassin/trunk/t/date.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/date.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/date.t (original)
+++ spamassassin/trunk/t/date.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl -w -T
 
 BEGIN {
   if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ...

Modified: spamassassin/trunk/t/db_awl_path.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/db_awl_path.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/db_awl_path.t (original)
+++ spamassassin/trunk/t/db_awl_path.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("db_awl_path");

Modified: spamassassin/trunk/t/db_awl_perms.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/db_awl_perms.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/db_awl_perms.t (original)
+++ spamassassin/trunk/t/db_awl_perms.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("db_awl_perms");
@@ -22,7 +22,7 @@ umask 022;
 sarun("--add-addr-to-whitelist whitelist_test\@example.org",
       \&patterns_run_cb);
 
-system "ls -l log/user_state";          # for the logs
+untaint_system "ls -l log/user_state";          # for the logs
 
 sub checkmode {
   my $fname = shift;

Modified: spamassassin/trunk/t/db_based_whitelist.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/db_based_whitelist.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/db_based_whitelist.t (original)
+++ spamassassin/trunk/t/db_based_whitelist.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 

Modified: spamassassin/trunk/t/db_based_whitelist_ips.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/db_based_whitelist_ips.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/db_based_whitelist_ips.t (original)
+++ spamassassin/trunk/t/db_based_whitelist_ips.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 

Modified: spamassassin/trunk/t/dcc.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/dcc.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/dcc.t (original)
+++ spamassassin/trunk/t/dcc.t Sat Jun 22 16:00:42 2019
@@ -1,9 +1,9 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("dcc");
 
-use constant HAS_DCC => eval { $_ = `which cdcc`; chomp; -x };
+use constant HAS_DCC => eval { $_ = untaint_cmd("which cdcc"); chomp; -x };
 
 use Test::More;
 plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests');

Modified: spamassassin/trunk/t/debug.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/debug.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/debug.t (original)
+++ spamassassin/trunk/t/debug.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl -w -T
 
 BEGIN {
   if (-e 't/test_dir') { # if we are running "t/rule_names.t", kluge around ...

Modified: spamassassin/trunk/t/desc_wrap.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/desc_wrap.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/desc_wrap.t (original)
+++ spamassassin/trunk/t/desc_wrap.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("desc_wrap");

Modified: spamassassin/trunk/t/dkim.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/dkim.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/dkim.t (original)
+++ spamassassin/trunk/t/dkim.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use strict;
 use warnings;

Modified: spamassassin/trunk/t/dnsbl.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/dnsbl.t?rev=1861877&r1=1861876&r2=1861877&view=diff
==============================================================================
--- spamassassin/trunk/t/dnsbl.t (original)
+++ spamassassin/trunk/t/dnsbl.t Sat Jun 22 16:00:42 2019
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -T
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("dns");