Login | Register For Free | Help
Search for: (Advanced)

Mailing List Archive: SpamAssassin: commits

svn commit: rev 6115 - in incubator/spamassassin/trunk: . lib/Mail lib/Mail/SpamAssassin lm masses qmail rules spamd tools

 

 

SpamAssassin commits RSS feed   Index | Next | Previous | View Threaded


jm at apache

Jan 7, 2004, 11:42 PM

Post #1 of 1 (333 views)
Permalink
svn commit: rev 6115 - in incubator/spamassassin/trunk: . lib/Mail lib/Mail/SpamAssassin lm masses qmail rules spamd tools

Author: jm
Date: Wed Jan 7 22:42:45 2004
New Revision: 6115

Modified:
incubator/spamassassin/trunk/MANIFEST
incubator/spamassassin/trunk/MANIFEST.SKIP
incubator/spamassassin/trunk/README
incubator/spamassassin/trunk/lib/Mail/SpamAssassin.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/AuditMessage.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Bayes.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/CmdLearn.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/ConfSourceSQL.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/DBBasedAddrList.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EncappedMIME.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EncappedMessage.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Locales.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Locker.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/MIME.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/MailingList.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/NoMailAudit.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgLearner.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PersistentAddrList.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Received.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Reporter.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/SHA1.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/TextCat.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/UnixLocker.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Win32Locker.pm
incubator/spamassassin/trunk/lm/LICENSE
incubator/spamassassin/trunk/lm/build.pl
incubator/spamassassin/trunk/masses/craig-evolve.c
incubator/spamassassin/trunk/masses/extract-message-from-mbox
incubator/spamassassin/trunk/masses/find-extremes
incubator/spamassassin/trunk/masses/fp-fn-to-tcr
incubator/spamassassin/trunk/masses/freqdiff
incubator/spamassassin/trunk/masses/hit-frequencies
incubator/spamassassin/trunk/masses/lint-rules-from-freqs
incubator/spamassassin/trunk/masses/logs-to-c
incubator/spamassassin/trunk/masses/mass-check
incubator/spamassassin/trunk/masses/mass-check-results-to-mbox
incubator/spamassassin/trunk/masses/mboxget
incubator/spamassassin/trunk/masses/overlap
incubator/spamassassin/trunk/masses/parse-rules-for-masses
incubator/spamassassin/trunk/masses/rewrite-cf-with-new-scores
incubator/spamassassin/trunk/masses/score-ranges-from-freqs
incubator/spamassassin/trunk/masses/true-false-pos-neg-filter.pl
incubator/spamassassin/trunk/masses/uniq-scores
incubator/spamassassin/trunk/qmail/qmail-spamc.c
incubator/spamassassin/trunk/rules/10_misc.cf
incubator/spamassassin/trunk/rules/20_anti_ratware.cf
incubator/spamassassin/trunk/rules/20_body_tests.cf
incubator/spamassassin/trunk/rules/20_compensate.cf
incubator/spamassassin/trunk/rules/20_dnsbl_tests.cf
incubator/spamassassin/trunk/rules/20_fake_helo_tests.cf
incubator/spamassassin/trunk/rules/20_head_tests.cf
incubator/spamassassin/trunk/rules/20_html_tests.cf
incubator/spamassassin/trunk/rules/20_meta_tests.cf
incubator/spamassassin/trunk/rules/20_phrases.cf
incubator/spamassassin/trunk/rules/20_porn.cf
incubator/spamassassin/trunk/rules/20_ratware.cf
incubator/spamassassin/trunk/rules/20_uri_tests.cf
incubator/spamassassin/trunk/rules/23_bayes.cf
incubator/spamassassin/trunk/rules/30_text_de.cf
incubator/spamassassin/trunk/rules/30_text_fr.cf
incubator/spamassassin/trunk/rules/50_scores.cf
incubator/spamassassin/trunk/rules/60_whitelist.cf
incubator/spamassassin/trunk/rules/70_broken_rules.cf
incubator/spamassassin/trunk/rules/70_cvs_rules_under_test.cf
incubator/spamassassin/trunk/rules/regression_tests.cf
incubator/spamassassin/trunk/spamassassin.spec
incubator/spamassassin/trunk/spamd/libspamc.c
incubator/spamassassin/trunk/spamd/libspamc.h
incubator/spamassassin/trunk/spamd/spamc.c
incubator/spamassassin/trunk/spamd/spamd.raw
incubator/spamassassin/trunk/spamd/utils.c
incubator/spamassassin/trunk/spamd/utils.h
incubator/spamassassin/trunk/tools/mboxsplit
incubator/spamassassin/trunk/tools/sa-stats.pl
incubator/spamassassin/trunk/tools/speedtest
Log:
preparing to insert license text using an automated tool

Modified: incubator/spamassassin/trunk/MANIFEST
==============================================================================
--- incubator/spamassassin/trunk/MANIFEST (original)
+++ incubator/spamassassin/trunk/MANIFEST Wed Jan 7 22:42:45 2004
@@ -1,4 +1,6 @@
BUGS
+COPYRIGHT
+STATUS
Changes
INSTALL
INSTALL.VMS
@@ -120,8 +122,6 @@
rules/20_uri_tests.cf
rules/20_fake_helo_tests.cf
rules/23_bayes.cf
-rules/25_body_tests_pl.cf
-rules/25_head_tests_pl.cf
rules/30_text_de.cf
rules/30_text_fr.cf
rules/50_scores.cf
@@ -236,3 +236,4 @@
lib/Mail/SpamAssassin/MIME/Parser.pm
lib/Mail/SpamAssassin/MIME.pm
tools/sa-stats.pl
+spamd/README.Win

