Version bump #228557, fix quoting and add GLEP 56 USE flag desc from use.local.desc

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r7 x86_64

4 files changed, 276 insertions, 9 deletions

diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index 13814634513d..1a9908a6c631 100644
--- a/mail-filter/spamassassin/ChangeLog
+++ b/mail-filter/spamassassin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/spamassassin
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.158 2008/05/14 21:25:56 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.159 2008/08/17 16:20:11 dertobi123 Exp $
+
+*spamassassin-3.2.5 (17 Aug 2008)
+
+  17 Aug 2008; Tobias Scherbaum <dertobi123@gentoo.org> metadata.xml,
+  +spamassassin-3.2.5.ebuild:
+  Version bump #228557, fix quoting and add GLEP 56 USE flag desc from
+  use.local.desc
 
   14 May 2008; Stefan Briesenick <sbriesen@gentoo.org>
   files/3.0.0-spamd.init:
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 31e488c7a08f..27ec197ba5cb 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -10,6 +10,7 @@ DIST Mail-SpamAssassin-3.2.1.tar.bz2 981918 RMD160 508e9aae2705d1caaeba78720ba78
 DIST Mail-SpamAssassin-3.2.2.tar.bz2 989555 RMD160 663a4e21e824bbdaa99f34c5155869a9cb3f098a SHA1 6dfaa36eb8e500f9315cf2461fbd3229ae92a2c7 SHA256 32797587da66214c7453bc0ae102b53cec9a0f5dc27a326cfab5bf96f6e0d69a
 DIST Mail-SpamAssassin-3.2.3.tar.bz2 993369 RMD160 208671bcfe6ccfffb79072991bbf3893928a40cf SHA1 53199e0218d2f93043fcdca4db3f164f1f9f7cbc SHA256 a675c91bd005a739891aeb9d6138bb43ba4e9b31407d9d69e41e6a6980f7a680
 DIST Mail-SpamAssassin-3.2.4.tar.bz2 1007497 RMD160 9523a5d3fad86b65743c3818b8a10b6af66a6323 SHA1 876fc328a2b6192fa0bb8d7f6926214716178417 SHA256 29f7bdac4a535b4ea668112d0d85e14befed618b21d770f2065be197bcedf7b2
+DIST Mail-SpamAssassin-3.2.5.tar.bz2 1011883 RMD160 444baab6d966d4366834b82cde34c81e3e521144 SHA1 32b701ffc68f7975eded107c456b902bc710d8b2 SHA256 baaab5e4da7d3b0e04c0db579bdb44bbd6be916d29540682346eccead23f6c8a
 EBUILD spamassassin-3.1.8-r1.ebuild 8085 RMD160 58b2b4cbdf8c57a7200afa09353e1da189f8a641 SHA1 f2ecad25e1d6ab9480787e8c48eb76255561f3ab SHA256 12e91a72687c6ccf65cd34917722dc7b97ce0fc5115e6a73d64a1ef78f6c12e6
 EBUILD spamassassin-3.1.8.ebuild 7932 RMD160 08661f01aed67ded5918a23d16785329175edfb9 SHA1 f16da9dc7cf7cdf755a68440c91fe2001cf3a325 SHA256 34a1231669006bbd436138a38736a78ae2a3922e250b27bb5ae65d89a8f20493
 EBUILD spamassassin-3.2.0-r1.ebuild 7948 RMD160 c1de17f70d3e265d3a5df63d75296c43a648840c SHA1 70b71e386984383416426f7bf42e4ba6e2d74a75 SHA256 4d6585c69352cc158ce1eb0122ef19da195576c8693b20c0e7305805ce680b1c
@@ -19,5 +20,6 @@ EBUILD spamassassin-3.2.1.ebuild 7907 RMD160 3cd89b296a57adee3e55ab31481d47ccbf0
 EBUILD spamassassin-3.2.2.ebuild 8159 RMD160 8100bfae9e404405c4f3a5b992f4555cf69f0e6e SHA1 fca44d73b8846f5112e93e20d1b93557eaed26b3 SHA256 fece6aa2dcd38f2efb13feb9a1aafddfb046152933020098183a612a2191a25c
 EBUILD spamassassin-3.2.3.ebuild 7988 RMD160 3dc5f27d6d50f8b9e9e4dc40987d082dd59b5da6 SHA1 2ff01b85b47d771a685c97e5597f6322edcf218d SHA256 8106dec0e77c13be5f450cf0fb836783ecdd2e2bd26ec22c9a645ec574a7f3d8
 EBUILD spamassassin-3.2.4.ebuild 7988 RMD160 b946f0856da5ab5626e78fd83a9699213904aea7 SHA1 5b98d8c269dead25fdae10ac8825de13397abd60 SHA256 8a65718afda18aba6e5057a3a5bea82417ba29b6d3ac8dbb10541ed710dc6565
-MISC ChangeLog 33362 RMD160 b81af0f69fcf05be5ec9e9e87e2265ed15d3aac8 SHA1 c6868c7062788fac0a0b1112b01bd1f29ee962fc SHA256 603b9c8216cff452b87c48adebbf64593e1fc1a0f20fe4e7bb7226ce15683dac
-MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
+EBUILD spamassassin-3.2.5.ebuild 8001 RMD160 d761e0cda62607ee34f97cd6c1ccea5871615a1b SHA1 bb82c1f3a79e94633fe20a7213a92bacdb7f561a SHA256 a639b59f38713085c60446c7f2166c02e2ed0c5615824c23ae86c298a2ebf64a
+MISC ChangeLog 33588 RMD160 9d6b1d854d65208c8bc204c0c73303815cfb6208 SHA1 7a2705d3d0edb5c6854a15708189ebe616a569ea SHA256 1964716e6275d6cdc41bbc1b580d7350baddc42ea9208d49aba52c3aab51d688
+MISC metadata.xml 397 RMD160 57fce2ddbc573f348530f856bc0735ba1aae08b9 SHA1 ffab343d82e13c81c74ecb9d0724634a4df755d8 SHA256 6b960f56b7be9f2ecb4b7023b54e20fc6d5583d8ff9ea0b1a4a987c6d86b0a0a
diff --git a/mail-filter/spamassassin/metadata.xml b/mail-filter/spamassassin/metadata.xml
index 86672fe64c10..916faf12136c 100644
--- a/mail-filter/spamassassin/metadata.xml
+++ b/mail-filter/spamassassin/metadata.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+<herd>perl</herd>
+<maintainer>
+	<email>perl@gentoo.org</email>
+	<description>Primary Maintainer</description>
+</maintainer>
+<use>
+	<flag name='qmail'>Build qmail functionality and docs</flag>
+	<flag name='tools'>Enables tools for spamassassin</flag>
+</use>
 </pkgmetadata>
+
diff --git a/mail-filter/spamassassin/spamassassin-3.2.5.ebuild b/mail-filter/spamassassin/spamassassin-3.2.5.ebuild
new file mode 100644
index 000000000000..e3047a74d2a0
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-3.2.5.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.2.5.ebuild,v 1.1 2008/08/17 16:20:11 dertobi123 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="http://archive.apache.org/dist/spamassassin/source/${MY_P}.tar.bz2 mirror://gentoo/${MY_P}.tar.bz2"
+
+SRC_TEST="do"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~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.43
+	>=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-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"
+
+}