Mailing List Archive

Author: felicity
Date: Thu Jan 29 19:43:03 2004
New Revision: 6358

Modified:
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
incubator/spamassassin/trunk/rules/10_misc.cf
incubator/spamassassin/trunk/rules/30_text_de.cf
incubator/spamassassin/trunk/rules/30_text_fr.cf
incubator/spamassassin/trunk/spamassassin.raw
Log:
more removal of deprecated options and such


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 19:43:03 2004
@@ -275,10 +275,9 @@
# defaults for SQL based auto-whitelist
$self->{user_awl_sql_table} = 'awl';

- # for backwards compatibility, we need to set the default headers
- # remove this except for X-Spam-Checker-Version in 2.70
- $self->add_default_spam_headers(); # always run this first
- $self->add_default_ham_headers(); # always run this second
+ # Make sure we add in X-Spam-Checker-Version
+ $self->{headers_spam}->{"Checker-Version"} = "SpamAssassin _VERSION_ (_SUBVERSION_) on _HOSTNAME_";
+ $self->{headers_ham}->{"Checker-Version"} = $self->{headers_spam}->{"Checker-Version"};

$self;
}
@@ -291,23 +290,6 @@
return $self->{mtime};
}

-sub add_default_spam_headers {
- my ($self) = @_;
-
- $self->{headers_spam}->{"Flag"} = "_YESNOCAPS_";
- $self->{headers_spam}->{"Status"} = "_YESNO_, hits=_HITS_ required=_REQD_ tests=_TESTS_ autolearn=_AUTOLEARN_ version=_VERSION_";
- $self->{headers_spam}->{"Level"} = "_STARS(*)_";
- $self->{headers_spam}->{"Checker-Version"} = "SpamAssassin _VERSION_ (_SUBVERSION_) on _HOSTNAME_";
-}
-
-sub add_default_ham_headers {
- my ($self) = @_;
-
- $self->{headers_ham}->{"Status"} = $self->{headers_spam}->{"Status"};
- $self->{headers_ham}->{"Level"} = $self->{headers_spam}->{"Level"};
- $self->{headers_ham}->{"Checker-Version"} = $self->{headers_spam}->{"Checker-Version"};
-}
-
###########################################################################

sub parse_scores_only {
@@ -774,7 +756,6 @@
long header lines are possible). The lines will still be properly folded
(marked as continuing) though.

-For backwards compatibility, some headers are (still) added by default.
You can customize existing headers with add_header (only the specified
subset of messages will be changed).


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 19:43:03 2004
@@ -44,32 +44,6 @@
# _CONTACTADDRESS_ above if present)
report_contact @@CONTACT_ADDRESS@@

-
-###########################################################################
-# and now, a template for spam-trap responses. If the first few lines
-# begin with "Xxxxxx: " where Xxxxxx is a header, they'll be used as
-# headers.
-
-clear_spamtrap_template
-spamtrap Subject: this address is no longer available
-
-spamtrap [this message has been automatically generated]
-spamtrap
-spamtrap Please note that this address is no longer in use, and nowadays
-spamtrap receives nothing but unsolicited commercial mail. Accordingly,
-spamtrap any mail sent to it is added to several spam-tracking databases,
-spamtrap then automatically deleted.
-spamtrap
-spamtrap If you genuinely want to contact the owner of the address, please
-spamtrap re-check your contact lists, or search the web, to find their
-spamtrap current e-mail address.
-spamtrap
-spamtrap The mail you sent is reproduced in full below, for resending to
-spamtrap the correct address. Sorry for the inconvenience!
-spamtrap
-spamtrap [-- Signed: the SpamAssassin mail filter]
-spamtrap
-
###########################################################################

# Unsafe-for-viewing message report template.

Modified: incubator/spamassassin/trunk/rules/30_text_de.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/30_text_de.cf (original)
+++ incubator/spamassassin/trunk/rules/30_text_de.cf Thu Jan 29 19:43:03 2004
@@ -52,44 +52,6 @@
lang de terse_report ---- Ende des SpamAssassin-Reports
# ........................................................................

-# ........................................................................
-lang de clear_spamtrap_template
-lang de spamtrap Subject: Adresse existiert nicht mehr / address is no longer available
-
-lang de spamtrap [English version follows]
-lang de spamtrap [-----------------------]
-lang de spamtrap [Diese Nachricht wurde automatisch erzeugt]
-lang de spamtrap
-lang de spamtrap Diese Adresse wird nicht mehr benutzt und empfängt seit einiger Zeit nur
-lang de spamtrap noch unerwünschte Spam-Nachrichten. Daher wird jede hier empfangene
-lang de spamtrap Nachricht an mehrere öffentliche Anti-Spam-Datenbanken weitergeleitet
-lang de spamtrap und dann gelöscht.
-lang de spamtrap
-lang de spamtrap Wenn Sie den früheren Besitzer wirklich kontaktieren wollen, dann müssen
-lang de spamtrap Sie eine andere Adresse benutzen, eventuell können Sie im World Wide Web
-lang de spamtrap danach suchen.
-lang de spamtrap
-lang de spamtrap Bitte haben Sie Verständnis für diese Maßnahme.
-lang de spamtrap
-lang de spamtrap [-----------------------]
-lang de spamtrap [this message has been automatically generated]
-lang de spamtrap
-lang de spamtrap Please note that this address is no longer in use, and nowadays
-lang de spamtrap receives nothing but unsolicited commercial mail. Accordingly,
-lang de spamtrap any mail sent to it is added to several spam-tracking databases,
-lang de spamtrap then automatically deleted.
-lang de spamtrap
-lang de spamtrap If you genuinely want to contact the owner of the address, please
-lang de spamtrap re-check your contact lists, or search the web, to find their
-lang de spamtrap current e-mail address.
-lang de spamtrap
-lang de spamtrap The mail you sent is reproduced in full below, for resending to
-lang de spamtrap the correct address. Sorry for the inconvenience!
-lang de spamtrap
-lang de spamtrap [-- Signed: the SpamAssassin mail filter]
-lang de spamtrap
-
-# ........................................................................
lang de clear_unsafe_report_template
lang de unsafe_report Die ursprüngliche Nachricht enthielt nicht ausschließlich Klartext
lang de unsafe_report (plain text) und kann eventuell eine Gefahr für einige E-mail-Programme