Modified: incubator/spamassassin/trunk/MANIFEST.SKIP
==============================================================================
--- incubator/spamassassin/trunk/MANIFEST.SKIP (original)
+++ incubator/spamassassin/trunk/MANIFEST.SKIP Wed Jan 7 22:42:45 2004
@@ -2,6 +2,7 @@
.cvsignore
.exists
CVS
+\.svn
Changes.bak
Mail-SpamAssassin-.*
Makefile

Modified: incubator/spamassassin/trunk/README
==============================================================================
--- incubator/spamassassin/trunk/README (original)
+++ incubator/spamassassin/trunk/README Wed Jan 7 22:42:45 2004
@@ -88,11 +88,12 @@
server. This lives in the "released" directory on the web site.

SpamAssassin lives at http://spamassassin.org/ or in CPAN, and is
-distributed under the same license as Perl itself. Use of the
-SpamAssassin name is restricted as documented in the file named "Trademark".
+distributed under the Apache License, version 1.1, as described in the
+file named "LICENSE". Use of the SpamAssassin name is restricted as
+documented in the file named "TRADEMARK".

-This module owes a lot of inspiration to Mark Jeftovic's filter.plx, which
-I used for a long time, and contributed some code to. However,
+This module owes a lot of inspiration to Mark Jeftovic's filter.plx [2],
+which I used for a long time, and contributed some code to. However,
SpamAssassin is a ground-up rewrite with a new, greatly improved ruleset,
a different code model and installation system, and hopefully will be easy
to adapt for a multitude of applications.

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin.pm Wed Jan 7 22:42:45 2004
@@ -1,3 +1,5 @@
+# @LICENSE
+
=head1 NAME

Mail::SpamAssassin - Mail::Audit spam detector plugin
@@ -1573,7 +1575,8 @@

=head1 COPYRIGHT

-SpamAssassin is distributed under Perl's Artistic license.
+SpamAssassin is distributed under the Apache Software License, as described
+in the file C<LICENSE> included with the distribution.

=head1 AVAILABILITY


Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm Wed Jan 7 22:42:45 2004
@@ -1,6 +1,6 @@
-#!/usr/bin/perl -w
-#
# iterate over mail archives, calling a function on each message.
+#
+# @LICENSE

package Mail::SpamAssassin::ArchiveIterator;


Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/AuditMessage.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/AuditMessage.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/AuditMessage.pm Wed Jan 7 22:42:45 2004
@@ -1,4 +1,6 @@
# Mail::SpamAssassin::AuditMessage - interface to Mail::Audit message text
+#
+# @LICENSE
package Mail::SpamAssassin::AuditMessage;

use strict;

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm Wed Jan 7 22:42:45 2004
@@ -1,3 +1,5 @@
+# @LICENSE
+
=head1 NAME

Mail::SpamAssassin::AutoWhitelist - auto-whitelist handler for SpamAssassin

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Bayes.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Bayes.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Bayes.pm Wed Jan 7 22:42:45 2004
@@ -1,3 +1,5 @@
+# @LICENSE
+
=head1 NAME

Mail::SpamAssassin::Bayes - determine spammishness using a Bayesian classifier

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore.pm Wed Jan 7 22:42:45 2004
@@ -1,3 +1,5 @@
+# @LICENSE
+
package Mail::SpamAssassin::BayesStore;

use strict;

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/CmdLearn.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/CmdLearn.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/CmdLearn.pm Wed Jan 7 22:42:45 2004
@@ -1,3 +1,5 @@
+# @LICENSE
+
package Mail::SpamAssassin::CmdLearn;

use strict;

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 Wed Jan 7 22:42:45 2004
@@ -1,3 +1,5 @@
+# @LICENSE
+
=head1 NAME

Mail::SpamAssassin::Conf - SpamAssassin configuration file

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/ConfSourceSQL.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/ConfSourceSQL.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/ConfSourceSQL.pm Wed Jan 7 22:42:45 2004
@@ -1,3 +1,5 @@
+# @LICENSE
+
=head1 NAME

Mail::SpamAssassin::ConfSourceSQL - load SpamAssassin scores from SQL database

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/DBBasedAddrList.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/DBBasedAddrList.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/DBBasedAddrList.pm Wed Jan 7 22:42:45 2004
@@ -1,3 +1,5 @@
+# @LICENSE
+
package Mail::SpamAssassin::DBBasedAddrList;

use strict;

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm Wed Jan 7 22:42:45 2004
@@ -1,3 +1,5 @@
+# @LICENSE
+
package Mail::SpamAssassin::Dns;
1;


Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EncappedMIME.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EncappedMIME.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EncappedMIME.pm Wed Jan 7 22:42:45 2004
@@ -1,6 +1,8 @@
# Mail::SpamAssassin::EncappedMIME - interface to Mail::Audit message text,
# for MIME::Entity-based Mail::Audit objects.

+# @LICENSE
+
package Mail::SpamAssassin::EncappedMIME;

use Carp;

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EncappedMessage.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EncappedMessage.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EncappedMessage.pm Wed Jan 7 22:42:45 2004
@@ -2,6 +2,8 @@
# for versions of Mail::Audit with methods to encapsulate the message text
# itself (ie. not exposing a Mail::Internet object).

+# @LICENSE
+
package Mail::SpamAssassin::EncappedMessage;

