Version bump upstream

Package-Manager: portage-2.1.1_pre3-r1

4 files changed, 272 insertions, 8 deletions

diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index 67f55b39808e..194970e9be07 100644
--- a/mail-filter/spamassassin/ChangeLog
+++ b/mail-filter/spamassassin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/spamassassin
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.113 2006/08/06 13:07:26 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.114 2006/08/30 20:37:15 mcummings Exp $
+
+*spamassassin-3.1.5 (30 Aug 2006)
+
+  30 Aug 2006; Michael Cummings <mcummings@gentoo.org>
+  +spamassassin-3.1.5.ebuild:
+  Version bump upstream
 
 *spamassassin-3.1.4 (06 Aug 2006)
 
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index d81811d43d2a..a7890c720e3e 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -28,6 +28,7 @@ SHA256 8b5abf70f7aac3ddcf7b258ce693f01dd4691048bb4f40a19c25a92e985321a8 files/sp
 DIST Mail-SpamAssassin-3.1.0.tar.bz2 1012946 RMD160 976d18f76bf804472b24f70a695551c7f1b71d43 SHA1 0185f076f619dd9e64e94b453017f9b08d4b0f04 SHA256 5470943fd57d42feef998ed0eeb59a5eb4bbddd9ad956b4f864fcf47b6a911c4
 DIST Mail-SpamAssassin-3.1.3.tar.bz2 975274 RMD160 a17b5245e577bd1517db40d6d1de50699b0f72b5 SHA1 e1f4489ec8805985e0ca79765bde586bf0286725 SHA256 2170ead06852832166585f8b100150864844f8f2790615dc0c5e9c3778572dd4
 DIST Mail-SpamAssassin-3.1.4.tar.bz2 979302 RMD160 c5c0543827431a1ec0f157c8f09d23fa4f2ac64b SHA1 c764e94a4666c9bcb30b0540183b71e8edef6bb9 SHA256 646a8bc8b7ad70ea9abe003c7b0cad78955bf59558b9900f4249a9b0808ab395
+DIST Mail-SpamAssassin-3.1.5.tar.bz2 992013 RMD160 1afb28b30d5c10b1b34bf6cfb6216b5570dbd36c SHA1 9c9bcf4098c2b3418d5ea9ba69d1dcdfa255a819 SHA256 3265de94a2ca758a584a726630724f2bf1cfdfa8a0088149ad26ab2cf2daa1ed
 EBUILD spamassassin-3.1.0.ebuild 6500 RMD160 855e73b34f75dd247892daeeaedccea6fd5ab140 SHA1 934db3c658b6a365378cdf5af8ff6673e5861333 SHA256 1c5150c0be7fa48f1185bc7c63c6ae05fe930154e4d77ff793178ac36908c5f2
 MD5 925e038959618d5d0a78eed2cc27d4e2 spamassassin-3.1.0.ebuild 6500
 RMD160 855e73b34f75dd247892daeeaedccea6fd5ab140 spamassassin-3.1.0.ebuild 6500
@@ -44,10 +45,14 @@ EBUILD spamassassin-3.1.4.ebuild 7838 RMD160 a02cdd7bf2f78bd49a0b8027f823c18350e
 MD5 12c62d899d666b8c713a01fbb981538a spamassassin-3.1.4.ebuild 7838
 RMD160 a02cdd7bf2f78bd49a0b8027f823c18350e5ac75 spamassassin-3.1.4.ebuild 7838
 SHA256 1b926cee4a4a89e782493a0dbd6655d3f940035b2fd2623b304777f3e4195573 spamassassin-3.1.4.ebuild 7838
