You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by km...@apache.org on 2015/04/17 07:27:06 UTC
svn commit: r1674213 - in /spamassassin/site: downloads.html main.wmk
Author: kmcgrail
Date: Fri Apr 17 05:27:05 2015
New Revision: 1674213
URL: http://svn.apache.org/r1674213
Log:
cleaning up the downloads for packages
Modified:
spamassassin/site/downloads.html
spamassassin/site/main.wmk
Modified: spamassassin/site/downloads.html
URL: http://svn.apache.org/viewvc/spamassassin/site/downloads.html?rev=1674213&r1=1674212&r2=1674213&view=diff
==============================================================================
--- spamassassin/site/downloads.html (original)
+++ spamassassin/site/downloads.html Fri Apr 17 05:27:05 2015
@@ -257,182 +257,157 @@
</li>
</ul>
- <a name="Packages" id="Packages"><h3>Packages</h3></a><p>
- <--
-
- </p>
- <ul>
- <li>
- <strong>Fedora, Red Hat Enterprise Linux, CentOS, Scientific Linux users</strong>: See <a href="http://www.spamtips.org/p/rpm-packages.html">SpamTips.org</a> for the latest upgrade directions.
-
- </li>
- <li>
- <strong>Debian users</strong>: install SpamAssassin using:
- <blockquote>
- <code>sudo apt-get install spamassassin</code>
- </blockquote>
- </li>
- <li>
- <strong>Gentoo Linux users</strong> install SpamAssassin using:
- <blockquote>
- <code>sudo emerge mail-filter/spamassassin</code>
- </blockquote>
- </li>
- <li>
- <strong>BSD users</strong>: SpamAssassin is available in BSD package systems under the following names:
- <ul>
- <li>
- FreeBSD: <code>mail/p5-Mail-SpamAssassin</code>
- </li>
- <li>
- NetBSD: <code>mail/spamassassin</code>
- </li>
- <li>
- OpenBSD: <code>mail/p5-Mail-SpamAssassin</code>
- </li>
- </ul>
- </li>
- </ul>
--->
- <ul>
- <li>
- <strong>Everyone</strong>: SpamAssassin can be downloaded from <a href="http://www.cpan.org/">CPAN</a>, as the module <a href="http://search.cpan.org/dist/Mail-SpamAssassin/"><code>Mail::SpamAssassin</code></a>:
- <blockquote>
- <code>sudo cpan Mail::SpamAssassin</code>
- </blockquote>
- </li>
- </ul>
+ <a name="CPAN" id="CPAN"><h3>CPAN</h3></a><p>
+ <!--
+ </p><ul><li><strong>Fedora, Red Hat Enterprise Linux, CentOS, Scientific Linux users</strong>: See <a href=http://www.spamtips.org/p/rpm-packages.html>SpamTips.org</a> for the latest upgrade directions.
+ </li><li><strong>Debian users</strong>: install SpamAssassin using:
+ <blockquote><code>sudo apt-get install spamassassin</code>
+ </blockquote></li><li><strong>Gentoo Linux users</strong> install SpamAssassin using:
+ <blockquote><code>sudo emerge mail-filter/spamassassin</code>
+ </blockquote></li><li><strong>BSD users</strong>: SpamAssassin is available in BSD package systems under the following names:
+ <ul><li>FreeBSD: <code>mail/p5-Mail-SpamAssassin</code>
+ </li><li>NetBSD: <code>mail/spamassassin</code>
+ </li><li>OpenBSD: <code>mail/p5-Mail-SpamAssassin</code>
+ </li></ul></li></ul>-->
+ <ul>
+ <li>
+ SpamAssassin can be downloaded from <a href="http://www.cpan.org/">CPAN</a>, as the module <a href="http://search.cpan.org/dist/Mail-SpamAssassin/"><code>Mail::SpamAssassin</code></a>:
+ <blockquote>
+ <code>sudo cpan Mail::SpamAssassin</code>
+ </blockquote>
+ </li>
+ </ul>
<!--
- Other stuff regarding released versions
- <hr />
- <ul><li>Michael Moncur has written a very good <a href="http://www.yrex.com/spam/spamconfig.php">configuration
- tool</a> which will generate a local.cf or user_prefs file for you, once you fill
- out a few simple questions.
- </li><li><strong>MacOS X users</strong>: Ben Trott of <a
- href=http://www.movabletype.org>MovableType</a> has written a <A
- href=http://rhumba.pair.com/ben/docs/sa.html>good how-to</a> on installing
- SpamAssassin on OSX. A possibly more up-to-date article is <a
- href=http://developer.apple.com/server/fighting_spam.html>'Fighting Spam on
- Mac OS X Server'</a> at Apple Developer Connection.
- </li></ul>-->
- <a name="Current_Pre_Release_Development_Version_preversion" id="Current_Pre_Release_Development_Version_preversion"><h3>Current Pre-Release Development Version (3.4.1-rc2)</h3></a><ul>
- <li>
- <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.tar.gz">SpamAssassin in tar.gz</a> format. (signatures:
- <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.tar.gz.asc">GPG</a> <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.tar.gz.md5">MD5</a> <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.tar.gz.sha1">SHA1</a>)
-
- </li>
- <li>
- <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.tar.bz2">SpamAssassin in tar.bz2</a> format. (signatures:
- <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.tar.bz2.asc">GPG</a> <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.tar.bz2.md5">MD5</a> <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.tar.bz2.sha1">SHA1</a>)
+ Other stuff regarding released versions
+ <hr />
+ <ul><li>Michael Moncur has written a very good <a href="http://www.yrex.com/spam/spamconfig.php">configuration
+ tool</a> which will generate a local.cf or user_prefs file for you, once you fill
+ out a few simple questions.
+ </li><li><strong>MacOS X users</strong>: Ben Trott of <a
+ href=http://www.movabletype.org>MovableType</a> has written a <A
+ href=http://rhumba.pair.com/ben/docs/sa.html>good how-to</a> on installing
+ SpamAssassin on OSX. A possibly more up-to-date article is <a
+ href=http://developer.apple.com/server/fighting_spam.html>'Fighting Spam on
+ Mac OS X Server'</a> at Apple Developer Connection.
+ </li></ul>-->
+ <a name="Current_Pre_Release_Development_Version_preversion" id="Current_Pre_Release_Development_Version_preversion"><h3>Current Pre-Release Development Version (3.4.1-rc2)</h3></a><ul>
+ <li>
+ <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.tar.gz">SpamAssassin in tar.gz</a> format. (signatures:
+ <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.tar.gz.asc">GPG</a> <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.tar.gz.md5">MD5</a> <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.tar.gz.sha1">SHA1</a>)
+
+ </li>
+ <li>
+ <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.tar.bz2">SpamAssassin in tar.bz2</a> format. (signatures:
+ <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.tar.bz2.asc">GPG</a> <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.tar.bz2.md5">MD5</a> <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.tar.bz2.sha1">SHA1</a>)
+
+ </li>
+ <li>
+ <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.zip">SpamAssassin in ZIP</a> format. (signatures:
+ <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.zip.asc">GPG</a> <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.zip.md5">MD5</a> <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.zip.sha1">SHA1</a>)
+
+ </li>
+ </ul>
+ <p>
+ <!--
+ <em>jm: </em>not sure this note still applies (Aug 12 2005 jm) <br />
+ </p><p><strong>Note</strong>: If you plan to build this into an RPM via <code>rpmbuild -tb</code>,
+ please rename the tar archive and remove the -pre or -rc
+ section first. The included spec file is written for the 3.1.0
+ final release, and will not work with the filename including <code>-pre</code>
+ or <code>-rc</code>.
+ <br />-->
+
+ </p>
+ <a name="Latest_bleeding_edge_code" id="Latest_bleeding_edge_code"><h3>Latest bleeding-edge code</h3></a><p>
+ The latest development version can be obtained at any given time from the SpamAssassin Subversion (SVN) repository. See <a href="http://wiki.apache.org/spamassassin/DownloadFromSvn" target="_blank">http://wiki.apache.org/spamassassin/DownloadFromSvn</a> for more information.
+
+ </p>
+ <p>
+ Nightly snapshots are no longer available.
+
+ </p>
+ <a name="GPG_Signing_Key" id="GPG_Signing_Key"><h3>GPG Signing Key</h3></a><p>
+ <a name="gpgkey"></a>If you want to use GPG to verify the downloads listed above, please use the <a href="https://www.apache.org/dist/spamassassin/KEYS">SpamAssassin Release GPG Keys</a> to verify them.
+
+ </p>
+ <p>
+ <em>Note: </em>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. <br />
+
+ </p>
+ <a name="Old_releases" id="Old_releases"><h3>Old releases</h3></a><p>
+ Old Apache-licensed versions (from version 3.0.0 on) can be <a href="http://archive.apache.org/dist/spamassassin/">downloaded from archive.apache.org</a>. Older, Perl-licensed versions can be found <a href="http://www.cpan.org/modules/by-module/Mail/">via CPAN</a>.
- </li>
- <li>
- <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.zip">SpamAssassin in ZIP</a> format. (signatures:
- <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.zip.asc">GPG</a> <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.zip.md5">MD5</a> <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.zip.sha1">SHA1</a>)
-
- </li>
- </ul>
- <p>
- <!--
- <em>jm: </em>not sure this note still applies (Aug 12 2005 jm) <br />
- </p><p><strong>Note</strong>: If you plan to build this into an RPM via <code>rpmbuild -tb</code>,
- please rename the tar archive and remove the -pre or -rc
- section first. The included spec file is written for the 3.1.0
- final release, and will not work with the filename including <code>-pre</code>
- or <code>-rc</code>.
- <br />-->
-
- </p>
- <a name="Latest_bleeding_edge_code" id="Latest_bleeding_edge_code"><h3>Latest bleeding-edge code</h3></a><p>
- The latest development version can be obtained at any given time from the SpamAssassin Subversion (SVN) repository. See <a href="http://wiki.apache.org/spamassassin/DownloadFromSvn" target="_blank">http://wiki.apache.org/spamassassin/DownloadFromSvn</a> for more information.
-
- </p>
- <p>
- Nightly snapshots are no longer available.
-
- </p>
- <a name="GPG_Signing_Key" id="GPG_Signing_Key"><h3>GPG Signing Key</h3></a><p>
- <a name="gpgkey"></a>If you want to use GPG to verify the downloads listed above, please use the <a href="https://www.apache.org/dist/spamassassin/KEYS">SpamAssassin Release GPG Keys</a> to verify them.
+ </p>
+<!--
+ </td></tr></table>
+ </td></tr></table>
+ </td></tr></table> -->
+ </div>
+ <table align="center" width="90%">
+ <tr>
+ <td valign="top">
+ <p>
+ <div align="left">
+ <a href="http://www.apache.org/"> <img src="images/apache-feather.png" alt="An Apache Project" title="An Apache Project" border="0" width="124" height="35" /></a>
+ </div>
+ </p>
+ </td>
+ <td valign="top">
+ <p>
+ <div align="middle" class="noimgborder">
+ <script type="text/javascript" src="http://www.ohloh.net/projects/4543/widgets/project_partner_badge">
+
+ </script>
+ </div>
+ </p>
+ </td>
+ <td valign="top">
+ <p>
+ <div align="right">
+ <a href="http://webmake.taint.org/"> <img src="images/BuiltWithWebMake.png" width="88" height="31" border="0" alt="Site Built With WebMake" title="Site Built with WebMake" /></a>
+ </div>
+ </p>
+ </td>
+ </tr>
+ </table>
+ <table align="center" width="90%">
+ <tr>
+ <td align="center">
+
+ Copyright © 2003-2015 The Apache Software Foundation. All rights reserved.<br />
+
+ Apache, Apache SpamAssassin, and the Apache SpamAssassin logo are registered trademarks or trademarks of The Apache Software Foundation in the U.S. and/or other countries.
+
+ </td>
+ </tr>
+ </table>
+ <br />
+
+ <!-- some anti-spam trapping links -->
+ <font size="-6">
+ <a href="mailto:sa_website@incoming.spamassassin.org"></a>
+ </font>
+ <font size="-6">
+ <a href="mailto:abanspam@taint.org"></a>
+ </font>
+ <font size="-6">
+ <a href="mailto:zbanspam@taint.org"></a>
+ </font>
+ <font size="-6">
+ <a href="http://SpamAssassin.taint.org/moreinfo.whtml"></a>
+ </font>
+<!-- analytics -->
+ <!--etsafe-->
+ <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
- </p>
- <p>
- <em>Note: </em>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. <br />
+ </script>
+ <script type="text/javascript">
- </p>
- <a name="Old_releases" id="Old_releases"><h3>Old releases</h3></a><p>
- Old Apache-licensed versions (from version 3.0.0 on) can be <a href="http://archive.apache.org/dist/spamassassin/">downloaded from archive.apache.org</a>. Older, Perl-licensed versions can be found <a href="http://www.cpan.org/modules/by-module/Mail/">via CPAN</a>.
+ _uacct = "UA-2299573-1";
+ urchinTracker();
- </p>
-<!--
- </td></tr></table>
- </td></tr></table>
- </td></tr></table> -->
- </div>
- <table align="center" width="90%">
- <tr>
- <td valign="top">
- <p>
- <div align="left">
- <a href="http://www.apache.org/"> <img src="images/apache-feather.png" alt="An Apache Project" title="An Apache Project" border="0" width="124" height="35" /></a>
- </div>
- </p>
- </td>
- <td valign="top">
- <p>
- <div align="middle" class="noimgborder">
- <script type="text/javascript" src="http://www.ohloh.net/projects/4543/widgets/project_partner_badge">
-
- </script>
- </div>
- </p>
- </td>
- <td valign="top">
- <p>
- <div align="right">
- <a href="http://webmake.taint.org/"> <img src="images/BuiltWithWebMake.png" width="88" height="31" border="0" alt="Site Built With WebMake" title="Site Built with WebMake" /></a>
- </div>
- </p>
- </td>
- </tr>
- </table>
- <table align="center" width="90%">
- <tr>
- <td align="center">
-
- Copyright © 2003-2015 The Apache Software Foundation. All rights reserved.<br />
-
- Apache, Apache SpamAssassin, and the Apache SpamAssassin logo are registered trademarks or trademarks of The Apache Software Foundation in the U.S. and/or other countries.
-
- </td>
- </tr>
- </table>
- <br />
-
- <!-- some anti-spam trapping links -->
- <font size="-6">
- <a href="mailto:sa_website@incoming.spamassassin.org"></a>
- </font>
- <font size="-6">
- <a href="mailto:abanspam@taint.org"></a>
- </font>
- <font size="-6">
- <a href="mailto:zbanspam@taint.org"></a>
- </font>
- <font size="-6">
- <a href="http://SpamAssassin.taint.org/moreinfo.whtml"></a>
- </font>
-<!-- analytics -->
- <!--etsafe-->
- <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
-
- </script>
- <script type="text/javascript">
-
- _uacct = "UA-2299573-1";
- urchinTracker();
-
- </script>
+ </script>
<!--/etsafe-->
- <!-- /analytics -->
- </body>
-</html>
+ <!-- /analytics -->
+ </body>
+ </html>
Modified: spamassassin/site/main.wmk
URL: http://svn.apache.org/viewvc/spamassassin/site/main.wmk?rev=1674213&r1=1674212&r2=1674213&view=diff
==============================================================================
--- spamassassin/site/main.wmk (original)
+++ spamassassin/site/main.wmk Fri Apr 17 05:27:05 2015
@@ -412,9 +412,9 @@ NOTE: This version is no longer supporte
- <a href=${archivehref}/Mail-SpamAssassin-${prevbranchrelversion}.zip>SpamAssassin in ZIP</a> format. (signatures: <a href=${archivehref}/Mail-SpamAssassin-${prevbranchrelversion}.zip.asc>GPG</a> <a href=${archivehref}/Mail-SpamAssassin-${prevbranchrelversion}.zip.md5>MD5</a> <a href=${archivehref}/Mail-SpamAssassin-${prevbranchrelversion}.zip.sha1>SHA1</a>)
-Packages
-~~~~~~~~
-<--
+CPAN
+~~~~
+<!--
- **Fedora, Red Hat Enterprise Linux, CentOS, Scientific Linux users**: See <a href=http://www.spamtips.org/p/rpm-packages.html>SpamTips.org</a> for the latest upgrade directions.
- **Debian users**: install SpamAssassin using:
@@ -434,7 +434,7 @@ Packages
- OpenBSD: ##mail/p5-Mail-SpamAssassin##
-->
- - **Everyone**: SpamAssassin can be downloaded from <a href=http://www.cpan.org/>CPAN</a>, as the module <a href="http://search.cpan.org/dist/Mail-SpamAssassin/">##Mail::SpamAssassin##</a>:
+ - SpamAssassin can be downloaded from <a href=http://www.cpan.org/>CPAN</a>, as the module <a href="http://search.cpan.org/dist/Mail-SpamAssassin/">##Mail::SpamAssassin##</a>:
##sudo cpan Mail::SpamAssassin##