You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by gb...@apache.org on 2019/02/27 18:16:20 UTC

svn commit: r1854477 - in /spamassassin/trunk: ./ build/automc/ build/mkupdates/ lib/ lib/Mail/ lib/Mail/SpamAssassin/ lib/Mail/SpamAssassin/Message/Metadata/ lib/Mail/SpamAssassin/Plugin/ masses/rule-qa/ masses/rule-qa/automc/ rules/ rulesrc/sandbox/e...

Author: gbechis
Date: Wed Feb 27 18:16:20 2019
New Revision: 1854477

URL: http://svn.apache.org/viewvc?rev=1854477&view=rev
Log:
Switch to https and fix some 404 errors
bz #7652

Modified:
    spamassassin/trunk/INSTALL
    spamassassin/trunk/Makefile.PL
    spamassassin/trunk/build/automc/buildbot_ready
    spamassassin/trunk/build/automc/home-bbmass-.corpus
    spamassassin/trunk/build/automc/mail_freqs_for_changed_rules
    spamassassin/trunk/build/mkupdates/listpromotable
    spamassassin/trunk/lib/Mail/SpamAssassin.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/AskDNS.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/PhishTag.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDetail.pm
    spamassassin/trunk/lib/spamassassin-run.pod
    spamassassin/trunk/masses/rule-qa/automc/config
    spamassassin/trunk/masses/rule-qa/corpus.example
    spamassassin/trunk/masses/rule-qa/list-bad-rules
    spamassassin/trunk/rules/20_aux_tlds.cf
    spamassassin/trunk/rules/20_dnsbl_tests.cf
    spamassassin/trunk/rules/20_dynrdns.cf
    spamassassin/trunk/rules/20_head_tests.cf
    spamassassin/trunk/rules/20_uri_tests.cf
    spamassassin/trunk/rules/20_vbounce.cf
    spamassassin/trunk/rules/25_dnswl.cf
    spamassassin/trunk/rules/25_uribl.cf
    spamassassin/trunk/rules/30_text_de.cf
    spamassassin/trunk/rules/30_text_fr.cf
    spamassassin/trunk/rules/30_text_nl.cf
    spamassassin/trunk/rules/50_scores.cf
    spamassassin/trunk/rules/active.list
    spamassassin/trunk/rules/user_prefs.template
    spamassassin/trunk/rulesrc/sandbox/emailed/00_FVGT_File001.cf
    spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_bl.cf
    spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_dynamic.cf
    spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_sc_bug_6114.cf
    spamassassin/trunk/rulesrc/sandbox/khopesh/20_trust.cf
    spamassassin/trunk/rulesrc/sandbox/wtogami/20_rp_certified.cf
    spamassassin/trunk/rulesrc/sandbox/wtogami/20_ubl.cf
    spamassassin/trunk/sa-compile.raw
    spamassassin/trunk/sa-learn.raw
    spamassassin/trunk/sa-update.raw
    spamassassin/trunk/spamassassin.raw
    spamassassin/trunk/spamc/spamc.pod
    spamassassin/trunk/spamd-apache2/README.apache
    spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd.pm
    spamassassin/trunk/spamd/PROTOCOL
    spamassassin/trunk/spamd/spamd.raw

Modified: spamassassin/trunk/INSTALL
URL: http://svn.apache.org/viewvc/spamassassin/trunk/INSTALL?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/INSTALL (original)
+++ spamassassin/trunk/INSTALL Wed Feb 27 18:16:20 2019
@@ -23,7 +23,7 @@ Using Linux:
 	Fedora: yum install spamassassin
 
 Alternatively download the tarfile, zipfile, and/or build your own RPM
-from http://spamassassin.apache.org/.  Building from tar/zip file is
+from https://spamassassin.apache.org/.  Building from tar/zip file is
 usually as simple as:
 
 	[unzip/untar the archive]
@@ -129,7 +129,7 @@ http://wiki.apache.org/spamassassin/Used
    check to be sure it is marked as spam.  GTUBE is located in the
    sample-spam.txt message distributed with SpamAssassin and also at:
 
-     http://spamassassin.apache.org/gtube/
+     https://spamassassin.apache.org/gtube/
 
    If your test emails don't get through to you, immediately rename your
    .forward file until you figure out cause of the the problem, so you
@@ -169,7 +169,7 @@ Obtain all the following files:
 Save them all to the current directory.
 Obtain a rules-signing public key:
 
-    curl -O http://spamassassin.apache.org/updates/GPG.KEY
+    curl -O https://spamassassin.apache.org/updates/GPG.KEY
 
 Import the signing key to the SpamAssassin gpg keyring, so that the rules
 files can be verified safely:

