Cleaning up; bug 91430 resolved, added secrets.cf and a note to the local.cf file

(Portage version: 2.0.51.22-r1)

11 files changed, 48 insertions, 529 deletions

diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index d00f5948ce71..d8d8c7f931d5 100644
--- a/mail-filter/spamassassin/ChangeLog
+++ b/mail-filter/spamassassin/ChangeLog
@@ -1,6 +1,13 @@
 # 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.67 2005/06/28 23:08:52 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.68 2005/08/16 09:52:10 mcummings Exp $
+
+  16 Aug 2005; Michael Cummings <mcummings@gentoo.org> files/3.0.0-spamd.conf,
+  +files/secrets.cf, -spamassassin-2.64-r1.ebuild,
+  -spamassassin-3.0.2-r1.ebuild, -spamassassin-3.0.3.ebuild,
+  spamassassin-3.0.4.ebuild:
+  Cleaning up; bug 91430 resolved, added secrets.cf and a note to the local.cf
+  file
 
   28 Jun 2005; Michael Cummings <mcummings@gentoo.org>
   files/3.0.0-spamd.init, spamassassin-3.0.4.ebuild:
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 0bce1bbfe8d0..7b0b5396c997 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -1,24 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ac38c2da4c8ffdaf74a88e4e6db02a1c ChangeLog 19528
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 98c4ab915f43b3d21d5bb831614332b8 spamassassin-3.0.4.ebuild 5967
-MD5 0dc3669ecd2b16304953702f296131fe spamassassin-3.0.2-r1.ebuild 5786
-MD5 c6b400456b9e96b064ff3d445034754e spamassassin-2.64-r1.ebuild 2524
-MD5 b2e1c1869a28e383f102d68857f260ff spamassassin-3.0.3.ebuild 5941
-MD5 1951dd84955cce642d59c03780a5fb6f files/3.0.0-spamd.conf 932
+MD5 ac38c2da4c8ffdaf74a88e4e6db02a1c ChangeLog 19528
+MD5 32268ad365f3e38c61c36a9b744de060 spamassassin-3.0.4.ebuild 6554
+MD5 6eab480d5d7178685422567dcef9d9ef files/3.0.0-spamd.conf 1427
 MD5 13c538208e1f991a44a30a8bce130fa8 files/3.0.0-spamd.init 738
-MD5 6a161feb8320fadb55f440aab192d008 files/digest-spamassassin-2.64-r1 75
-MD5 faa89d7205b3bde710ddc585969a3992 files/digest-spamassassin-3.0.2-r1 76
-MD5 8bae43ab6b7e9fc82d663ebe76535484 files/digest-spamassassin-3.0.3 76
+MD5 d3b6df49d772fdf4425d4c2376bc7173 files/secrets.cf 664
 MD5 66f6531ea3b0a382b4d97bd1234c43a1 files/spamd.conf 604
 MD5 9ab5a9bd40752148b4cb0982dd1a5581 files/spamd.init 617
 MD5 4783482f6c574067f3c8fa48e3202fae files/digest-spamassassin-3.0.4 76
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCwdfbtG5z4I8BtQoRAjoCAJ9ohbaMZf2f9sCwxrv1Uzc7rJgepgCggGF6
-vT834NRKfFt2pyuzITPGsz4=
-=uMWC
------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 ba2e7253b2e7..8c346a5afcd3 100644
--- a/mail-filter/spamassassin/files/3.0.0-spamd.conf
+++ b/mail-filter/spamassassin/files/3.0.0-spamd.conf
@@ -18,9 +18,20 @@
 #             must be used in combination with -A to actually allow
 #             connections from anybody but localhost
 # -m limit    to set the number of children, default 5
+# -u user     the user to run spamd as
 # -L          if you want to run no net tests
 #
 # for more help look in man spamd
