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:10:24 UTC
svn commit: r1823175 [1/2] - in /spamassassin/branches/3.4: ./ 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/Spam...
Author: kmcgrail
Date: Mon Feb 5 14:10:22 2018
New Revision: 1823175
URL: http://svn.apache.org/viewvc?rev=1823175&view=rev
Log:
Bug 7492 - switch from use vars to our cleanup
Added:
spamassassin/branches/3.4/masses/rule-qa/corpus-hourly (with props)
Modified:
spamassassin/branches/3.4/Makefile.PL
spamassassin/branches/3.4/build/automc/freqsd
spamassassin/branches/3.4/build/mkrules
spamassassin/branches/3.4/build/parse-rules-for-masses
spamassassin/branches/3.4/lib/Mail/SpamAssassin.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/ArchiveIterator.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/AsyncLoop.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/AutoWhitelist.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/BDB.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/DBM.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/MySQL.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/Redis.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/SDBM.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/SQL.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/LDAP.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/Parser.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/SQL.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Constants.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Dns.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/DnsResolver.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locales.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locker.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locker/Flock.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locker/UnixNFSSafe.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locker/Win32.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/File.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/Stderr.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/Syslog.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/NetSet.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgLearner.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/PersistentAddrList.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AWL.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AccessDB.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AntiVirus.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AskDNS.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Bayes.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/BodyEval.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Check.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DCC.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DKIM.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DNSEval.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/FreeMail.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HTMLEval.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HTTPSMismatch.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Hashcash.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/NetCache.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/P595Body.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/PDFInfo.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/PhishTag.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Pyzor.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RabinKarpBody.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Razor2.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayEval.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Reuse.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Rule2XSBody.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/SPF.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Shortcircuit.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/SpamCop.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Test.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TextCat.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TxRep.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDetail.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIEval.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/WhiteListSubject.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/PluginHandler.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/RegistryBoundaries.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Reporter.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/SQLBasedAddrList.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/SpamdForkScaling.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/SubProcBackChannel.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Timeout.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
spamassassin/branches/3.4/masses/bayes-testing/draw-bayes-histogram
spamassassin/branches/3.4/masses/bayes-testing/graph-accuracy-curve
spamassassin/branches/3.4/masses/bayes-testing/graph-bayes-histogram
spamassassin/branches/3.4/masses/bayes-testing/map-s-space/bayes-analyse-from-raw-counts
spamassassin/branches/3.4/masses/corpora/mass-find-nonspam
spamassassin/branches/3.4/masses/corpora/mk-corpus-link-farm
spamassassin/branches/3.4/masses/find-extremes
spamassassin/branches/3.4/masses/fp-fn-statistics
spamassassin/branches/3.4/masses/fp-fn-to-tcr
spamassassin/branches/3.4/masses/freqdiff
spamassassin/branches/3.4/masses/generate-translation
spamassassin/branches/3.4/masses/hit-frequencies
spamassassin/branches/3.4/masses/logs-to-c
spamassassin/branches/3.4/masses/mass-check
spamassassin/branches/3.4/masses/mboxget
spamassassin/branches/3.4/masses/mk-roc-graphs
spamassassin/branches/3.4/masses/overlap
spamassassin/branches/3.4/masses/plugins/HitFreqsRuleTiming.pm
spamassassin/branches/3.4/masses/rewrite-cf-with-new-scores
spamassassin/branches/3.4/masses/rule-qa/get-rulemetadata-for-revision
spamassassin/branches/3.4/masses/rule-qa/import-logs
spamassassin/branches/3.4/masses/rule-qa/reports-from-logs
spamassassin/branches/3.4/masses/rule-qa/rule-hits-over-time
spamassassin/branches/3.4/rulesrc/sandbox/dos/SIQ.pm
spamassassin/branches/3.4/rulesrc/sandbox/felicity/sandbox-felicity.pm
spamassassin/branches/3.4/rulesrc/sandbox/hstern/sandbox-hstern.pm
spamassassin/branches/3.4/sa-awl.raw
spamassassin/branches/3.4/sa-compile.raw
spamassassin/branches/3.4/sa-learn.raw
spamassassin/branches/3.4/sa-update.raw
spamassassin/branches/3.4/spamd-apache2/bin/apache-spamd.pl
spamassassin/branches/3.4/spamd-apache2/lib/Mail/SpamAssassin/Spamd.pm
spamassassin/branches/3.4/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2.pm
spamassassin/branches/3.4/spamd/spamd.raw
spamassassin/branches/3.4/tools/convert_awl_dbm_to_sql
spamassassin/branches/3.4/tools/mboxsplit
Modified: spamassassin/branches/3.4/Makefile.PL
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/Makefile.PL?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/Makefile.PL (original)
+++ spamassassin/branches/3.4/Makefile.PL Mon Feb 5 14:10:22 2018
@@ -395,17 +395,13 @@ print "Makefile written by ExtUtils::Mak
package MY;
-use vars qw(
- $MY_GLOBALS_ARE_SANE
- $RUNNING_ON_WINDOWS
- @REPOSITORIES
-
- $MACRO_RE
- $EQ_RE
- $EQ
-
- $SELF
-);
+our ($MY_GLOBALS_ARE_SANE,
+ $RUNNING_ON_WINDOWS,
+ @REPOSITORIES,
+ $MACRO_RE,
+ $EQ_RE,
+ $EQ,
+ $SELF);
# For some reason initializing the vars on the global scope doesn't work;
# guess its some weird Perl behaviour in combination with bless().
Modified: spamassassin/branches/3.4/build/automc/freqsd
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/build/automc/freqsd?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/build/automc/freqsd (original)
+++ spamassassin/branches/3.4/build/automc/freqsd Mon Feb 5 14:10:22 2018
@@ -9,11 +9,7 @@ use warnings;
use Getopt::Long;
use IPC::DirQueue;
-use vars qw(
- $pidfile
- $opt_enq
- $opt_kill
-);
+our ( $pidfile, $opt_enq, $opt_kill);
GetOptions(
"pidfile=s" => \$pidfile,
"enq=s" => \$opt_enq,
Modified: spamassassin/branches/3.4/build/mkrules
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/build/mkrules?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/build/mkrules (original)
+++ spamassassin/branches/3.4/build/mkrules Mon Feb 5 14:10:22 2018
@@ -47,12 +47,11 @@ use Getopt::Long;
use lib 'lib';
use Mail::SpamAssassin;
-use vars qw(
- @opt_srcs $opt_out $opt_sandboxout $opt_manifest
- $opt_manifestskip $opt_listpromotable $opt_active
- $opt_activeout $default_file_header
- $opt_rulemetadata $opt_exit_on_no_src
-);
+our ( @opt_srcs, $opt_out, $opt_sandboxout, $opt_manifest,
+ $opt_manifestskip, $opt_listpromotable, $opt_active,
+ $opt_activeout, $default_file_header,
+ $opt_rulemetadata, $opt_exit_on_no_src);
+
GetOptions("src=s" => \@opt_srcs,
"out=s",
"sandboxout=s",
@@ -115,7 +114,7 @@ my $current_src;
my $newest_src_mtime = 0;
my $newest_out_mtime = 0;
-my $default_file_header = join('', <DATA>);
+$default_file_header = join('', <DATA>);
compile_utf8ify_function();
foreach my $src (@opt_srcs) {
Modified: spamassassin/branches/3.4/build/parse-rules-for-masses
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/build/parse-rules-for-masses?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/build/parse-rules-for-masses (original)
+++ spamassassin/branches/3.4/build/parse-rules-for-masses Mon Feb 5 14:10:22 2018
@@ -36,7 +36,7 @@ scoreset default to 0
use Getopt::Long;
use Data::Dumper;
-use vars qw(@rulesdirs $outputfile $scoreset $skip_test_rules);
+our (@rulesdirs, $outputfile, $scoreset, $skip_test_rules);
GetOptions (
"d=s" => \@rulesdirs,
"o=s" => \$outputfile,
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin.pm Mon Feb 5 14:10:22 2018
@@ -87,25 +87,18 @@ use Time::HiRes qw(time);
use Cwd;
use Config;
-use vars qw{
- @ISA $VERSION $SUB_VERSION @EXTRA_VERSION $IS_DEVEL_BUILD $HOME_URL
- @default_rules_path @default_prefs_path
- @default_userprefs_path @default_userstate_dir
- @site_rules_path
-};
-
-$VERSION = "3.004002"; # update after release (same format as perl $])
-$IS_DEVEL_BUILD = 1; # change for release versions
+our $VERSION = "3.004002"; # update after release (same format as perl $])
+our $IS_DEVEL_BUILD = 1; # change for release versions
# Used during the prerelease/release-candidate part of the official release
# process. If you hacked up your SA, you should add a version_tag to your .cf
# files; this variable should not be modified.
-@EXTRA_VERSION = qw(pre3);
+our @EXTRA_VERSION = qw(pre3);
-@ISA = qw();
+our @ISA = qw();
# SUB_VERSION is now just <yyyy>-<mm>-<dd>
-$SUB_VERSION = 'svnunknown';
+our $SUB_VERSION = 'svnunknown';
if ('$LastChangedDate$' =~ ':') {
# Subversion keyword "$LastChangedDate$" has been successfully expanded.
# Doesn't happen with automated launchpad builds:
@@ -128,13 +121,14 @@ sub Version {
return join('-', sprintf("%d.%d.%d", $1, $2, $3), @EXTRA_VERSION);
}
-$HOME_URL = "http://spamassassin.apache.org/";
+our $HOME_URL = "http://spamassassin.apache.org/";
# note that the CWD takes priority. This is required in case a user
# is testing a new version of SpamAssassin on a machine with an older
# version installed. Unless you can come up with a fix for this that
# allows "make test" to work, don't change this.
-@default_rules_path = (
+
+our @default_rules_path = (
'./rules', # REMOVEFORINST
'../rules', # REMOVEFORINST
'__local_state_dir__/__version__',
@@ -145,7 +139,7 @@ $HOME_URL = "http://spamassassin.apache.
);
# first 3 are BSDish, latter 2 Linuxish
-@site_rules_path = (
+our @site_rules_path = (
'__local_rules_dir__',
'__prefix__/etc/mail/spamassassin',
'__prefix__/etc/spamassassin',
@@ -156,7 +150,7 @@ $HOME_URL = "http://spamassassin.apache.
'/etc/spamassassin',
);
-@default_prefs_path = (
+our @default_prefs_path = (
'__local_rules_dir__/user_prefs.template',
'__prefix__/etc/mail/spamassassin/user_prefs.template',
'__prefix__/share/spamassassin/user_prefs.template',
@@ -166,11 +160,11 @@ $HOME_URL = "http://spamassassin.apache.
'/usr/share/spamassassin/user_prefs.template',
);
-@default_userprefs_path = (
+our @default_userprefs_path = (
'~/.spamassassin/user_prefs',
);
-@default_userstate_dir = (
+our @default_userstate_dir = (
'~/.spamassassin',
);
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/ArchiveIterator.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/ArchiveIterator.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/ArchiveIterator.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/ArchiveIterator.pm Mon Feb 5 14:10:22 2018
@@ -33,14 +33,9 @@ use Mail::SpamAssassin::AICache;
# 256 KiB is a big email, unless stated otherwise
use constant BIG_BYTES => 256*1024;
-use vars qw {
- $MESSAGES
- $AICache
- %class_opts
- @ISA
-};
+our ( $MESSAGES, $AICache, %class_opts );
-@ISA = qw();
+our @ISA = qw();
=head1 NAME
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/AsyncLoop.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/AsyncLoop.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/AsyncLoop.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/AsyncLoop.pm Mon Feb 5 14:10:22 2018
@@ -46,8 +46,8 @@ use Mail::SpamAssassin::Logger;
our @ISA = qw();
# obtain timer resolution if possible
+our $timer_resolution;
BEGIN {
- use vars qw($timer_resolution);
eval {
$timer_resolution = Time::HiRes->can('clock_getres')
? Time::HiRes::clock_getres(Time::HiRes::CLOCK_REALTIME())
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/AutoWhitelist.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/AutoWhitelist.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/AutoWhitelist.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/AutoWhitelist.pm Mon Feb 5 14:10:22 2018
@@ -52,11 +52,7 @@ use Mail::SpamAssassin;
use Mail::SpamAssassin::Logger;
use Mail::SpamAssassin::Util qw(untaint_var);
-use vars qw{
- @ISA
-};
-
-@ISA = qw();
+our @ISA = qw();
###########################################################################
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/BDB.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/BDB.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/BDB.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/BDB.pm Mon Feb 5 14:10:22 2018
@@ -46,9 +46,7 @@ BEGIN {
use Mail::SpamAssassin::BayesStore;
use Mail::SpamAssassin::Logger;
-use vars qw( @ISA );
-
-@ISA = qw( Mail::SpamAssassin::BayesStore );
+our @ISA = qw( Mail::SpamAssassin::BayesStore );
use constant HAS_BDB => eval { require BerkeleyDB; BerkeleyDB->import; };
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/DBM.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/DBM.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/DBM.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/DBM.pm Mon Feb 5 14:10:22 2018
@@ -40,16 +40,14 @@ use Mail::SpamAssassin::Logger;
use constant MAGIC_RE => qr/^\015\001\007\011\003/;
-use vars qw{
- @ISA
- @DBNAMES
- $NSPAM_MAGIC_TOKEN $NHAM_MAGIC_TOKEN $LAST_EXPIRE_MAGIC_TOKEN $LAST_JOURNAL_SYNC_MAGIC_TOKEN
- $NTOKENS_MAGIC_TOKEN $OLDEST_TOKEN_AGE_MAGIC_TOKEN $LAST_EXPIRE_REDUCE_MAGIC_TOKEN
- $RUNNING_EXPIRE_MAGIC_TOKEN $DB_VERSION_MAGIC_TOKEN $LAST_ATIME_DELTA_MAGIC_TOKEN
+our ( @DBNAMES,
+ $NSPAM_MAGIC_TOKEN, $NHAM_MAGIC_TOKEN, $LAST_EXPIRE_MAGIC_TOKEN, $LAST_JOURNAL_SYNC_MAGIC_TOKEN,
+ $NTOKENS_MAGIC_TOKEN, $OLDEST_TOKEN_AGE_MAGIC_TOKEN, $LAST_EXPIRE_REDUCE_MAGIC_TOKEN,
+ $RUNNING_EXPIRE_MAGIC_TOKEN, $DB_VERSION_MAGIC_TOKEN, $LAST_ATIME_DELTA_MAGIC_TOKEN,
$NEWEST_TOKEN_AGE_MAGIC_TOKEN
-};
+);
-@ISA = qw( Mail::SpamAssassin::BayesStore );
+our @ISA = qw( Mail::SpamAssassin::BayesStore );
# db layout (quoting Matt):
#
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/MySQL.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/MySQL.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/MySQL.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/MySQL.pm Mon Feb 5 14:10:22 2018
@@ -44,9 +44,7 @@ use re 'taint';
use Mail::SpamAssassin::BayesStore::SQL;
use Mail::SpamAssassin::Logger;
-use vars qw( @ISA );
-
-@ISA = qw( Mail::SpamAssassin::BayesStore::SQL );
+our @ISA = qw( Mail::SpamAssassin::BayesStore::SQL );
use constant HAS_DBI => eval { require DBI; };
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm Mon Feb 5 14:10:22 2018
@@ -47,9 +47,7 @@ use re 'taint';
use Mail::SpamAssassin::BayesStore::SQL;
use Mail::SpamAssassin::Logger;
-use vars qw( @ISA );
-
-@ISA = qw( Mail::SpamAssassin::BayesStore::SQL );
+our @ISA = qw( Mail::SpamAssassin::BayesStore::SQL );
use constant HAS_DBI => eval { require DBI; };
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/Redis.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/Redis.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/Redis.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/Redis.pm Mon Feb 5 14:10:22 2018
@@ -133,12 +133,8 @@ use Mail::SpamAssassin::Logger;
use Mail::SpamAssassin::BayesStore;
use Mail::SpamAssassin::Util::TinyRedis;
-use vars qw( @ISA $VERSION );
-
-BEGIN {
- $VERSION = 0.09;
- @ISA = qw( Mail::SpamAssassin::BayesStore );
-}
+our $VERSION = 0.09;
+our @ISA = qw( Mail::SpamAssassin::BayesStore );
=head1 METHODS
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/SDBM.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/SDBM.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/SDBM.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/SDBM.pm Mon Feb 5 14:10:22 2018
@@ -26,9 +26,8 @@ use Fcntl;
use Mail::SpamAssassin::BayesStore::DBM;
use Mail::SpamAssassin::Logger;
-use vars qw{ @ISA @DBNAMES };
-
-@ISA = qw( Mail::SpamAssassin::BayesStore::DBM );
+# our @DBNAMES; # <---- unused!
+our @ISA = qw( Mail::SpamAssassin::BayesStore::DBM );
sub HAS_DBM_MODULE {
my ($self) = @_;
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/SQL.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/SQL.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/SQL.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/SQL.pm Mon Feb 5 14:10:22 2018
@@ -43,9 +43,7 @@ BEGIN {
use Mail::SpamAssassin::BayesStore;
use Mail::SpamAssassin::Logger;
-use vars qw( @ISA );
-
-@ISA = qw( Mail::SpamAssassin::BayesStore );
+our @ISA = qw( Mail::SpamAssassin::BayesStore );
use constant HAS_DBI => eval { require DBI; };
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf.pm Mon Feb 5 14:10:22 2018
@@ -91,40 +91,25 @@ use Mail::SpamAssassin::Util::TieOneStri
use Mail::SpamAssassin::Util qw(untaint_var);
use File::Spec;
-use vars qw{
- @ISA
- $CONF_TYPE_STRING $CONF_TYPE_BOOL
- $CONF_TYPE_NUMERIC $CONF_TYPE_HASH_KEY_VALUE
- $CONF_TYPE_ADDRLIST $CONF_TYPE_TEMPLATE
- $CONF_TYPE_STRINGLIST $CONF_TYPE_IPADDRLIST
- $CONF_TYPE_DURATION $CONF_TYPE_NOARGS
- $MISSING_REQUIRED_VALUE $INVALID_VALUE $INVALID_HEADER_FIELD_NAME
- @MIGRATED_SETTINGS
- $COLLECT_REGRESSION_TESTS
-
-$TYPE_HEAD_TESTS $TYPE_HEAD_EVALS
-$TYPE_BODY_TESTS $TYPE_BODY_EVALS $TYPE_FULL_TESTS $TYPE_FULL_EVALS
-$TYPE_RAWBODY_TESTS $TYPE_RAWBODY_EVALS $TYPE_URI_TESTS $TYPE_URI_EVALS
-$TYPE_META_TESTS $TYPE_RBL_EVALS $TYPE_EMPTY_TESTS
-};
+our @ISA = qw();
-@ISA = qw();
+our $COLLECT_REGRESSION_TESTS; # Used only for unit tests.
# odd => eval test. Not constants so they can be shared with Parser
# TODO: move to Constants.pm?
-$TYPE_HEAD_TESTS = 0x0008;
-$TYPE_HEAD_EVALS = 0x0009;
-$TYPE_BODY_TESTS = 0x000a;
-$TYPE_BODY_EVALS = 0x000b;
-$TYPE_FULL_TESTS = 0x000c;
-$TYPE_FULL_EVALS = 0x000d;
-$TYPE_RAWBODY_TESTS = 0x000e;
-$TYPE_RAWBODY_EVALS = 0x000f;
-$TYPE_URI_TESTS = 0x0010;
-$TYPE_URI_EVALS = 0x0011;
-$TYPE_META_TESTS = 0x0012;
-$TYPE_RBL_EVALS = 0x0013;
-$TYPE_EMPTY_TESTS = 0x0014;
+our $TYPE_HEAD_TESTS = 0x0008;
+our $TYPE_HEAD_EVALS = 0x0009;
+our $TYPE_BODY_TESTS = 0x000a;
+our $TYPE_BODY_EVALS = 0x000b;
+our $TYPE_FULL_TESTS = 0x000c;
+our $TYPE_FULL_EVALS = 0x000d;
+our $TYPE_RAWBODY_TESTS = 0x000e;
+our $TYPE_RAWBODY_EVALS = 0x000f;
+our $TYPE_URI_TESTS = 0x0010;
+our $TYPE_URI_EVALS = 0x0011;
+our $TYPE_META_TESTS = 0x0012;
+our $TYPE_RBL_EVALS = 0x0013;
+our $TYPE_EMPTY_TESTS = 0x0014;
my @rule_types = ("body_tests", "uri_tests", "uri_evals",
"head_tests", "head_evals", "body_evals", "full_tests",
@@ -137,19 +122,19 @@ my @rule_types = ("body_tests", "uri_tes
# these are variables instead of constants so that other classes can
# access them; if they're constants, they'd have to go in Constants.pm
# TODO: move to Constants.pm?
-$CONF_TYPE_STRING = 1;
-$CONF_TYPE_BOOL = 2;
-$CONF_TYPE_NUMERIC = 3;
-$CONF_TYPE_HASH_KEY_VALUE = 4;
-$CONF_TYPE_ADDRLIST = 5;
-$CONF_TYPE_TEMPLATE = 6;
-$CONF_TYPE_NOARGS = 7;
-$CONF_TYPE_STRINGLIST = 8;
-$CONF_TYPE_IPADDRLIST = 9;
-$CONF_TYPE_DURATION = 10;
-$MISSING_REQUIRED_VALUE = '-99999999999999'; # string expected by parser
-$INVALID_VALUE = '-99999999999998';
-$INVALID_HEADER_FIELD_NAME = '-99999999999997';
+our $CONF_TYPE_STRING = 1;
+our $CONF_TYPE_BOOL = 2;
+our $CONF_TYPE_NUMERIC = 3;
+our $CONF_TYPE_HASH_KEY_VALUE = 4;
+our $CONF_TYPE_ADDRLIST = 5;
+our $CONF_TYPE_TEMPLATE = 6;
+our $CONF_TYPE_NOARGS = 7;
+our $CONF_TYPE_STRINGLIST = 8;
+our $CONF_TYPE_IPADDRLIST = 9;
+our $CONF_TYPE_DURATION = 10;
+our $MISSING_REQUIRED_VALUE = '-99999999999999'; # string expected by parser
+our $INVALID_VALUE = '-99999999999998';
+our $INVALID_HEADER_FIELD_NAME = '-99999999999997';
# set to "1" by the test suite code, to record regression tests
# $Mail::SpamAssassin::Conf::COLLECT_REGRESSION_TESTS = 1;
@@ -4502,7 +4487,7 @@ distances that are greater than 9.)
# bundled plugins. These will be warned about, but do not generate a fatal
# error when "spamassassin --lint" is run like a normal syntax error would.
-@MIGRATED_SETTINGS = qw{
+our @MIGRATED_SETTINGS = qw{
ok_languages
};
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/LDAP.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/LDAP.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/LDAP.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/LDAP.pm Mon Feb 5 14:10:22 2018
@@ -48,11 +48,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw{
- @ISA
-};
-
-@ISA = qw();
+our @ISA = qw();
###########################################################################
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/Parser.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/Parser.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/Parser.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/Parser.pm Mon Feb 5 14:10:22 2018
@@ -145,11 +145,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw{
- @ISA
-};
-
-@ISA = qw();
+our @ISA = qw();
###########################################################################
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/SQL.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/SQL.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/SQL.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/SQL.pm Mon Feb 5 14:10:22 2018
@@ -48,11 +48,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw{
- @ISA
-};
-
-@ISA = qw();
+our @ISA = qw();
###########################################################################
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Constants.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Constants.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Constants.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Constants.pm Mon Feb 5 14:10:22 2018
@@ -25,16 +25,14 @@ use strict;
use warnings;
use re 'taint';
-BEGIN {
- use Exporter ();
- use vars qw(@ISA);
- @ISA = qw(Exporter);
+use Exporter ();
+our @ISA = qw(Exporter);
- use vars qw (
- @BAYES_VARS @IP_VARS @SA_VARS %EXPORT_TAGS @EXPORT_OK
- );
+our(@BAYES_VARS, @IP_VARS, @SA_VARS, %EXPORT_TAGS, @EXPORT_OK);
- @IP_VARS = qw(
+# NOTE: Unless you need these to be available at BEGIN time, you're better with this out of a BEGIN block with a simple our statement.
+BEGIN {
+ @IP_VARS = qw(
IP_IN_RESERVED_RANGE IP_PRIVATE LOCALHOST IPV4_ADDRESS IP_ADDRESS
);
@BAYES_VARS = qw(
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Dns.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Dns.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Dns.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Dns.pm Mon Feb 5 14:10:22 2018
@@ -35,13 +35,13 @@ use File::Spec;
use IO::Socket;
use POSIX ":sys_wait_h";
-use vars qw{
- $KNOWN_BAD_DIALUP_RANGES @EXISTING_DOMAINS $IS_DNS_AVAILABLE $LAST_DNS_CHECK
-};
+
+our $KNOWN_BAD_DIALUP_RANGES; # Nothing uses this var???
+our $LAST_DNS_CHECK;
# use very well-connected domains (fast DNS response, many DNS servers,
# geographical distribution is a plus, TTL of at least 3600s)
-@EXISTING_DOMAINS = qw{
+our @EXISTING_DOMAINS = qw{
adelphia.net
akamai.com
apache.org
@@ -64,7 +64,7 @@ use vars qw{
yahoo.com
};
-$IS_DNS_AVAILABLE = undef;
+our $IS_DNS_AVAILABLE = undef;
#Removed $VERSION per BUG 6422
#$VERSION = 'bogus'; # avoid CPAN.pm picking up razor ver
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/DnsResolver.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/DnsResolver.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/DnsResolver.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/DnsResolver.pm Mon Feb 5 14:10:22 2018
@@ -53,7 +53,7 @@ use Time::HiRes qw(time);
our @ISA = qw();
-use vars qw($io_socket_module_name);
+our $io_socket_module_name;
BEGIN {
if (eval { require IO::Socket::IP }) {
$io_socket_module_name = 'IO::Socket::IP';
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locales.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locales.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locales.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locales.pm Mon Feb 5 14:10:22 2018
@@ -22,10 +22,6 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw{
- %charsets_for_locale
-};
-
###########################################################################
# A mapping of known country codes to frequent charsets used therein.
@@ -36,7 +32,7 @@ use vars qw{
#
# A good listing is in /usr/share/config/charsets from KDE 2.2.1
#
-%charsets_for_locale = (
+our %charsets_for_locale = (
# Japanese: Peter Evans writes: iso-2022-jp = rfc approved, rfc 1468, created
# by Jun Murai in 1993 back when he didnt have white hair! rfc approved.
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locker.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locker.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locker.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locker.pm Mon Feb 5 14:10:22 2018
@@ -26,11 +26,7 @@ use Time::HiRes ();
use Mail::SpamAssassin;
-use vars qw{
- @ISA
-};
-
-@ISA = qw();
+our @ISA = qw();
###########################################################################
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locker/Flock.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locker/Flock.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locker/Flock.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locker/Flock.pm Mon Feb 5 14:10:22 2018
@@ -30,11 +30,7 @@ use File::Spec;
use IO::File;
use Fcntl qw(:DEFAULT :flock);
-use vars qw{
- @ISA
-};
-
-@ISA = qw(Mail::SpamAssassin::Locker);
+our @ISA = qw(Mail::SpamAssassin::Locker);
###########################################################################
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locker/UnixNFSSafe.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locker/UnixNFSSafe.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locker/UnixNFSSafe.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locker/UnixNFSSafe.pm Mon Feb 5 14:10:22 2018
@@ -30,11 +30,7 @@ use File::Spec;
use Time::Local;
use Fcntl qw(:DEFAULT :flock);
-use vars qw{
- @ISA
-};
-
-@ISA = qw(Mail::SpamAssassin::Locker);
+our @ISA = qw(Mail::SpamAssassin::Locker);
###########################################################################
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locker/Win32.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locker/Win32.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locker/Win32.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locker/Win32.pm Mon Feb 5 14:10:22 2018
@@ -30,11 +30,7 @@ use Mail::SpamAssassin::Logger;
use File::Spec;
use Time::Local;
-use vars qw{
- @ISA
-};
-
-@ISA = qw(Mail::SpamAssassin::Locker);
+our @ISA = qw(Mail::SpamAssassin::Locker);
###########################################################################
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger.pm Mon Feb 5 14:10:22 2018
@@ -40,13 +40,11 @@ use warnings;
# use bytes;
use re 'taint';
-BEGIN {
- use Exporter ();
- use vars qw(@ISA @EXPORT @EXPORT_OK);
- @ISA = qw(Exporter);
- @EXPORT = qw(dbg info would_log);
- @EXPORT_OK = qw(log_message);
-}
+use Exporter ();
+
+our @ISA = qw(Exporter);
+our @EXPORT = qw(dbg info would_log);
+our @EXPORT_OK = qw(log_message);
use constant ERROR => 0;
use constant WARNING => 1;
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/File.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/File.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/File.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/File.pm Mon Feb 5 14:10:22 2018
@@ -39,8 +39,7 @@ use Time::HiRes ();
use Mail::SpamAssassin::Logger;
use Mail::SpamAssassin::Util qw(am_running_on_windows);
-use vars qw(@ISA);
-@ISA = ();
+our @ISA = ();
# ADDING OS-DEPENDENT LINE TERMINATOR - BUG 6456
my $eol = "\n";
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/Stderr.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/Stderr.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/Stderr.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/Stderr.pm Mon Feb 5 14:10:22 2018
@@ -37,8 +37,7 @@ use re 'taint';
use POSIX ();
use Time::HiRes ();
-use vars qw(@ISA);
-@ISA = ();
+our @ISA = ();
# ADDING OS-DEPENDENT LINE TERMINATOR - BUG 6456
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/Syslog.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/Syslog.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/Syslog.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/Syslog.pm Mon Feb 5 14:10:22 2018
@@ -39,22 +39,19 @@ use Time::HiRes ();
use Sys::Syslog qw(:DEFAULT setlogsock);
use Mail::SpamAssassin::Logger;
-use vars qw(@ISA %prio_map $syslog_open);
-@ISA = ();
+our @ISA = ();
-BEGIN {
- # %prio_map maps Logger.pm log level names (warn, error, info, dbg)
- # into standard Sys::Syslog::syslog() log level names
- #
- %prio_map = (dbg => 'debug', debug => 'debug', info => 'info',
- notice => 'notice', warn => 'warning', warning => 'warning',
- error => 'err', err => 'err', crit => 'crit', alert => 'alert',
- emerg => 'emerg');
+# %prio_map maps Logger.pm log level names (warn, error, info, dbg)
+# into standard Sys::Syslog::syslog() log level names
+#
+our %prio_map = (dbg => 'debug', debug => 'debug', info => 'info',
+ notice => 'notice', warn => 'warning', warning => 'warning',
+ error => 'err', err => 'err', crit => 'crit', alert => 'alert',
+ emerg => 'emerg');
- # make sure never to hit the CPAN-RT#56826 bug (memory corruption
- # when closelog() is called twice), fixed in Sys-Syslog 0.28
- $syslog_open = 0;
-}
+# make sure never to hit the CPAN-RT#56826 bug (memory corruption
+# when closelog() is called twice), fixed in Sys-Syslog 0.28
+our $syslog_open = 0;
sub new {
my $class = shift;
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message.pm Mon Feb 5 14:10:22 2018
@@ -57,9 +57,7 @@ use Mail::SpamAssassin::Message::Metadat
use Mail::SpamAssassin::Constants qw(:sa);
use Mail::SpamAssassin::Logger;
-use vars qw(@ISA);
-
-@ISA = qw(Mail::SpamAssassin::Message::Node);
+our @ISA = qw(Mail::SpamAssassin::Message::Node);
# ---------------------------------------------------------------------------
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/NetSet.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/NetSet.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/NetSet.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/NetSet.pm Mon Feb 5 14:10:22 2018
@@ -28,10 +28,7 @@ use NetAddr::IP 4.000;
use Mail::SpamAssassin::Util;
use Mail::SpamAssassin::Logger;
-use vars qw{
- @ISA $TESTCODE $NUMTESTS $have_patricia
-};
-
+our $have_patricia;
BEGIN {
eval {
require Net::Patricia;
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgLearner.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgLearner.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgLearner.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgLearner.pm Mon Feb 5 14:10:22 2018
@@ -56,11 +56,7 @@ use Mail::SpamAssassin::PerMsgStatus;
use Mail::SpamAssassin::Bayes;
use Mail::SpamAssassin::Logger;
-use vars qw{
- @ISA
-};
-
-@ISA = qw();
+our @ISA = qw();
###########################################################################
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm Mon Feb 5 14:10:22 2018
@@ -63,21 +63,17 @@ use Mail::SpamAssassin::Util qw(untaint_
use Mail::SpamAssassin::Timeout;
use Mail::SpamAssassin::Logger;
-use vars qw{
- @ISA @TEMPORARY_METHODS %TEMPORARY_EVAL_GLUE_METHODS
-};
-
-@ISA = qw();
+our @ISA = qw();
# methods defined by the compiled ruleset; deleted in finish_tests()
-@TEMPORARY_METHODS = ();
+our @TEMPORARY_METHODS;
# methods defined by register_plugin_eval_glue(); deleted in finish_tests()
-%TEMPORARY_EVAL_GLUE_METHODS = ();
+our %TEMPORARY_EVAL_GLUE_METHODS;
###########################################################################
-use vars qw( %common_tags );
+our %common_tags;
BEGIN {
%common_tags = (
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/PersistentAddrList.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/PersistentAddrList.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/PersistentAddrList.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/PersistentAddrList.pm Mon Feb 5 14:10:22 2018
@@ -51,11 +51,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw{
- @ISA
-};
-
-@ISA = qw();
+our @ISA = qw();
###########################################################################
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin.pm Mon Feb 5 14:10:22 2018
@@ -102,11 +102,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw{
- @ISA $VERSION
-};
-
-@ISA = qw();
+our @ISA = qw();
#Removed $VERSION per BUG 6422
#$VERSION = 'bogus';
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AWL.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AWL.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AWL.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AWL.pm Mon Feb 5 14:10:22 2018
@@ -67,8 +67,7 @@ use Mail::SpamAssassin::AutoWhitelist;
use Mail::SpamAssassin::Util qw(untaint_var);
use Mail::SpamAssassin::Logger;
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
# constructor: register the eval rule
sub new {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AccessDB.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AccessDB.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AccessDB.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AccessDB.pm Mon Feb 5 14:10:22 2018
@@ -60,8 +60,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
use constant HAS_DB_FILE => eval { require DB_File; };
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AntiVirus.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AntiVirus.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AntiVirus.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AntiVirus.pm Mon Feb 5 14:10:22 2018
@@ -52,8 +52,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
# constructor: register the eval rule
sub new {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AskDNS.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AskDNS.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AskDNS.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AskDNS.pm Mon Feb 5 14:10:22 2018
@@ -192,16 +192,17 @@ use Mail::SpamAssassin::Plugin;
use Mail::SpamAssassin::Util qw(decode_dns_question_entry);
use Mail::SpamAssassin::Logger;
-use vars qw(@ISA %rcode_value $txtdata_can_provide_a_list);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
-%rcode_value = ( # http://www.iana.org/assignments/dns-parameters, RFC 6195
+our %rcode_value = ( # http://www.iana.org/assignments/dns-parameters, RFC 6195
NOERROR => 0, FORMERR => 1, SERVFAIL => 2, NXDOMAIN => 3, NOTIMP => 4,
REFUSED => 5, YXDOMAIN => 6, YXRRSET => 7, NXRRSET => 8, NOTAUTH => 9,
NOTZONE => 10, BADVERS => 16, BADSIG => 16, BADKEY => 17, BADTIME => 18,
BADMODE => 19, BADNAME => 20, BADALG => 21, BADTRUNC => 22,
);
+our $txtdata_can_provide_a_list;
+
sub new {
my($class,$sa_main) = @_;
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm Mon Feb 5 14:10:22 2018
@@ -58,8 +58,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
sub new {
my $class = shift;
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Bayes.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Bayes.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Bayes.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Bayes.pm Mon Feb 5 14:10:22 2018
@@ -65,20 +65,13 @@ use Mail::SpamAssassin::Bayes::CombineCh
our @ISA = qw(Mail::SpamAssassin::Plugin);
-use vars qw{
- $IGNORED_HDRS
- $MARK_PRESENCE_ONLY_HDRS
- %HEADER_NAME_COMPRESSION
- $OPPORTUNISTIC_LOCK_VALID
-};
-
# Which headers should we scan for tokens? Don't use all of them, as it's easy
# to pick up spurious clues from some. What we now do is use all of them
# *less* these well-known headers; that way we can pick up spammers' tracking
# headers (which are obviously not well-known in advance!).
# Received is handled specially
-$IGNORED_HDRS = qr{(?: (?:X-)?Sender # misc noise
+our $IGNORED_HDRS = qr{(?: (?:X-)?Sender # misc noise
|Delivered-To |Delivery-Date
|(?:X-)?Envelope-To
|X-MIME-Auto[Cc]onverted |X-Converted-To-Plain-Text
@@ -145,7 +138,7 @@ $IGNORED_HDRS = qr{(?: (?:X-)?Sender
# Note only the presence of these headers, in order to reduce the
# hapaxen they generate.
-$MARK_PRESENCE_ONLY_HDRS = qr{(?: X-Face
+our $MARK_PRESENCE_ONLY_HDRS = qr{(?: X-Face
|X-(?:Gnu-?PG|PGP|GPG)(?:-Key)?-Fingerprint
|D(?:KIM|omainKey)-Signature
)}ix;
@@ -185,7 +178,7 @@ use constant ADD_INVIZ_TOKENS_NO_PREFIX
# be 2-way (ie. LHSes that map to the same RHS are not a problem), but mixing
# tokens from multiple different headers may impact accuracy, so might as well
# avoid this if possible. These are the top ones from my corpus, BTW (jm).
-%HEADER_NAME_COMPRESSION = (
+our %HEADER_NAME_COMPRESSION = (
'Message-Id' => '*m',
'Message-ID' => '*M',
'Received' => '*r',
@@ -208,7 +201,7 @@ use constant ADD_INVIZ_TOKENS_NO_PREFIX
);
# How many seconds should the opportunistic_expire lock be valid?
-$OPPORTUNISTIC_LOCK_VALID = 300;
+our $OPPORTUNISTIC_LOCK_VALID = 300;
# Should we use the Robinson f(w) equation from
# http://radio.weblogs.com/0101454/stories/2002/09/16/spamDetection.html ?
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/BodyEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/BodyEval.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/BodyEval.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/BodyEval.pm Mon Feb 5 14:10:22 2018
@@ -26,8 +26,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
# constructor: register the eval rule
sub new {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm Mon Feb 5 14:10:22 2018
@@ -40,8 +40,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
use constant DEBUG_RE_PARSING => 0; # noisy!
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Check.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Check.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Check.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Check.pm Mon Feb 5 14:10:22 2018
@@ -26,11 +26,10 @@ use Mail::SpamAssassin::Util qw(untaint_
use Mail::SpamAssassin::Timeout;
use Mail::SpamAssassin::Constants qw(:sa);
-use vars qw(@ISA @TEMPORARY_METHODS);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
-# methods defined by the compiled ruleset; deleted in finish_tests()
-@TEMPORARY_METHODS = ();
+# methods defined by the compiled ruleset; deleted in finish_tests()
+our @TEMPORARY_METHODS;
# constructor
sub new {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DCC.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DCC.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DCC.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DCC.pm Mon Feb 5 14:10:22 2018
@@ -88,8 +88,7 @@ use Mail::SpamAssassin::Util qw(untaint_
use Errno qw(ENOENT EACCES);
use IO::Socket;
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
our $io_socket_module_name;
BEGIN {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DKIM.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DKIM.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DKIM.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DKIM.pm Mon Feb 5 14:10:22 2018
@@ -133,8 +133,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
# constructor: register the eval rule
sub new {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DNSEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DNSEval.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DNSEval.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DNSEval.pm Mon Feb 5 14:10:22 2018
@@ -34,8 +34,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
# constructor: register the eval rule
sub new {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/FreeMail.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/FreeMail.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/FreeMail.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/FreeMail.pm Mon Feb 5 14:10:22 2018
@@ -111,11 +111,10 @@ my $VERSION = 2.002;
use Mail::SpamAssassin::Plugin;
use Mail::SpamAssassin::PerMsgStatus;
-use vars qw(@ISA $email_whitelist $skip_replyto_envfrom);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
# default email whitelist
-$email_whitelist = qr/
+our $email_whitelist = qr/
^(?:
abuse|support|sales|info|helpdesk|contact|kontakt
| (?:post|host|domain)master
@@ -129,8 +128,8 @@ $email_whitelist = qr/
# skip replyto check when envelope sender is
# allow <> for now
-{ # no re "strict"; # since perl 5.21.8: Ranges of ASCII printables...
- $skip_replyto_envfrom = qr/
+# no re "strict"; # since perl 5.21.8: Ranges of ASCII printables...
+our $skip_replyto_envfrom = qr/
(?:
^(?:post|host|domain)master
| ^double-bounce
@@ -140,7 +139,6 @@ $email_whitelist = qr/
| .+=.+
)\@
/xi;
-}
sub dbg { Mail::SpamAssassin::Plugin::dbg ("FreeMail: @_"); }
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HTMLEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HTMLEval.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HTMLEval.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HTMLEval.pm Mon Feb 5 14:10:22 2018
@@ -26,8 +26,7 @@ use Mail::SpamAssassin::Plugin;
use Mail::SpamAssassin::Locales;
use Mail::SpamAssassin::Util qw(untaint_var);
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
# constructor: register the eval rule
sub new {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HTTPSMismatch.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HTTPSMismatch.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HTTPSMismatch.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HTTPSMismatch.pm Mon Feb 5 14:10:22 2018
@@ -24,8 +24,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
# constructor: register the eval rule
sub new {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Hashcash.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Hashcash.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Hashcash.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Hashcash.pm Mon Feb 5 14:10:22 2018
@@ -102,8 +102,7 @@ BEGIN {
or do { require Digest::SHA1; import Digest::SHA1 qw(sha1) }
}
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
use constant HAS_DB_FILE => eval { require DB_File; };
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm Mon Feb 5 14:10:22 2018
@@ -29,8 +29,7 @@ use Mail::SpamAssassin::Util qw(get_my_l
use Mail::SpamAssassin::Logger;
use Mail::SpamAssassin::Constants qw(:sa :ip);
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
# constructor: register the eval rule
sub new {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm Mon Feb 5 14:10:22 2018
@@ -87,8 +87,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
# constructor: register the eval rule
sub new {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm Mon Feb 5 14:10:22 2018
@@ -55,8 +55,7 @@ use Mail::SpamAssassin::Constants qw(:sa
use Mail::SpamAssassin::Util qw(untaint_var);
use Mail::SpamAssassin::Logger;
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
# constructor: register the eval rule
sub new {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm Mon Feb 5 14:10:22 2018
@@ -67,10 +67,9 @@ use Mail::SpamAssassin::Conf;
use Mail::SpamAssassin::Logger;
use Mail::SpamAssassin::Util qw(untaint_var);
-use vars qw(@ISA @TEMPORARY_METHODS);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
-@TEMPORARY_METHODS = ();
+our @TEMPORARY_METHODS;
# ---------------------------------------------------------------------------
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/NetCache.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/NetCache.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/NetCache.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/NetCache.pm Mon Feb 5 14:10:22 2018
@@ -50,8 +50,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
# constructor: register the eval rule
sub new {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm Mon Feb 5 14:10:22 2018
@@ -15,7 +15,7 @@ use strict;
use warnings;
use re 'taint';
-use vars qw(@ISA); @ISA = qw();
+our @ISA = qw();
# constructor
sub new {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/P595Body.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/P595Body.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/P595Body.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/P595Body.pm Mon Feb 5 14:10:22 2018
@@ -26,8 +26,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
sub new {
my $class = shift;
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/PDFInfo.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/PDFInfo.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/PDFInfo.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/PDFInfo.pm Mon Feb 5 14:10:22 2018
@@ -150,8 +150,7 @@ use warnings;
use Digest::MD5 qw(md5_hex);
use MIME::QuotedPrint;
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
# constructor: register the eval rule
sub new {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/PhishTag.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/PhishTag.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/PhishTag.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/PhishTag.pm Mon Feb 5 14:10:22 2018
@@ -25,9 +25,7 @@ use Errno qw(EBADF);
use Mail::SpamAssassin;
use Mail::SpamAssassin::Logger;
-use vars qw(@ISA);
-
-our @ISA = qw(Mail::SpamAssassin::Plugin);
+our our @ISA = qw(Mail::SpamAssassin::Plugin);
sub new{
my ($class, $mailsa)=@_;
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Pyzor.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Pyzor.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Pyzor.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Pyzor.pm Mon Feb 5 14:10:22 2018
@@ -44,8 +44,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
sub new {
my $class = shift;
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RabinKarpBody.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RabinKarpBody.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RabinKarpBody.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RabinKarpBody.pm Mon Feb 5 14:10:22 2018
@@ -27,8 +27,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
sub new {
my $class = shift;
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Razor2.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Razor2.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Razor2.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Razor2.pm Mon Feb 5 14:10:22 2018
@@ -48,8 +48,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
sub new {
my $class = shift;
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm Mon Feb 5 14:10:22 2018
@@ -47,8 +47,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
my ($db, $dbv6);
my $ip_to_cc; # will hold a sub() for the lookup
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayEval.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayEval.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayEval.pm Mon Feb 5 14:10:22 2018
@@ -26,8 +26,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
# constructor: register the eval rule
sub new {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm Mon Feb 5 14:10:22 2018
@@ -58,8 +58,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
sub new {
my ($class, $mailsa) = @_;
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Reuse.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Reuse.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Reuse.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Reuse.pm Mon Feb 5 14:10:22 2018
@@ -29,8 +29,7 @@ use warnings;
use Mail::SpamAssassin::Conf;
use Mail::SpamAssassin::Logger;
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
# constructor
sub new {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Rule2XSBody.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Rule2XSBody.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Rule2XSBody.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Rule2XSBody.pm Mon Feb 5 14:10:22 2018
@@ -44,8 +44,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
sub new {
my $class = shift;
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/SPF.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/SPF.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/SPF.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/SPF.pm Mon Feb 5 14:10:22 2018
@@ -41,8 +41,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
# constructor: register the eval rule
sub new {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Shortcircuit.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Shortcircuit.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Shortcircuit.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Shortcircuit.pm Mon Feb 5 14:10:22 2018
@@ -48,8 +48,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
sub new {
my $class = shift;
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/SpamCop.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/SpamCop.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/SpamCop.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/SpamCop.pm Mon Feb 5 14:10:22 2018
@@ -52,8 +52,7 @@ use re 'taint';
use constant HAS_NET_DNS => eval { require Net::DNS; };
use constant HAS_NET_SMTP => eval { require Net::SMTP; };
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
sub new {
my $class = shift;
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Test.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Test.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Test.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Test.pm Mon Feb 5 14:10:22 2018
@@ -39,8 +39,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
# constructor: register the eval rule
sub new {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TextCat.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TextCat.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TextCat.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TextCat.pm Mon Feb 5 14:10:22 2018
@@ -54,8 +54,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
# language models
my @nm;
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TxRep.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TxRep.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TxRep.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TxRep.pm Mon Feb 5 14:10:22 2018
@@ -210,8 +210,7 @@ use Mail::SpamAssassin::Plugin::Bayes;
use Mail::SpamAssassin::Util qw(untaint_var);
use Mail::SpamAssassin::Logger;
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
###########################################################################
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm Mon Feb 5 14:10:22 2018
@@ -301,8 +301,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
use constant LOG_COMPLETION_TIMES => 0;
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDetail.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDetail.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDetail.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDetail.pm Mon Feb 5 14:10:22 2018
@@ -75,8 +75,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
# constructor
sub new {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIEval.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIEval.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIEval.pm Mon Feb 5 14:10:22 2018
@@ -25,8 +25,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
# constructor: register the eval rule
sub new {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm Mon Feb 5 14:10:22 2018
@@ -118,8 +118,7 @@ my $gic_have = version->parse(Geo::IP->l
my $gip_wanted = version->parse('v1.4.4');
my $gip_have = version->parse($Geo::IP::VERSION);
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
# constructor
sub new {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm Mon Feb 5 14:10:22 2018
@@ -27,8 +27,7 @@ use NetAddr::IP 4.000;
use Mail::SpamAssassin::Plugin;
use Mail::SpamAssassin::Logger;
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
# constructor: register the eval rule
sub new {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/WhiteListSubject.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/WhiteListSubject.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/WhiteListSubject.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/WhiteListSubject.pm Mon Feb 5 14:10:22 2018
@@ -49,8 +49,7 @@ use warnings;
# use bytes;
use re 'taint';
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
# constructor: register the eval rule
sub new {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/PluginHandler.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/PluginHandler.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/PluginHandler.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/PluginHandler.pm Mon Feb 5 14:10:22 2018
@@ -34,11 +34,7 @@ use warnings;
use re 'taint';
use File::Spec;
-use vars qw{
- @ISA @CONFIG_TIME_HOOKS
-};
-
-@ISA = qw();
+our @ISA = qw();
#Removed $VERSION per BUG 6422
#$VERSION = 'bogus'; # avoid CPAN.pm picking up version strings later
@@ -56,7 +52,7 @@ use vars qw{
# Any other such hooks that may be compiled at config-parse-time should be
# listed here.
-@CONFIG_TIME_HOOKS = qw( parse_config );
+our @CONFIG_TIME_HOOKS = qw( parse_config );
###########################################################################
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/RegistryBoundaries.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/RegistryBoundaries.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/RegistryBoundaries.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/RegistryBoundaries.pm Mon Feb 5 14:10:22 2018
@@ -31,7 +31,6 @@ use warnings;
use re 'taint';
our @ISA = qw();
-use vars qw(%US_STATES);
# called from SpamAssassin->init() to create $self->{util_rb}
sub new {
@@ -60,13 +59,11 @@ sub new {
}
# This is required because the .us domain is nuts. See split_domain.
-foreach (qw/
- ak al ar az ca co ct dc de fl ga gu hi ia id il in ks ky la ma md me mi
- mn mo ms mt nc nd ne nh nj nm nv ny oh ok or pa pr ri sc sd tn tx ut va vi
- vt wa wi wv wy
- /) {
- $US_STATES{$_} = 1;
-}
+our %US_STATES = qw(
+ ak 1 al 1 ar 1 az 1 ca 1 co 1 ct 1 dc 1 de 1 fl 1 ga 1 gu 1 hi 1 ia 1 id 1 il 1 in 1 ks 1 ky 1 la 1 ma 1 md 1 me 1 mi 1
+ mn 1 mo 1 ms 1 mt 1 nc 1 nd 1 ne 1 nh 1 nj 1 nm 1 nv 1 ny 1 oh 1 ok 1 or 1 pa 1 pr 1 ri 1 sc 1 sd 1 tn 1 tx 1 ut 1 va 1
+ vi 1 vt 1 wa 1 wi 1 wv 1 wy 1
+ );
###########################################################################
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Reporter.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Reporter.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Reporter.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Reporter.pm Mon Feb 5 14:10:22 2018
@@ -25,11 +25,7 @@ use warnings;
use re 'taint';
use Mail::SpamAssassin::Logger;
-use vars qw{
- @ISA
-};
-
-@ISA = qw();
+our @ISA = qw();
#Removed $VERSION per BUG 6422
#$VERSION = 'bogus'; # avoid CPAN.pm picking up razor ver
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/SQLBasedAddrList.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/SQLBasedAddrList.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/SQLBasedAddrList.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/SQLBasedAddrList.pm Mon Feb 5 14:10:22 2018
@@ -84,9 +84,7 @@ BEGIN { require DBI; import DBI; }
use Mail::SpamAssassin::PersistentAddrList;
use Mail::SpamAssassin::Logger;
-use vars qw(@ISA);
-
-@ISA = qw(Mail::SpamAssassin::PersistentAddrList);
+our @ISA = qw(Mail::SpamAssassin::PersistentAddrList);
=head2 new
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/SpamdForkScaling.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/SpamdForkScaling.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/SpamdForkScaling.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/SpamdForkScaling.pm Mon Feb 5 14:10:22 2018
@@ -29,21 +29,17 @@ use Mail::SpamAssassin::Util qw(am_runni
use Mail::SpamAssassin::Logger;
use Mail::SpamAssassin::Timeout;
-use vars qw {
- @PFSTATE_VARS %EXPORT_TAGS @EXPORT_OK
-};
-
use base qw( Exporter );
-@PFSTATE_VARS = qw(
+our @PFSTATE_VARS = qw(
PFSTATE_ERROR PFSTATE_STARTING PFSTATE_IDLE PFSTATE_BUSY PFSTATE_KILLED
PFORDER_ACCEPT PFSTATE_GOT_SIGCHLD
);
-%EXPORT_TAGS = (
+our %EXPORT_TAGS = (
'pfstates' => [ @PFSTATE_VARS ]
);
-@EXPORT_OK = ( @PFSTATE_VARS );
+our @EXPORT_OK = ( @PFSTATE_VARS );
use constant PFSTATE_ERROR => -1;
use constant PFSTATE_STARTING => 0;
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/SubProcBackChannel.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/SubProcBackChannel.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/SubProcBackChannel.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/SubProcBackChannel.pm Mon Feb 5 14:10:22 2018
@@ -28,10 +28,7 @@ use IO::Socket;
use Mail::SpamAssassin::Util;
use Mail::SpamAssassin::Constants qw(:sa);
-use vars qw {
-};
-
-my @ISA = qw();
+our @ISA = qw();
=head1 NAME
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Timeout.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Timeout.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Timeout.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Timeout.pm Mon Feb 5 14:10:22 2018
@@ -61,11 +61,7 @@ use re 'taint';
use Time::HiRes qw(time);
use Mail::SpamAssassin::Logger;
-use vars qw{
- @ISA
-};
-
-@ISA = qw();
+our @ISA = qw();
###########################################################################
@@ -90,9 +86,9 @@ be applied. If both are specified, the s
=cut
-use vars qw($id_gen);
-BEGIN { $id_gen = 0 } # unique generator of IDs for timer objects
-use vars qw(@expiration); # stack of expected expiration times, top at [0]
+our $id_gen;
+BEGIN { $id_gen = 0 } # unique generator of IDs for timer objects
+our @expiration; # stack of expected expiration times, top at [0]
sub new {
my ($class, $opts) = @_;
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm?rev=1823175&r1=1823174&r2=1823175&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm Mon Feb 5 14:10:22 2018
@@ -49,24 +49,17 @@ require 5.008001; # needs utf8::is_utf8
use Mail::SpamAssassin::Logger;
-BEGIN {
- use Exporter ();
+use Exporter ();
- use vars qw (
- @ISA @EXPORT @EXPORT_OK
- $AM_TAINTED
- );
-
- @ISA = qw(Exporter);
- @EXPORT = ();
- @EXPORT_OK = qw(&local_tz &base64_decode &untaint_var &untaint_file_path
+our @ISA = qw(Exporter);
+our @EXPORT = ();
+our @EXPORT_OK = qw(&local_tz &base64_decode &untaint_var &untaint_file_path
&exit_status_str &proc_status_ok &am_running_on_windows
&reverse_ip_address &decode_dns_question_entry
&get_my_locales &parse_rfc822_date
&secure_tmpfile &secure_tmpdir &uri_list_canonicalize);
-}
-use Mail::SpamAssassin;
+our $AM_TAINTED;
use Config;
use IO::Handle;