Version bump, bug forthcoming

(Portage version: 2.0.51.22-r1)

4 files changed, 214 insertions, 11 deletions

diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index c826cabee7c9..4702bbda0376 100644
--- a/mail-filter/spamassassin/ChangeLog
+++ b/mail-filter/spamassassin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/spamassassin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.54 2005/05/25 16:53:32 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.55 2005/06/08 12:18:17 mcummings Exp $
+
+*spamassassin-3.0.4 (08 Jun 2005)
+
+  08 Jun 2005; Michael Cummings <mcummings@gentoo.org>
+  +spamassassin-3.0.4.ebuild:
+  Version bump, bug forthcoming
 
   25 May 2005; Michael Cummings <mcummings@gentoo.org>
   spamassassin-2.64.ebuild:
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index c16a8acb9f3a..f2f35eb01eac 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 baf413863790387f23a97c01603caf92 ChangeLog 17736
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 MD5 133d36d0294d99d90c5baa2c51fc35ab spamassassin-2.63-r1.ebuild 2419
@@ -13,6 +10,7 @@ MD5 020ebe77ab67a92f8ab6c28413d6a9ad spamassassin-3.0.1.ebuild 5782
 MD5 77ac0d7df7af55d62ddaa9ef4bbf90c2 spamassassin-3.0.2-r1.ebuild 5781
 MD5 f6a9c300f3f3d900174d2b6ac003839c spamassassin-3.0.2.ebuild 5779
 MD5 b2e1c1869a28e383f102d68857f260ff spamassassin-3.0.3.ebuild 5941
+MD5 e0deaffab659c409d894e02e2af0f32d spamassassin-3.0.4.ebuild 5822
 MD5 1951dd84955cce642d59c03780a5fb6f files/3.0.0-spamd.conf 932
 MD5 4c6b90d2e998278228f4898f4066570f files/3.0.0-spamd.init 619
 MD5 2bc962fe7cbd5fc24b6ca7703a498e83 files/digest-spamassassin-2.63 75
@@ -27,10 +25,4 @@ MD5 faa89d7205b3bde710ddc585969a3992 files/digest-spamassassin-3.0.2-r1 76
 MD5 66f6531ea3b0a382b4d97bd1234c43a1 files/spamd.conf 604
 MD5 9ab5a9bd40752148b4cb0982dd1a5581 files/spamd.init 617
 MD5 8bae43ab6b7e9fc82d663ebe76535484 files/digest-spamassassin-3.0.3 76
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFClK2jtG5z4I8BtQoRAhTTAJ9MaiFt/km8H8hbcaem3Ui6XzDaiACbB7Bv
-VOahvIn9xPqqHc3pDvt42z0=
-=pRJK
------END PGP SIGNATURE-----
+MD5 4783482f6c574067f3c8fa48e3202fae files/digest-spamassassin-3.0.4 76
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.0.4 b/mail-filter/spamassassin/files/digest-spamassassin-3.0.4
new file mode 100644
index 000000000000..130ab288c688
--- /dev/null
+++ b/mail-filter/spamassassin/files/digest-spamassassin-3.0.4
@@ -0,0 +1 @@
+MD5 ba6e1bd95f6f9f3882f73212a11dbe46 Mail-SpamAssassin-3.0.4.tar.bz2 847365
diff --git a/mail-filter/spamassassin/spamassassin-3.0.4.ebuild b/mail-filter/spamassassin/spamassassin-3.0.4.ebuild
new file mode 100644
index 000000000000..4e31284b2065
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-3.0.4.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.0.4.ebuild,v 1.1 2005/06/08 12:18:17 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="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~amd64 ~ppc64"
+IUSE="berkdb qmail ssl doc"
+
+# To consider (not all may be in tree at this time - mcummings):
+# dev-perl/Net-SMTP
+# dev-perl/Mail-SPF-Query
+# dev-perl/IP-Country-Fast
+# dev-perl/Net-Ident
+# perl-core/Time-HiRes
+# DB support? mysql, postgres, etc.
+
+DEPEND=">=dev-lang/perl-5.8.2-r1
+	>=dev-perl/PodParser-1.22
+	perl-core/MIME-Base64
+	perl-core/Storable
+	>=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? (
+		perl-core/DB_File
+	)"
+
+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() {
+	# - 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"
+
+	# 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
+		dobin spamc/qmail-spamc
+	fi
+
+	dosym /etc/mail/spamassassin /etc/spamassassin
+
+	# 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 spamd/PROTOCOL
+		dohtml doc/*.html
+	fi
+}
+
+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
+
+	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
+	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
+}