New SA, closes bug 125899, opens bug 126772, 126673, 126674, 126675, 126678, 126679, 126680, 126683, 126684, 126685. Joy

Package-Manager: portage-2.1_pre6-r1

5 files changed, 302 insertions, 7 deletions

diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index fb49be8582e6..a6d727ab1a3b 100644
--- a/mail-filter/spamassassin/ChangeLog
+++ b/mail-filter/spamassassin/ChangeLog
@@ -1,6 +1,13 @@
 # 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.91 2006/03/14 01:55:33 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.92 2006/03/18 17:20:38 mcummings Exp $
+
+*spamassassin-3.1.1 (18 Mar 2006)
+
+  18 Mar 2006; Michael Cummings <mcummings@gentoo.org>
+  files/3.0.0-spamd.conf, +spamassassin-3.1.1.ebuild:
+  New SA, closes bug 125899, opens bug 126772, 126673, 126674, 126675, 126678,
+  126679, 126680, 126683, 126684, 126685. Joy
 
   14 Mar 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   spamassassin-3.1.0-r1.ebuild, spamassassin-3.1.0-r2.ebuild:
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index cc82e02d9414..4a4db2180b0a 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -1,25 +1,61 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 06ab55d62fd560962f9b59564c6e926d ChangeLog 23466
-MD5 6eab480d5d7178685422567dcef9d9ef files/3.0.0-spamd.conf 1427
+MD5 f73eb1533388e237590aba0a3aa66da5 ChangeLog 23737
+RMD160 f664fccc0960ce6f8a2c72ef590c16a215dd6259 ChangeLog 23737
+SHA256 2d1d3f4263b39e9c659d0016bc02d73b18eb63b7f3082d5162fd7acd0a0294b6 ChangeLog 23737
+MD5 cde41d7639fa7e7077f1c74fef8a4ed2 files/3.0.0-spamd.conf 1528
+RMD160 92bbeb8d14ada234e9001cae914055b2d2cb69aa files/3.0.0-spamd.conf 1528
+SHA256 bf6dfce0e63813da4b900987826780d4bede9a1f5cc8324e3b96bce30dfe5158 files/3.0.0-spamd.conf 1528
 MD5 13c538208e1f991a44a30a8bce130fa8 files/3.0.0-spamd.init 738
+RMD160 bcc78fcfcf783411790f8b9f62a58a45a91c126d files/3.0.0-spamd.init 738
+SHA256 15d8d35f4d4043f31b4db1de40183a375d789918cd7bb645edc5b65f5c5ebf37 files/3.0.0-spamd.init 738
 MD5 4783482f6c574067f3c8fa48e3202fae files/digest-spamassassin-3.0.4 76
+RMD160 b7b5e479085c42b5b0a30bd5df858ad10f88b541 files/digest-spamassassin-3.0.4 76
+SHA256 6a52b28213070af05b519aaea3f9c8e5bd711c9e209535ce12c4d9c665201497 files/digest-spamassassin-3.0.4 76
 MD5 9d87182bab72ef8b6ae97fe0ab22f5d1 files/digest-spamassassin-3.1.0 77
+RMD160 07c03d38776ded5214aeca7e878438aeb3bd265f files/digest-spamassassin-3.1.0 77
+SHA256 305c4f8214445e20b3bbd8f4a21c45673da5461470c21f98c51b98b77d442258 files/digest-spamassassin-3.1.0 77
 MD5 9d87182bab72ef8b6ae97fe0ab22f5d1 files/digest-spamassassin-3.1.0-r1 77
+RMD160 07c03d38776ded5214aeca7e878438aeb3bd265f files/digest-spamassassin-3.1.0-r1 77
+SHA256 305c4f8214445e20b3bbd8f4a21c45673da5461470c21f98c51b98b77d442258 files/digest-spamassassin-3.1.0-r1 77
 MD5 d6f2ad1930ee7a36de0443fa6656ec88 files/digest-spamassassin-3.1.0-r2 277