-MISC ChangeLog 26664 RMD160 fd8f5529130d79ff5ac740abf1d855d497d1e6d5 SHA1 3403f05ea03456634ce57640eab9c173ca4c2cac SHA256 5ec1f61095878300af2e5c988f5bafc38bc02af35b278d220baf252fc8bad95a
-MD5 3fc784f133e40756066cf60b11131558 ChangeLog 26664
-RMD160 fd8f5529130d79ff5ac740abf1d855d497d1e6d5 ChangeLog 26664
-SHA256 5ec1f61095878300af2e5c988f5bafc38bc02af35b278d220baf252fc8bad95a ChangeLog 26664
+EBUILD spamassassin-3.1.5.ebuild 7859 RMD160 3961490a54163843a40e911649cae7f0699347bf SHA1 e9c5861ecacbad32aba10bcac585f1681ff3fe0f SHA256 fae843f7aae10b1b9d60dbb09cd44f943ed501f97de1ee39e54403d4a1ae961b
+MD5 09faf7b6e122ef4d31f539c608ae9877 spamassassin-3.1.5.ebuild 7859
+RMD160 3961490a54163843a40e911649cae7f0699347bf spamassassin-3.1.5.ebuild 7859
+SHA256 fae843f7aae10b1b9d60dbb09cd44f943ed501f97de1ee39e54403d4a1ae961b spamassassin-3.1.5.ebuild 7859
+MISC ChangeLog 26809 RMD160 73ca54a324838d9aca08f9bc3a1aceb1ee8c6769 SHA1 f66007642cce1508018e41436716bfadfe82ee90 SHA256 1e1c61fb1c8c894918b4a100e17726f5ae07c54dea4241fc8a4e1d0601650683
+MD5 4e8eaae0301dc40fe19c1aea1e68fc15 ChangeLog 26809
+RMD160 73ca54a324838d9aca08f9bc3a1aceb1ee8c6769 ChangeLog 26809
+SHA256 1e1c61fb1c8c894918b4a100e17726f5ae07c54dea4241fc8a4e1d0601650683 ChangeLog 26809
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
@@ -64,10 +69,13 @@ SHA256 f4af93fd5e39b91800c4e6ff5709d6e215b38b6a3497c5564d1249cac437aea8 files/di
 MD5 1670ace34a902f78bc5124fdc57fe9f5 files/digest-spamassassin-3.1.4 274
 RMD160 56e00caa82804a31b6eaf0722d32ab84d4e069a6 files/digest-spamassassin-3.1.4 274
 SHA256 16d403fee5dc471053eee15a8a047599c7edb0314cd7a88d96cac256b8dba2c1 files/digest-spamassassin-3.1.4 274
