diff options
author | Michael Cummings <mcummings@gentoo.org> | 2004-10-26 23:39:42 +0000 |
---|---|---|
committer | Michael Cummings <mcummings@gentoo.org> | 2004-10-26 23:39:42 +0000 |
commit | f8d6c3d7770d7a25b2576f9e66fe5ab363d3b264 (patch) | |
tree | b8c75d2f584b8f8133ff1beeb1a09c4941bc12e3 /mail-filter | |
parent | make.defaults (diff) | |
download | gentoo-2-f8d6c3d7770d7a25b2576f9e66fe5ab363d3b264.tar.gz gentoo-2-f8d6c3d7770d7a25b2576f9e66fe5ab363d3b264.tar.bz2 gentoo-2-f8d6c3d7770d7a25b2576f9e66fe5ab363d3b264.zip |
bug 68841 (&& 64133?)
Diffstat (limited to 'mail-filter')
-rw-r--r-- | mail-filter/spamassassin/ChangeLog | 12 | ||||
-rw-r--r-- | mail-filter/spamassassin/Manifest | 22 | ||||
-rw-r--r-- | mail-filter/spamassassin/files/digest-spamassassin-3.0.1 | 1 | ||||
-rw-r--r-- | mail-filter/spamassassin/spamassassin-2.63-r1.ebuild | 4 | ||||
-rw-r--r-- | mail-filter/spamassassin/spamassassin-2.63.ebuild | 4 | ||||
-rw-r--r-- | mail-filter/spamassassin/spamassassin-2.64.ebuild | 4 | ||||
-rw-r--r-- | mail-filter/spamassassin/spamassassin-3.0.1.ebuild | 201 |
7 files changed, 226 insertions, 22 deletions
diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog index 4fd454001b1a..1a401b0fca17 100644 --- a/mail-filter/spamassassin/ChangeLog +++ b/mail-filter/spamassassin/ChangeLog @@ -1,6 +1,16 @@ # 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.16 2004/09/28 01:04:08 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.17 2004/10/26 23:39:42 mcummings Exp $ + + 26 Oct 2004; Michael Cummings <mcummings@gentoo.org> : + Bug 68841. - excessive memory-usage fixes - bug fixed which stopped DCC, Pyzor + working with amavisd - deprecate RCVD_IN_RFC_IPWHOIS - user_prefs were staying + active between different spamd users, fixed - user_prefs blacklist entries + were not working in spamd, fixed - excessive time and memory consumption when + ok_languages is used, fixed - sa-learn -u switch to specify the username for + virtual environments - avoid bug in Sys::Hostname::Long that renames the + hostname when "make test" is run - whitelist the top 125 queried SURBL domains + common in nonspam 28 Sep 2004; Sven Wegener <swegener@gentoo.org> files/3.0.0-spamd.init: Gentoo Technologies, Inc. -> Gentoo Foundation diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest index 0c106862c6ee..ed45a0004aad 100644 --- a/mail-filter/spamassassin/Manifest +++ b/mail-filter/spamassassin/Manifest @@ -1,26 +1,18 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 c840524c434a3b9449ad4d0ac674fcf2 ChangeLog 10019 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305 MD5 07be834b0dbedbb5f91170c18dd22c1f spamassassin-2.63-r1.ebuild 2401 MD5 977dc4b389deafd70daf9fd67c796b06 spamassassin-2.63.ebuild 2293 MD5 205e042f0bd8a0cac7df1b17ff5b8aa5 spamassassin-2.64.ebuild 2505 -MD5 c607c46288451f185dc1c3a769e10fa8 spamassassin-3.0.0.ebuild 5799 MD5 2a3d10825088e74b85c07939be66c34b spamassassin-3.0.0-r1.ebuild 5602 +MD5 c607c46288451f185dc1c3a769e10fa8 spamassassin-3.0.0.ebuild 5799 +MD5 7a80d564e4f777afacb253b7b467fb52 spamassassin-3.0.1.ebuild 5609 +MD5 4b17c303c2a11eab455003b92cd1851a files/3.0.0-spamd.conf 596 +MD5 33f67831957d640746a374b8774e7d2d files/3.0.0-spamd.init 667 MD5 2bc962fe7cbd5fc24b6ca7703a498e83 files/digest-spamassassin-2.63 75 MD5 2bc962fe7cbd5fc24b6ca7703a498e83 files/digest-spamassassin-2.63-r1 75 MD5 6a161feb8320fadb55f440aab192d008 files/digest-spamassassin-2.64 75 -MD5 1ed9c6ddcb224ed5d2ad37aab7c0cce9 files/spamd.conf 265 -MD5 90925e8f6521add45f8a727ed982e61a files/spamd.init 645 -MD5 4b17c303c2a11eab455003b92cd1851a files/3.0.0-spamd.conf 596 -MD5 33f67831957d640746a374b8774e7d2d files/3.0.0-spamd.init 667 MD5 7d4ce834279c9e36320d114a7118c127 files/digest-spamassassin-3.0.0 76 MD5 7d4ce834279c9e36320d114a7118c127 files/digest-spamassassin-3.0.0-r1 76 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFBcSoYtG5z4I8BtQoRApg/AKCLl7Uea41lPDBYx0wQUP0LfWWEMQCfSCH1 -PASEvDpO7T8CbJEaFn+hSxA= -=EK11 ------END PGP SIGNATURE----- +MD5 1ed9c6ddcb224ed5d2ad37aab7c0cce9 files/spamd.conf 265 +MD5 90925e8f6521add45f8a727ed982e61a files/spamd.init 645 +MD5 37be9f25f104cf5e5ad47b37351c7900 files/digest-spamassassin-3.0.1 76 diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.0.1 b/mail-filter/spamassassin/files/digest-spamassassin-3.0.1 new file mode 100644 index 000000000000..b765ad453b96 --- /dev/null +++ b/mail-filter/spamassassin/files/digest-spamassassin-3.0.1 @@ -0,0 +1 @@ +MD5 83f60f97c823d9b8df19309247fe33eb Mail-SpamAssassin-3.0.1.tar.bz2 843720 diff --git a/mail-filter/spamassassin/spamassassin-2.63-r1.ebuild b/mail-filter/spamassassin/spamassassin-2.63-r1.ebuild index 33a1176e391a..b7c524e754af 100644 --- a/mail-filter/spamassassin/spamassassin-2.63-r1.ebuild +++ b/mail-filter/spamassassin/spamassassin-2.63-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-2.63-r1.ebuild,v 1.3 2004/07/22 02:50:19 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-2.63-r1.ebuild,v 1.4 2004/10/26 23:39:42 mcummings Exp $ inherit perl-module @@ -11,7 +11,7 @@ DESCRIPTION="Perl Mail::SpamAssassin - A program to filter spam" HOMEPAGE="http://spamassassin.org/" SRC_URI="http://spamassassin.org/released/${MY_P}.tar.bz2" -LICENSE="GPL-2 | Artistic" +LICENSE="|| ( GPL-2 Artistic )" SLOT="0" KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~ia64 ~amd64 ppc64" IUSE="berkdb ssl" diff --git a/mail-filter/spamassassin/spamassassin-2.63.ebuild b/mail-filter/spamassassin/spamassassin-2.63.ebuild index f47c2de2d4f8..7d370e5fdf78 100644 --- a/mail-filter/spamassassin/spamassassin-2.63.ebuild +++ b/mail-filter/spamassassin/spamassassin-2.63.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-2.63.ebuild,v 1.4 2004/06/24 22:22:23 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-2.63.ebuild,v 1.5 2004/10/26 23:39:42 mcummings Exp $ inherit perl-module @@ -11,7 +11,7 @@ DESCRIPTION="Perl Mail::SpamAssassin - A program to filter spam" HOMEPAGE="http://spamassassin.org/" SRC_URI="http://spamassassin.org/released/${MY_P}.tar.bz2" -LICENSE="GPL-2 | Artistic" +LICENSE="|| ( GPL-2 Artistic )" SLOT="0" KEYWORDS="x86 ppc sparc alpha hppa ~mips ia64 amd64" IUSE="berkdb ssl" diff --git a/mail-filter/spamassassin/spamassassin-2.64.ebuild b/mail-filter/spamassassin/spamassassin-2.64.ebuild index 653d461ac702..f19197986053 100644 --- a/mail-filter/spamassassin/spamassassin-2.64.ebuild +++ b/mail-filter/spamassassin/spamassassin-2.64.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-2.64.ebuild,v 1.8 2004/09/26 05:27:13 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-2.64.ebuild,v 1.9 2004/10/26 23:39:42 mcummings Exp $ inherit perl-module @@ -11,7 +11,7 @@ DESCRIPTION="Perl Mail::SpamAssassin - A program to filter spam" HOMEPAGE="http://spamassassin.org/" SRC_URI="http://old.spamassassin.org/released/${MY_P}.tar.bz2" -LICENSE="GPL-2 | Artistic" +LICENSE="|| ( GPL-2 Artistic )" SLOT="0" KEYWORDS="x86 ppc sparc ~mips alpha hppa amd64 ia64 ppc64" IUSE="berkdb ssl" diff --git a/mail-filter/spamassassin/spamassassin-3.0.1.ebuild b/mail-filter/spamassassin/spamassassin-3.0.1.ebuild new file mode 100644 index 000000000000..fe8168a85085 --- /dev/null +++ b/mail-filter/spamassassin/spamassassin-3.0.1.ebuild @@ -0,0 +1,201 @@ +# 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.1 2004/10/26 23:39:42 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 +# <http://bugs.gentoo.org/show_bug.cgi?id=62276> +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. +# <http://bugzilla.spamassassin.org/show_bug.cgi?id=2511> and +# <http://spamassassin.org/released/Razor2.patch>. +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 "<mail-filter/razor-2.40"; then + ewarn "requires at least version 2.40, version 2.61 or later is recommended." + else + ewarn "recommends at least version 2.61." + fi + fi + fi + + einfo + einfo "Please read the file" + einfo " /usr/share/doc/${PF}/INSTALL.gz" + einfo "to find out which optional modules you need to install to enable" + einfo "additional features which depend on them." + einfo + einfo "If upgraded from 2.x, please read the file" + einfo " /usr/share/doc/${PF}/UPGRADE.gz" + einfo +} + |