use strict;

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm Wed Jan 7 22:42:45 2004
@@ -1,3 +1,5 @@
+# @LICENSE
+
package Mail::SpamAssassin::EvalTests;
1;


Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm Wed Jan 7 22:42:45 2004
@@ -1,5 +1,7 @@
# $Id: HTML.pm,v 1.101 2003/10/15 08:08:05 quinlan Exp $

+# @LICENSE
+
# HTML decoding TODOs
# - add URIs to list for faster URI testing


Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Locales.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Locales.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Locales.pm Wed Jan 7 22:42:45 2004
@@ -1,3 +1,5 @@
+# @LICENSE
+
package Mail::SpamAssassin::Locales;

use strict;

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Locker.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Locker.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Locker.pm Wed Jan 7 22:42:45 2004
@@ -1,3 +1,5 @@
+# @LICENSE
+
package Mail::SpamAssassin::Locker;

use strict;

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/MIME.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/MIME.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/MIME.pm Wed Jan 7 22:42:45 2004
@@ -1,5 +1,7 @@
# $Id: MIME.pm,v 1.8 2003/10/02 22:59:00 quinlan Exp $

+# @LICENSE
+
package Mail::SpamAssassin::MIME;
use strict;
use MIME::Base64;

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/MailingList.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/MailingList.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/MailingList.pm Wed Jan 7 22:42:45 2004
@@ -1,5 +1,7 @@
# $Id: MailingList.pm,v 1.12 2003/01/09 23:51:56 msquadrat Exp $

+# @LICENSE
+
# Eval Tests to detect genuine mailing lists.

package Mail::SpamAssassin::MailingList;

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm Wed Jan 7 22:42:45 2004
@@ -1,5 +1,7 @@
# Mail::SpamAssassin::Message - interface to any mail message text/headers

+# @LICENSE
+
package Mail::SpamAssassin::Message;

use strict;

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm Wed Jan 7 22:42:45 2004
@@ -1,4 +1,6 @@
# Mail::SpamAssassin::NetSet - object to manipulate CIDR net IP addrs
+# @LICENSE
+
package Mail::SpamAssassin::NetSet;

use strict;

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/NoMailAudit.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/NoMailAudit.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/NoMailAudit.pm Wed Jan 7 22:42:45 2004
@@ -1,3 +1,5 @@
+# @LICENSE
+
# Mail message object, used by SpamAssassin. This was written to eliminate, as
# much as possible, SpamAssassin's dependency on Mail::Audit and the
# Mail::Internet, Net::SMTP, etc. module set it requires.

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgLearner.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgLearner.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgLearner.pm Wed Jan 7 22:42:45 2004
@@ -1,3 +1,5 @@
+# @LICENSE
+
=head1 NAME

Mail::SpamAssassin::PerMsgLearner - per-message status (spam or not-spam)

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Wed Jan 7 22:42:45 2004
@@ -1,3 +1,5 @@
+# @LICENSE
+
=head1 NAME

Mail::SpamAssassin::PerMsgStatus - per-message status (spam or not-spam)

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PersistentAddrList.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PersistentAddrList.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PersistentAddrList.pm Wed Jan 7 22:42:45 2004
@@ -1,3 +1,5 @@
+# @LICENSE
+
=head1 NAME

Mail::SpamAssassin::PersistentAddrList - persistent address list base class

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Received.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Received.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Received.pm Wed Jan 7 22:42:45 2004
@@ -1,5 +1,7 @@
# $Id: Received.pm,v 1.40 2003/12/17 07:08:44 jmason Exp $

+# @LICENSE
+
# ---------------------------------------------------------------------------

# So, what's the difference between a trusted and untrusted Received header?

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Reporter.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Reporter.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Reporter.pm Wed Jan 7 22:42:45 2004
@@ -1,5 +1,7 @@
# Mail::SpamAssassin::Reporter - report a message as spam

+# @LICENSE
+
package Mail::SpamAssassin::Reporter;

use strict;

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/SHA1.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/SHA1.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/SHA1.pm Wed Jan 7 22:42:45 2004
@@ -25,11 +25,8 @@
#
# Copyright (C) 2002 Daniel Quinlan
# (adapted public domain code into a module)
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
+
+# @LICENSE

package Mail::SpamAssassin::SHA1;


Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/TextCat.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/TextCat.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/TextCat.pm Wed Jan 7 22:42:45 2004
@@ -6,11 +6,8 @@
#
# Copyright (C) 2002 Daniel Quinlan
# (adapted for spamassassin, performance optimizations)
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
+
+# @LICENSE

package Mail::SpamAssassin::TextCat;


Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/UnixLocker.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/UnixLocker.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/UnixLocker.pm Wed Jan 7 22:42:45 2004
@@ -1,3 +1,5 @@
+# @LICENSE
+
package Mail::SpamAssassin::UnixLocker;

use strict;

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm Wed Jan 7 22:42:45 2004
@@ -4,11 +4,8 @@

# Copyright (C) 2003 Justin Mason
# Copyright (C) 2003 Daniel Quinlan
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
+
+# @LICENSE

package Mail::SpamAssassin::Util;


Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Win32Locker.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Win32Locker.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Win32Locker.pm Wed Jan 7 22:42:45 2004
@@ -1,3 +1,5 @@
+# @LICENSE
+
package Mail::SpamAssassin::Win32Locker;

use strict;

Modified: incubator/spamassassin/trunk/lm/LICENSE
==============================================================================
--- incubator/spamassassin/trunk/lm/LICENSE (original)
+++ incubator/spamassassin/trunk/lm/LICENSE Wed Jan 7 22:42:45 2004
@@ -8,6 +8,5 @@
Copyright (C) 2002 Daniel Quinlan.

