You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2010/01/26 14:18:51 UTC
svn commit: r903214 - /spamassassin/site/main.wmk
Author: jm
Date: Tue Jan 26 13:18:50 2010
New Revision: 903214
URL: http://svn.apache.org/viewvc?rev=903214&view=rev
Log:
lots of changes to website to support new 3.3.x version line, sa-update rule tarballs. also move Y2K+10 warning off front page, it's old news now
Modified:
spamassassin/site/main.wmk
Modified: spamassassin/site/main.wmk
URL: http://svn.apache.org/viewvc/spamassassin/site/main.wmk?rev=903214&r1=903213&r2=903214&view=diff
==============================================================================
--- spamassassin/site/main.wmk (original)
+++ spamassassin/site/main.wmk Tue Jan 26 13:18:50 2010
@@ -3,24 +3,26 @@
Here's how to rebuild this website:
- ssh people.apache.org
- cd /www/spamassassin.apache.org
- PATH=$HOME/sabuildtools/perl584/bin:$HOME/sabuildtools/bin:$PATH
- webmake -F
+ ssh spamassassin.zones.apache.org
+ cd /var/www/buildbot.spamassassin.org/staging/website
+ PATH=$HOME/sabuildtools/bin:$PATH
+ export PATH
+ webmake -F
- Note that you may need to install HTML-WebMake.
+ Note that you may need to install HTML-WebMake if running elsewhere.
See http://webmake.taint.org/.
- To add files to the website that are not handled by webmake, first submit
- the files to the repository, then run the following:
+ Preview at http://buildbot.spamassassin.org/staging/website/ .
+
+ Once happy, commit using "svn commit", then:
ssh people.apache.org
cd /www/spamassassin.apache.org/
svn update
- Note that changes will not be visible immediately at
- http://SpamAssassin.apache.org/ . Instead, to preview, set your
- browser's HTTP proxy to 140.211.11.10 port 80.
+ Note that changes to spamassassin.apache.org will not be visible
+ immediately at http://SpamAssassin.apache.org/ . Instead, to preview,
+ set your browser's HTTP proxy to 140.211.11.10 port 80.
-->
@@ -29,8 +31,9 @@
Doing a new release? you'll need to change one or more of these! -->
<!-- Change this to the current release version -->
-<content name="relversion">3.2.5</content>
-<content name="prevbranchrelversion">3.1.9</content>
+<content name="relversion">3.3.0</content>
+<content name="relrulesversion">3.3.0.r901671</content>
+<content name="prevbranchrelversion">3.2.5</content>
<!-- this is the href to use to refer to the downloads page.
it will use the ASF mirror infrastructure and ensures the mirror
@@ -42,16 +45,16 @@
format, in the *WET timezone*, not UTC! This command will provide it:
TZ=WET date +%Y%m%d%H%M
-->
-<content name="mirrordl">http://spamassassin.apache.org/downloads.cgi?update=200806121419</content>
+<content name="mirrordl">http://spamassassin.apache.org/downloads.cgi?update=201001261315</content>
<!-- If you've started a new "release line" (3.0.x, 3.1.x, etc.), change this -->
-<content name="relline">3.2.x</content>
+<content name="relline">3.3.x</content>
<!-- The "release line" that documentation should be displayed for -->
-<content name="docsline">3.2.x</content>
+<content name="docsline">3.3.x</content>
<!-- The URL of the "release line"'s branch in SVN -->
-<content name="relsvnhref">http://svn.apache.org/repos/asf/spamassassin/branches/3.2</content>
+<content name="relsvnhref">http://svn.apache.org/repos/asf/spamassassin/branches/3.3</content>
<!-- If you want the "current pre-release" block to be available in
downloads.html, change this AND search for 'preversion' in the HTML
@@ -60,7 +63,7 @@
<content format="text/et" name="latest_news_snippet">
-2008-06-12: SpamAssassin 3.2.5 has been released, a minor bug-fix release. Visit <a href="${mirrordl}">the downloads page</a> to pick it up, and for more info.
+2010-01-27: SpamAssassin 3.3.0 has been released, a major new release! Visit <a href="${mirrordl}">the downloads page</a> to pick it up, and for more info.
</content>
<!-- when updating, move the old "latest" snippet to the content block
@@ -78,6 +81,24 @@
${latest_news_snippet}
+ 2010-01-01: Y2K10 Rule Bug - Update Your Rules Now!
+
+ Versions of the <a href="http://wiki.apache.org/spamassassin/Rules/FH_DATE_PAST_20XX">FH_DATE_PAST_20XX</a> rule released with versions of Apache SpamAssassin 3.2.0 thru 3.2.5 will trigger on most mail with a Date header that includes the year 2010 or later. The rule will add a score of up to 3.6 towards the spam classification of all email. You should take corrective action immediately; there are two easy ways to correct the problem:
+
+ <ul><li>If your system is configured to use <a href="http://wiki.apache.org/spamassassin/RuleUpdates">sa-update</a>
+ <b>run sa-update now</b>. An update is available that will correct the rule. No further action is necessary (other than restarting spamd or any service that uses SpamAssassin directly).</li></ul>
+
+ <ul><li>Add "score FH_DATE_PAST_20XX 0" without the quotes to the end of your local.cf file to disable the rule.</li></ul>
+
+ <p>If you require help updating your rules to correct this issue you are encouraged to ask for assistance on the Apache SpamAssassin Users' list. <a href="http://wiki.apache.org/spamassassin/MailingLists">Users' mailing list info is here</a>.</p>
+ <p>On behalf of the Apache SpamAssassin project I apologize for this error and the grief it may have caused you.</p>
+ <p>Regards,</p>
+ <p>Daryl C. W. O'Shea</p>
+ <p>VP, Apache SpamAssassin</p>
+ <p> </p>
+
+ 2008-06-12: SpamAssassin 3.2.5 has been released, a minor bug-fix release. Visit <a href="${mirrordl}">the downloads page</a> to pick it up, and for more info.
+
2008-01-05: SpamAssassin 3.2.4 has been released. Visit <a href="${mirrordl}">the downloads page</a> to pick it up, and for more info.
2007-09-12: SpamAssassin has won an InfoWorld ''Best Of Open Source Software'' BOSSIE Award, as the winner in the anti-spam category for 2007!
@@ -218,7 +239,8 @@
- <a href=$(TOP/)full/2.6x/dist/doc/>Version 2.6x</a> (old)
- <a href=$(TOP/)full/3.0.x/dist/doc/>Version 3.0.x</a> (old)
- <a href=$(TOP/)full/3.1.x/doc/>Version 3.1.x</a> (old)
- - <a href=$(TOP/)full/3.2.x/doc/>Version 3.2.x</a> (current)
+ - <a href=$(TOP/)full/3.2.x/doc/>Version 3.2.x</a> (old)
+ - <a href=$(TOP/)full/3.3.x/doc/>Version 3.3.x</a> (current)
</content>
<content name="testsbyversion" format=text/et>
@@ -226,7 +248,8 @@
- <a href=$(TOP/)tests_2_6x.html>Version 2.6x</a> (old)
- <a href=$(TOP/)tests_3_0_x.html>Version 3.0.x</a> (old)
- <a href=$(TOP/)tests_3_1_x.html>Version 3.1.x</a> (old)
- - <a href=$(TOP/)tests_3_2_x.html>Version 3.2.x</a> (current)
+ - <a href=$(TOP/)tests_3_2_x.html>Version 3.2.x</a> (old)
+ - <a href=$(TOP/)tests_3_3_x.html>Version 3.3.x</a> (current)
</content>
@@ -270,6 +293,16 @@
</table>
</content>
+<content name="tests_3_3_x.txt" format=text/et>
+<{set title="Tests Performed: v3.3.x"}>
+${testsheader}
+<!--etsafe--> <{perl
+ # calls out to a script in the spamassassin build dir
+ `cd $SITE_SRC_DIR/versions/3.3; ./build/cf_to_html rules/*.cf`
+}> <!--/etsafe-->
+</table>
+</content>
+
<{perl
# backwards compat: we still have a /dist and a /doc subdir
@@ -288,7 +321,7 @@
${title}
---------
-This is the current list of tests SpamAssassin(tm) performs on mail messages to
+This is the current list of tests SpamAssassin performs on mail messages to
determine if they're spam or not. If you wish to <b>change the score</b> from the
default, add a line like this to your ##~/.spamassassin/user_prefs##:
@@ -342,42 +375,6 @@
<content format="text/et" name="index.txt"><{set title="Welcome to SpamAssassin"}>
${badges_block}
-
-<h2><font color="#FF0000">Y2K10 Rule Bug - Update Your Rules Now!</font></h2>
-
-2010-01-01:
-
-Versions of the <a href="http://wiki.apache.org/spamassassin/Rules/FH_DATE_PAST_20XX">FH_DATE_PAST_20XX</a>
-rule released with versions of Apache SpamAssassin
-3.2.0 thru 3.2.5 will trigger on most mail with a Date
-header that includes the year 2010 or later. The
-rule will add a score of up to 3.6 towards the spam
-classification of all email. You should take
-corrective action immediately; there are two easy ways
-to correct the problem:
-
-<ul><li>If your system is configured to use <a href="http://wiki.apache.org/spamassassin/RuleUpdates">sa-update</a>
-<b>run sa-update now</b>. An update is
-available that will correct the rule. No
-further action is necessary (other than restarting
-spamd or any service that uses SpamAssassin
-directly).</li></ul>
-
-<ul><li>Add "score FH_DATE_PAST_20XX 0" without
-the quotes to the end of your local.cf file to
-disable the rule.</li></ul>
-
-<p>If you require help updating your rules to correct
-this issue you are encouraged to ask for assistance on
-the Apache SpamAssassin Users' list. <a href="http://wiki.apache.org/spamassassin/MailingLists">Users'
-mailing list info is here</a>.</p>
-<p>On behalf of the Apache SpamAssassin project I
-apologize for this error and the grief it may have
-caused you.</p>
-<p>Regards,</p>
-<p>Daryl C. W. O'Shea</p>
-<p>VP, Apache SpamAssassin</p>
-<p> </p>
<h2>Note</h2>
@@ -514,12 +511,13 @@
is compromised, the sigs are not and they will mismatch.
-->
- - <a href=${mirrorhref}/Mail-SpamAssassin-${relversion}.tar.gz>SpamAssassin(tm) in tar.gz</a> format. (signatures: <a href=${relhomehref}/Mail-SpamAssassin-${relversion}.tar.gz.asc>GPG</a> <a href=${relhomehref}/Mail-SpamAssassin-${relversion}.tar.gz.md5>MD5</a> <a href=${relhomehref}/Mail-SpamAssassin-${relversion}.tar.gz.sha1>SHA1</a>)
+ - <a href=${mirrorhref}/Mail-SpamAssassin-${relversion}.tar.gz>SpamAssassin in tar.gz</a> format. (signatures: <a href=${relhomehref}/Mail-SpamAssassin-${relversion}.tar.gz.asc>GPG</a> <a href=${relhomehref}/Mail-SpamAssassin-${relversion}.tar.gz.md5>MD5</a> <a href=${relhomehref}/Mail-SpamAssassin-${relversion}.tar.gz.sha1>SHA1</a>)
- - <a href=${mirrorhref}/Mail-SpamAssassin-${relversion}.tar.bz2>SpamAssassin(tm) in tar.bz2</a> format. (signatures: <a href=${relhomehref}/Mail-SpamAssassin-${relversion}.tar.bz2.asc>GPG</a> <a href=${relhomehref}/Mail-SpamAssassin-${relversion}.tar.bz2.md5>MD5</a> <a href=${relhomehref}/Mail-SpamAssassin-${relversion}.tar.bz2.sha1>SHA1</a>)
+ - <a href=${mirrorhref}/Mail-SpamAssassin-${relversion}.tar.bz2>SpamAssassin in tar.bz2</a> format. (signatures: <a href=${relhomehref}/Mail-SpamAssassin-${relversion}.tar.bz2.asc>GPG</a> <a href=${relhomehref}/Mail-SpamAssassin-${relversion}.tar.bz2.md5>MD5</a> <a href=${relhomehref}/Mail-SpamAssassin-${relversion}.tar.bz2.sha1>SHA1</a>)
- - <a href=${mirrorhref}/Mail-SpamAssassin-${relversion}.zip>SpamAssassin(tm) in ZIP</a> format. (signatures: <a href=${relhomehref}/Mail-SpamAssassin-${relversion}.zip.asc>GPG</a> <a href=${relhomehref}/Mail-SpamAssassin-${relversion}.zip.md5>MD5</a> <a href=${relhomehref}/Mail-SpamAssassin-${relversion}.zip.sha1>SHA1</a>)
+ - <a href=${mirrorhref}/Mail-SpamAssassin-${relversion}.zip>SpamAssassin in ZIP</a> format. (signatures: <a href=${relhomehref}/Mail-SpamAssassin-${relversion}.zip.asc>GPG</a> <a href=${relhomehref}/Mail-SpamAssassin-${relversion}.zip.md5>MD5</a> <a href=${relhomehref}/Mail-SpamAssassin-${relversion}.zip.sha1>SHA1</a>)
- <a href=${relsvnhref}/build/announcements/${relversion}.txt>Change log summary</a>, <a href=${relsvnhref}/Changes>more detail</a>
+ - <a href=${mirrorhref}/Mail-SpamAssassin-rules-${relrulesversion}.tgz>SpamAssassin sa-update rules tarball</a>, for use if you cannot run "sa-update" to download these automatically after installing. (signatures: <a href=${relhomehref}/Mail-SpamAssassin-rules-${relrulesversion}.tgz.asc>GPG</a> <a href=${relhomehref}/Mail-SpamAssassin-rules-${relrulesversion}.tgz.md5>MD5</a> <a href=${relhomehref}/Mail-SpamAssassin-rules-${relrulesversion}.tgz.sha1>SHA1</a>)
Previous Released version, ${prevbranchrelversion}
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -528,11 +526,11 @@
is compromised, the sigs are not and they will mismatch.
-->
- - <a href=${mirrorhref}/Mail-SpamAssassin-${prevbranchrelversion}.tar.gz>SpamAssassin(tm) in tar.gz</a> format. (signatures: <a href=${relhomehref}/Mail-SpamAssassin-${prevbranchrelversion}.tar.gz.asc>GPG</a> <a href=${relhomehref}/Mail-SpamAssassin-${prevbranchrelversion}.tar.gz.md5>MD5</a> <a href=${relhomehref}/Mail-SpamAssassin-${prevbranchrelversion}.tar.gz.sha1>SHA1</a>)
+ - <a href=${mirrorhref}/Mail-SpamAssassin-${prevbranchrelversion}.tar.gz>SpamAssassin in tar.gz</a> format. (signatures: <a href=${relhomehref}/Mail-SpamAssassin-${prevbranchrelversion}.tar.gz.asc>GPG</a> <a href=${relhomehref}/Mail-SpamAssassin-${prevbranchrelversion}.tar.gz.md5>MD5</a> <a href=${relhomehref}/Mail-SpamAssassin-${prevbranchrelversion}.tar.gz.sha1>SHA1</a>)
- - <a href=${mirrorhref}/Mail-SpamAssassin-${prevbranchrelversion}.tar.bz2>SpamAssassin(tm) in tar.bz2</a> format. (signatures: <a href=${relhomehref}/Mail-SpamAssassin-${prevbranchrelversion}.tar.bz2.asc>GPG</a> <a href=${relhomehref}/Mail-SpamAssassin-${prevbranchrelversion}.tar.bz2.md5>MD5</a> <a href=${relhomehref}/Mail-SpamAssassin-${prevbranchrelversion}.tar.bz2.sha1>SHA1</a>)
+ - <a href=${mirrorhref}/Mail-SpamAssassin-${prevbranchrelversion}.tar.bz2>SpamAssassin in tar.bz2</a> format. (signatures: <a href=${relhomehref}/Mail-SpamAssassin-${prevbranchrelversion}.tar.bz2.asc>GPG</a> <a href=${relhomehref}/Mail-SpamAssassin-${prevbranchrelversion}.tar.bz2.md5>MD5</a> <a href=${relhomehref}/Mail-SpamAssassin-${prevbranchrelversion}.tar.bz2.sha1>SHA1</a>)
- - <a href=${mirrorhref}/Mail-SpamAssassin-${prevbranchrelversion}.zip>SpamAssassin(tm) in ZIP</a> format. (signatures: <a href=${relhomehref}/Mail-SpamAssassin-${prevbranchrelversion}.zip.asc>GPG</a> <a href=${relhomehref}/Mail-SpamAssassin-${prevbranchrelversion}.zip.md5>MD5</a> <a href=${relhomehref}/Mail-SpamAssassin-${prevbranchrelversion}.zip.sha1>SHA1</a>)
+ - <a href=${mirrorhref}/Mail-SpamAssassin-${prevbranchrelversion}.zip>SpamAssassin in ZIP</a> format. (signatures: <a href=${relhomehref}/Mail-SpamAssassin-${prevbranchrelversion}.zip.asc>GPG</a> <a href=${relhomehref}/Mail-SpamAssassin-${prevbranchrelversion}.zip.md5>MD5</a> <a href=${relhomehref}/Mail-SpamAssassin-${prevbranchrelversion}.zip.sha1>SHA1</a>)
Packages
~~~~~~~~
@@ -586,17 +584,17 @@
Current Pre-Release Development Version (${preversion})
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- - <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.tar.gz>SpamAssassin(tm) in tar.gz</a> format. (signatures:
+ - <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.tar.gz>SpamAssassin in tar.gz</a> format. (signatures:
<a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.tar.gz.asc>GPG</a>
<a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.tar.gz.md5>MD5</a>
<a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.tar.gz.sha1>SHA1</a>)
- - <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.tar.bz2>SpamAssassin(tm) in tar.bz2</a> format. (signatures:
+ - <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.tar.bz2>SpamAssassin in tar.bz2</a> format. (signatures:
<a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.tar.bz2.asc>GPG</a>
<a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.tar.bz2.md5>MD5</a>
<a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.tar.bz2.sha1>SHA1</a>)
- - <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.zip>SpamAssassin(tm) in ZIP</a> format. (signatures:
+ - <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.zip>SpamAssassin in ZIP</a> format. (signatures:
<a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.zip.asc>GPG</a>
<a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.zip.md5>MD5</a>
<a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.zip.sha1>SHA1</a>)
@@ -624,14 +622,9 @@
<a name=gpgkey></a>
If you want to use GPG to verify the downloads listed above, please use
-the <a href=http://www.apache.org/dist/spamassassin/KEYS>SpamAssassin Release GPG Key</a>:
-
-<pre>
-pub 1024D/265FA05B 2003-06-09 SpamAssassin Signing Key <release@spamassassin.org>
- Key fingerprint = 26C9 00A4 6DD4 0CD5 AD24 F6D7 DEE0 1987 265F A05B
-</pre>
+the <a href=http://www.apache.org/dist/spamassassin/KEYS>SpamAssassin Release GPG Keys</a> to verify them.
-Note: GnuPG 1.4.0, and possibly 1.3.x versions, seem to have problems verifying certain signature files, including the type as used for SpamAssassin releases. If you are running an affected version, please verify the code using both MD5 and SHA1 sum values instead.
+Note: GnuPG 1.4.0, and possibly 1.3.x versions, seem to have problems verifying certain signature files, including the type as used for SpamAssassin releases. If you are running an affected version, please verify the code using both MD5 and SHA1 sum values instead, or upgrade GPG.
Old releases
~~~~~~~~~~~~~
@@ -640,7 +633,7 @@
</content>
-<content format="text/et" name="hacking.txt"><{set title="Hacking On SpamAssassin(tm)"}>
+<content format="text/et" name="hacking.txt"><{set title="Hacking On SpamAssassin"}>
${title}
---------
@@ -742,7 +735,7 @@
But The Message Was Not Spam!
=============================
-Sometimes SpamAssassin(tm) will get a ''false positive'', resulting in tagged
+Sometimes SpamAssassin will get a ''false positive'', resulting in tagged
mails which are not actually spam at all. Since spammers don't usually
highlight the fact that their mail is unwanted, unsolicited ads, SpamAssassin
has to try to work it out -- and it's not always easy to do.
@@ -775,7 +768,7 @@
What is SpamAssassin, After All That?
=====================
-SpamAssassin(tm) is a mail filter which scans, and attempts to block, spam.
+SpamAssassin is a mail filter which scans, and attempts to block, spam.
More information <a href=$(TOP/)>here</a>.
__(thanks to <a href=http://www.roaringpenguin.com/mimedefang/enduser.html>
@@ -836,7 +829,7 @@
${title}
--------
- - The <a href=$(tests)>list of tests</a> SpamAssassin(tm) includes by default.
+ - The <a href=$(tests)>list of tests</a> SpamAssassin includes by default.
- <a href=${relsvnhref}/README>Top-level README file</a>.
@@ -1070,7 +1063,7 @@
<tr>
<td valign=center>
<img align=center src=$(TOP/)images/arrowlogo.png ${IMGSIZE}
- alt="SpamAssassin(tm)" />
+ alt="SpamAssassin" />
</td>
<td valign=center>
<h1>The Apache SpamAssassin Project</h1>