+RMD160 005ad7ec092992819f493d1743a3be5dfb4ed782 files/digest-spamassassin-3.1.0-r2 277
+SHA256 265d522d398492e085649c9af06ab47b0d8dbb099e7684889f285a68bc79c2d4 files/digest-spamassassin-3.1.0-r2 277
+MD5 415094f6195c81f5c47aaee049ff7227 files/digest-spamassassin-3.1.1 274
+RMD160 d824ef6e600dd68cef91d6040369c8cf86f8df2f files/digest-spamassassin-3.1.1 274
+SHA256 27b1a488f7058c7bdbef88fb4db129bf01b41a2be392fb7afa3a151bb7b3fba6 files/digest-spamassassin-3.1.1 274
 MD5 d3b6df49d772fdf4425d4c2376bc7173 files/secrets.cf 664
+RMD160 afb1212a464bd7053c1301c1a1e670b73216528a files/secrets.cf 664
+SHA256 9f134c7b857b21689f612fc6d131f719e5a65e2ba341b282e7aa57402c854139 files/secrets.cf 664
 MD5 66f6531ea3b0a382b4d97bd1234c43a1 files/spamd.conf 604
+RMD160 b93b367d735801e0d6c30ba41daa749555238e00 files/spamd.conf 604
+SHA256 2d91fde46ccc70fc157824e9fca564f398ddf8e7d75526bc26d390df02b389cc files/spamd.conf 604
 MD5 9ab5a9bd40752148b4cb0982dd1a5581 files/spamd.init 617
+RMD160 4624c79222ba863dc68e88a13f3de6bb0d579f89 files/spamd.init 617
+SHA256 8b5abf70f7aac3ddcf7b258ce693f01dd4691048bb4f40a19c25a92e985321a8 files/spamd.init 617
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
+SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca metadata.xml 305
 MD5 454b9e640791a53f159cf2cfd5f246bd spamassassin-3.0.4.ebuild 6567
+RMD160 b0eb899403e30dd54c31bc5374c15a769fb0edd5 spamassassin-3.0.4.ebuild 6567
+SHA256 66777c179c3425bbf6cd6df076ef8d7b28d09e7dce249e4a311235f8c203db53 spamassassin-3.0.4.ebuild 6567
 MD5 5a1429650c999fd901d0bd156f522797 spamassassin-3.1.0-r1.ebuild 6737
+RMD160 9192f1c8facf0f4d87d271f5cacfeaa55ad5e905 spamassassin-3.1.0-r1.ebuild 6737
+SHA256 66d6b428675c6bfefc4a053d34156d0b6ed115f6a2cf3986be3e61b8e78a941f spamassassin-3.1.0-r1.ebuild 6737
 MD5 c415f6600f4680f9fa0a07d8b30f9444 spamassassin-3.1.0-r2.ebuild 6836
+RMD160 dfc676c21f12460df64fefedf2b01ada83742a6a spamassassin-3.1.0-r2.ebuild 6836
+SHA256 a4ee5488f45cc1fd47d5a21d7874e71c5e8fdb784a3d4bda372757267030b4ec spamassassin-3.1.0-r2.ebuild 6836
 MD5 91b5e033bc40ed39ff378042862c2d58 spamassassin-3.1.0.ebuild 6548
