Dep fixes; tests are still failing on some platforms, opened upstream bug 5524 on the SA bugzilla

Package-Manager: portage-2.1.2.9

4 files changed, 280 insertions, 8 deletions

diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index 8688ee7364f4..4da5fe0ecc35 100644
--- a/mail-filter/spamassassin/ChangeLog
+++ b/mail-filter/spamassassin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/spamassassin
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.141 2007/06/18 07:19:16 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.142 2007/06/18 19:37:00 mcummings Exp $
+
+*spamassassin-3.2.1-r1 (18 Jun 2007)
+
+  18 Jun 2007; Michael Cummings <mcummings@gentoo.org>
+  +spamassassin-3.2.1-r1.ebuild:
+  Dep fixes; tests are still failing on some platforms, opened upstream bug
+  5524 on the SA bugzilla
 
 *spamassassin-3.2.1 (18 Jun 2007)
 
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 110aa6f84a5e..4109cd784e51 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -36,14 +36,18 @@ EBUILD spamassassin-3.2.0.ebuild 7916 RMD160 c6cb7831b3d3708b9e3972b6d9122b5fd7e
 MD5 23884cfa7d148ed792a1227e4855aaeb spamassassin-3.2.0.ebuild 7916
 RMD160 c6cb7831b3d3708b9e3972b6d9122b5fd7e508e9 spamassassin-3.2.0.ebuild 7916
 SHA256 44b9945621355c6c3d468d8ddeb2d57dc6df2a1492e98c919469a1291a608d61 spamassassin-3.2.0.ebuild 7916
+EBUILD spamassassin-3.2.1-r1.ebuild 7939 RMD160 5aff18b73b670de83977c81416f99f1474600728 SHA1 ac0066a60bdfecc4189a394fd17a150fb295b3c7 SHA256 7abbe77b597e550c89226e7c3ccb4df1b0c56ed77450927bbdfe958947ff9552
+MD5 dd5eae6320557f0486681420224147f2 spamassassin-3.2.1-r1.ebuild 7939
+RMD160 5aff18b73b670de83977c81416f99f1474600728 spamassassin-3.2.1-r1.ebuild 7939
+SHA256 7abbe77b597e550c89226e7c3ccb4df1b0c56ed77450927bbdfe958947ff9552 spamassassin-3.2.1-r1.ebuild 7939
 EBUILD spamassassin-3.2.1.ebuild 7933 RMD160 c529f8bab261f1edc880360f4e94852fa68c9aa5 SHA1 e20c9a025358edbd5e67e15201ab40741c87ccca SHA256 07e3d4458272a4f3ab2829945d46da5a062eb44c22581dbfce70c4e968a65670
 MD5 853c84a88431ee75185bef2a4281d10f spamassassin-3.2.1.ebuild 7933
 RMD160 c529f8bab261f1edc880360f4e94852fa68c9aa5 spamassassin-3.2.1.ebuild 7933
 SHA256 07e3d4458272a4f3ab2829945d46da5a062eb44c22581dbfce70c4e968a65670 spamassassin-3.2.1.ebuild 7933