This program is free software; you can redistribute it and/or modify
-it under the terms of either the Artistic License or the GNU General
-Public License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
+it under the same terms as SpamAssassin, as described in the file "LICENSE"
+in the top level of this distribution.

Modified: incubator/spamassassin/trunk/lm/build.pl
==============================================================================
--- incubator/spamassassin/trunk/lm/build.pl (original)
+++ incubator/spamassassin/trunk/lm/build.pl Wed Jan 7 22:42:45 2004
@@ -2,13 +2,10 @@

# Copyright (C) 2002 Daniel Quinlan
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-
# *.lm = old format, uses '_' as separator
# *.ln = new format, uses NULL as separator
+#
+# @LICENSE

@files = <*.l[mn]>;
open(STDOUT, "> ../rules/languages");

Modified: incubator/spamassassin/trunk/masses/craig-evolve.c
==============================================================================
--- incubator/spamassassin/trunk/masses/craig-evolve.c (original)
+++ incubator/spamassassin/trunk/masses/craig-evolve.c Wed Jan 7 22:42:45 2004
@@ -1,3 +1,4 @@
+/* @COPYRIGHT */
/*
* This program uses PGAPack to do its GA stuff.
* ftp://ftp.mcs.anl.gov/pub/pgapack/pgapack.tar.Z

Modified: incubator/spamassassin/trunk/masses/extract-message-from-mbox
==============================================================================
--- incubator/spamassassin/trunk/masses/extract-message-from-mbox (original)
+++ incubator/spamassassin/trunk/masses/extract-message-from-mbox Wed Jan 7 22:42:45 2004
@@ -3,11 +3,7 @@
#
# Modified by Duncan Findlay <duncf [at] debian> May 2003
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-
+# @LICENSE

use strict;
use bytes;

Modified: incubator/spamassassin/trunk/masses/find-extremes
==============================================================================
--- incubator/spamassassin/trunk/masses/find-extremes (original)
+++ incubator/spamassassin/trunk/masses/find-extremes Wed Jan 7 22:42:45 2004
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w

# hacked version of hit-frequencies - Allen
+# @LICENSE

use Getopt::Std;
getopts("l:L:h");

Modified: incubator/spamassassin/trunk/masses/fp-fn-to-tcr
==============================================================================
--- incubator/spamassassin/trunk/masses/fp-fn-to-tcr (original)
+++ incubator/spamassassin/trunk/masses/fp-fn-to-tcr Wed Jan 7 22:42:45 2004
@@ -1,4 +1,6 @@
#!/usr/bin/perl
+#
+# @LICENSE

use Getopt::Long;
use vars qw($opt_lambda $opt_fn $opt_fp $opt_spam $opt_ham);

Modified: incubator/spamassassin/trunk/masses/freqdiff
==============================================================================
--- incubator/spamassassin/trunk/masses/freqdiff (original)
+++ incubator/spamassassin/trunk/masses/freqdiff Wed Jan 7 22:42:45 2004
@@ -1,13 +1,10 @@
#!/usr/bin/perl -w
-
+#
# freqdiff - print frequency difference between two inputs
#
# Copyright (C) 2002 Daniel Quinlan
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
+# @LICENSE

use vars qw($opt_a $opt_b $opt_c $opt_d $opt_h $opt_p $opt_r);
use Getopt::Std;

Modified: incubator/spamassassin/trunk/masses/hit-frequencies
==============================================================================
--- incubator/spamassassin/trunk/masses/hit-frequencies (original)
+++ incubator/spamassassin/trunk/masses/hit-frequencies Wed Jan 7 22:42:45 2004
@@ -1,4 +1,6 @@
#!/usr/bin/perl -w
+#
+# @LICENSE

use FindBin;
use Getopt::Std;

Modified: incubator/spamassassin/trunk/masses/lint-rules-from-freqs
==============================================================================
--- incubator/spamassassin/trunk/masses/lint-rules-from-freqs (original)
+++ incubator/spamassassin/trunk/masses/lint-rules-from-freqs Wed Jan 7 22:42:45 2004
@@ -1,4 +1,6 @@
#!/usr/bin/perl
+#
+# @LICENSE

# any tests that get less than this % of matches on *both* spam or nonspam, are
# reported.

Modified: incubator/spamassassin/trunk/masses/logs-to-c
==============================================================================
--- incubator/spamassassin/trunk/masses/logs-to-c (original)
+++ incubator/spamassassin/trunk/masses/logs-to-c Wed Jan 7 22:42:45 2004
@@ -1,4 +1,6 @@
#!/usr/bin/perl -w
+#
+# @LICENSE

use Getopt::Long;
use vars qw($opt_cffile $opt_count $opt_lambda $opt_threshold

Modified: incubator/spamassassin/trunk/masses/mass-check
==============================================================================
--- incubator/spamassassin/trunk/masses/mass-check (original)
+++ incubator/spamassassin/trunk/masses/mass-check Wed Jan 7 22:42:45 2004
@@ -1,4 +1,6 @@
#!/usr/bin/perl -w
+#
+# @LICENSE

sub usage {
die <<ENDOFUSAGE;

Modified: incubator/spamassassin/trunk/masses/mass-check-results-to-mbox
==============================================================================
--- incubator/spamassassin/trunk/masses/mass-check-results-to-mbox (original)
+++ incubator/spamassassin/trunk/masses/mass-check-results-to-mbox Wed Jan 7 22:42:45 2004
@@ -3,6 +3,8 @@
# very handy for e.g.:
#
# grep SUBJECT_FREQ spam.log | ./mass-check-results-to-mbox | grep Subject:
+#
+# @LICENSE

my $grep = undef;
my $annotate = 1;

Modified: incubator/spamassassin/trunk/masses/mboxget
==============================================================================
--- incubator/spamassassin/trunk/masses/mboxget (original)
+++ incubator/spamassassin/trunk/masses/mboxget Wed Jan 7 22:42:45 2004
@@ -3,6 +3,8 @@
# mboxget - get a message from a mailbox
#
# usage: mboxget [mass-check-mbox-id ...]
+#
+# @LICENSE

use strict;


Modified: incubator/spamassassin/trunk/masses/overlap
==============================================================================
--- incubator/spamassassin/trunk/masses/overlap (original)
+++ incubator/spamassassin/trunk/masses/overlap Wed Jan 7 22:42:45 2004
@@ -4,10 +4,7 @@
#
# Copyright (C) 2002 Daniel Quinlan
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
+# @LICENSE

use vars qw($opt_a $opt_h);
use Getopt::Std;

Modified: incubator/spamassassin/trunk/masses/parse-rules-for-masses
==============================================================================
--- incubator/spamassassin/trunk/masses/parse-rules-for-masses (original)
+++ incubator/spamassassin/trunk/masses/parse-rules-for-masses Wed Jan 7 22:42:45 2004
@@ -1,4 +1,6 @@
#!/usr/bin/perl
+#
+# @LICENSE

sub usage {
die "

Modified: incubator/spamassassin/trunk/masses/rewrite-cf-with-new-scores
==============================================================================
--- incubator/spamassassin/trunk/masses/rewrite-cf-with-new-scores (original)
+++ incubator/spamassassin/trunk/masses/rewrite-cf-with-new-scores Wed Jan 7 22:42:45 2004
@@ -1,4 +1,6 @@
#!/usr/bin/perl -w
+#
+# @LICENSE

my $NUM_SCORESETS = 4;


Modified: incubator/spamassassin/trunk/masses/score-ranges-from-freqs
==============================================================================
--- incubator/spamassassin/trunk/masses/score-ranges-from-freqs (original)
+++ incubator/spamassassin/trunk/masses/score-ranges-from-freqs Wed Jan 7 22:42:45 2004
@@ -1,4 +1,6 @@
#!/usr/bin/perl -w
+#
+# @LICENSE

# (rough) graphic demo of this algorithm:
# 0.0 = -limit [......] 0 ........ limit

Modified: incubator/spamassassin/trunk/masses/true-false-pos-neg-filter.pl
==============================================================================
--- incubator/spamassassin/trunk/masses/true-false-pos-neg-filter.pl (original)
+++ incubator/spamassassin/trunk/masses/true-false-pos-neg-filter.pl Wed Jan 7 22:42:45 2004
@@ -1,4 +1,6 @@
#!/usr/bin/perl -w
+#
+# @LICENSE

use strict;
use warnings;

Modified: incubator/spamassassin/trunk/masses/uniq-scores
==============================================================================
--- incubator/spamassassin/trunk/masses/uniq-scores (original)
+++ incubator/spamassassin/trunk/masses/uniq-scores Wed Jan 7 22:42:45 2004
@@ -1,4 +1,6 @@
#!/usr/bin/perl
+#
+# @LICENSE

while (<>) {
if (/^score\s+(\S+)\s/){

Modified: incubator/spamassassin/trunk/qmail/qmail-spamc.c
==============================================================================
--- incubator/spamassassin/trunk/qmail/qmail-spamc.c (original)
+++ incubator/spamassassin/trunk/qmail/qmail-spamc.c Wed Jan 7 22:42:45 2004
@@ -1,10 +1,7 @@
/*
* This code is copyright (c) 2002-2003 by John Peacock
*
- * It is licensed under the same license as SpamAssassin itself.
- * The text of this license is included in the SpamAssassin
- * distribution in the file named "License".
- *
+ * @LICENSE
*/

