From a992a779e7daa640b767ca4be9eaf9481fa95f7a Mon Sep 17 00:00:00 2001 From: Michael Cummings Date: Mon, 20 Dec 2004 11:07:54 +0000 Subject: [PATCH] New version; closes bug 74731 --- mail-filter/spamassassin/ChangeLog | 23 +- mail-filter/spamassassin/Manifest | 16 +- .../files/digest-spamassassin-3.0.2 | 1 + .../spamassassin/spamassassin-3.0.0-r1.ebuild | 4 +- .../spamassassin/spamassassin-3.0.0.ebuild | 4 +- .../spamassassin/spamassassin-3.0.1.ebuild | 4 +- .../spamassassin/spamassassin-3.0.2.ebuild | 206 ++++++++++++++++++ 7 files changed, 244 insertions(+), 14 deletions(-) create mode 100644 mail-filter/spamassassin/files/digest-spamassassin-3.0.2 create mode 100644 mail-filter/spamassassin/spamassassin-3.0.2.ebuild diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog index 99cfa54cc176..5acd2c03f011 100644 --- a/mail-filter/spamassassin/ChangeLog +++ b/mail-filter/spamassassin/ChangeLog @@ -1,6 +1,27 @@ # ChangeLog for mail-filter/spamassassin # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.18 2004/12/20 10:13:56 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.19 2004/12/20 11:07:54 mcummings Exp $ + +*spamassassin-3.0.2 (20 Dec 2004) + + 20 Dec 2004; Michael Cummings + +spamassassin-3.0.2.ebuild: + New version; closes bug 74731 + Updates: + SA-bug 4005: Yahoo groups messages flagged as forged + SA-bug 4030: incapable Net::DNS module usage should be a warning + SA-bug 2462: detect legitimate SMTP AUTH submission, to avoid false positives on Dynablock-style rules + SA-bug 4019: Needed to add in RPAD call wherever token was used in a select + SA-bug 3961: Docu fix for two contradicting explanations of the -x switch + SA-bug 4014: change spamcop_submission_address to correct name, spamcop_to_address + SA-bug 3990: two small regexp errors in RegistrarBoundaries + SA-bug 3967: fix performance issues with USERPASS and RATWARE_STORM_URI + SA-bug 3953: Provide better debug output for sa-learn --restore + SA-bug 3816: deal with 'rewrite_header Subject' markup when no Subject header previously existed + SA-bug 3950: Exim 'sender_fullhost' var was not recognized by Received header parser + SA-bug 3942: EvalTests::_check_recipients() would sometimes parse out the wrong addresses/overwrite entries on the array/etc + SA-bug 3941: spamcop now only wants max 2 day old mail + SA-bug 3930: uridnsbl plugin didn't respect the uridnsbl_max_domains value *spamassassin-3.0.1 (20 Dec 2004) diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest index 2d75b8794aaa..1d51a25acbaf 100644 --- a/mail-filter/spamassassin/Manifest +++ b/mail-filter/spamassassin/Manifest @@ -1,14 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 adf0453bea76a846b54c5e51419c99e2 ChangeLog 11004 +MD5 9f7e615f5f8d670ccbedd80ed80ade50 ChangeLog 12283 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305 MD5 65493afe87a913fca09fc1a71f91c049 spamassassin-2.63-r1.ebuild 2411 MD5 2340f8dc700ca777028031b023b4d168 spamassassin-2.63.ebuild 2300 MD5 765fc4df91c2d5259208d35fc1c6068b spamassassin-2.64.ebuild 2515 -MD5 5401cb605f05a9d1bb60d2b22aa32e22 spamassassin-3.0.0-r1.ebuild 5775 -MD5 a494f0c43e9ee58f3c99217cb1bf6637 spamassassin-3.0.0.ebuild 5972 -MD5 e84888a64e68cab6b337c7572f54a6d9 spamassassin-3.0.1.ebuild 5779 +MD5 8ba5cfffb43037101ab50a95ea535d66 spamassassin-3.0.0-r1.ebuild 5774 +MD5 9edc1167fa27cd5bb5770b30162362c7 spamassassin-3.0.0.ebuild 5971 +MD5 eb9d69c3a00f5ae1fb3380da85e49500 spamassassin-3.0.1.ebuild 5778 +MD5 988b6dc72f8be28399486d4348ced3a6 spamassassin-3.0.2.ebuild 5778 MD5 2bc962fe7cbd5fc24b6ca7703a498e83 files/digest-spamassassin-2.63 75 MD5 3fe5a2e4cdb6c4830cb22f635d1b24e3 files/3.0.0-spamd.conf 777 MD5 33f67831957d640746a374b8774e7d2d files/3.0.0-spamd.init 667 @@ -19,10 +20,11 @@ MD5 7d4ce834279c9e36320d114a7118c127 files/digest-spamassassin-3.0.0-r1 76 MD5 e76e0d7ee2c9225a16dfe1f177823f70 files/spamd.conf 446 MD5 90925e8f6521add45f8a727ed982e61a files/spamd.init 645 MD5 37be9f25f104cf5e5ad47b37351c7900 files/digest-spamassassin-3.0.1 76 +MD5 faa89d7205b3bde710ddc585969a3992 files/digest-spamassassin-3.0.2 76 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFBxqW2tG5z4I8BtQoRAnSbAJ4sA7z2Tee0seLsOB00ylCFlkPpXACcDwCE -69OqLX0yYjfPRyZbGPxKYOg= -=zoer +iD8DBQFBxrIvtG5z4I8BtQoRAuCqAKCJSvnfODIp0CM75ArjRGzAixgP8QCfXOws +E60icV1jrHDCsu6paphj/EQ= +=gG94 -----END PGP SIGNATURE----- diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.0.2 b/mail-filter/spamassassin/files/digest-spamassassin-3.0.2 new file mode 100644 index 000000000000..0656c7638050 --- /dev/null +++ b/mail-filter/spamassassin/files/digest-spamassassin-3.0.2 @@ -0,0 +1 @@ +MD5 b373bc48c4f50b70cb784f40d88868bf Mail-SpamAssassin-3.0.2.tar.bz2 846410 diff --git a/mail-filter/spamassassin/spamassassin-3.0.0-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.0.0-r1.ebuild index bd9532ef6199..7e7cd63ac150 100644 --- a/mail-filter/spamassassin/spamassassin-3.0.0-r1.ebuild +++ b/mail-filter/spamassassin/spamassassin-3.0.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.0.0-r1.ebuild,v 1.3 2004/12/20 10:13:56 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.0.0-r1.ebuild,v 1.4 2004/12/20 11:07:54 mcummings Exp $ inherit perl-module @@ -194,7 +194,7 @@ pkg_postinst() { einfo "If upgraded from 2.x, please read the file" einfo " /usr/share/doc/${PF}/UPGRADE.gz" einfo - ewarn + ewarn ewarn "spamd is not designed to listen to an untrusted network" ewarn "and is vulnerable to DoS attacks (and eternal doom) if" ewarn "configured to do so" diff --git a/mail-filter/spamassassin/spamassassin-3.0.0.ebuild b/mail-filter/spamassassin/spamassassin-3.0.0.ebuild index a0fb901a666c..edeb0e40acac 100644 --- a/mail-filter/spamassassin/spamassassin-3.0.0.ebuild +++ b/mail-filter/spamassassin/spamassassin-3.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.0.0.ebuild,v 1.4 2004/12/20 10:13:56 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.0.0.ebuild,v 1.5 2004/12/20 11:07:54 mcummings Exp $ inherit perl-module @@ -199,7 +199,7 @@ pkg_postinst() { einfo "If upgraded from 2.x, please read the file" einfo " /usr/share/doc/${PF}/UPGRADE.gz" einfo - ewarn + ewarn ewarn "spamd is not designed to listen to an untrusted network" ewarn "and is vulnerable to DoS attacks (and eternal doom) if" ewarn "configured to do so" diff --git a/mail-filter/spamassassin/spamassassin-3.0.1.ebuild b/mail-filter/spamassassin/spamassassin-3.0.1.ebuild index b704f18298e4..731672ed3fde 100644 --- a/mail-filter/spamassassin/spamassassin-3.0.1.ebuild +++ b/mail-filter/spamassassin/spamassassin-3.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.0.1.ebuild,v 1.2 2004/12/20 10:13:56 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.0.1.ebuild,v 1.3 2004/12/20 11:07:54 mcummings Exp $ inherit perl-module @@ -197,7 +197,7 @@ pkg_postinst() { einfo "If upgraded from 2.x, please read the file" einfo " /usr/share/doc/${PF}/UPGRADE.gz" einfo - ewarn + ewarn ewarn "spamd is not designed to listen to an untrusted network" ewarn "and is vulnerable to DoS attacks (and eternal doom) if" ewarn "configured to do so" diff --git a/mail-filter/spamassassin/spamassassin-3.0.2.ebuild b/mail-filter/spamassassin/spamassassin-3.0.2.ebuild new file mode 100644 index 000000000000..07d7472ef17c --- /dev/null +++ b/mail-filter/spamassassin/spamassassin-3.0.2.ebuild @@ -0,0 +1,206 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.0.2.ebuild,v 1.1 2004/12/20 11:07:54 mcummings Exp $ + +inherit perl-module + +DESCRIPTION="SpamAssassin is an extensible email filter which is used to identify spam." +HOMEPAGE="http://spamassassin.apache.org/" +LICENSE="Apache-2.0" + +MY_P=Mail-SpamAssassin-${PV//_/-} +S=${WORKDIR}/${MY_P} + +SRC_URI="http://www.apache.org/dist/spamassassin/${MY_P}.tar.bz2" + +SLOT="0" +KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~amd64" +IUSE="berkdb qmail ssl doc" + +DEPEND=">=dev-lang/perl-5.8.2-r1 + >=dev-perl/PodParser-1.22 + dev-perl/MIME-Base64 + >=dev-perl/HTML-Parser-3.31 + >=dev-perl/Net-DNS-0.34 + dev-perl/Digest-SHA1 + ssl? ( + dev-perl/IO-Socket-SSL + dev-libs/openssl + ) + berkdb? ( + dev-perl/DB_File + )" + + +# - Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again +# (just to be sure, nobody knows how it could happen in the first place). +myconf="SYSCONFDIR=/etc DATADIR=/usr/share/spamassassin" + +# If ssl is enabled, spamc can be built with ssl support +if use ssl; then + myconf="${myconf} ENABLE_SSL=yes" +else + myconf="${myconf} ENABLE_SSL=no" +fi + +# Set the path to the Perl executable explictly. This will be used to +# create the initial sharpbang line in the scripts and might cause +# a versioned app name end in there, see +# +myconf="${myconf} PERL_BIN=/usr/bin/perl" + +# If you are going to enable taint mode, make sure that the bug where +# spamd doesn't start when the PATH contains . is addressed, and make +# sure you deal with versions of razor <2.36-r1 not being taint-safe. +# and +# . +myconf="${myconf} PERL_TAINT=no" + +# No settings needed for 'make all'. +mymake="" + +# Neither for 'make install'. +myinst="" + +# Some more files to be installed (README* and Changes are already +# included per default) +mydoc="NOTICE + TRADEMARK + LICENSE + CREDITS + INSTALL + UPGRADE + BUGS + USAGE + README.spamd + README.sql + README.ldap + procmailrc.example + sample-nonspam.txt + sample-spam.txt + STATISTICS.set0 + STATISTICS.set1 + STATISTICS.set2 + STATISTICS.set3" + +use qmail && mydoc="${mydoc} README.qmail" + + +src_move_doc() { + echo "Renaming $1 to $2" + mv $1 $2 || die failed to move documentation +} + +src_append_doc() { + echo "Appending $1 to $2" + cat $1 >> $2 || die failed to append documentation +} + +src_compile() { + # Add Gentoo tag to make it easier for the upstream devs to spot + # possible modifications or patches. + version_tag="g${PV:6}${PR}" + version_str="${PV//_/-}-${version_tag}" + + # Create the Gentoo config file before Makefile.PL is called so it + # is copied later on. + echo "version_tag ${version_tag}" > rules/11_gentoo.cf + + # Setting the following env var ensures that no questions are asked. + export PERL_MM_USE_DEFAULT=1 + perl-module_src_prep + # Run the autoconf stuff now, just to make the build sequence look more + # familiar to the user :) Plus feeding the VERSION_STRING skips some + # calls to Perl. + make spamc/Makefile VERSION_STRING="${version_str}" + + # Now compile all the stuff selected. + perl-module_src_compile + if use qmail; then + make spamc/qmail-spamc || die building qmail-spamc failed + fi + + # Rename some docu files so they don't clash with others + src_move_doc spamd/README README.spamd + src_move_doc spamc/README.qmail README.qmail + src_move_doc sql/README README.sql + src_append_doc sql/README.bayes README.sql + src_append_doc sql/README.awl README.sql + src_move_doc ldap/README README.ldap + src_move_doc rules/STATISTICS.txt STATISTICS.set0 + src_move_doc rules/STATISTICS-set1.txt STATISTICS.set1 + src_move_doc rules/STATISTICS-set2.txt STATISTICS.set2 + src_move_doc rules/STATISTICS-set3.txt STATISTICS.set3 + # Remove the MANIFEST files as they aren't docu files + rm -f MANIFEST* + + if use doc; then + make text_html_doc + fi + +} + +src_install () { + perl-module_src_install + + # Move spamd to sbin where it belongs. + dodir /usr/sbin + mv ${D}/usr/bin/spamd ${D}/usr/sbin/spamd || die + + if use qmail; then + into /usr + dobin spamc/qmail-spamc + fi + + # Add the init and config scripts. + dodir /etc/init.d /etc/conf.d + insinto /etc/init.d + newins ${FILESDIR}/3.0.0-spamd.init spamd + fperms 755 /etc/init.d/spamd + insinto /etc/conf.d + newins ${FILESDIR}/3.0.0-spamd.conf spamd + dosym /etc/mail/spamassassin /etc/spamassassin + + if use doc; then + dodoc spamd/PROTOCOL + for f in doc/*.html; do + dodoc $f + done + fi +} + +pkg_postinst() { + perl-module_pkg_postinst + + if ! has_version "dev-perl/DB_File"; then + einfo "The Bayes backend requires the Berkeley DB to store its data. You" + einfo "need to emerge dev-perl/DB_File or USE=berkdb to make it available." + fi + + if has_version "mail-filter/razor"; then + if ! has_version ">=mail-filter/razor-2.61"; then + ewarn "You have $(best_version mail-filter/razor) installed but SpamAssassin" + if has_version "