-MISC ChangeLog 30636 RMD160 b4e9880645d3fb7234efc43f5ec639999f31a59b SHA1 7efaa8c93fe8d6295ff8b2378c8fccf7c95372d4 SHA256 3a8ad6b8ac95b1d1f07ed01cb98fb7b0d617ab29f5de1a851387d1c85ab1324c
-MD5 9b044865dfc2f95a6e5e170032a0463c ChangeLog 30636
-RMD160 b4e9880645d3fb7234efc43f5ec639999f31a59b ChangeLog 30636
-SHA256 3a8ad6b8ac95b1d1f07ed01cb98fb7b0d617ab29f5de1a851387d1c85ab1324c ChangeLog 30636
+MISC ChangeLog 30865 RMD160 ec4c0dc66d998d0d01d36c3710cfdbedc9b9e58d SHA1 7bad96d063d224b37a409249f368878dbc3dbf0f SHA256 e2bdc1be85d9c3f20a0a66322c0641e612e503a82ed08d7c00eaec43076031f7
+MD5 941a64625c2e0e83c427f43cd43e98f3 ChangeLog 30865
+RMD160 ec4c0dc66d998d0d01d36c3710cfdbedc9b9e58d ChangeLog 30865
+SHA256 e2bdc1be85d9c3f20a0a66322c0641e612e503a82ed08d7c00eaec43076031f7 ChangeLog 30865
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
@@ -63,10 +67,13 @@ SHA256 ace871103fda5cd2648fc510eed3d8b5eb2929c8b1d138667b4f38f2a47170dd files/di
 MD5 e84cda69451c9b16d8cc53e22e07e3a1 files/digest-spamassassin-3.2.1 274
 RMD160 8ab0a09c4714e16f74f08f255b0438a5762056a1 files/digest-spamassassin-3.2.1 274
 SHA256 2feb469b636e7aca19c64bb33f8dfd3477e811dbabf05a7672a2f231bbf3faf5 files/digest-spamassassin-3.2.1 274
+MD5 e84cda69451c9b16d8cc53e22e07e3a1 files/digest-spamassassin-3.2.1-r1 274
+RMD160 8ab0a09c4714e16f74f08f255b0438a5762056a1 files/digest-spamassassin-3.2.1-r1 274
+SHA256 2feb469b636e7aca19c64bb33f8dfd3477e811dbabf05a7672a2f231bbf3faf5 files/digest-spamassassin-3.2.1-r1 274
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGdjH6tG5z4I8BtQoRAjRNAJ9j6DzmpyoGJSlzjc/M49C9dx3RHwCbB6sm
-r79nQCVEL30RVJ2zgpfjlxs=
-=VSq5
+iD8DBQFGdt7htG5z4I8BtQoRAlY+AJ9Cfh+qZofssG0zwriU5qUavGyF8QCePUsP
+1m/Y6zXzOjNKceWr1XVf1t0=
+=+T5L
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.2.1-r1 b/mail-filter/spamassassin/files/digest-spamassassin-3.2.1-r1
new file mode 100644
index 000000000000..3943a6fd2c83
--- /dev/null
+++ b/mail-filter/spamassassin/files/digest-spamassassin-3.2.1-r1
@@ -0,0 +1,3 @@
+MD5 7b2fdbcdca5e9a181d4bb1b17663c138 Mail-SpamAssassin-3.2.1.tar.bz2 981918
+RMD160 508e9aae2705d1caaeba78720ba78b6385a6e237 Mail-SpamAssassin-3.2.1.tar.bz2 981918
+SHA256 bccd0ecf00c3bc6bbcbe4a5eaa486e0db7dc755076130a66c935ec50b3fa8b3c Mail-SpamAssassin-3.2.1.tar.bz2 981918
diff --git a/mail-filter/spamassassin/spamassassin-3.2.1-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..f6ec76ca09a3
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-3.2.1-r1.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.2.1-r1.ebuild,v 1.1 2007/06/18 19:37:00 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"
+
+SRC_TEST="do"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~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.43
+	>=dev-perl/Net-DNS-0.53
+	dev-perl/Digest-SHA1
+	dev-perl/libwww-perl
+	dev-perl/Tie-Cache
+	>=dev-perl/Archive-Tar-1.26
+	app-crypt/gnupg
+	>=dev-perl/IO-Zlib-1.04
+	>=dev-util/re2c-0.12.0
+	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_test
+}
+
+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
+	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"
+	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
+	einfo "If you build ${PN} with optional dependancy support,"
+	einfo "you can enable them in /etc/mail/spamassassin/init.pre"
+	einfo
+
+	if has_version '>=dev-lang/perl-5.8.8'; then
+		elog "A note 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-DKIM"
+
+}