Sorry for the bump in -r2, best way to deal with some fixes to configs

Package-Manager: portage-2.0.53_rc6

6 files changed, 271 insertions, 13 deletions

diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index b8d8f0be3ded..27a8fa01fbe6 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.79 2005/11/17 00:45:47 hparker Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.80 2005/11/21 17:26:04 mcummings Exp $
+
+*spamassassin-3.1.0-r2 (21 Nov 2005)
+
+  21 Nov 2005; <mcumming@gentoo.org> spamassassin-3.1.0-r1.ebuild,
+  +spamassassin-3.1.0-r2.ebuild, spamassassin-3.1.0.ebuild:
+  Sorry for the bump in -r2, best way to deal with some fixes to configs
 
   17 Nov 2005; Homer Parker <hparker@gentoo.org> spamassassin-3.1.0.ebuild:
   Stable on amd64 fixing bug 112063
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 7fe2f11e2f41..e7caa85c6232 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -1,13 +1,25 @@
-MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 6495e28833bca5a9d686c47bdeed3e07 spamassassin-3.0.4.ebuild 6554
-MD5 aa1fdb1af8a67dd3597ada33d43afeb0 spamassassin-3.1.0-r1.ebuild 6284
-MD5 0620e11042e6d5f946af1a5104c91d53 spamassassin-3.1.0.ebuild 6312
-MD5 9e6de695f9d175d255f92150c95c0bff ChangeLog 21622
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 aea63c3f57c269fd3fa5f43b3def9fab ChangeLog 21863
 MD5 6eab480d5d7178685422567dcef9d9ef files/3.0.0-spamd.conf 1427
 MD5 13c538208e1f991a44a30a8bce130fa8 files/3.0.0-spamd.init 738
 MD5 4783482f6c574067f3c8fa48e3202fae files/digest-spamassassin-3.0.4 76
+MD5 9d87182bab72ef8b6ae97fe0ab22f5d1 files/digest-spamassassin-3.1.0 77
+MD5 9d87182bab72ef8b6ae97fe0ab22f5d1 files/digest-spamassassin-3.1.0-r1 77
+MD5 9d87182bab72ef8b6ae97fe0ab22f5d1 files/digest-spamassassin-3.1.0-r2 77
 MD5 d3b6df49d772fdf4425d4c2376bc7173 files/secrets.cf 664
 MD5 66f6531ea3b0a382b4d97bd1234c43a1 files/spamd.conf 604
 MD5 9ab5a9bd40752148b4cb0982dd1a5581 files/spamd.init 617
-MD5 9d87182bab72ef8b6ae97fe0ab22f5d1 files/digest-spamassassin-3.1.0 77
-MD5 9d87182bab72ef8b6ae97fe0ab22f5d1 files/digest-spamassassin-3.1.0-r1 77
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 6495e28833bca5a9d686c47bdeed3e07 spamassassin-3.0.4.ebuild 6554
+MD5 b02ef02fa16564799c2d94c68e66ce25 spamassassin-3.1.0-r1.ebuild 6699
+MD5 f390e0dedb3463bf16701b61b90ec8bd spamassassin-3.1.0-r2.ebuild 6699
+MD5 1e7f494db1025013f6bb833d107a655f spamassassin-3.1.0.ebuild 6536
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDggNGtG5z4I8BtQoRArNfAJ9CgH3xA4VgbsCHjCYw3Ps0sKEKUwCePx12
+oMPzlkmpi33BZ4tGdpvVSvk=
+=E0h6
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.0-r2 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.0-r2
new file mode 100644
index 000000000000..261f2ae1e3e2
--- /dev/null
+++ b/mail-filter/spamassassin/files/digest-spamassassin-3.1.0-r2
@@ -0,0 +1 @@
+MD5 d28bd7e83d01b234144e336bbfde0caa Mail-SpamAssassin-3.1.0.tar.bz2 1012946
diff --git a/mail-filter/spamassassin/spamassassin-3.1.0-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.1.0-r1.ebuild
index 07fcdcadc516..9f64b8079018 100644
--- a/mail-filter/spamassassin/spamassassin-3.1.0-r1.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.0-r1.ebuild,v 1.4 2005/11/12 23:02:03 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.1.0-r1.ebuild,v 1.5 2005/11/21 17:26:04 mcummings Exp $
 
 inherit perl-module
 
