You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by ms...@apache.org on 2004/01/09 22:29:58 UTC
svn commit: rev 6135 - in incubator/spamassassin/trunk/lib/Mail: . SpamAssassin
Author: mss
Date: Fri Jan 9 13:29:57 2004
New Revision: 6135
Modified:
incubator/spamassassin/trunk/lib/Mail/SpamAssassin.pm (contents, props changed)
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
Log:
Adapted the versioning code to SVN.
Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin.pm Fri Jan 9 13:29:57 2004
@@ -147,15 +147,14 @@
@ISA = qw();
-# SUB_VERSION is now <revision>-<yyyy>-<mm>-<dd>-<state>
-$SUB_VERSION = lc(join('-', (split(/[ \/]/, '$Id: SpamAssassin.pm,v 1.222 2003/12/17 07:07:59 jmason Exp $'))[2 .. 5, 8]));
+# SUB_VERSION is now just <yyyy>-<mm>-<dd>
+$SUB_VERSION = qw{$LastChangedDate$ updated by SVN}[1];
-# If you hacked up your SA, add a token to identify it here. Eg.: I use
-# "mss<number>", <number> increasing with every hack.
+# If you hacked up your SA, you should add a version_tag to you .cf files.
+# This variable should not be modified directly.
@EXTRA_VERSION = qw();
-
if (defined $IS_DEVEL_BUILD && $IS_DEVEL_BUILD) {
- push(@EXTRA_VERSION, 'cvs');
+ @EXTRA_VERSION = ( 'r' . qw{$LastChangedRevision$ updated by SVN}[1] );
}
sub Version { join('-', $VERSION, @EXTRA_VERSION) }
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 Fri Jan 9 13:29:57 2004
@@ -109,8 +109,8 @@
_YESNO_ "Yes"/"No" for is/isn't spam
_HITS_ message score
_REQD_ message threshold
- _VERSION_ version (eg. 2.55)
- _SUBVERSION_ sub-version (eg. 1.187-2003-05-15-exp)
+ _VERSION_ version (eg. 2.61 or 2.70-r6142-foo1)
+ _SUBVERSION_ sub-version/code revision date (eg. 2004-01-10)
_HOSTNAME_ hostname
_BAYES_ bayes score
_AWL_ AWL modifier
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 Fri Jan 9 13:29:57 2004
@@ -698,8 +698,7 @@
# tvd: do this after report_safe_copy_headers so Received will be done correctly
$newmsg = "Received: from localhost [127.0.0.1] by " .
Mail::SpamAssassin::Util::fq_hostname() . "\n" .
- "\twith SpamAssassin (" . Mail::SpamAssassin::Version() . " " .
- $Mail::SpamAssassin::SUB_VERSION . ");\n" .
+ "\twith SpamAssassin (" . Mail::SpamAssassin::Version() . ");\n" .
"\t" . Mail::SpamAssassin::Util::time_to_rfc822_date() . "\n" .
$newmsg;