#include <stdio.h>

Modified: incubator/spamassassin/trunk/rules/10_misc.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/10_misc.cf (original)
+++ incubator/spamassassin/trunk/rules/10_misc.cf Wed Jan 7 22:42:45 2004
@@ -4,13 +4,7 @@
# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead.
# See 'perldoc Mail::SpamAssassin::Conf' for details.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 1 of the License, or (at your option) any later version.
-#
-# See the file "License" in the top level of the SpamAssassin source
-# distribution for more details.
+# @LICENSE
#
###########################################################################


Modified: incubator/spamassassin/trunk/rules/20_anti_ratware.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_anti_ratware.cf (original)
+++ incubator/spamassassin/trunk/rules/20_anti_ratware.cf Wed Jan 7 22:42:45 2004
@@ -4,13 +4,7 @@
# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead.
# See 'perldoc Mail::SpamAssassin::Conf' for details.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 1 of the License, or (at your option) any later version.
-#
-# See the file "License" in the top level of the SpamAssassin source
-# distribution for more details.
+# @LICENSE
#
###########################################################################


Modified: incubator/spamassassin/trunk/rules/20_body_tests.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_body_tests.cf (original)
+++ incubator/spamassassin/trunk/rules/20_body_tests.cf Wed Jan 7 22:42:45 2004
@@ -11,13 +11,7 @@
# Note: If you are adding a rule which looks for a phrase in the body
# (as most of them do), please add it to rules/20_phrases.cf instead.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 1 of the License, or (at your option) any later version.
-#
-# See the file "License" in the top level of the SpamAssassin source
-# distribution for more details.
+# @LICENSE
#
###########################################################################


