You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by km...@apache.org on 2018/02/05 14:11:03 UTC
svn commit: r1823176 [2/2] - in /spamassassin/trunk: ./ build/ build/automc/
lib/Mail/ lib/Mail/SpamAssassin/ lib/Mail/SpamAssassin/BayesStore/
lib/Mail/SpamAssassin/Conf/ lib/Mail/SpamAssassin/Locker/
lib/Mail/SpamAssassin/Logger/ lib/Mail/SpamAssassi...
Modified: spamassassin/trunk/masses/corpora/mass-find-nonspam
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/corpora/mass-find-nonspam?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/masses/corpora/mass-find-nonspam (original)
+++ spamassassin/trunk/masses/corpora/mass-find-nonspam Mon Feb 5 14:11:02 2018
@@ -109,8 +109,7 @@ $|++;
my $format = "dir"; # for now. TODO
-use vars qw( $opt_single
-);
+our $opt_single;
use Getopt::Long;
GetOptions("single");
Modified: spamassassin/trunk/masses/corpora/mk-corpus-link-farm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/corpora/mk-corpus-link-farm?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/masses/corpora/mk-corpus-link-farm (original)
+++ spamassassin/trunk/masses/corpora/mk-corpus-link-farm Mon Feb 5 14:11:02 2018
@@ -65,11 +65,7 @@ my $mbox_tmpdir = $ENV{TMPDIR} || "/tmp"
sub dbg;
use Getopt::Long;
-use vars qw(
-
- $opt_most_recent $opt_after $opt_before
-
-);
+our ($opt_most_recent, $opt_after, $opt_before);
$opt_most_recent = 0;
tz_init();
Modified: spamassassin/trunk/masses/find-extremes
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/find-extremes?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/masses/find-extremes (original)
+++ spamassassin/trunk/masses/find-extremes Mon Feb 5 14:11:02 2018
@@ -21,9 +21,7 @@
use Getopt::Std;
getopts("l:L:h");
-use vars qw {
- $opt_h $opt_l $opt_L
-};
+our ($opt_h, $opt_l, $opt_L);
sub usage {
die "find-extremes [-l LC] [-L LC] [spam log] [nonspam log]
Modified: spamassassin/trunk/masses/fp-fn-statistics
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/fp-fn-statistics?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/masses/fp-fn-statistics (original)
+++ spamassassin/trunk/masses/fp-fn-statistics Mon Feb 5 14:11:02 2018
@@ -60,8 +60,7 @@ the wheel?
use Getopt::Long;
use strict;
-use vars qw($opt_cffile $opt_lambda $opt_threshold $opt_scoreset
- $opt_spam $opt_ham $opt_fplog $opt_fnlog);
+our ($opt_cffile, $opt_lambda, $opt_threshold, $opt_scoreset, $opt_spam, $opt_ham, $opt_fplog, $opt_fnlog);
$opt_cffile = "../rules";
$opt_threshold = 5;
@@ -92,7 +91,7 @@ if (defined $opt_fplog) { open (FPLOG, "
my $lambda = 50;
if ($opt_lambda) { $lambda = $opt_lambda; }
-use vars qw(%scores %allrules %rules);
+our (%scores, %allrules, %rules);
readscores();
Modified: spamassassin/trunk/masses/fp-fn-to-tcr
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/fp-fn-to-tcr?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/masses/fp-fn-to-tcr (original)
+++ spamassassin/trunk/masses/fp-fn-to-tcr Mon Feb 5 14:11:02 2018
@@ -18,7 +18,7 @@
# </...@LICENSE>
use Getopt::Long;
-use vars qw($opt_lambda $opt_fn $opt_fp $opt_spam $opt_ham);
+our ($opt_lambda, $opt_fn, $opt_fp, $opt_spam, $opt_ham);
GetOptions("lambda=f", "fn=f", "fp=f", "spam=f", "ham=f");
# lambda value for TCR equation, representing the cost of of an FP vs. the
Modified: spamassassin/trunk/masses/freqdiff
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/freqdiff?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/masses/freqdiff (original)
+++ spamassassin/trunk/masses/freqdiff Mon Feb 5 14:11:02 2018
@@ -19,7 +19,7 @@
# limitations under the License.
# </...@LICENSE>
-use vars qw($opt_a $opt_b $opt_c $opt_d $opt_h $opt_p $opt_r $opt_l);
+our ($opt_a, $opt_b, $opt_c, $opt_d, $opt_h, $opt_p, $opt_r, $opt_l);
use Getopt::Std;
getopts("abcdhprl:");
Modified: spamassassin/trunk/masses/generate-translation
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/generate-translation?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/masses/generate-translation (original)
+++ spamassassin/trunk/masses/generate-translation Mon Feb 5 14:11:02 2018
@@ -26,7 +26,7 @@ use Getopt::Std;
use Lingua::Translate;
# %rules and %scores from tmp/rules.pl
-use vars qw { $opt_c $opt_e $opt_h $opt_n $opt_r %rules %scores };
+our ($opt_c, $opt_e, $opt_h, $opt_n, $opt_r, %rules, %scores);
sub usage {
die "generate-translation language output_file
Modified: spamassassin/trunk/masses/hit-frequencies
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/hit-frequencies?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/masses/hit-frequencies (original)
+++ spamassassin/trunk/masses/hit-frequencies Mon Feb 5 14:11:02 2018
@@ -24,11 +24,11 @@ use FindBin;
use Getopt::Long qw(:config bundling auto_help);
use Pod::Usage;
-use vars qw {
- $opt_c $opt_s $opt_f $opt_a $opt_p $opt_x $opt_m $opt_t $opt_M
- $opt_X $opt_L $opt_l $opt_i $opt_T $opt_o $opt_S $opt_P $opt_d
- $opt_g $sorting
-};
+our (
+ $opt_c, $opt_s, $opt_f, $opt_a, $opt_p, $opt_x, $opt_m, $opt_t, $opt_M,
+ $opt_X, $opt_L, $opt_l, $opt_i, $opt_T, $opt_o, $opt_S, $opt_P, $opt_d,
+ $opt_g, $sorting
+);
GetOptions("c|cffile=s" => \$opt_c,
"s|scoreset=i" => \$opt_s, # ,, pacify stupid emacs cperl mode
Modified: spamassassin/trunk/masses/logs-to-c
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/logs-to-c?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/masses/logs-to-c (original)
+++ spamassassin/trunk/masses/logs-to-c Mon Feb 5 14:11:02 2018
@@ -51,12 +51,11 @@ L<mass-check(1)>, L<perceptron(1)>
use Getopt::Long qw(:config auto_help bundling);
use strict;
-use vars qw($opt_cffile $opt_spam $opt_ham $opt_scoreset);
-$opt_cffile = "../rules";
-$opt_spam = 'spam.log';
-$opt_ham = 'ham.log';
-$opt_scoreset = 0;
+our $opt_cffile = "../rules";
+our $opt_spam = 'spam.log';
+our $opt_ham = 'ham.log';
+our $opt_scoreset = 0;
GetOptions("cffile=s", "spam=s", "ham=s", "scoreset=i");
@@ -64,7 +63,7 @@ my $is_spam = ''; # vec aligned with @t
my @tests_hit = ();
my %mutable_tests = ();
-use vars qw(%rules %allrules %scores);
+our (%rules, %allrules, %scores);
my (%ignored_rule, %range_lo, %range_hi);
my %rule_to_index;
Modified: spamassassin/trunk/masses/mass-check
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/mass-check?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/masses/mass-check (original)
+++ spamassassin/trunk/masses/mass-check Mon Feb 5 14:11:02 2018
@@ -147,20 +147,20 @@ EOF
###########################################################################
-use vars qw($opt_c $opt_p $opt_f $opt_j $opt_n $opt_o $opt_all $opt_bayes
- $opt_debug $opt_format $opt_hamlog $opt_head $opt_loghits
- $opt_mid $opt_net $opt_nosort $opt_progress $opt_showdots
- $opt_spamlog $opt_tail $opt_rules $opt_restart $opt_loguris
- $opt_logmem $opt_after $opt_before $opt_rewrite $opt_deencap
- $opt_learn $opt_reuse $opt_lint $opt_cache $opt_noisy $opt_cf
- $total_messages $statusevery $opt_cachedir $opt_scanprob
- $opt_client $opt_cs_conn_retries $opt_cs_max $opt_cs_timeout
- $opt_cs_paths_only $opt_server %postdata %real $svn_revision
- $opt_cs_ssl $opt_run_post_scan $opt_cs_verbose %client_caches
- %server_caches @cache_tmp_files %min_other_caches
- %unique_cache_completed $opt_cs_schedule_cache $opt_cs_cache
- $opt_cs_cachedir $opt_cs_max_tries $opt_pre
- $tmpfd);
+our ($opt_c, $opt_p, $opt_f, $opt_j, $opt_n, $opt_o, $opt_all, $opt_bayes,
+ $opt_debug, $opt_format, $opt_hamlog, $opt_head, $opt_loghits,
+ $opt_mid, $opt_net, $opt_nosort, $opt_progress, $opt_showdots,
+ $opt_spamlog, $opt_tail, $opt_rules, $opt_restart, $opt_loguris,
+ $opt_logmem, $opt_after, $opt_before, $opt_rewrite, $opt_deencap,
+ $opt_learn, $opt_reuse, $opt_lint, $opt_cache, $opt_noisy, $opt_cf,
+ $total_messages, $statusevery, $opt_cachedir, $opt_scanprob,
+ $opt_client, $opt_cs_conn_retries, $opt_cs_max, $opt_cs_timeout,
+ $opt_cs_paths_only, $opt_server, %postdata, %real, $svn_revision,
+ $opt_cs_ssl, $opt_run_post_scan, $opt_cs_verbose, %client_caches,
+ %server_caches, @cache_tmp_files, %min_other_caches,
+ %unique_cache_completed, $opt_cs_schedule_cache, $opt_cs_cache,
+ $opt_cs_cachedir, $opt_cs_max_tries, $opt_pre,
+ $tmpfd);
use FindBin;
Modified: spamassassin/trunk/masses/mboxget
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/mboxget?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/masses/mboxget (original)
+++ spamassassin/trunk/masses/mboxget Mon Feb 5 14:11:02 2018
@@ -24,7 +24,7 @@ sub mywarn;
use Getopt::Long qw(:config bundling auto_help);
use Pod::Usage;
-use vars qw($opt_noannotate $opt_h $opt_ids);
+our ($opt_noannotate, $opt_h, $opt_ids);
GetOptions("noannotate" => \$opt_noannotate,
"ids" => \$opt_ids,
"h|headers" => \$opt_h
Modified: spamassassin/trunk/masses/mk-roc-graphs
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/mk-roc-graphs?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/masses/mk-roc-graphs (original)
+++ spamassassin/trunk/masses/mk-roc-graphs Mon Feb 5 14:11:02 2018
@@ -24,7 +24,7 @@
# </...@LICENSE>
use Getopt::Long;
-use vars qw($opt_cffile $opt_spam $opt_ham $opt_count $opt_lambda);
+our ($opt_cffile, $opt_spam, $opt_ham, $opt_count, $opt_lambda);
GetOptions("cffile=s", "count", "threshold=f", "spam=s",
"ham=s", "scoreset=i", "lambda=f");
@@ -38,7 +38,7 @@ $opt_scoreset = 0 if (!defined $opt_scor
my $msgline;
-use vars qw(%rules %allrules);
+our (%rules, %allrules);
my %spam_points = ();
my %ham_points = ();
Modified: spamassassin/trunk/masses/overlap
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/overlap?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/masses/overlap (original)
+++ spamassassin/trunk/masses/overlap Mon Feb 5 14:11:02 2018
@@ -20,7 +20,7 @@
use strict;
use warnings;
-use vars qw($opt_a $opt_t);
+our ($opt_a, $opt_t);
use Getopt::Long qw(:config auto_help bundling);
GetOptions("a|all" => \$opt_a,
Modified: spamassassin/trunk/masses/plugins/HitFreqsRuleTiming.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/plugins/HitFreqsRuleTiming.pm?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/masses/plugins/HitFreqsRuleTiming.pm (original)
+++ spamassassin/trunk/masses/plugins/HitFreqsRuleTiming.pm Mon Feb 5 14:11:02 2018
@@ -27,8 +27,7 @@ use warnings;
use Time::HiRes qw(time);
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
sub new {
my $class = shift;
Modified: spamassassin/trunk/masses/rewrite-cf-with-new-scores
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/rewrite-cf-with-new-scores?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/masses/rewrite-cf-with-new-scores (original)
+++ spamassassin/trunk/masses/rewrite-cf-with-new-scores Mon Feb 5 14:11:02 2018
@@ -70,7 +70,7 @@ use warnings;
use Getopt::Long qw(:config auto_help);
use Pod::Usage;
-use vars qw($opt_old $opt_new $opt_scoreset $opt_out $opt_cffile);
+our ($opt_old, $opt_new, $opt_scoreset, $opt_out, $opt_cffile);
GetOptions("old-scores=s" => \$opt_old,
"new-scores=s" => \$opt_new,
Modified: spamassassin/trunk/masses/rule-qa/corpus-hourly
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/rule-qa/corpus-hourly?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/masses/rule-qa/corpus-hourly (original)
+++ spamassassin/trunk/masses/rule-qa/corpus-hourly Mon Feb 5 14:11:02 2018
@@ -5,11 +5,7 @@
use strict;
use Getopt::Long;
-use vars qw(
- $corpusdir
- $opt_override
- $opt_tag
-);
+our ( $corpusdir, $opt_override, $opt_tag );
GetOptions(
"tag=s" => \$opt_tag,
"dir=s" => \$corpusdir,
Modified: spamassassin/trunk/masses/rule-qa/get-rulemetadata-for-revision
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/rule-qa/get-rulemetadata-for-revision?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/masses/rule-qa/get-rulemetadata-for-revision (original)
+++ spamassassin/trunk/masses/rule-qa/get-rulemetadata-for-revision Mon Feb 5 14:11:02 2018
@@ -25,10 +25,7 @@ use Cwd;
my $perl = $^X;
my $EARLIEST_REV = 428771; # before this, mkrules won't work
-use vars qw(
- $opt_outputdir
- $opt_rev
-);
+our ( $opt_outputdir, $opt_rev );
GetOptions(
"rev=s" => \$opt_rev,
"outputdir=s" => \$opt_outputdir,
Modified: spamassassin/trunk/masses/rule-qa/import-logs
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/rule-qa/import-logs?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/masses/rule-qa/import-logs (original)
+++ spamassassin/trunk/masses/rule-qa/import-logs Mon Feb 5 14:11:02 2018
@@ -10,12 +10,7 @@ use Time::ParseDate;
use POSIX qw(nice strftime);
use Cwd;
-
-use vars qw(
- $opt_dir
- $opt_override
- $opt_tag
-);
+our ( $opt_dir, $opt_override, $opt_tag );
GetOptions(
"tag=s" => \$opt_tag,
"dir=s" => \$opt_dir,
Modified: spamassassin/trunk/masses/rule-qa/reports-from-logs
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/rule-qa/reports-from-logs?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/masses/rule-qa/reports-from-logs (original)
+++ spamassassin/trunk/masses/rule-qa/reports-from-logs Mon Feb 5 14:11:02 2018
@@ -5,10 +5,7 @@
use strict;
use Getopt::Long;
-use vars qw(
- $opt_override
- $opt_tag
-);
+our ( $opt_override, $opt_tag );
GetOptions(
"tag=s" => \$opt_tag,
"override=s" => \$opt_override,
Modified: spamassassin/trunk/masses/rule-qa/rule-hits-over-time
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/rule-qa/rule-hits-over-time?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/masses/rule-qa/rule-hits-over-time (original)
+++ spamassassin/trunk/masses/rule-qa/rule-hits-over-time Mon Feb 5 14:11:02 2018
@@ -45,11 +45,8 @@ usage: rule-hits-over-time [options] --r
};
}
-use vars qw(
- $opt_rule $opt_size_x $opt_size_y $opt_text $opt_cgi
- $opt_period $opt_scale_period $opt_ignore_older
- $opt_debug
-);
+our ( $opt_rule, $opt_size_x, $opt_size_y, $opt_text, $opt_cgi,
+ $opt_period, $opt_scale_period, $opt_ignore_older, $opt_debug );
GetOptions(
'rule=s',
Modified: spamassassin/trunk/rulesrc/sandbox/dos/SIQ.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/dos/SIQ.pm?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/dos/SIQ.pm (original)
+++ spamassassin/trunk/rulesrc/sandbox/dos/SIQ.pm Mon Feb 5 14:11:02 2018
@@ -123,8 +123,7 @@ use Socket;
use IO::Socket;
use Fcntl qw(F_GETFL F_SETFL O_NONBLOCK);
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
sub new {
Modified: spamassassin/trunk/rulesrc/sandbox/felicity/sandbox-felicity.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/felicity/sandbox-felicity.pm?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/felicity/sandbox-felicity.pm (original)
+++ spamassassin/trunk/rulesrc/sandbox/felicity/sandbox-felicity.pm Mon Feb 5 14:11:02 2018
@@ -23,8 +23,7 @@ use strict;
use warnings;
use bytes;
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
# constructor: register the eval rule
sub new {
Modified: spamassassin/trunk/rulesrc/sandbox/hstern/sandbox-hstern.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/hstern/sandbox-hstern.pm?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/hstern/sandbox-hstern.pm (original)
+++ spamassassin/trunk/rulesrc/sandbox/hstern/sandbox-hstern.pm Mon Feb 5 14:11:02 2018
@@ -23,10 +23,8 @@ use Mail::SpamAssassin::Plugin;
use Mail::SpamAssassin::Logger;
use Mail::SpamAssassin::Util;
-use vars qw(@ISA);
our @ISA = qw(Mail::SpamAssassin::Plugin);
-
sub new {
my $class = shift;
my $mailsa = shift;
Modified: spamassassin/trunk/sa-awl.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-awl.raw?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/sa-awl.raw (original)
+++ spamassassin/trunk/sa-awl.raw Mon Feb 5 14:11:02 2018
@@ -48,9 +48,7 @@ usage: sa-awl [--clean] [--min n] [dbfil
use Fcntl;
use Getopt::Long;
-use vars qw(
- $opt_clean $opt_min $opt_help
- );
+our ( $opt_clean, $opt_min, $opt_help );
GetOptions(
'clean' => \$opt_clean,
Modified: spamassassin/trunk/sa-compile.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-compile.raw?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/sa-compile.raw (original)
+++ spamassassin/trunk/sa-compile.raw Mon Feb 5 14:11:02 2018
@@ -66,7 +66,7 @@ use File::Path;
use Pod::Usage;
use Data::Dumper;
-use vars qw( %opt );
+our %opt;
Mail::SpamAssassin::Util::clean_path_in_taint_mode();
untaint_var( \%ENV );
@@ -603,14 +603,13 @@ EOT
package $modname;
use strict;
-use vars qw(\$VERSION \@ISA \@EXPORT_OK);
use XSLoader ();
BEGIN {
-\$VERSION = '1.0';
-\@ISA = qw(XSLoader);
-\@EXPORT_OK = qw();
+our \$VERSION = '1.0';
+our \@ISA = qw(XSLoader);
+our \@EXPORT_OK = qw();
our \$HAS_RULES = {
$has_rules
Modified: spamassassin/trunk/sa-learn.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-learn.raw?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/sa-learn.raw (original)
+++ spamassassin/trunk/sa-learn.raw Mon Feb 5 14:11:02 2018
@@ -25,12 +25,8 @@ use Getopt::Long;
use Pod::Usage;
use File::Spec;
-use vars qw(
- $spamtest %opt $isspam $forget
- $messagecount $learnedcount $messagelimit
- $progress $total_messages $init_results $start_time
- $synconly $learnprob @targets $bayes_override_path
-);
+our ( $spamtest, %opt, $isspam, $forget, $messagecount, $learnedcount, $messagelimit, $progress,
+ $total_messages, $init_results, $start_time, $synconly, $learnprob, @targets, $bayes_override_path );
my $PREFIX = '@@PREFIX@@'; # substituted at 'make' time
my $DEF_RULES_DIR = '@@DEF_RULES_DIR@@'; # substituted at 'make' time
Modified: spamassassin/trunk/sa-update.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-update.raw?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/sa-update.raw (original)
+++ spamassassin/trunk/sa-update.raw Mon Feb 5 14:11:02 2018
@@ -87,7 +87,7 @@ use HTTP::Date qw(time2str);
use Archive::Tar 1.23;
use IO::Zlib 1.04;
-use vars qw($have_lwp $io_socket_module_name $have_inet4 $have_inet6);
+our ($have_lwp, $io_socket_module_name, $have_inet4, $have_inet6);
BEGIN {
# Deal with optional modules
@@ -101,7 +101,6 @@ BEGIN {
if (eval { require IO::Socket::IP }) { # handles IPv6 and IPv4
$io_socket_module_name = 'IO::Socket::IP';
-
} elsif (eval { require IO::Socket::INET6 }) { # handles IPv6 and IPv4
$io_socket_module_name = 'IO::Socket::INET6';
@@ -110,7 +109,7 @@ BEGIN {
}
$have_inet4 = # can we create a PF_INET socket?
- defined $io_socket_module_name && eval {
+ defined $io_socket_module_name && eval {
my $sock =
$io_socket_module_name->new(LocalAddr => '0.0.0.0', Proto => 'tcp');
$sock->close or die "error closing socket: $!" if $sock;
Modified: spamassassin/trunk/spamd-apache2/bin/apache-spamd.pl
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd-apache2/bin/apache-spamd.pl?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/spamd-apache2/bin/apache-spamd.pl (original)
+++ spamassassin/trunk/spamd-apache2/bin/apache-spamd.pl Mon Feb 5 14:11:02 2018
@@ -297,7 +297,7 @@ sub get_libexecdir_apxs {
}
# as above, cached version
-use vars '$apache_module_path';
+our $apache_module_path;
sub apache_module_path {
my $modname = shift;
$apache_module_path ||= get_libexecdir(); # path is cached
Modified: spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd.pm?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd.pm (original)
+++ spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd.pm Mon Feb 5 14:11:02 2018
@@ -1,6 +1,6 @@
package Mail::SpamAssassin::Spamd;
-use vars qw(%conf_backup %msa_backup);
+our (%conf_backup, %msa_backup);
use Mail::SpamAssassin::Logger;
eval { use Time::HiRes qw(time); };
Modified: spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2.pm?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2.pm (original)
+++ spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2.pm Mon Feb 5 14:11:02 2018
@@ -22,7 +22,7 @@ use constant APACHE24 => have_min_apac
eval { use Time::HiRes qw(time); };
-use vars qw($spamtest);
+our $spamtest;
use Mail::SpamAssassin ();
use Mail::SpamAssassin::Message ();
Modified: spamassassin/trunk/spamd/spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd/spamd.raw?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/spamd/spamd.raw (original)
+++ spamassassin/trunk/spamd/spamd.raw Mon Feb 5 14:11:02 2018
@@ -38,9 +38,9 @@ BEGIN {
} # REMOVEFORINST
}
-use vars qw($have_getaddrinfo_in_core $have_getaddrinfo_legacy
- $io_socket_module_name $have_inet4 $have_inet6
- $ai_addrconfig_flag);
+our ($have_getaddrinfo_in_core, $have_getaddrinfo_legacy, $io_socket_module_name,
+ $have_inet4, $have_inet6, $ai_addrconfig_flag);
+
# don't force requirement on IO::Socket::IP or IO::Socket::INET6
BEGIN {
use Socket qw(:DEFAULT IPPROTO_TCP);
Modified: spamassassin/trunk/tools/convert_awl_dbm_to_sql
URL: http://svn.apache.org/viewvc/spamassassin/trunk/tools/convert_awl_dbm_to_sql?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/tools/convert_awl_dbm_to_sql (original)
+++ spamassassin/trunk/tools/convert_awl_dbm_to_sql Mon Feb 5 14:11:02 2018
@@ -12,8 +12,8 @@ use Getopt::Long;
use DBI;
-use DB_File ;
-use vars qw( %h $k $v ) ;
+use DB_File;
+my ( %h $k $v );
sub usage {
print "This program takes the following required arguments:\n";
Modified: spamassassin/trunk/tools/mboxsplit
URL: http://svn.apache.org/viewvc/spamassassin/trunk/tools/mboxsplit?rev=1823176&r1=1823175&r2=1823176&view=diff
==============================================================================
--- spamassassin/trunk/tools/mboxsplit (original)
+++ spamassassin/trunk/tools/mboxsplit Mon Feb 5 14:11:02 2018
@@ -22,7 +22,7 @@
my $prog = $0;
$prog =~ s@.*/@@;
-use vars qw($opt_h $opt_f $opt_i $opt_n);
+our ($opt_h, $opt_f, $opt_i, $opt_n);
use Getopt::Std;
getopts("hf:in:");