+RMD160 801803b399ce703eaa5b3a34c91c4f6558e85b6d spamassassin-3.1.0.ebuild 6548
+SHA256 347b9f65d79dcebf5b1703c833d5de47f737746bfc22fa8e2aad477678bc6af3 spamassassin-3.1.0.ebuild 6548
+MD5 8a88a758de510058c9e6091d455385ff spamassassin-3.1.1.ebuild 7494
+RMD160 5ac74fbe66a2da5c449daeb064c94ba661df0187 spamassassin-3.1.1.ebuild 7494
+SHA256 ad7dc988afee467faae5e2ad6de0076e57decf57bdae79d138760391d958c650 spamassassin-3.1.1.ebuild 7494
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFEFiKqKRy60XGEcJIRAtvDAKCdLkDp9cU61ERCbSrWKe3tm0eYWwCfZSyE
-9dFlpTe1+0pJEMPV6mh24RM=
-=JcYm
+iD8DBQFEHEFhtG5z4I8BtQoRAnUzAKCUIEINssjGE70FurZIu8Jk9r2VngCePMqj
+AfAjCtgH5+WRpjmfGlbaH50=
+=ascS
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/spamassassin/files/3.0.0-spamd.conf b/mail-filter/spamassassin/files/3.0.0-spamd.conf
index 8c346a5afcd3..e2cefb74968e 100644
--- a/mail-filter/spamassassin/files/3.0.0-spamd.conf
+++ b/mail-filter/spamassassin/files/3.0.0-spamd.conf
@@ -39,3 +39,8 @@ SPAMD_OPTS="-m 5 -c -H"
 # run spamd under another user, you might need to adjust it.
 
 PIDFILE="/var/run/spamd.pid"
+
+# SAPMD_NICELEVEL let's you set the 'nice'ness of the running 
+# spamd process
+
+# SPAMD_NICELEVEL=5
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.1 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.1
new file mode 100644
index 000000000000..ed1f2c2ccf4e
--- /dev/null
+++ b/mail-filter/spamassassin/files/digest-spamassassin-3.1.1
@@ -0,0 +1,3 @@
+MD5 33bc2bef2619135125ccf3b5a663be1d Mail-SpamAssassin-3.1.1.tar.bz2 974527
+RMD160 811a00bd79bb4d6c35cf107f3a67f60f488795fd Mail-SpamAssassin-3.1.1.tar.bz2 974527
+SHA256 edcb4adca3e28914bb59b44c320e1139f133535928cd6dfaaa50d128ecce812f Mail-SpamAssassin-3.1.1.tar.bz2 974527
diff --git a/mail-filter/spamassassin/spamassassin-3.1.1.ebuild b/mail-filter/spamassassin/spamassassin-3.1.1.ebuild
new file mode 100644
index 000000000000..123a13b0d5a9
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-3.1.1.ebuild
@@ -0,0 +1,244 @@
+# 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.1.ebuild,v 1.1 2006/03/18 17:20:38 mcummings Exp $
+
+inherit perl-module
+
+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 ~ppc ~ppc64 ~sparc ~x86 ~mips"
+KEYWORDS="~sparc ~x86"
+IUSE="berkdb qmail ssl doc ldap mysql postgres sqlite spf tools dcc pyzor razor extramodules 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
+	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
+	)
+	spf? (
+		dev-perl/Mail-SPF-Query
+	)
+
+	pyzor? (
+		dev-python/pyzor
+	)
+	razor? (
+		mail-filter/razor
+	)
+	dcc? (
+		mail-filter/dcc
+	)
+	extramodules? (
+		dev-perl/IP-Country
+		dev-perl/Net-Ident
+		dev-perl/Mail-DomainKeys
+	)
+	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
+	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
+	ewarn "If you plan on using the -u flag to spamd, please read the notes"
+	ewarn "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"
+
+	if has_version '>=dev-lang/perl-5.8.8'; then
+		ewarn "Perl 5.8 now uses Unicode internally by default, which causes trouble for"
+		ewarn "SpamAssassin (and almost all other reasonably complex pieces of perl"
+		ewarn" code!)."
+		echo ""
+		ewarn "We've worked around this in most places, as far as we know, but there may"
+		ewarn "still be some issues.  In addition, there is a speed hit, which it would"
+		ewarn "be nice to avoid."
+		echo ""
+		ewarn "Setting the LANG environment variable before any invocation of"
+		ewarn "SpamAssassin sometimes seems to help fix it, like so:"
+		echo ""
+		ewarn "  export LANG=en_US"
+		echo ""
+		ewarn "Notably, the LANG setting must not include \"utf8\".   However, some folks"
+		ewarn "have reported that this makes no difference. ;)"
+	fi
+}