Modified: incubator/spamassassin/trunk/rules/20_compensate.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_compensate.cf (original)
+++ incubator/spamassassin/trunk/rules/20_compensate.cf Wed Jan 7 22:42:45 2004
@@ -4,13 +4,7 @@
# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead.
# See 'perldoc Mail::SpamAssassin::Conf' for details.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 1 of the License, or (at your option) any later version.
-#
-# See the file "License" in the top level of the SpamAssassin source
-# distribution for more details.
+# @LICENSE
#
###########################################################################
# Header compensation tests

Modified: incubator/spamassassin/trunk/rules/20_dnsbl_tests.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_dnsbl_tests.cf (original)
+++ incubator/spamassassin/trunk/rules/20_dnsbl_tests.cf Wed Jan 7 22:42:45 2004
@@ -4,13 +4,7 @@
# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead.
# See 'perldoc Mail::SpamAssassin::Conf' for details.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 1 of the License, or (at your option) any later version.
-#
-# See the file "License" in the top level of the SpamAssassin source
-# distribution for more details.
+# @LICENSE
#
###########################################################################


Modified: incubator/spamassassin/trunk/rules/20_fake_helo_tests.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_fake_helo_tests.cf (original)
+++ incubator/spamassassin/trunk/rules/20_fake_helo_tests.cf Wed Jan 7 22:42:45 2004
@@ -6,13 +6,7 @@
#
# We should write a new ruletype for these, to save typing.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 1 of the License, or (at your option) any later version.
-#
-# See the file "License" in the top level of the SpamAssassin source
-# distribution for more details.
+# @LICENSE
#
###########################################################################


Modified: incubator/spamassassin/trunk/rules/20_head_tests.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_head_tests.cf (original)
+++ incubator/spamassassin/trunk/rules/20_head_tests.cf Wed Jan 7 22:42:45 2004
@@ -4,13 +4,7 @@
# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead.
# See 'perldoc Mail::SpamAssassin::Conf' for details.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 1 of the License, or (at your option) any later version.
-#
-# See the file "License" in the top level of the SpamAssassin source
-# distribution for more details.
+# @LICENSE
#
###########################################################################


Modified: incubator/spamassassin/trunk/rules/20_html_tests.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_html_tests.cf (original)
+++ incubator/spamassassin/trunk/rules/20_html_tests.cf Wed Jan 7 22:42:45 2004
@@ -4,13 +4,7 @@
# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead.
# See 'perldoc Mail::SpamAssassin::Conf' for details.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 1 of the License, or (at your option) any later version.
-#
-# See the file "License" in the top level of the SpamAssassin source
-# distribution for more details.
+# @LICENSE
#
###########################################################################


Modified: incubator/spamassassin/trunk/rules/20_meta_tests.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_meta_tests.cf (original)
+++ incubator/spamassassin/trunk/rules/20_meta_tests.cf Wed Jan 7 22:42:45 2004
@@ -4,19 +4,13 @@
# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead.
# See 'perldoc Mail::SpamAssassin::Conf' for details.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 1 of the License, or (at your option) any later version.
-#
-# See the file "License" in the top level of the SpamAssassin source
-# distribution for more details.
-#
# Add meta tests which cover *both* headers and body here.
#
# Note: body tests are run with long lines, so be sure to limit the
# size of searches; use /.{0,30}/ instead of /.*/ to avoid huge
# search times.
+#
+# @LICENSE
#
###########################################################################


Modified: incubator/spamassassin/trunk/rules/20_phrases.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_phrases.cf (original)
+++ incubator/spamassassin/trunk/rules/20_phrases.cf Wed Jan 7 22:42:45 2004
@@ -4,17 +4,11 @@
# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead.
# See 'perldoc Mail::SpamAssassin::Conf' for details.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 1 of the License, or (at your option) any later version.
-#
-# See the file "License" in the top level of the SpamAssassin source
-# distribution for more details.
-#
# Note: body tests are run with long lines, so be sure to limit the
# size of searches; use /.{0,30}/ instead of /.*/ to avoid huge
# search times.
+#
+# @LICENSE
#
###########################################################################


Modified: incubator/spamassassin/trunk/rules/20_porn.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_porn.cf (original)
+++ incubator/spamassassin/trunk/rules/20_porn.cf Wed Jan 7 22:42:45 2004
@@ -4,17 +4,11 @@
# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead.
# See 'perldoc Mail::SpamAssassin::Conf' for details.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 1 of the License, or (at your option) any later version.
-#
-# See the file "License" in the top level of the SpamAssassin source
-# distribution for more details.
-#
# Note: body tests are run with long lines, so be sure to limit the
# size of searches; use /.{0,30}/ instead of /.*/ to avoid huge
# search times.
+#
+# @LICENSE
#
###########################################################################


Modified: incubator/spamassassin/trunk/rules/20_ratware.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_ratware.cf (original)
+++ incubator/spamassassin/trunk/rules/20_ratware.cf Wed Jan 7 22:42:45 2004
@@ -7,13 +7,7 @@
# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead.
# See 'perldoc Mail::SpamAssassin::Conf' for details.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 1 of the License, or (at your option) any later version.
-#
-# See the file "License" in the top level of the SpamAssassin source
-# distribution for more details.
+# @LICENSE
#
###########################################################################


Modified: incubator/spamassassin/trunk/rules/20_uri_tests.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_uri_tests.cf (original)
+++ incubator/spamassassin/trunk/rules/20_uri_tests.cf Wed Jan 7 22:42:45 2004
@@ -4,13 +4,7 @@
# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead.
# See 'perldoc Mail::SpamAssassin::Conf' for details.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 1 of the License, or (at your option) any later version.
-#
-# See the file "License" in the top level of the SpamAssassin source
-# distribution for more details.
+# @LICENSE
#
###########################################################################