Modified: spamassassin/trunk/Makefile.PL
URL: http://svn.apache.org/viewvc/spamassassin/trunk/Makefile.PL?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/Makefile.PL (original)
+++ spamassassin/trunk/Makefile.PL Wed Feb 27 18:16:20 2019
@@ -355,7 +355,7 @@ $makefile{META_MERGE} = {
 
   resources => {
     license     => 'http://www.apache.org/licenses/LICENSE-2.0.html',
-    homepage    => 'http://spamassassin.apache.org/',
+    homepage    => 'https://spamassassin.apache.org/',
     bugtracker  => 'https://issues.apache.org/SpamAssassin/',
     repository  => { 
 			url=>'http://svn.apache.org/repos/asf/spamassassin/',

Modified: spamassassin/trunk/build/automc/buildbot_ready
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/buildbot_ready?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/build/automc/buildbot_ready (original)
+++ spamassassin/trunk/build/automc/buildbot_ready Wed Feb 27 18:16:20 2019
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 my $BBMHOME   = '/export/home/bbmass';
-my $RULEQAURL = 'http://ruleqa.spamassassin.org/';
+my $RULEQAURL = 'https://ruleqa.spamassassin.org/';
 
   # where do the reporting scripts get run from?
 my $REPORTSCRIPTSADIR = "/export/home/svn-trunk";

Modified: spamassassin/trunk/build/automc/home-bbmass-.corpus
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/home-bbmass-.corpus?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/build/automc/home-bbmass-.corpus (original)
+++ spamassassin/trunk/build/automc/home-bbmass-.corpus Wed Feb 27 18:16:20 2019
@@ -20,5 +20,5 @@ rules_dir=tstrules
 
 output_classes=DETAILS.new DETAILS.all DETAILS.age LOGS.all HTML.new HTML.all HTML.age NET.new NET.all NET.age SCOREMAP.new
 
-ruleqa_url=http://ruleqa.spamassassin.org/
+ruleqa_url=https://ruleqa.spamassassin.org/
 

Modified: spamassassin/trunk/build/automc/mail_freqs_for_changed_rules
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/mail_freqs_for_changed_rules?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/build/automc/mail_freqs_for_changed_rules (original)
+++ spamassassin/trunk/build/automc/mail_freqs_for_changed_rules Wed Feb 27 18:16:20 2019
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # 
-# usage: script [-n] http://ruleqa.spamassassin.org/reporturl freqsfile
+# usage: script [-n] https://ruleqa.spamassassin.org/reporturl freqsfile
 #
 # to be run at the top-level of the SVN checkout
 

Modified: spamassassin/trunk/build/mkupdates/listpromotable
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/mkupdates/listpromotable?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/build/mkupdates/listpromotable (original)
+++ spamassassin/trunk/build/mkupdates/listpromotable Wed Feb 27 18:16:20 2019
@@ -28,7 +28,7 @@ my @DAYS_REQUIRED = (1, 2, 3);
 
 ###########################################################################
 
-my $cgi_url = "http://ruleqa.spamassassin.org/";
+my $cgi_url = "https://ruleqa.spamassassin.org/";
 my @doc = ();
 my $cache = 'ruleqa.cache.';
 my $submitters = '';

Modified: spamassassin/trunk/lib/Mail/SpamAssassin.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin.pm?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin.pm Wed Feb 27 18:16:20 2019
@@ -122,7 +122,7 @@ sub Version {
   return join('-', sprintf("%d.%d.%d", $1, $2, $3), @EXTRA_VERSION);
 }
 
-our $HOME_URL = "http://spamassassin.apache.org/";
+our $HOME_URL = "https://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
@@ -2354,8 +2354,8 @@ C<Sys::Syslog>
 
 =head1 MORE DOCUMENTATION
 
-See also E<lt>http://spamassassin.apache.org/E<gt> and
-E<lt>http://wiki.apache.org/spamassassin/E<gt> for more information.
+See also E<lt>https://spamassassin.apache.org/E<gt> and
+E<lt>https://wiki.apache.org/spamassassin/E<gt> for more information.
 
 =head1 SEE ALSO
 
@@ -2366,11 +2366,11 @@ sa-update(1)
 
 =head1 BUGS
 
-See E<lt>http://issues.apache.org/SpamAssassin/E<gt>
+See E<lt>https://issues.apache.org/SpamAssassin/E<gt>
 
 =head1 AUTHORS
 
-The SpamAssassin(tm) Project E<lt>http://spamassassin.apache.org/E<gt>
+The SpamAssassin(tm) Project E<lt>https://spamassassin.apache.org/E<gt>
 
 =head1 COPYRIGHT
 
@@ -2382,6 +2382,6 @@ described in the file C<LICENSE> include
 The latest version of this library is likely to be available from CPAN
 as well as:
 
-  E<lt>http://spamassassin.apache.org/E<gt>
+  E<lt>https://spamassassin.apache.org/E<gt>
 
 =cut

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Wed Feb 27 18:16:20 2019
@@ -2988,10 +2988,10 @@ zone.  There's a few things to note:
 
 Duplicated IPs are only queried once and reserved IPs are not queried.
 Private IPs are those listed in
-<http://www.iana.org/assignments/ipv4-address-space>,
+<https://www.iana.org/assignments/ipv4-address-space>,
 <http://duxcw.com/faq/network/privip.htm>,
 <http://duxcw.com/faq/network/autoip.htm>, or
-<http://tools.ietf.org/html/rfc5735> as private.
+<https://tools.ietf.org/html/rfc5735> as private.
 
 =item the 'set' argument
 

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm Wed Feb 27 18:16:20 2019
@@ -72,11 +72,11 @@ use constant DUMP_BACKUP => 8;
 # from them; however we do not, so we should ignore them.
 # 
 # sources:
-#   IANA  = <http://www.iana.org/numbers>,
-#   5735  = <http://tools.ietf.org/html/rfc5735>
-#   6598  = <http://tools.ietf.org/html/rfc6598>
-#   4193  = <http://tools.ietf.org/html/rfc4193>
-#   CYMRU = <http://www.cymru.com/Documents/bogon-list.html>
+#   IANA  = <https://www.iana.org/numbers>,
+#   5735  = <https://tools.ietf.org/html/rfc5735>
+#   6598  = <https://tools.ietf.org/html/rfc6598>
+#   4193  = <https://tools.ietf.org/html/rfc4193>
+#   CYMRU = <https://www.team-cymru.com/bogon-reference.html>
 #
 # This includes:
 #   host-local address space 127.0.0.0/8 and ::1,

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm Wed Feb 27 18:16:20 2019
@@ -407,7 +407,7 @@ sub parse_received_line {
   # with HTTPU is used by Communigate Pro with Pronto! webmail interface
   # with HTTPS is used by Horde adjusts the Received header to say "HTTPS" when
   # a connection is made over HTTPS
-  # IANA registry: http://www.iana.org/assignments/mail-parameters/mail-parameters.xhtml
+  # IANA registry: https://www.iana.org/assignments/mail-parameters/mail-parameters.xhtml
   if (/ by / && / with ((?:ES|L|UTF8S|UTF8L)MTPS?A|ASMTP|HTTP[SU]?)(?: |;|$)/i) {
     $auth = $1;
   }

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Wed Feb 27 18:16:20 2019
@@ -2247,7 +2247,7 @@ the raw_uri.  I<parsed> is a faked type
 raw_uri was seen in the rendered text.
 
 C<cleaned> is an array of the raw and canonicalized version of the raw_uri
-(http://spamassassin.apache%2Eorg/, http://spamassassin.apache.org/).
+(http://spamassassin.apache%2Eorg/, https://spamassassin.apache.org/).
 
 C<anchor_text> is an array of the anchor text (text between <a> and
 </a>), if any, which linked to the URI.

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/AskDNS.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/AskDNS.pm?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/AskDNS.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/AskDNS.pm Wed Feb 27 18:16:20 2019
@@ -116,7 +116,7 @@ Currently recognized RR types in the rr_
 MX, TXT, PTR, NAPTR, NS, SOA, CERT, CNAME, DNAME, DHCID, HINFO, MINFO,
 RP, HIP, IPSECKEY, KX, LOC, SRV, SSHFP, SPF.
 
-http://www.iana.org/assignments/dns-parameters/dns-parameters.xml
+https://www.iana.org/assignments/dns-parameters/dns-parameters.xml
 
 The last optional parameter of a rule is a filtering expression, a.k.a. a
 subrule. Its function is much like the subrule in URIDNSBL plugin rules,
@@ -173,7 +173,7 @@ Some typical examples of a numeric filte
 Lastly, the filtering parameter can be a comma-separated list of DNS status
 codes (rcode), enclosed in square brackets. Rcodes can be represented either
 by their numeric decimal values (0=NOERROR, 3=NXDOMAIN, ...), or their names.
-See http://www.iana.org/assignments/dns-parameters for the list of names. When
+See https://www.iana.org/assignments/dns-parameters for the list of names. When
 testing for a rcode where rcode is nonzero, a RR type parameter is ignored
 as a filter, as there is typically no answer section in a DNS reply when
 rcode indicates an error.  Example: [NXDOMAIN], or [FormErr,ServFail,4,5] .
@@ -195,7 +195,7 @@ use version 0.77;
 
 our @ISA = qw(Mail::SpamAssassin::Plugin);
 
-our %rcode_value = (  # http://www.iana.org/assignments/dns-parameters, RFC 6195
+our %rcode_value = (  # https://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,
@@ -322,7 +322,7 @@ sub set_config {
         $query_type = 'A' if !defined $query_type;
         $query_type = uc $query_type;
         my @answer_types = split(/,/, $query_type);
-        # http://www.iana.org/assignments/dns-parameters/dns-parameters.xml
+        # https://www.iana.org/assignments/dns-parameters/dns-parameters.xml
         if (grep(!/^(?:ANY|A|AAAA|MX|TXT|PTR|NAPTR|NS|SOA|CERT|CNAME|DNAME|
                        DHCID|HINFO|MINFO|RP|HIP|IPSECKEY|KX|LOC|GPOS|SRV|
                        OPENPGPKEY|SSHFP|SPF|TLSA|URI|CAA|CSYNC)\z/x,

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm Wed Feb 27 18:16:20 2019
@@ -47,19 +47,19 @@ The DCC or Distributed Checksum Clearing
 collecting and counting checksums of millions of mail messages.
 The counts can be used by SpamAssassin to detect and filter spam.
 
-See http://www.dcc-servers.net/dcc/ for more information about DCC.
+See https://www.dcc-servers.net/dcc/ for more information about DCC.
 
 Note that DCC is disabled by default in C<v310.pre> because its use requires
 software that is not distributed with SpamAssassin and that has license
 restrictions for certain commercial uses.
-See the DCC license at http://www.dcc-servers.net/dcc/LICENSE for details.
+See the DCC license at https://www.dcc-servers.net/dcc/LICENSE for details.
 
 Enable it by uncommenting the "loadplugin Mail::SpamAssassin::Plugin::DCC"
 confdir/v310.pre or by adding this line to your local.pre.  It might also
 be necessary to install a DCC package, port, rpm, or equivalent from your
 operating system distributor or a tarball from the primary DCC source
-at http://www.dcc-servers.net/dcc/#download
-See also http://www.dcc-servers.net/dcc/INSTALL.html
+at https://www.dcc-servers.net/dcc/#download
+See also https://www.dcc-servers.net/dcc/INSTALL.html
 
 =head1 TAGS
 
@@ -183,7 +183,7 @@ See http://www.rhyolite.com/dcc/reputati
 You C<must> whitelist your trusted relays or MX servers with MX or
 MXDCC lines in /var/dcc/whiteclnt as described in the main DCC man page
 to avoid seeing your own MX servers as sources of bulk mail.
-See http://www.dcc-servers.net/dcc/dcc-tree/dcc.html#White-and-Blacklists
+See https://www.dcc-servers.net/dcc/dcc-tree/dcc.html#White-and-Blacklists
 The default is C<90>.
 
 =cut
@@ -498,7 +498,7 @@ sub find_dcc_home {
     if ($1 < 3 || ($1 == 3 && $2 < 50)) {
       info("dcc: DCC version $self->{dcc_version} is years old, ".
            "obsolete, and likely to cause problems.  ".
-           "See http://www.dcc-servers.net/dcc/old-versions.html");
+           "See https://www.dcc-servers.net/dcc/old-versions.html");
     }
     $self->{dccifd_lookup_options} = "header " . $opts;
     $self->{dccifd_report_options} = "header spam " . $opts;

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm Wed Feb 27 18:16:20 2019
@@ -114,11 +114,11 @@ are provided as a space-separated list,
 
 C<Mail::DKIM>, C<Mail::SpamAssassin::Plugin>
 
-  http://jason.long.name/dkimproxy/
-  http://tools.ietf.org/rfc/rfc4871.txt
-  http://tools.ietf.org/rfc/rfc4870.txt
-  http://tools.ietf.org/rfc/rfc5617.txt
-  http://ietf.org/html.charters/dkim-charter.html
+  http://dkimproxy.sourceforge.net/
+  https://tools.ietf.org/rfc/rfc4871.txt
+  https://tools.ietf.org/rfc/rfc4870.txt
+  https://tools.ietf.org/rfc/rfc5617.txt
+  https://datatracker.ietf.org/group/dkim/about/
 
 =cut
 

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/PhishTag.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/PhishTag.pm?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/PhishTag.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/PhishTag.pm Wed Feb 27 18:16:20 2019
@@ -256,7 +256,7 @@ http://umut.topkara.org/PhishTag/PhishTa
 
 Check the list of tests performed by SpamAssassin to modify the
 configuration file to match your needs from 
-http://spamassassin.apache.org/tests.html
+https://spamassassin.apache.org/tests.html
 
 =head1 AUTHOR
 

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDetail.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDetail.pm?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDetail.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDetail.pm Wed Feb 27 18:16:20 2019
@@ -45,7 +45,7 @@ rendered text.
 
 C<cleaned> is a list including the raw URI and various cleaned
 versions of the raw URI (http://spamassassin.apache%2Eorg/,
-http://spamassassin.apache.org/).
+https://spamassassin.apache.org/).
 
 C<text> is the anchor text(s) (text between <a> and </a>) that
 linked to the raw URI.

Modified: spamassassin/trunk/lib/spamassassin-run.pod
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/spamassassin-run.pod?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/lib/spamassassin-run.pod (original)
+++ spamassassin/trunk/lib/spamassassin-run.pod Wed Feb 27 18:16:20 2019
@@ -122,7 +122,7 @@ markup removed before being tested.
 Report this message as manually-verified spam.  This will submit the mail
 message read from STDIN to various spam-blocker databases.  Currently,
 these are the Distributed Checksum Clearinghouse
-C<http://www.dcc-servers.net/dcc/>, Pyzor
+C<https://www.dcc-servers.net/dcc/>, Pyzor
 C<http://pyzor.org/>, Vipul's Razor
 C<http://razor.sourceforge.net/>, and SpamCop C<http://www.spamcop.net/>.
 
@@ -324,7 +324,7 @@ See <http://issues.apache.org/SpamAssass
 
 =head1 AUTHORS
 
-The SpamAssassin(tm) Project <http://spamassassin.apache.org/>
+The SpamAssassin(tm) Project <https://spamassassin.apache.org/>
 
 =head1 COPYRIGHT
 

Modified: spamassassin/trunk/masses/rule-qa/automc/config
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/rule-qa/automc/config?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/masses/rule-qa/automc/config (original)
+++ spamassassin/trunk/masses/rule-qa/automc/config Wed Feb 27 18:16:20 2019
@@ -10,7 +10,7 @@ MCTMP=/usr/local/spamassassin/automc/tmp
 SADIR=/usr/local/spamassassin/svn/trunk
 
 # URL of the "ruleqa.cgi" script as installed
-RULEQA_URL=http://ruleqa.spamassassin.org
+RULEQA_URL=https://ruleqa.spamassassin.org
 
 # these must match what's in ~/.corpus, cf. "masses/rule-qa/README.nightly"
 html=/usr/local/spamassassin/automc/html

Modified: spamassassin/trunk/masses/rule-qa/corpus.example
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/rule-qa/corpus.example?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/masses/rule-qa/corpus.example (original)
+++ spamassassin/trunk/masses/rule-qa/corpus.example Wed Feb 27 18:16:20 2019
@@ -45,5 +45,5 @@ ignore_revisions=0
 # pre_mass_check_command=/path/to/script
 
 # the URL of the ruleqa web application.
-ruleqa_url=http://ruleqa.spamassassin.org/
+ruleqa_url=https://ruleqa.spamassassin.org/
 

Modified: spamassassin/trunk/masses/rule-qa/list-bad-rules
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/rule-qa/list-bad-rules?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/masses/rule-qa/list-bad-rules (original)
+++ spamassassin/trunk/masses/rule-qa/list-bad-rules Wed Feb 27 18:16:20 2019
@@ -39,7 +39,7 @@ This also applies for meta rules which u
 
 };
 
-my $cgi_url = "http://ruleqa.spamassassin.org/";
+my $cgi_url = "https://ruleqa.spamassassin.org/";
 my @doc = ();
 my $cache = 'ruleqa.cache.';
 my $submitters = '';

Modified: spamassassin/trunk/rules/20_aux_tlds.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_aux_tlds.cf?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_aux_tlds.cf (original)
+++ spamassassin/trunk/rules/20_aux_tlds.cf Wed Feb 27 18:16:20 2019
@@ -43,7 +43,7 @@ endif
 #
 
 # Basic list can be obtained with the following command:
-#  wget http://data.iana.org/TLD/tlds-alpha-by-domain.txt -q -O - | tail -n+2 | perl -ne 'print lc'
+#  wget https://data.iana.org/TLD/tlds-alpha-by-domain.txt -q -O - | tail -n+2 | perl -ne 'print lc'
 # Current list may include more or less.. TODO easier maintenance?
 
 # util_rb_tld only accepts alpha (a-z) input before RegistryBoundaries was
@@ -51,9 +51,9 @@ endif
 # this block
 #
 # For an up to date list of IDN TLDs that can be pasted into this block, run this command:
-#  wget http://data.iana.org/TLD/tlds-alpha-by-domain.txt -q -O - | grep -i '^xn--' | tr '\n' ' ' | fold -w 80 -s | perl -pe 'chomp; s/.*/util_rb_tld \L$_\n/'
+#  wget https://data.iana.org/TLD/tlds-alpha-by-domain.txt -q -O - | grep -i '^xn--' | tr '\n' ' ' | fold -w 80 -s | perl -pe 'chomp; s/.*/util_rb_tld \L$_\n/'
 # Since version 4.0 the util_rb_tld also accepts Unicode IDN labels (encoded as UTF-8), e.g.:
-#  wget http://data.iana.org/TLD/tlds-alpha-by-domain.txt -q -O - | grep -i '^xn--' | idn -u | tr '\n' ' ' | fold -w 80 -s | perl -pe 'chomp; s/.*/util_rb_tld \L$_\n/'
+#  wget https://data.iana.org/TLD/tlds-alpha-by-domain.txt -q -O - | grep -i '^xn--' | idn -u | tr '\n' ' ' | fold -w 80 -s | perl -pe 'chomp; s/.*/util_rb_tld \L$_\n/'
 
 if can(Mail::SpamAssassin::Conf::feature_registryboundaries)
 util_rb_tld xn--11b4c3d xn--1ck2e1b xn--1qqw23a xn--2scrj9c xn--30rr7y xn--3bst00m 
@@ -87,7 +87,7 @@ endif
 
 # Standard List
 # For an up to date list of TLDs that can be pasted into this block, run this command:
-#  wget http://data.iana.org/TLD/tlds-alpha-by-domain.txt -q -O - | tail -n+2 | grep -vi '^xn--' | tr '\n' ' ' | fold -w 80 -s | perl -pe 'chomp; s/.*/util_rb_tld \L$_\n/'
+#  wget https://data.iana.org/TLD/tlds-alpha-by-domain.txt -q -O - | tail -n+2 | grep -vi '^xn--' | tr '\n' ' ' | fold -w 80 -s | perl -pe 'chomp; s/.*/util_rb_tld \L$_\n/'
 
 util_rb_tld aaa aarp abarth abb abbott abbvie abc able abogado abudhabi ac academy 
 util_rb_tld accenture accountant accountants aco active actor ad adac ads adult ae aeg aero 
@@ -210,7 +210,7 @@ util_rb_tld zappos zara zero zip zippo z
 # updated as per bug 5815
 # cleanup in progress per bug 6795 (axb)
 # Unsorted sources:
-# .ua : http://hostmaster.ua
+# .ua : https://hostmaster.ua
 # .hu : http://www.domain.hu/domain/English/szabalyzat/sld.html
 
 util_rb_2tld com.ac edu.ac gov.ac mil.ac net.ac org.ac

Modified: spamassassin/trunk/rules/20_dnsbl_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_dnsbl_tests.cf?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_dnsbl_tests.cf (original)
+++ spamassassin/trunk/rules/20_dnsbl_tests.cf Wed Feb 27 18:16:20 2019
@@ -99,7 +99,7 @@ reuse  RCVD_IN_SORBS_DUL
 
 # ---------------------------------------------------------------------------
 # Spamhaus ZEN includes SBL+CSS+XBL+PBL
-# http://www.spamhaus.org/faq/section/DNSBL%20Usage#200
+# https://www.spamhaus.org/faq/section/DNSBL%20Usage#200
 #
 # Spamhaus XBL contains the Abuseat CBL data (cbl.abuseat.org)
 
@@ -108,25 +108,25 @@ describe __RCVD_IN_ZEN          Received
 tflags __RCVD_IN_ZEN            net
 reuse  __RCVD_IN_ZEN
 
-# SBL is the Spamhaus Block List: http://www.spamhaus.org/sbl/
+# SBL is the Spamhaus Block List: https://www.spamhaus.org/sbl/
 header RCVD_IN_SBL              eval:check_rbl_sub('zen', '127.0.0.2')
 describe RCVD_IN_SBL            Received via a relay in Spamhaus SBL
 tflags RCVD_IN_SBL              net
 reuse  RCVD_IN_SBL
 
-# XBL is the Exploits Block List: http://www.spamhaus.org/xbl/
+# XBL is the Exploits Block List: https://www.spamhaus.org/xbl/
 header RCVD_IN_XBL              eval:check_rbl('zen-lastexternal', 'zen.spamhaus.org.', '^127\.0\.0\.[45678]$')
 describe RCVD_IN_XBL            Received via a relay in Spamhaus XBL
 tflags RCVD_IN_XBL              net
 reuse  RCVD_IN_XBL
 
-# PBL is the Policy Block List: http://www.spamhaus.org/pbl/
+# PBL is the Policy Block List: https://www.spamhaus.org/pbl/
 header RCVD_IN_PBL              eval:check_rbl('zen-lastexternal', 'zen.spamhaus.org.', '^127\.0\.0\.1[01]$')
 describe RCVD_IN_PBL            Received via a relay in Spamhaus PBL
 tflags RCVD_IN_PBL              net
 reuse  RCVD_IN_PBL
 
-# CSS is the Spamhaus CSS Component of the SBL List: http://www.spamhaus.org/css/
+# CSS is the Spamhaus CSS Component of the SBL List: https://www.spamhaus.org/css/
 header RCVD_IN_SBL_CSS		eval:check_rbl_sub('zen', '127.0.0.3')
 describe RCVD_IN_SBL_CSS	Received via a relay in Spamhaus SBL-CSS
 tflags RCVD_IN_SBL_CSS		net
@@ -186,7 +186,7 @@ reuse RCVD_IN_IADB_VOUCHED
 
 # ---------------------------------------------------------------------------
 # Return Path Certified:
-# http://www.returnpath.net/internetserviceprovider/certification/
+# https://www.returnpath.net/internetserviceprovider/certification/
 # (replaces RCVD_IN_BSP_TRUSTED, RCVD_IN_BSP_OTHER, RCVD_IN_SSC_TRUSTED_COI)
 header RCVD_IN_RP_CERTIFIED     eval:check_rbl_txt('ssc-firsttrusted', 'sa-trusted.bondedsender.org.')
 describe RCVD_IN_RP_CERTIFIED   Sender in ReturnPath Certified - Contact cert-sa@returnpath.net
@@ -194,7 +194,7 @@ tflags RCVD_IN_RP_CERTIFIED     net nice
 reuse RCVD_IN_RP_CERTIFIED
 
 # Return Path Safe:
-# http://www.returnpath.net/internetserviceprovider/certification/
+# https://www.returnpath.net/internetserviceprovider/certification/
 # (replaces HABEAS_ACCREDITED_COI, HABEAS_ACCREDITED_SOI, HABEAS_CHECKED)
 header RCVD_IN_RP_SAFE     eval:check_rbl_txt('ssc-firsttrusted','sa-accredit.habeas.com.')
 describe RCVD_IN_RP_SAFE   Sender in ReturnPath Safe - Contact safe-sa@returnpath.net

Modified: spamassassin/trunk/rules/20_dynrdns.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_dynrdns.cf?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_dynrdns.cf (original)
+++ spamassassin/trunk/rules/20_dynrdns.cf Wed Feb 27 18:16:20 2019
@@ -168,7 +168,7 @@ header __RDNS_DYNAMIC_VIRTUA  X-Spam-Rel
 header __RDNS_DYNAMIC_SPACELAN X-Spam-Relays-External =~ /^[^\]]+ rdns=\S+-[a-z]\d+-\d+\./i
 
 # rDNS host-type indicators, as per
-# http://tools.ietf.org/wg/dnsop/draft-msullivan-dnsop-generic-naming-schemes-00.txt
+# https://tools.ietf.org/id/draft-msullivan-dnsop-generic-naming-schemes-00.txt
 header __RDNS_INDICATOR_DYN   X-Spam-Relays-External =~ /^[^\]]+ rdns=\S+[\-\.]dyn(?:amic)?[\-\.]/i
 
 # surprisingly large ham hitrate

Modified: spamassassin/trunk/rules/20_head_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_head_tests.cf?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_head_tests.cf (original)
+++ spamassassin/trunk/rules/20_head_tests.cf Wed Feb 27 18:16:20 2019
@@ -430,7 +430,7 @@ header   __ML_TURNS_SP_TO_TAB  Received
 describe __ML_TURNS_SP_TO_TAB  A mailing list changing a space to a TAB
 
 
-# must keep it in sync with http://www.iana.org/assignments/ipv4-address-space/
+# must keep it in sync with https://www.iana.org/assignments/ipv4-address-space/
 header RCVD_ILLEGAL_IP		X-Spam-Relays-Untrusted =~ / (?:by|ip)=(?=\d+\.\d+\.\d+\.\d+ )(?:(?:0|2(?:2[4-9]|[3-5]\d)|192\.0\.2|198\.51\.100|203\.0\.113)\.|(?:\d+\.){0,3}(?!(?:2(?:[0-4]\d|5[0-5])|[01]?\d\d?)\b))/
 describe RCVD_ILLEGAL_IP	Received: contains illegal IP address
 

Modified: spamassassin/trunk/rules/20_uri_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_uri_tests.cf?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_uri_tests.cf (original)
+++ spamassassin/trunk/rules/20_uri_tests.cf Wed Feb 27 18:16:20 2019
@@ -25,7 +25,7 @@
 
 require_version @@VERSION@@
 
-# possible IDN spoofing attack: http://www.shmoo.com/idn/homograph.txt
+# possible IDN spoofing attack: https://web.archive.org/web/20141006091906/https://www.shmoo.com/idn/homograph.txt
 # not expecting any hits on this (yet)
 uri HIGH_CODEPAGE_URI	       /^https?:\/\/[^\/]*\&\#(?:\d{4,}|[3456789]\d\d);/i
 tflags HIGH_CODEPAGE_URI       userconf

Modified: spamassassin/trunk/rules/20_vbounce.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_vbounce.cf?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_vbounce.cf (original)
+++ spamassassin/trunk/rules/20_vbounce.cf Wed Feb 27 18:16:20 2019
@@ -39,7 +39,7 @@
 # details.
 #
 # This ruleset is substantially based on
-# http://www.timj.co.uk/linux/bogus-virus-warnings.cf ; the main difference is
+# https://www.timj.co.uk/linux/bogus-virus-warnings.cf ; the main difference is
 # that I (jm) prefer to keep bounces and spam separate, so it now uses a single
 # rule for each type of message, instead of having multiple individual rules
 # with high scores.  That way, you can spot the individual rule names, as
@@ -156,7 +156,7 @@ meta __CRBOUNCE_0SPAM    (__CRBOUNCE_0SP
 
 header __CRBOUNCE_SPAMARREST exists:X-Spamarrest-noauth
 
-# http://mailinblack.com , a French C/R system with no other reliable
+# https://mailinblack.com , a French C/R system with no other reliable
 # signatures.  annoying!
 header __CRBOUNCE_MIB    Content-Type =~ /mUlTiPaRtBoUnDaRy_MailInBlack/
 

Modified: spamassassin/trunk/rules/25_dnswl.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/25_dnswl.cf?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/rules/25_dnswl.cf (original)
+++ spamassassin/trunk/rules/25_dnswl.cf Wed Feb 27 18:16:20 2019
@@ -35,22 +35,22 @@ tflags	__RCVD_IN_DNSWL		nice net
 reuse   __RCVD_IN_DNSWL
 
 header	RCVD_IN_DNSWL_NONE	eval:check_rbl_sub('dnswl-firsttrusted', '^127\.0\.\d+\.0$')
-describe RCVD_IN_DNSWL_NONE	Sender listed at http://www.dnswl.org/, no trust
+describe RCVD_IN_DNSWL_NONE	Sender listed at https://www.dnswl.org/, no trust
 tflags RCVD_IN_DNSWL_NONE	nice net
 reuse  RCVD_IN_DNSWL_NONE
 
 header	RCVD_IN_DNSWL_LOW	eval:check_rbl_sub('dnswl-firsttrusted', '^127\.0\.\d+\.1$')
-describe RCVD_IN_DNSWL_LOW	Sender listed at http://www.dnswl.org/, low trust
+describe RCVD_IN_DNSWL_LOW	Sender listed at https://www.dnswl.org/, low trust
 tflags RCVD_IN_DNSWL_LOW	nice net
 reuse  RCVD_IN_DNSWL_LOW
 
 header	RCVD_IN_DNSWL_MED	eval:check_rbl_sub('dnswl-firsttrusted', '^127\.0\.\d+\.2$')
-describe RCVD_IN_DNSWL_MED	Sender listed at http://www.dnswl.org/, medium trust
+describe RCVD_IN_DNSWL_MED	Sender listed at https://www.dnswl.org/, medium trust
 tflags RCVD_IN_DNSWL_MED	nice net
 reuse  RCVD_IN_DNSWL_MED
 
 header	RCVD_IN_DNSWL_HI	eval:check_rbl_sub('dnswl-firsttrusted', '^127\.0\.\d+\.3$')
-describe RCVD_IN_DNSWL_HI	Sender listed at http://www.dnswl.org/, high trust
+describe RCVD_IN_DNSWL_HI	Sender listed at https://www.dnswl.org/, high trust
 tflags RCVD_IN_DNSWL_HI		nice net
 reuse  RCVD_IN_DNSWL_HI
 

Modified: spamassassin/trunk/rules/25_uribl.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/25_uribl.cf?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/rules/25_uribl.cf (original)
+++ spamassassin/trunk/rules/25_uribl.cf Wed Feb 27 18:16:20 2019
@@ -60,8 +60,8 @@ if can(Mail::SpamAssassin::Plugin::URIDN
   reuse           URIBL_CSS_A
 endif
 
-# DBL, http://www.spamhaus.org/dbl/
-# changes axb 05-17-2014: as per http://www.spamhaus.org/news/article/713/
+# DBL, https://www.spamhaus.org/dbl/
+# changes axb 05-17-2014: as per https://www.spamhaus.org/news/article/713/
 # SH changes effective 06-01-2014
 if can(Mail::SpamAssassin::Plugin::URIDNSBL::has_tflags_domains_only)
 

Modified: spamassassin/trunk/rules/30_text_de.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/30_text_de.cf?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/rules/30_text_de.cf (original)
+++ spamassassin/trunk/rules/30_text_de.cf Wed Feb 27 18:16:20 2019
@@ -86,8 +86,8 @@ lang de describe RCVD_IN_SORBS_WEB SORBS
 lang de describe RCVD_IN_SORBS_BLOCK SORBS: Senderechner verweigert Tests
 lang de describe RCVD_IN_SORBS_ZOMBIE SORBS: Senderechner in Liste "entführter" Adressblöcke
 lang de describe RCVD_IN_SORBS_DUL SORBS: Senderechner nur temporär mit Internet verbunden
-lang de describe RCVD_IN_SBL Transportiert via Rechner in SBL-Liste (http://www.spamhaus.org/sbl/)
-lang de describe RCVD_IN_XBL Transportiert via Rechner in XBL-Liste (http://www.spamhaus.org/xbl/)
+lang de describe RCVD_IN_SBL Transportiert via Rechner in SBL-Liste (https://www.spamhaus.org/sbl/)
+lang de describe RCVD_IN_XBL Transportiert via Rechner in XBL-Liste (https://www.spamhaus.org/xbl/)
 lang de describe RCVD_IN_BL_SPAMCOP_NET Transportiert via Rechner in Liste von www.spamcop.net
 lang de describe RCVD_IN_MAPS_RBL Transportiert via Rechner in Liste von http://www.mail-abuse.org/rbl/
 lang de describe RCVD_IN_MAPS_DUL Transportiert via Rechner in Liste von http://www.mail-abuse.org/dul/
@@ -357,7 +357,7 @@ lang de describe SPF_HELO_SOFTFAIL HELO-
 endif
 
 ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-lang de describe URIBL_SBL Enthält URL in SBL-Liste (http://www.spamhaus.org/sbl/)
+lang de describe URIBL_SBL Enthält URL in SBL-Liste (https://www.spamhaus.org/sbl/)
 #lang de describe URIBL_SC_SURBL Enthält URL in SC-Liste  (www.surbl.org) - removed bug 7279
 lang de describe URIBL_WS_SURBL Enthält URL in WS-Liste (www.surbl.org)
 lang de describe URIBL_PH_SURBL Enthält URL in PH-Liste (www.surbl.org)

Modified: spamassassin/trunk/rules/30_text_fr.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/30_text_fr.cf?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/rules/30_text_fr.cf (original)
+++ spamassassin/trunk/rules/30_text_fr.cf Wed Feb 27 18:16:20 2019
@@ -46,7 +46,7 @@ lang fr report Si ce robot a classifié
 lang fr report destiné, ou pour toute question, veuillez contacter l'administrateur
 lang fr report du système par e-mail à _CONTACTADDRESS_ .
 lang fr report
-lang fr report Voir http://spamassassin.apache.org/tag/ pour plus de détails (en anglais).
+lang fr report Voir https://spamassassin.apache.org/tag/ pour plus de détails (en anglais).
 lang fr report
 lang fr report Détails de l'analyse du message:   (_SCORE_ points, _REQD_ requis)
 lang fr report _SUMMARY_
@@ -218,7 +218,7 @@ lang fr describe RCVD_IN_MAPS_DUL	Relais
 lang fr describe RCVD_IN_MAPS_NML	Relais listé dans NML, http://www.mail-abuse.org/nml/
 lang fr describe RCVD_IN_MAPS_RBL	Relais listé dans RBL, http://www.mail-abuse.org/rbl/
 lang fr describe RCVD_IN_MAPS_RSS	Relais listé dans RSS, http://www.mail-abuse.org/rss/
-lang fr describe RCVD_IN_SBL		Relais listé dans http://www.spamhaus.org/sbl/
+lang fr describe RCVD_IN_SBL		Relais listé dans https://www.spamhaus.org/sbl/
 lang fr describe RCVD_IN_SORBS_BLOCK	SORBS: Relais refusant d'être testé par SORBS
 lang fr describe RCVD_IN_SORBS_HTTP	SORBS: Envoyé par un proxy HTTP ouvert
 lang fr describe RCVD_IN_SORBS_MISC	SORBS: Envoyé par un proxy ouvert

Modified: spamassassin/trunk/rules/30_text_nl.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/30_text_nl.cf?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/rules/30_text_nl.cf (original)
+++ spamassassin/trunk/rules/30_text_nl.cf Wed Feb 27 18:16:20 2019
@@ -255,7 +255,7 @@ lang nl describe MIME_SUSPECT_NAME
 endif
 
 ifplugin Mail::SpamAssassin::Plugin::DCC
-lang nl describe DCC_CHECK                       Gevonden in DCC (http://www.dcc-servers.net/dcc/)
+lang nl describe DCC_CHECK                       Gevonden in DCC (https://www.dcc-servers.net/dcc/)
 endif
 
 ifplugin Mail::SpamAssassin::Plugin::Pyzor

Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/50_scores.cf?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Wed Feb 27 18:16:20 2019
@@ -517,7 +517,7 @@ score NO_DNS_FOR_FROM 0 0.379 0 0.001 #
 # </gen:mutable>
 
 # ReturnPath Certified
-# http://www.returnpath.net/internetserviceprovider/certification/
+# https://www.returnpath.net/internetserviceprovider/certification/
 # CERTIFIED is a subset of SAFE, thus the score is cumulative.
 # -2 + -3 = -5 points for CERTIFIED
 score RCVD_IN_RP_CERTIFIED 0.0 -3.0 0.0 -3.0

Modified: spamassassin/trunk/rules/active.list
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/active.list?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/rules/active.list (original)
+++ spamassassin/trunk/rules/active.list Wed Feb 27 18:16:20 2019
@@ -1,4 +1,4 @@
-# active ruleset list, automatically generated from http://ruleqa.spamassassin.org/
+# active ruleset list, automatically generated from https://ruleqa.spamassassin.org/
 # with results from: day 1: axb-coi-bulk axb-generic axb-ham-misc axb-ninja darxus ena-week0 ena-week1 ena-week2 ena-week3 ena-week4 giovanni-ham giovanni-spam giovanni-spammy grenier hege jarif jbrooks llanga sihde thendrikx; day 2: axb-coi-bulk axb-generic axb-ham-misc axb-ninja ena-week2 ena-week3 giovanni-ham giovanni-spam giovanni-spammy jarif mmiroslaw-mails-ham mmiroslaw-mails-spam sihde; day 3: axb-coi-bulk axb-generic axb-ham-misc axb-ninja darxus ena-week0 ena-week1 ena-week2 ena-week3 ena-week4 giovanni-ham giovanni-spam giovanni-spammy hege jarif jbrooks llanga mmiroslaw-mails-ham mmiroslaw-mails-spam sihde thendrikx
 
 # tflags publish

Modified: spamassassin/trunk/rules/user_prefs.template
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/user_prefs.template?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/rules/user_prefs.template (original)
+++ spamassassin/trunk/rules/user_prefs.template Wed Feb 27 18:16:20 2019
@@ -18,7 +18,7 @@
 # Add your own customised scores for some tests below.  The default scores are
 # read from the installed spamassassin rules files, but you can override them
 # here.  To see the list of tests and their default scores, go to
-# http://spamassassin.apache.org/tests.html .
+# https://spamassassin.apache.org/tests.html .
 #
 # score SYMBOLIC_TEST_NAME n.nn
 

Modified: spamassassin/trunk/rulesrc/sandbox/emailed/00_FVGT_File001.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/emailed/00_FVGT_File001.cf?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/emailed/00_FVGT_File001.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/emailed/00_FVGT_File001.cf Wed Feb 27 18:16:20 2019
@@ -2089,7 +2089,7 @@
 ### #counts   FH_HOST_EQ_D_D_D_D       11366s/308h of 47019 corpus (37183s/9836h FVGT) 12/23/06
 #
 #
-## now hits nothing in http://ruleqa.spamassassin.org/20071029-r589545-n
+## now hits nothing in https://ruleqa.spamassassin.org/20071029-r589545-n
 ### header   FH_HOST_EQ_D_D_D_DB X-Spam-Relays-External =~ /^[^\]]+ rdns=\d{1,3}[^0-9]\d{1,3}[^0-9]\d{1,3}[^0-9]\d{1,3}[^ ]+ /
 ### describe FH_HOST_EQ_D_D_D_DB Host is d-d-d-d
 ### ##score    FH_HOST_EQ_D_D_D_DB       0.688

Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_bl.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_bl.cf?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_bl.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_bl.cf Wed Feb 27 18:16:20 2019
@@ -7,7 +7,7 @@
 ## I'm using the RCVD_VIA_ prefix to represent regional internet registries
 ## rather than blocklists' RCVD_IN_ prefix.  It is VERY important that people
 ## not consider these to be DNS blocklists ... especially given the fact that
-## their mass-check stats at http://ruleqa.spamassassin.org/?rule=/RCVD_VIA are
+## their mass-check stats at https://ruleqa.spamassassin.org/?rule=/RCVD_VIA are
 ## quite competitive with the DNSBLs, which is more a reflection of our lack of
 ## foreign ham in the corpora than any real facts.
 #
@@ -54,7 +54,7 @@
 ## (Canada, many Carribbean and North Atlantic islands, the United States)
 ## from https://www.arin.net/knowledge/ip_blocks.html at 20100524
 ## ... that page is out of date.  Using IANA page instead:
-## http://www.iana.org/assignments/ipv4-address-space/ipv4-address-space.txt
+## https://www.iana.org/assignments/ipv4-address-space/ipv4-address-space.txt
 ##header         __RCVD_VIA_ARIN        X-Spam-Relays-External =~ /^\[ ip=(?:1(?:0[78]|7[34]|84|99)|2(?:0[4-9]|16|4)|6[3-9]|7[0-6]|9[6-9]|50)\.\d/
 #header  __RCVD_VIA_ARIN        X-Spam-Relays-External =~ /^\[ ip=(?!169\.254|172\.(?:1[6-9]|2\d|3[01])\.|192\.(?:0\.[02]|168)\.|198\.51\.100)(?:1(?:3[0124-9]|6[0124-9]|4[02346-9]|5[25-9]|7[0234]|9[289]|0[78]|2[89]|84)|2(?:0[4-9]|16|4)|7[0-6]?|6[3-9]|9[6-9]|50)\.\d/
 #header  __RCVD_VIA_ARIN_E      X-Spam-Relays-External  =~ /\[ ip=(?!169\.254|172\.(?:1[6-9]|2\d|3[01])\.|192\.(?:0\.[02]|168)\.|198\.51\.100)(?:1(?:3[0124-9]|6[0124-9]|4[02346-9]|5[25-9]|7[0234]|9[289]|0[78]|2[89]|84)|2(?:0[4-9]|16|4)|7[0-6]?|6[3-9]|9[6-9]|50)\.\d/

Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_dynamic.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_dynamic.cf?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_dynamic.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_dynamic.cf Wed Feb 27 18:16:20 2019
@@ -14,7 +14,7 @@
 ## "Detecting Gray in Black and White"
 ## 
 ## This file is fully vetted by the Spamassassin Rule QA testing system at
-## http://ruleqa.spamassassin.org/?srcpath=20_khop_dynamic.cf
+## https://ruleqa.spamassassin.org/?srcpath=20_khop_dynamic.cf
 
 
 # S25R is:  http://www.gabacho-net.jp/en/anti-spam/anti-spam-system.html

Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_sc_bug_6114.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_sc_bug_6114.cf?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_sc_bug_6114.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_sc_bug_6114.cf Wed Feb 27 18:16:20 2019
@@ -15,7 +15,7 @@
 ### Frequent updates are needed for these rules, so they are marked 'nopublish'
 ### This keeps them from being automatically promoted to SpamAssassin proper
 ### from the testing system, which affirms their usefulness.  You can check
-### their efficiency at http://ruleqa.spamassassin.org/?rule=%2FKHOP_SC
+### their efficiency at https://ruleqa.spamassassin.org/?rule=%2FKHOP_SC
 #
 #meta   __KHOP_SC_EXCLUSIONS    __VIA_ML || __freemail_safe || __RCVD_IN_DNSWL || RCVD_IN_HOSTKARMA_WL
 #
@@ -160,7 +160,7 @@
 ## 2.9091/0.0056 0.998 20130705@376k
 #
 #
-## Spamhaus DROP, http://www.spamhaus.org/drop/
+## Spamhaus DROP, https://www.spamhaus.org/drop/
 #header  KHOP_SPAMHAUS_DROP     X-Spam-Relays-Untrusted =~ /___ FAILED TO POPULATE ___/
 #describe KHOP_SPAMHAUS_DROP    Relay listed in Spamhaus Don't Route Or Peer List
 #tflags  KHOP_SPAMHAUS_DROP     nopublish
@@ -193,7 +193,7 @@
 ## 0.4298/0      1.000 20130629@465k net
 ## 1.0958/0      1.000 20130705@376k
 #
-## test for ruleqa, 20100409, http://ruleqa.spamassassin.org/?rule=/KHOP_SPAMMY
+## test for ruleqa, 20100409, https://ruleqa.spamassassin.org/?rule=/KHOP_SPAMMY
 #meta __KHOP_SPAMMY_CIDR24  KHOP_PSBL_CIDR24||KHOP_SC_CIDR24||KHOP_SC_TOP_CIDR24
 ## est. 1.2/0.0050@.996, floor: 1.0/0.0112@.989, ceiling: 1.4/0@1
 ##   spam/ham     s/o   corpus

Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_trust.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_trust.cf?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_trust.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_trust.cf Wed Feb 27 18:16:20 2019
@@ -6,7 +6,7 @@
 ## khopesh on irc://irc.freenode.net/#spamassassin
 ## 
 ## This file is fully vetted by the Spamassassin Rule QA testing system at
-## http://ruleqa.spamassassin.org/?srcpath=20_trust.cf
+## https://ruleqa.spamassassin.org/?srcpath=20_trust.cf
 
 # Detect milter-greylist, postgrey, SQLgrey, scam-grey, and hopefully others
 header	 __GREYLISTING	ALL =~ /(?:^|\n)X-(?:Scam-Grey|Greylist(?:ing)?):\s/m

Modified: spamassassin/trunk/rulesrc/sandbox/wtogami/20_rp_certified.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/wtogami/20_rp_certified.cf?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/wtogami/20_rp_certified.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/wtogami/20_rp_certified.cf Wed Feb 27 18:16:20 2019
@@ -8,14 +8,14 @@
 #ifplugin Mail::SpamAssassin::Plugin::DNSEval # {
 
 # Return Path Certified:
-# http://www.returnpath.net/internetserviceprovider/certification/
+# https://www.returnpath.net/internetserviceprovider/certification/
 # (replaces RCVD_IN_BSP_TRUSTED, RCVD_IN_BSP_OTHER, RCVD_IN_SSC_TRUSTED_COI)
 #header RCVD_IN_RP_CERTIFIED     eval:check_rbl_txt('ssc-firsttrusted', 'sa-trusted.bondedsender.org.')
 #describe RCVD_IN_RP_CERTIFIED   Sender in ReturnPath Certified - Contact cert-sa@returnpath.net
 #tflags RCVD_IN_RP_CERTIFIED     net nice
 
 # Return Path Safe:
-# http://www.returnpath.net/internetserviceprovider/certification/
+# https://www.returnpath.net/internetserviceprovider/certification/
 # (replaces HABEAS_ACCREDITED_COI, HABEAS_ACCREDITED_SOI, HABEAS_CHECKED)
 #header RCVD_IN_RP_SAFE     eval:check_rbl_txt('ssc-firsttrusted','sa-accredit.habeas.com.')
 #describe RCVD_IN_RP_SAFE   Sender in ReturnPath Safe - Contact safe-sa@returnpath.net

Modified: spamassassin/trunk/rulesrc/sandbox/wtogami/20_ubl.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/wtogami/20_ubl.cf?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/wtogami/20_ubl.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/wtogami/20_ubl.cf Wed Feb 27 18:16:20 2019
@@ -1,5 +1,5 @@
 # UBL testing disabled 20091019
-# http://ruleqa.spamassassin.org/20091017-r826198-n/T_RCVD_IN_UBL/detail
+# https://ruleqa.spamassassin.org/20091017-r826198-n/T_RCVD_IN_UBL/detail
 # Saturday masscheck revealed 7.9% spam and 2.3% ham hit rate
 # 20110116: UBL randomly timing out, or taking up to 12 seconds to respond.
 

Modified: spamassassin/trunk/sa-compile.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-compile.raw?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/sa-compile.raw (original)
+++ spamassassin/trunk/sa-compile.raw Wed Feb 27 18:16:20 2019
@@ -807,7 +807,7 @@ See <http://issues.apache.org/SpamAssass
 
 =head1 AUTHORS
 
-The Apache SpamAssassin(tm) Project <http://spamassassin.apache.org/>
+The Apache SpamAssassin(tm) Project <https://spamassassin.apache.org/>
 
 =head1 LICENSE AND COPYRIGHT
 

Modified: spamassassin/trunk/sa-learn.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-learn.raw?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/sa-learn.raw (original)
+++ spamassassin/trunk/sa-learn.raw Wed Feb 27 18:16:20 2019
@@ -1354,7 +1354,7 @@ C<Mail::SpamAssassin>
 
 =head1 AUTHORS
 
-The SpamAssassin(tm) Project E<lt>http://spamassassin.apache.org/E<gt>
+The SpamAssassin(tm) Project E<lt>https://spamassassin.apache.org/E<gt>
 
 =cut
 

Modified: spamassassin/trunk/sa-update.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-update.raw?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/sa-update.raw (original)
+++ spamassassin/trunk/sa-update.raw Wed Feb 27 18:16:20 2019
@@ -950,7 +950,7 @@ key.  Instead, it was signed with the fo
 
 Perhaps you need to import the channel's GPG key?  For example:
 
-    wget http://spamassassin.apache.org/updates/GPG.KEY
+    wget https://spamassassin.apache.org/updates/GPG.KEY
     sa-update --import GPG.KEY
 
 ENDOFVALIDATIONERR
@@ -2137,7 +2137,7 @@ See <http://issues.apache.org/SpamAssass
 
 =head1 AUTHORS
 
-The Apache SpamAssassin(tm) Project <http://spamassassin.apache.org/>
+The Apache SpamAssassin(tm) Project <https://spamassassin.apache.org/>
 
 =head1 LICENSE AND COPYRIGHT
 

Modified: spamassassin/trunk/spamassassin.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamassassin.raw?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/spamassassin.raw (original)
+++ spamassassin/trunk/spamassassin.raw Wed Feb 27 18:16:20 2019
@@ -638,8 +638,8 @@ program or perldoc(1).
 
 =head1 WEB SITES
 
-    SpamAssassin web site:     http://spamassassin.apache.org/
-    Wiki-based documentation:  http://wiki.apache.org/spamassassin/
+    SpamAssassin web site:     https://spamassassin.apache.org/
+    Wiki-based documentation:  https://wiki.apache.org/spamassassin/
 
 =head1 USER MAILING LIST
 
@@ -897,11 +897,11 @@ from the SpamAssassin distribution.
 
 =head1 BUGS
 
-See <http://issues.apache.org/SpamAssassin/>
+See <https://issues.apache.org/SpamAssassin/>
 
 =head1 AUTHORS
 
-The SpamAssassin(tm) Project <http://spamassassin.apache.org/>
+The SpamAssassin(tm) Project <https://spamassassin.apache.org/>
 
 =head1 COPYRIGHT AND LICENSE
 

Modified: spamassassin/trunk/spamc/spamc.pod
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamc/spamc.pod?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/spamc/spamc.pod (original)
+++ spamassassin/trunk/spamc/spamc.pod Wed Feb 27 18:16:20 2019
@@ -351,7 +351,7 @@ C<Mail::SpamAssassin>
 
 =head1 AUTHORS
 
-The SpamAssassin(tm) Project <http://spamassassin.apache.org/>
+The SpamAssassin(tm) Project <https://spamassassin.apache.org/>
 
 =head1 COPYRIGHT
 

Modified: spamassassin/trunk/spamd-apache2/README.apache
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd-apache2/README.apache?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/spamd-apache2/README.apache (original)
+++ spamassassin/trunk/spamd-apache2/README.apache Wed Feb 27 18:16:20 2019
@@ -2,7 +2,7 @@ Mail::SpamAssassin::Spamd::Apache2
 ==================================
 
 This distribution contains a mod_perl2 module, implementing the spamd
-protocol from the SpamAssassin (http://spamassassin.apache.org/) project
+protocol from the SpamAssassin (https://spamassassin.apache.org/) project
 in Apache2.  It's mostly compatible with the original spamd.
 
 The apache-spamd.pl script is included to help you configuring Apache.

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=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd.pm (original)
+++ spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd.pm Wed Feb 27 18:16:20 2019
@@ -49,7 +49,7 @@ See the source code of C<spamd(1)> and C
 
 =head1 AUTHORS
 
-The SpamAssassin(tm) Project E<lt>http://spamassassin.apache.org/E<gt>
+The SpamAssassin(tm) Project E<lt>https://spamassassin.apache.org/E<gt>
 
 =head1 COPYRIGHT
 

Modified: spamassassin/trunk/spamd/PROTOCOL
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd/PROTOCOL?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/spamd/PROTOCOL (original)
+++ spamassassin/trunk/spamd/PROTOCOL Wed Feb 27 18:16:20 2019
@@ -109,7 +109,7 @@ generated by spamd:
         \r\n
 	This mail is probably spam.  The original message has been attached
 	along with this report, so you can recognize or block similar unwanted
-	mail in future.  See http://spamassassin.apache.org/tag/ for more details.
+	mail in future.  See https://spamassassin.apache.org/tag/ for more details.
 	[...]
 
 Note that the superfluous-score/threshold-line bug that appeared in

Modified: spamassassin/trunk/spamd/spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd/spamd.raw?rev=1854477&r1=1854476&r2=1854477&view=diff
==============================================================================
--- spamassassin/trunk/spamd/spamd.raw (original)
+++ spamassassin/trunk/spamd/spamd.raw Wed Feb 27 18:16:20 2019
@@ -3846,7 +3846,7 @@ C<Mail::SpamAssassin>
 
 =head1 AUTHORS
 
-The SpamAssassin(tm) Project (http://spamassassin.apache.org/)
+The SpamAssassin(tm) Project (https://spamassassin.apache.org/)
 
 =head1 LICENSE