+#
+# Note: if you plan on using the -u flag to spamd you will need to
+# make sure the location of the PID file is writable by that user.
+# This can be done by making the directory /var/run/spamd and
+# changing the owner to the UID that runs spamd.  You will then
+# need to edit $pidfile in /etc/init.d/spamd. This should fix the
+# problem with stop/restart in the init scripts.
+#
+# See http://bugs.gentoo.org/show_bug.cgi?id=70124 for a full
+# explanation.
 
 SPAMD_OPTS="-m 5 -c -H"
 
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-2.64-r1 b/mail-filter/spamassassin/files/digest-spamassassin-2.64-r1
deleted file mode 100644
index 6071f0182a89..000000000000
--- a/mail-filter/spamassassin/files/digest-spamassassin-2.64-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cd482160ddbe371bbf4fb58b715ebbdf Mail-SpamAssassin-2.64.tar.bz2 736911
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.0.2-r1 b/mail-filter/spamassassin/files/digest-spamassassin-3.0.2-r1
deleted file mode 100644
index 0656c7638050..000000000000
--- a/mail-filter/spamassassin/files/digest-spamassassin-3.0.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b373bc48c4f50b70cb784f40d88868bf Mail-SpamAssassin-3.0.2.tar.bz2 846410
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.0.3 b/mail-filter/spamassassin/files/digest-spamassassin-3.0.3
deleted file mode 100644
index 5de1d5ba4ad2..000000000000
--- a/mail-filter/spamassassin/files/digest-spamassassin-3.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c9028e72958909285e43feb806d948dc Mail-SpamAssassin-3.0.3.tar.bz2 848226
diff --git a/mail-filter/spamassassin/files/secrets.cf b/mail-filter/spamassassin/files/secrets.cf
new file mode 100644
index 000000000000..efa31a6fbc00
--- /dev/null
+++ b/mail-filter/spamassassin/files/secrets.cf
@@ -0,0 +1,14 @@
+# The below sample from bug 91430 is an example of using mysql
+# for spam filter storage
+
+#(Tell Spamassissin to use MySQL for bayes data
+#bayes_store_module              Mail::SpamAssassin::BayesStore::SQL
+#bayes_sql_dsn                   DBI:mysql:sa_bayes:localhost:3306
+#bayes_sql_username              db_name
+#bayes_sql_password              another_very_secret_password
+
+#(Tell Spamassissin to use MySQL for AWL data
+#auto_whitelist_factory          Mail::SpamAssassin::SQLBasedAddrList
+#user_awl_dsn                    DBI:mysql:sa_bayes:localhost:3306
+#user_awl_sql_username           db_name
+#user_awl_sql_password           another_very_secret_password
diff --git a/mail-filter/spamassassin/spamassassin-2.64-r1.ebuild b/mail-filter/spamassassin/spamassassin-2.64-r1.ebuild
deleted file mode 100644
index 065c71fd5dc1..000000000000
--- a/mail-filter/spamassassin/spamassassin-2.64-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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-2.64-r1.ebuild,v 1.7 2005/05/25 16:53:11 mcummings Exp $
-
-inherit perl-module
-
-MY_P=Mail-SpamAssassin-${PV}
-
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Perl Mail::SpamAssassin - A program to filter spam"
-HOMEPAGE="http://spamassassin.org/"
-SRC_URI="http://old.spamassassin.org/released/${MY_P}.tar.bz2"
-
-LICENSE="|| ( GPL-2  Artistic )"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha hppa amd64 ia64 ppc64"
-IUSE="berkdb ssl"
-
-DEPEND="|| ( >=dev-lang/perl-5.8.2-r1
-	( >=perl-core/ExtUtils-MakeMaker-6.11-r1
-	>=perl-core/File-Spec-0.8
-	perl-core/Time-Local
-	perl-core/Getopt-Long
-	) )
-	>=dev-perl/PodParser-1.22
-	>=dev-perl/HTML-Parser-3.24
-	dev-perl/Net-DNS
-	dev-perl/Digest-SHA1
-	ssl?    ( dev-perl/IO-Socket-SSL )
-	berkdb? ( perl-core/DB_File )"
-
-# Neither for 'make install'.
-myinst=""
-
-# Some more files to be installed (README* and Changes are already
-# included per default)
-mydoc="License
-	COPYRIGHT
-	TRADEMARK
-	CONTRIB_CERT
-	BUGS
-	USAGE
-	procmailrc.example
-	sample-nonspam.txt
-	sample-spam.txt
-	qmail/README.qmail-spamc"
-
-src_compile() {
-	# If ssl is enabled, spamc can be built with ssl support
-	use ssl && myconf="${myconf} ENABLE_SSL=yes"
-
-	# 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=""
-
-	export PERL_MM_USE_DEFAULT=1
-	perl-module_src_compile
-
-	# without this check, portage .51 runs test suite twice for people
-	# with the maketest feature
-
-	if ! hasq maketest $FEATURES; then
-		perl-module_src_test
-	fi
-	cd ${S}
-	make qmail/qmail-spamc
-}
-
-src_install () {
-	perl-module_src_install
-
-	# Add the init and config scripts.
-	dodir /etc/init.d /etc/conf.d
-	insinto /etc/init.d
-	newins ${FILESDIR}/spamd.init spamd
-	fperms 755 /etc/init.d/spamd
-	insinto /etc/conf.d
-	newins ${FILESDIR}/spamd.conf spamd
-
-	into /usr
-	dobin qmail/qmail-spamc
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-
-	if [ -z "`best_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 to make it available."
-	fi
-
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.0.2-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.0.2-r1.ebuild
deleted file mode 100644
index 30c5c10bcb34..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# 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.2-r1.ebuild,v 1.4 2005/06/09 16:38:39 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="http://www.apache.org/dist/spamassassin/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa ia64 amd64 ppc64 mips"
-IUSE="berkdb qmail ssl doc"
-
-DEPEND=">=dev-lang/perl-5.8.2-r1
-	>=dev-perl/PodParser-1.22
-	perl-core/MIME-Base64
-	>=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
-	)"
-
-
-# - 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"
-
-
-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() {
-	# 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
-		into /usr
-		dobin spamc/qmail-spamc
-	fi
-
-	# Add the init and config scripts.
-	dodir /etc/init.d /etc/conf.d
-	insinto /etc/init.d
-	newins ${FILESDIR}/3.0.0-spamd.init spamd
-	fperms 755 /etc/init.d/spamd
-	insinto /etc/conf.d
-	newins ${FILESDIR}/3.0.0-spamd.conf spamd
-	dosym /etc/mail/spamassassin /etc/spamassassin
-
-	if use doc; then
-		dodoc spamd/PROTOCOL
-		for f in doc/*.html; do
-			dodoc $f
-		done
-	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
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.0.3.ebuild b/mail-filter/spamassassin/spamassassin-3.0.3.ebuild
deleted file mode 100644
index a479dec55a92..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.0.3.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# 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.3.ebuild,v 1.6 2005/05/25 15:31:55 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="http://www.apache.org/dist/spamassassin/${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
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.0.4.ebuild b/mail-filter/spamassassin/spamassassin-3.0.4.ebuild
index 123b28e2dd02..5d342d97e441 100644
--- a/mail-filter/spamassassin/spamassassin-3.0.4.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.0.4.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.0.4.ebuild,v 1.10 2005/06/28 23:08:52 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.0.4.ebuild,v 1.11 2005/08/16 09:52:10 mcummings Exp $
 
 inherit perl-module
 
@@ -168,6 +168,14 @@ src_install () {
 		dodoc spamd/PROTOCOL
 		dohtml doc/*.html
 	fi
+
+	cp ${FILESDIR}/secrets.cf ${D}/etc/mail/spamassassin/secrets.cf
+	fperms 0400 ${D}/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() {
@@ -205,4 +213,6 @@ pkg_postinst() {
 	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."
 }