Modified: incubator/spamassassin/trunk/rules/23_bayes.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/23_bayes.cf (original)
+++ incubator/spamassassin/trunk/rules/23_bayes.cf Wed Jan 7 22:42:45 2004
@@ -4,13 +4,7 @@
# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead.
# See 'perldoc Mail::SpamAssassin::Conf' for details.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 1 of the License, or (at your option) any later version.
-#
-# See the file "License" in the top level of the SpamAssassin source
-# distribution for more details.
+# @LICENSE
#
###########################################################################


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 Wed Jan 7 22:42:45 2004
@@ -7,13 +7,7 @@
# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead.
# See 'perldoc Mail::SpamAssassin::Conf' for details.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 1 of the License, or (at your option) any later version.
-#
-# See the file "License" in the top level of the SpamAssassin source
-# distribution for more details.
+# @LICENSE
#
###########################################################################


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 Wed Jan 7 22:42:45 2004
@@ -7,13 +7,7 @@
# the next update. Use /etc/mail/spamassassin/local.cf instead.
# See 'perldoc Mail::SpamAssassin::Conf' for details.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# See the file "License" in the top level of the SpamAssassin source
-# distribution for more details.
+# @LICENSE
#
###########################################################################


Modified: incubator/spamassassin/trunk/rules/50_scores.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/50_scores.cf (original)
+++ incubator/spamassassin/trunk/rules/50_scores.cf Wed Jan 7 22:42:45 2004
@@ -4,13 +4,7 @@
# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead.
# See 'perldoc Mail::SpamAssassin::Conf' for details.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 1 of the License, or (at your option) any later version.
-#
-# See the file "License" in the top level of the SpamAssassin source
-# distribution for more details.
+# @LICENSE
#
###########################################################################
# Default scores. Note that if a test is named in the files, but a score is

Modified: incubator/spamassassin/trunk/rules/60_whitelist.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/60_whitelist.cf (original)
+++ incubator/spamassassin/trunk/rules/60_whitelist.cf Wed Jan 7 22:42:45 2004
@@ -4,14 +4,7 @@
# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead.
# See 'perldoc Mail::SpamAssassin::Conf' for details.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 1 of the License, or (at your option) any later version.
-#
-# See the file "License" in the top level of the SpamAssassin source
-# distribution for more details.
-
+# @LICENSE

###########################################################################
# Whitelist rules

Modified: incubator/spamassassin/trunk/rules/70_broken_rules.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/70_broken_rules.cf (original)
+++ incubator/spamassassin/trunk/rules/70_broken_rules.cf Wed Jan 7 22:42:45 2004
@@ -4,13 +4,7 @@
# but might be worth another try are moved onto this pile. Normally every
# line in this file should be commented out.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 1 of the License, or (at your option) any later version.
-#
-# See the file "License" in the top level of the SpamAssassin source
-# distribution for more details.
+# @LICENSE
#
###########################################################################
#

Modified: incubator/spamassassin/trunk/rules/70_cvs_rules_under_test.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/70_cvs_rules_under_test.cf (original)
+++ incubator/spamassassin/trunk/rules/70_cvs_rules_under_test.cf Wed Jan 7 22:42:45 2004
@@ -8,13 +8,7 @@
# I suggest adding a prefix to rules in this file, "T_" -- this
# helps identify probationary rules in test output.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 1 of the License, or (at your option) any later version.
-#
-# See the file "License" in the top level of the SpamAssassin source
-# distribution for more details.
+# @LICENSE
#
###########################################################################


Modified: incubator/spamassassin/trunk/rules/regression_tests.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/regression_tests.cf (original)
+++ incubator/spamassassin/trunk/rules/regression_tests.cf Wed Jan 7 22:42:45 2004
@@ -3,13 +3,7 @@
# This file contains tests perfomed on `make test`. It should not be
# distributed.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 1 of the License, or (at your option) any later version.
-#
-# See the file "License" in the top level of the SpamAssassin source
-# distribution for more details.
+# @LICENSE
#
###########################################################################


Modified: incubator/spamassassin/trunk/spamassassin.spec
==============================================================================
--- incubator/spamassassin/trunk/spamassassin.spec (original)
+++ incubator/spamassassin/trunk/spamassassin.spec Wed Jan 7 22:42:45 2004
@@ -42,7 +42,7 @@
Name: %{name}
Version: %{version}
Release: %{release}
-License: Artistic
+License: Apache Software License
URL: http://spamassassin.org/
Source: http://spamassassin.org/released/Mail-SpamAssassin-%{real_version}.tar%{srcext}
Buildroot: %{_tmppath}/%{name}-root
@@ -149,7 +149,7 @@

%files
%defattr(-,root,root)
-%doc README Changes sample-nonspam.txt sample-spam.txt spamd/README.spamd INSTALL BUGS COPYRIGHT License TRADEMARK USAGE Razor2.patch
+%doc README Changes sample-nonspam.txt sample-spam.txt spamd/README.spamd INSTALL BUGS COPYRIGHT LICENSE TRADEMARK USAGE Razor2.patch
%attr(755,root,root) %{_bindir}/*
%attr(644,root,root) %{_includedir}/*
%attr(644,root,root) %{_libdir}/*.so

Modified: incubator/spamassassin/trunk/spamd/libspamc.c
==============================================================================
--- incubator/spamassassin/trunk/spamd/libspamc.c (original)
+++ incubator/spamassassin/trunk/spamd/libspamc.c Wed Jan 7 22:42:45 2004
@@ -1,9 +1,8 @@
/*
* This code is copyright 2001 by Craig Hughes
* Portions copyright 2002 by Brad Jorsch
- * It is licensed under the same license as Perl itself. The text of this
- * license is included in the SpamAssassin distribution in the file named
- * "License".
+ *
+ * @LICENSE
*/

