Mailing List Archive

Author: felicity
Date: Thu Jan 29 11:27:12 2004
New Revision: 6351

Modified:
incubator/spamassassin/trunk/README
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
incubator/spamassassin/trunk/rules/10_misc.cf
incubator/spamassassin/trunk/spamassassin.raw
Log:
first pass at removing deprecated options

Modified: incubator/spamassassin/trunk/README
==============================================================================
--- incubator/spamassassin/trunk/README (original)
+++ incubator/spamassassin/trunk/README Thu Jan 29 11:27:12 2004
@@ -11,38 +11,39 @@
using an earlier release, you will need to upgrade when SpamAssassin 2.70
is eventually released.

-Users of SpamAssassin versions earlier than 2.50 should note that the
-default tagging behavior has changed. If an incoming message is tagged as
-spam, instead of modifying the original message, SpamAssassin will create a
-new report message and attach the original message as a message/rfc822 MIME
-part (ensuring the original message is completely preserved and easier to
-recover). If you do not want to modify the body of incoming spam, use the
-"report_safe" option.
-
-The "report_header" and "defang_mime" options are also deprecated as a
-result. Read the docs for "report_safe" for details.
+Users of SpamAssassin versions earlier than 2.50 should note that
+the default tagging behavior has changed. If an incoming message is
+tagged as spam, instead of modifying the original message, SpamAssassin
+will create a new report message and attach the original message as a
+message/rfc822 MIME part (ensuring the original message is completely
+preserved and easier to recover). If you do not want to modify the body
+of incoming spam, use the "report_safe" option. The "report_header"
+and "defang_mime" options have been removed as a result.

Please note that the use of the following commandline parameters for
-spamassassin and spamd have been deprecated! They will still work in
-the 2.6x series (a warning will be displayed), but they will be removed
-in the next major release. If you currently use these flags, please
-remove them. The flags are: --add-from, --pipe, -F, -P
+spamassassin and spamd were deprecated in the 2.6x series and are
+now removed! If you currently use these flags, please remove them.
+The flags are: --add-from, --pipe, -F, -P, --stop-at-threshold, -S.
+
+The following flags are deprecated and will be removed in the next major
+release: --whitelist-factory, -M, --auto-whitelist, -a, --warning-from,
+-w, --log-to-mbox, -l.

-SpamAssassin now runs in "taint mode" by default for improved
-security. If you want to enable usage of Razor v2, you will need to be
-using v2.40 of razor-agents or higher which fixes taint issues in previous
-versions.
+SpamAssassin runs in "taint mode" by default for improved security.
+Certain third-party modules, such as Razor v2, may be incompatible with
+taint mode. For Razor v2, you will need to be using v2.40 of razor-agents
+or higher which allows taint mode by default. Earlier versions which are
+patched to allow taint mode may be used as well.

-The 2.6x series has a new Bayes backend and database format (since 2.5x).
-Your old database(s) will automatically be upgraded the first time
-SpamAssassin tries to write to the DB, and any journal, if it exists,
-will be wiped out without being synced. Please see the INSTALL document
-for more details.
+If you are upgrading from a 2.5x series version of SpamAssassin, please
+note that there is a new Bayes backend and database format. Your old
+database(s) will automatically be upgraded the first time SpamAssassin
+tries to write to the DB, and any journal, if it exists, will be wiped out
+without being synced. Please see the INSTALL document for more details.

-Finally, the "check_bayes_db" script has been deprecated and will no
-longer function properly with 2.6x series databases. The functionality
-from that script was added to sa-learn via the "--dump" parameter.
-Please see the sa-learn man/pod documentation for more info.
+Finally, 2.6x deprecated the use of the "check_bayes_db" script, and it
+is now no longer available. Please see the sa-learn man/pod documentation
+for more info.


Welcome to SpamAssassin!

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Thu Jan 29 11:27:12 2004
@@ -1761,172 +1761,6 @@

=back