@@ -19,13 +19,12 @@ IUSE="berkdb qmail ssl doc mysql postgres sqlite spf tools"
 # To consider (not all may be in tree at this time - mcummings):
 # dev-perl/Net-SMTP
 # dev-perl/IP-Country-Fast
-# dev-perl/Net-Ident
-# perl-core/Time-HiRes
 
 DEPEND=">=dev-lang/perl-5.8.2-r1
 	>=dev-perl/PodParser-1.22
 	perl-core/MIME-Base64
 	perl-core/Storable
+	perl-core/Time-HiRes
 	>=dev-perl/HTML-Parser-3.31
 	>=dev-perl/Net-DNS-0.34
 	dev-perl/Digest-SHA1
@@ -136,6 +135,9 @@ src_install () {
 
 	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
@@ -209,4 +211,12 @@ pkg_postinst() {
 	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"
+	einfo
+	einfo "You may also consider installing the following for add on"
+	einfo "benefits: dev-perl/IO-Socket-INET6  dev-prel/Mail-DomainKeys"
+	einfo "dev-perl/Net-Ident dev-perl/IP-Country"
 }
diff --git a/mail-filter/spamassassin/spamassassin-3.1.0-r2.ebuild b/mail-filter/spamassassin/spamassassin-3.1.0-r2.ebuild
new file mode 100644
index 000000000000..6e1674b645df
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-3.1.0-r2.ebuild
@@ -0,0 +1,222 @@
+# 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.1.0-r2.ebuild,v 1.1 2005/11/21 17:26:04 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="~alpha ~ppc ~ppc64 ~sparc ~x86"
+IUSE="berkdb qmail ssl doc mysql postgres sqlite spf tools"
+
+# To consider (not all may be in tree at this time - mcummings):
+# dev-perl/Net-SMTP
+# dev-perl/IP-Country-Fast
+
+DEPEND=">=dev-lang/perl-5.8.2-r1
+	>=dev-perl/PodParser-1.22
+	perl-core/MIME-Base64
+	perl-core/Storable
+	perl-core/Time-HiRes
+	>=dev-perl/HTML-Parser-3.31
+	>=dev-perl/Net-DNS-0.34
+	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? (
+		perl-core/DB_File
+	)
+	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
+	)"
+
+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
+
+	# 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
+	fperms 0400 /etc/mail/spamassassin/secrets.cf
+	echo "">>${D}/etc/mail/spamassassin/local.cf
+	echo "# Sensitive data, such as database connection info, should">>${D}/etc/mail/spamassassin/local.cf
+	echo "# be stored in /etc/mail/spamassassin/secrets.cf with">>${D}/etc/mail/spamassassin/local.cf
+	echo "# appropriate permissions">>${D}/etc/mail/spamassassin/local.cf
+}
+
+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"
+	einfo
+	einfo "You may also consider installing the following for add on"
+	einfo "benefits: dev-perl/IO-Socket-INET6  dev-prel/Mail-DomainKeys"
+	einfo "dev-perl/Net-Ident dev-perl/IP-Country"
+}
diff --git a/mail-filter/spamassassin/spamassassin-3.1.0.ebuild b/mail-filter/spamassassin/spamassassin-3.1.0.ebuild
index 205503db7300..92d82ad9dfb8 100644
--- a/mail-filter/spamassassin/spamassassin-3.1.0.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.1.0.ebuild
@@ -1,6 +1,6 @@
 # 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.1.0.ebuild,v 1.8 2005/11/17 00:45:47 hparker Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.1.0.ebuild,v 1.9 2005/11/21 17:26:04 mcummings Exp $
 
 inherit perl-module
 
@@ -13,7 +13,7 @@ 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 mysql postgres sqlite spf tools"
+IUSE="berkdb qmail ssl doc mysql tools"
 
 # To consider (not all may be in tree at this time - mcummings):
 # dev-perl/Net-SMTP
@@ -137,6 +137,9 @@ src_install () {
 
 	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
@@ -210,4 +213,8 @@ pkg_postinst() {
 	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"
 }