Modified: incubator/spamassassin/trunk/rules/30_text_fr.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/30_text_fr.cf (original)
+++ incubator/spamassassin/trunk/rules/30_text_fr.cf Thu Jan 29 19:43:03 2004
@@ -56,45 +56,6 @@
# _CONTACTADDRESS_ est remplacée par ce texte.
# ......................................................................

-lang fr clear-spamtrap-template
-lang fr spamtrap Subject: Adresse mail périmée / Mail address discontinued
-lang fr spamtrap [English version follows]
-lang fr spamtrap [-----------------------]
-lang fr spamtrap [Réponse automatique]
-lang fr spamtrap
-lang fr spamtrap L'adresse e-mail à laquelle vous avez écrit n'est plus
-lang fr spamtrap utilisée, et ne reçoit plus que du spam. Par conséquent,
-lang fr spamtrap tout message reçu à cette adresses est transmis à divers
-lang fr spamtrap systèmes de lutte contre le spam, puis automatiquement
-lang fr spamtrap détruit.
-lang fr spamtrap
-lang fr spamtrap Si vous souhaitez joindre le propriétaire de cette ancienne
-lang fr spamtrap adresse mail, veuillez vous procurer sa nouvelle adresse, qui
-lang fr spamtrap ne peut pas vous être communiquée ici pour ne pas donner cette
-lang fr spamtrap information à d'éventuels spammeurs.
-lang fr spamtrap
-lang fr spamtrap [-- SpamAssassin, système anti-spam automatisé]
-lang fr spamtrap
-lang fr spamtrap [-----------------------]
-lang fr spamtrap [Automatically generated answer]
-lang fr spamtrap
-lang fr spamtrap The e-mail address to which you sent your message is obsolete,
-lang fr spamtrap and doesn't receive anything but spam anymore. Any message sent
-lang fr spamtrap to this address is automatically forwarded to several anti-spam
-lang fr spamtrap systems, then deleted.
-lang fr spamtrap
-lang fr spamtrap If you truly want to contact the owner of this old address,
-lang fr spamtrap please try to find his/her new address, which cannot be given
-lang fr spamtrap by this system to avoid giving this address to possible
-lang fr spamtrap spammers.
-lang fr spamtrap
-lang fr spamtrap Your original message is reproduced below, so you can resend it to
-lang fr spamtrap the correct recipient address. Sorry for the inconvenience!
-lang fr spamtrap
-lang fr spamtrap [-- Spamassassin, automated anti-spam system]
-lang fr spamtrap
-# ......................................................................
-
lang fr clear-terse-report-template
lang fr terse-report ------------------ Début de Rapport SpamAssassin ---------------------
lang fr terse-report _HITS_ points, _REQD_ points requis ;

Modified: incubator/spamassassin/trunk/spamassassin.raw
==============================================================================
--- incubator/spamassassin/trunk/spamassassin.raw (original)
+++ incubator/spamassassin/trunk/spamassassin.raw Thu Jan 29 19:43:03 2004
@@ -597,40 +597,6 @@
option. Please see the manpage for Mail::SpamAssassin::Conf(3) for
more information.

-=head1 SPAM TRAPPING
-
-Quite often, if you've been on the internet for a while, you'll have
-accumulated a few old email accounts that nowadays get nothing but
-spam.
-
-SpamAssassin lets you set them up as aliases, as follows:
-
-=over 4
-
-=item spamtrap1: "| /path/to/spamassassin -r -w spamtrap1"
-
-=back
-
-This will add any incoming mail messages straight into spam-tracking databases,
-such as Vipul's Razor; send an explanatory reply message to the sender, from
-the I<spamtrap1> address; then drop the mail into the bit-bucket.
-
-The explanatory reply text is taken from the SpamAssassin configuration file,
-where it is stored in the C<spamtrap> lines.
-
-If you want to keep a copy of the mails, use something like this:
-
-=over 4
-
-=item spamtrap1: "| /path/to/spamassassin -r -w spamtrap1 -l /var/spam/caught"
-
-=back
-
-It is suggested you familiarise yourself with how MTAs run programs specified
-in aliases, if you plan to do this; for one thing, B<spamassassin> will not run
-under your user id in this case. If you are nervous about this, create a user
-for spamtrapping, and set up spamassassin in its F<.forward> file.
-
=head1 INSTALLATION

The B<spamassassin> command is part of the B<Mail::SpamAssassin> Perl module.