-=head2 DEPRECATED OPTIONS
-
-=over 4
-=item rewrite_subject { 0 | 1 } (default: 0)
-
-By default, the subject lines of suspected spam will not be tagged.
-This can be enabled here, but should instead be done with the
-C<rewrite_header> option described above.
-
-The use of this option is deprecated.
-
-=cut
-
- if (/^rewrite_subject\s+(\d+)$/) {
- if ($1) {
- $self->{rewrite_header}->{Subject} = $self->{subject_tag};
- } else {
- delete $self->{rewrite_header}->{Subject};
- }
- next;
- }
-
-=item subject_tag STRING ... (default: *****SPAM*****)
-
-Text added to the C<Subject:> line of mails that are considered spam,
-if C<rewrite_subject> is 1. Tags can be used here as with the
-add_header option. If report_safe is not used (see below), you may
-only use the _HITS_ and _REQD_ tags, if report_safe is 0, or
-SpamAssassin will not be able to remove this markup from your message.
-
-The use of this option is deprecated. Use the C<rewrite_header> option
-above.
-
-=cut
-
- if (/^subject_tag\s+(.+)$/) {
- $self->{subject_tag} = $1;
- if (exists ($self->{rewrite_header}->{Subject})) {
- $self->{rewrite_header}->{Subject} = $1;
- }
- next;
- }
-
-=item always_add_headers { 0 | 1 } (default: 1)
-
-By default, B<X-Spam-Status> and B<X-Spam-Level>) will be added to all
-messages scanned by SpamAssassin. If you don't want to add those headers
-to non-spam, set this value to 0.
-
-This option is deprecated in version 2.60 and later. It will be removed
-in a future version. Instead, use the B<clear_headers> and
-B<add_header> options to customize headers.
-
-=cut
-
- if (/^always_add_headers\s+(\d+)$/) {
- if ($1 == 0) {
- for my $name (keys %{ $self->{headers_ham} }) {
- delete $self->{headers_ham}->{$name} if $name ne "Checker-Version";
- }
- }
- else {
- $self->add_default_ham_headers();
- }
- next;
- }
-
-
-=item spam_level_stars { 0 | 1 } (default: 1)
-
-By default, a header field called "X-Spam-Level" will be added to the message,
-with its value set to a number of asterisks equal to the score of the message.
-In other words, for a message scoring 7.2 points:
-
- X-Spam-Level: *******
-
-This can be useful for MUA rule creation.
-
-Note that a maximum of 50 'stars' will be added, to keep under RFC-822's
-message header line length limit.
-
-This option is deprecated in version 2.60 and later. It will be removed
-in a future version. Please use the add_header option instead:
-
- add_header all Level _STARS(*)_
-
-=cut
-
- if(/^spam_level_stars\s+(\d+)$/) {
- if ($1 == 0) {
- delete $self->{headers_ham}->{"Level"};
- delete $self->{headers_spam}->{"Level"};
- }
- next;
- }
-
-=item spam_level_char { x (some character, unquoted) } (default: *)
-
-By default, the "X-Spam-Level" header will use a '*' character with
-its length equal to the score of the message. Some people don't like
-escaping *s though, so you can set the character to anything with this
-option.
-
-In other words, for a message scoring 7.2 points with this option set to .
-
- X-Spam-Level: .......
-
-This option is deprecated in version 2.60 and later. It will be removed
-in a future version. Please use the add_header option instead:
-
- add_header all Level _STARS(.)_
-
-=cut
-
- if(/^spam_level_char\s+(.)$/) {
- $self->{headers_ham}->{"Level"} = "_STARS($1)_";
- $self->{headers_spam}->{"Level"} = "_STARS($1)_";
- next;
- }
-
-=item dcc_add_header { 0 | 1 } (default: 0)
-
-DCC processing creates a message header containing the statistics for the
-message. This option sets whether SpamAssassin will add the heading to
-messages it processes.
-
-The default is to not add the header.
-
-This option is deprecated in version 2.60 and later. It will be removed
-in a future version. Please use the add_header option instead:
-
-add_header all DCC _DCCB_: _DCCR_
-
-=cut
-
- if (/^dcc_add_header\s+(\d+)$/) {
- if ($1 == 1) {
- $self->{headers_spam}->{"DCC"} = "_DCCB_: _DCCR_";
- $self->{headers_ham}->{"DCC"} = $self->{headers_spam}->{"DCC"};
- }
- next;
- }
-
-=item pyzor_add_header { 0 | 1 } (default: 0)
-
-Pyzor processing creates a message header containing the statistics for the
-message. This option sets whether SpamAssassin will add the heading to
-messages it processes.
-
-The default is to not add the header.
-
-This option is deprecated in version 2.60 and later. It will be removed
-in a future version. Please use the add_header option instead:
-
-add_header all Pyzor _PYZOR_
-
-=cut
-
- if (/^pyzor_add_header\s+(\d+)$/) {
- if ($1 == 1) {
- $self->{headers_spam}->{"Pyzor"} = "_PYZOR_";
- $self->{headers_ham}->{"Pyzor"} = "_PYZOR_";
- }
- next;
- }
-
##############

=item pyzor_options [option ...]
@@ -1940,27 +1774,6 @@
if (/^pyzor_options\s+([-A-Za-z0-9_\/ ]+)$/) {
$self->{pyzor_options} = $1;
next;
- }
-
-=item num_check_received { integer } (default: 9)
-
-How many received lines from and including the original mail relay
-do we check in RBLs (at least 1 or 2 is recommended).
-
-Note that for checking against dialup lists, you can call C<check_rbl()> with a
-special set name of B<set-notfirsthop> and this rule will only be matched
-against the relays except for the very first one; this allows SpamAssassin to
-catch dialup-sent spam, without penalizing people who properly relay through
-their ISP.
-
-This option is deprecated in version 2.60 and later. It will be removed
-in a future version. Please use the C<trusted_networks> option instead
-(it is a much better way to control DNSBL-checking behaviour).
-
-=cut
-
- if ( $key eq 'num_check_received' ) {
- $self->{num_check_received} = $value+0; next;
}

###########################################################################

Modified: incubator/spamassassin/trunk/rules/10_misc.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/10_misc.cf (original)
+++ incubator/spamassassin/trunk/rules/10_misc.cf Thu Jan 29 11:27:12 2004
@@ -169,8 +169,4 @@
# unless the user override them. See the user_prefs.template file for
# explanations.

-# rewrite_header Subject *****SPAM*****
-# skip_rbl_checks 0
-# check_mx_attempts 2
-# check_mx_delay 5


Modified: incubator/spamassassin/trunk/spamassassin.raw
==============================================================================
--- incubator/spamassassin/trunk/spamassassin.raw (original)
+++ incubator/spamassassin/trunk/spamassassin.raw Thu Jan 29 11:27:12 2004
@@ -110,10 +110,6 @@

# NOTE: ignored for backwards compatibility. will be stripped
# in a future release.
- 'pipe|P' => sub { warn "The -P option has been removed.\n" },
- 'F=i' => sub { warn "The -F option has been removed.\n" },
- 'add-from!' => sub { warn "The --add-from option has been removed.\n" },
- 'stop-at-threshold|S' => sub { warn "The -S option has been removed.\n" },
'whitelist-factory|M=s' => sub { warn "The -M option has been removed.\n" },
'auto-whitelist|a' => sub { warn "The -a option has been removed.\n" },
'warning-from|w=s' => sub { warn "The -w option has been removed.\n" },