+MD5 5382ba9b92ffa6df15ece36ae91f3213 files/digest-spamassassin-3.1.5 274
+RMD160 00180e2f0179a76e1156a0100a24bd6f5397bdc9 files/digest-spamassassin-3.1.5 274
+SHA256 063333e6900b289796b0814057ac9683e27f868301ab7e7f53d44b9672896ad6 files/digest-spamassassin-3.1.5 274
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFE1emltG5z4I8BtQoRApHSAJ9ikOtxQAWg09V0LXOsJUyFD4KSAACcDCHV
-a5TUkEjlEj/WMajmMGnOpwc=
-=k5Lz
+iD8DBQFE9fcGtG5z4I8BtQoRAsv2AJ0SzJXc3xOBmNVvUSMOOpAFwVfTPgCeKdHq
+hh9ZzL6oEJBIYs5fmhA9aIM=
+=paAe
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.5 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.5
new file mode 100644
index 000000000000..b91309fb4725
--- /dev/null
+++ b/mail-filter/spamassassin/files/digest-spamassassin-3.1.5
@@ -0,0 +1,3 @@
+MD5 ae8734220ef82bbb1872f64dbf9c0995 Mail-SpamAssassin-3.1.5.tar.bz2 992013
+RMD160 1afb28b30d5c10b1b34bf6cfb6216b5570dbd36c Mail-SpamAssassin-3.1.5.tar.bz2 992013
+SHA256 3265de94a2ca758a584a726630724f2bf1cfdfa8a0088149ad26ab2cf2daa1ed Mail-SpamAssassin-3.1.5.tar.bz2 992013
diff --git a/mail-filter/spamassassin/spamassassin-3.1.5.ebuild b/mail-filter/spamassassin/spamassassin-3.1.5.ebuild
new file mode 100644
index 000000000000..6c9e232a009a
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-3.1.5.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.1.5.ebuild,v 1.1 2006/08/30 20:37:15 mcummings Exp $
+
+inherit perl-module eutils
+
+MY_P=Mail-SpamAssassin-${PV//_/-}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="SpamAssassin is an extensible email filter which is used to identify spam."
+HOMEPAGE="http://spamassassin.apache.org/"
+SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="berkdb qmail ssl doc ldap mysql postgres sqlite tools ipv6"
+
+DEPEND=">=dev-lang/perl-5.8.2-r1
+	virtual/perl-MIME-Base64
+	>=virtual/perl-PodParser-1.32
+	virtual/perl-Storable
+	virtual/perl-Time-HiRes
+	>=dev-perl/HTML-Parser-3.31
+	>=dev-perl/Net-DNS-0.53
+	dev-perl/Digest-SHA1
+	dev-perl/libwww-perl
+	>=dev-perl/Archive-Tar-1.26
+	app-crypt/gnupg
+	dev-perl/IO-Zlib
+	ssl? (
+		dev-perl/IO-Socket-SSL
+		dev-libs/openssl
+	)
+	berkdb? (
+		virtual/perl-DB_File
+	)
+	ldap? ( dev-perl/perl-ldap )
+	mysql? (
+		dev-perl/DBI
+		dev-perl/DBD-mysql
+	)
+	postgres? (
+		dev-perl/DBI
+		dev-perl/DBD-Pg
+	)
+	sqlite? (
+		dev-perl/DBI
+		dev-perl/DBD-SQLite
+	)
+
+	ipv6? (
+		dev-perl/IO-Socket-INET6
+	)"
+
+src_compile() {
+	# - 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=""
+
+	# 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
+
+	# Remove the MANIFEST files as they aren't docu files
+	rm -f MANIFEST*
+
+	use doc && make text_html_doc
+}
+
+src_install () {
+	perl-module_src_install
+
+	# Create the stub dir used by sa-update and friends
+	dodir /var/lib/spamassassin
+
+	# Move spamd to sbin where it belongs.
+	dodir /usr/sbin
+	mv "${D}"/usr/bin/spamd "${D}"/usr/sbin/spamd  || die
+
+	use qmail && dobin spamc/qmail-spamc
+
+	dosym /etc/mail/spamassassin /etc/spamassassin
+
+	# Disable plugin by default
+	sed -i -e 's/^loadplugin/\#loadplugin/g' ${D}/etc/mail/spamassassin/init.pre
+
+	# Add the init and config scripts.
+	newinitd "${FILESDIR}"/3.0.0-spamd.init spamd
+	newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd
+
+	if use doc; then
+		dodoc NOTICE TRADEMARK CREDITS INSTALL UPGRADE BUGS USAGE \
+		sql/README.bayes sql/README.awl README.ldap procmailrc.example \
+		sample-nonspam.txt sample-spam.txt rules/STATISTICS-set0.txt \
+		STATISTICS-set1.txt STATISTICS-set2.txt STATISTICS-set3.txt \
+		spamd/PROTOCOL
+
+		# Rename some docu files so they don't clash with others
+		newdoc spamd/README README.spamd
+		newdoc sql/README README.sql
+		newdoc ldap/README README.ldap
+		use qmail && newdoc spamc/README.qmail README.qmail
+
+		dohtml doc/*.html
+		docinto sql
+		dodoc sql/*.sql
+	fi
+
+	# Install provided tools. See bug 108168
+	if use tools; then
+		docinto tools
+		dodoc tools/*
+	fi
+
+	cp ${FILESDIR}/secrets.cf ${D}/etc/mail/spamassassin/secrets.cf.example
+	fperms 0400 /etc/mail/spamassassin/secrets.cf.example
+	echo "">>${D}/etc/mail/spamassassin/local.cf.example
+	echo "# Sensitive data, such as database connection info, should">>${D}/etc/mail/spamassassin/local.cf.example
+	echo "# be stored in /etc/mail/spamassassin/secrets.cf with">>${D}/etc/mail/spamassassin/local.cf.example
+	echo "# appropriate permissions">>${D}/etc/mail/spamassassin/local.cf.example
+}
+
+pkg_postinst() {
+	perl-module_pkg_postinst
+
+	if ! has_version "perl-core/DB_File"; then
+		einfo "The Bayes backend requires the Berkeley DB to store its data. You"
+		einfo "need to emerge perl-core/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
+
+	if use doc; then
+		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
+	fi
+
+	ewarn
+	elog "spamd is not designed to listen to an untrusted network"
+	elog "and is vulnerable to DoS attacks (and eternal doom) if"
+	elog "configured to do so"
+	ewarn
+	elog "If you plan on using the -u flag to spamd, please read the notes"
+	elog "in /etc/conf.d/spamd regarding the location of the pid file."
+
+	einfo
+	elog "If you build ${PN} with optional dependancy support,"
+	elog "you can enable them in /etc/mail/spamassassin/init.pre"
+
+	if has_version '>=dev-lang/perl-5.8.8'; then
+		elog "A not from the SA developers:"
+		elog "Perl 5.8 now uses Unicode internally by default, which causes trouble for"
+		elog "SpamAssassin (and almost all other reasonably complex pieces of perl"
+		elog "code!)."
+		elog ""
+		elog "We've worked around this in most places, as far as we know, but there may"
+		elog "still be some issues.  In addition, there is a speed hit, which it would"
+		elog "be nice to avoid."
+		elog ""
+		elog "Setting the LANG environment variable before any invocation of"
+		elog "SpamAssassin sometimes seems to help fix it, like so:"
+		elog ""
+		elog "  export LANG=en_US"
+		elog ""
+		elog "Notably, the LANG setting must not include \"utf8\".   However, some folks"
+		elog "have reported that this makes no difference. ;)"
+	fi
+	einfo
+	if ! has_version 'dev-perl/Mail-SPF-Query'; then
+		elog "For spf support, please emerge dev-perl/Mail-SPF-Query"
+	fi
+	if ! has_version 'mail-filter/dcc'; then
+		elog "For dcc support, please emerge mail-filter/dcc"
+	fi
+	if ! has_version 'dev-python/pyzor'; then
+		elog "For pyzor support, please emerge dev-python/pyzor"
+	fi
+	if ! has_version 'mail-filter/razor'; then
+		elog "For razor support, please emerge mail-filter/razor"
+	fi
+	einfo
+	elog "For addtional functionality, you may wish to emerge:"
+	elog "dev-perl/IP-Country       dev-perl/Net-Ident "
+	elog "dev-perl/Mail-DomainKeys"
+
+}