#include "config.h"

Modified: incubator/spamassassin/trunk/spamd/libspamc.h
==============================================================================
--- incubator/spamassassin/trunk/spamd/libspamc.h (original)
+++ incubator/spamassassin/trunk/spamd/libspamc.h Wed Jan 7 22:42:45 2004
@@ -2,9 +2,8 @@
* This code is copyright 2001 by Craig Hughes
* Conversion to a thread-safe shared library copyright 2002 Liam Widdowson
* Portions copyright 2002 by Brad Jorsch
- * It is licensed under the same license as Perl itself. The text of this
- * license is included in the SpamAssassin distribution in the file named
- * "License".
+ *
+ * @LICENSE
*/
#ifndef LIBSPAMC_H
#define LIBSPAMC_H 1

Modified: incubator/spamassassin/trunk/spamd/spamc.c
==============================================================================
--- incubator/spamassassin/trunk/spamd/spamc.c (original)
+++ incubator/spamassassin/trunk/spamd/spamc.c Wed Jan 7 22:42:45 2004
@@ -1,8 +1,7 @@
/*
* This code is copyright 2001 by Craig Hughes
- * It is licensed under the same license as Perl itself. The text of this
- * license is included in the SpamAssassin distribution in the file named
- * "License".
+ *
+ * @LICENSE
*/

#include "config.h"

Modified: incubator/spamassassin/trunk/spamd/spamd.raw
==============================================================================
--- incubator/spamassassin/trunk/spamd/spamd.raw (original)
+++ incubator/spamassassin/trunk/spamd/spamd.raw Wed Jan 7 22:42:45 2004
@@ -1,9 +1,6 @@
#!/usr/bin/perl -w -T
#############################################################
# The code in this file is copyright 2001 by Craig Hughes #
-# It is licensed for use with the SpamAssassin distribution #
-# under the terms of the Perl Artistic License, the text of #
-# which is included as the file named "License" #
#############################################################

my $PREFIX = '@@PREFIX@@'; # substituted at 'make' time

Modified: incubator/spamassassin/trunk/spamd/utils.c
==============================================================================
--- incubator/spamassassin/trunk/spamd/utils.c (original)
+++ incubator/spamassassin/trunk/spamd/utils.c Wed Jan 7 22:42:45 2004
@@ -1,9 +1,8 @@
/*
* This code is copyright 2001 by Craig Hughes
* Portions copyright 2002 by Brad Jorsch
- * It is licensed under the same license as Perl itself. The text of this
- * license is included in the SpamAssassin distribution in the file named
- * "License".
+ *
+ * @LICENSE
*/

#ifndef _WIN32

Modified: incubator/spamassassin/trunk/spamd/utils.h
==============================================================================
--- incubator/spamassassin/trunk/spamd/utils.h (original)
+++ incubator/spamassassin/trunk/spamd/utils.h Wed Jan 7 22:42:45 2004
@@ -1,3 +1,7 @@
+/*
+ * @LICENSE
+ */
+
#ifndef UTILS_H
#define UTILS_H


Modified: incubator/spamassassin/trunk/tools/mboxsplit
==============================================================================
--- incubator/spamassassin/trunk/tools/mboxsplit (original)
+++ incubator/spamassassin/trunk/tools/mboxsplit Wed Jan 7 22:42:45 2004
@@ -4,10 +4,7 @@
#
# Copyright (C) 2002 Daniel Quinlan
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either the Artistic License or the GNU General
-# Public License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
+# @LICENSE

my $prog = $0;
$prog =~ s@.*/@@;

Modified: incubator/spamassassin/trunk/tools/sa-stats.pl
==============================================================================
--- incubator/spamassassin/trunk/tools/sa-stats.pl (original)
+++ incubator/spamassassin/trunk/tools/sa-stats.pl Wed Jan 7 22:42:45 2004
@@ -3,9 +3,8 @@
#Authors : Brad Rathbun <brad [at] computechnv> http://www.computechnv.com/
# : Bob Apthorpe <apthorpe+sa [at] cynistar> http://www.cynistar.net/~apthorpe/
# : Duncan Findlay <duncf [at] debian>
-
-# Licensed under the terms of the SpamAssassin distribution (GPL/PAL).
-
+#
+# @LICENSE

use strict;


Modified: incubator/spamassassin/trunk/tools/speedtest
==============================================================================
--- incubator/spamassassin/trunk/tools/speedtest (original)
+++ incubator/spamassassin/trunk/tools/speedtest Wed Jan 7 22:42:45 2004
@@ -1,10 +1,6 @@
#!/usr/bin/perl -w
-############################################################
-# The code in this file is copyright 2001 by Craig Hughes #
-# It is licensed for use with the SpamAssassin distribution#
-# under the terms of the Perl Artistic License, the text of#
-# which is included as the file named "License" #
-############################################################
+# The code in this file is copyright 2001 by Craig Hughes
+# @LICENSE

use strict;

SpamAssassin commits RSS feed   Index | Next | Previous | View Threaded
 
 


Interested in having your list archived? Contact Gossamer Threads
 
  Web Applications & Managed Hosting Powered by Gossamer Threads Inc.