Fixed 3 birds, uh bugs with one stone - Bugs #84539, #81345, #78727

(Portage version: 2.0.51.19)

5 files changed, 449 insertions, 8 deletions

diff --git a/mail-filter/dspam/ChangeLog b/mail-filter/dspam/ChangeLog
index 2067529fb27a..d83fd8ed65fb 100644
--- a/mail-filter/dspam/ChangeLog
+++ b/mail-filter/dspam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/dspam
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.46 2005/03/09 07:13:38 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.47 2005/03/11 01:04:24 st_lim Exp $
+
+*dspam-3.4_rc3 (11 Mar 2005)
+
+  11 Mar 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-3.4_rc2.ebuild,
+  +dspam-3.4_rc3.ebuild:
+  Fixed 3 birds, uh bugs with one stone - Bugs #84539, #81345, #78727
 
   09 Mar 2005; Lim Swee Tat <st_lim@gentoo.org> -dspam-3.2.4.ebuild,
   -dspam-3.2.6.ebuild, -dspam-3.3.11.ebuild, -dspam-3.3.8.ebuild,
diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest
index 967aecfca7f3..b54d43462987 100644
--- a/mail-filter/dspam/Manifest
+++ b/mail-filter/dspam/Manifest
@@ -1,12 +1,14 @@
 MD5 5b70dc8689f648ce8e2daea030f1ae68 ChangeLog 9247
 MD5 e380a39924d3ab14f6b1bcffcba31030 dspam-3.2.7.ebuild 15589
-MD5 56c515c1c1ce7393507fd61de138fc04 dspam-3.4_rc2.ebuild 15540
+MD5 7d05a3afc8f8fd4e14e892997748e632 dspam-3.4_rc2.ebuild 16374
+MD5 89a547ca73f85a4c8368e8a1ef7778ac dspam-3.4_rc3.ebuild 16376
 MD5 dbfbe5a3bbe3347938107f5f5bd2197e metadata.xml 308
 MD5 c12a54112c6fec3530a7b1a368d04ac8 files/README.postfix 309
 MD5 e0469b961385fda4305602dc2519d319 files/README.qmail 2317
 MD5 cd1bdb75fd86304f9453741a910cb8a2 files/crontab.db4 196
 MD5 f2f86e8f7ab440c8537f40fa18a0ee43 files/crontab.mysql 118
 MD5 38b4d6fe59c97cd8157debd9384db8ac files/digest-dspam-3.4_rc2 131
+MD5 b09e3fad7343b70d40f8ff7ddeca0e81 files/digest-dspam-3.4_rc3 131
 MD5 9a2fda6789f0db17b6a32ca84e9e3884 files/dspam.cron 2501
 MD5 2163ca41de383f09f4d754e2d35cb158 files/logrotate.dspam 156
 MD5 7735956f416bd58bfcbeee99af43bea0 files/digest-dspam-3.2.7 63
diff --git a/mail-filter/dspam/dspam-3.4_rc2.ebuild b/mail-filter/dspam/dspam-3.4_rc2.ebuild
index 88fddf814c94..3dd4fc57c4f4 100644
--- a/mail-filter/dspam/dspam-3.4_rc2.ebuild
+++ b/mail-filter/dspam/dspam-3.4_rc2.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/dspam/dspam-3.4_rc2.ebuild,v 1.3 2005/03/09 07:10:48 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.4_rc2.ebuild,v 1.4 2005/03/11 01:04:24 st_lim Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://dspam.nuclearelephant.com/sources/${PN}-${MY_PV}.tar.gz
 HOMEPAGE="http://dspam.nuclearelephant.com/"
 LICENSE="GPL-2"
 
-IUSE="debug mysql neural oci8 postgres sqlite large-domain"
+IUSE="debug mysql neural oci8 postgres sqlite sqlite3 large-domain"
 DEPEND="mysql? ( >=dev-db/mysql-3.23 )
 		sqlite? ( <dev-db/sqlite-3 )
 		sqlite3? ( >=dev-db/sqlite-3 )
@@ -33,9 +33,12 @@ pkg_setup() {
 	if (use mysql && use postgres) || \
 		(use mysql && use oci8) || \
 		(use mysql && use sqlite) || \
+		(use mysql && use sqlite3) || \
 		(use postgres && use oci8) || \
 		(use postgres && use sqlite) || \
-		(use sqlite && use oci8); then
+		(use postgres && use sqlite3) || \
+		(use sqlite && use oci8) || \
+		(use sqlite3 && use oci8); then
 		echo
 		ewarn "You have two of either \"mysql\", \"postgres\", \"oci8\", \"sqlite\" or \"sqlite3\" in your USE flags."
 		ewarn "Will default to MySQL as your dspam database backend."
@@ -45,7 +48,7 @@ pkg_setup() {
 		has_version ">=sys-apps/portage-2.0.50" && (
 		einfo "It would be best practice to add the set of USE flags that you use for this"
 		einfo "package to the file: /etc/portage/package.use. Example:"
-		einfo "\`echo \"net-mail/dspam -mysql postgres -oci8 -sqlite -sqlite3\" >> /etc/portage/package.use\`"
+		einfo "\`echo \"mail-filter/dspam -mysql postgres -oci8 -sqlite -sqlite3\" >> /etc/portage/package.use\`"
 		einfo "to build dspam with Postgres database as your dspam backend."
 		)
 		echo
@@ -62,11 +65,12 @@ src_compile() {
 
 	# these are the default settings
 	#myconf="${myconf} --enable-daemon"
-	#myconf="${myconf} --enable-nodalcore"
 	myconf="${myconf} --enable-homedir"
 	myconf="${myconf} --enable-long-username"
-	myconf="${myconf} --enable-robinson"
+	# Note: The author recommends that if you enable chi square,
+	#       you also DISABLE graham and burton bayesian tests.
 	#myconf="${myconf} --enable-chi-square"
+	#myconf="${myconf} --disable-graham-bayesian --disable-burton-bayesian"
 	#myconf="${myconf} --enable-robinson-pvalues"
 	use large-domain && myconf="${myconf} --enable-large-scale" ||\
 		myconf="${myconf} --enable-domain-scale"
@@ -115,6 +119,9 @@ src_compile() {
 			--with-oracle-version=MAJOR
 			myconf="${myconf} --with-oracle-version=10"
 		fi
+	elif use sqlite3 ; then
+		myconf="${myconf} --with-storage-driver=sqlite3_drv"
+		myconf="${myconf} --enable-virtual-users"
 	elif use sqlite ; then
 		myconf="${myconf} --with-storage-driver=sqlite_drv"
 		myconf="${myconf} --enable-virtual-users"
@@ -152,6 +159,7 @@ src_install () {
 		-i Makefile
 	make DESTDIR=${D} install || die
 	chmod 4755 ${D}/usr/bin/dspam
+	chmod 4755 ${D}/usr/bin/dspam_stats
 
 	# documentation
 	if use mysql; then
@@ -282,6 +290,18 @@ src_install () {
 	exeopts -m0755 -o dspam -g dspam
 	doexe ${FILESDIR}/dspam.cron
 
+	# installs the notification messages
+	diropts -m0775 -o dspam -g dspam
+	dodir ${HOMEDIR}/txt
+	keepdir ${HOMEDIR}/txt
+	insinto ${HOMEDIR}/txt
+	insopts -m644 -o dspam -g dspam
+	for foo in ${S}/txt/*.txt; do
+		if [ ! -f "$(basename ${foo})" ]; then
+			doins ${foo}
+		fi
+	done
+
 	# dspam enviroment
 	echo -ne "CONFIG_PROTECT_MASK=\"${HOMEDIR}\"\n\n" > ${T}/40dspam
 	doenvd ${T}/40dspam || die
@@ -377,6 +397,9 @@ pkg_config () {
 		/usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -c "GRANT ALL PRIVILEGES ON SCHEMA public TO ${DSPAM_PgSQL_USER};" 1>/dev/null 2>&1
 	elif use oci8 ; then
 		[[ -f ${HOMEDIR}/oracle.data ]] && mv -f ${HOMEDIR}/oracle.data ${HOMEDIR}
+	elif use sqlite3 ; then
+		einfo "sqlite3_drv will automatically create the necessary database"
+		einfo "objects for each user upon first use of DSPAM by that user."
 	elif use sqlite ; then
 		einfo "sqlite_drv will automatically create the necessary database"
 		einfo "objects for each user upon first use of DSPAM by that user."
diff --git a/mail-filter/dspam/dspam-3.4_rc3.ebuild b/mail-filter/dspam/dspam-3.4_rc3.ebuild
new file mode 100644
index 000000000000..f1fb8933fa12
--- /dev/null
+++ b/mail-filter/dspam/dspam-3.4_rc3.ebuild
@@ -0,0 +1,408 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.4_rc3.ebuild,v 1.1 2005/03/11 01:04:24 st_lim Exp $
+
+inherit eutils
+
+MY_PV=${PV/_rc3/.pr1}
+S=${WORKDIR}/${PN}-${MY_PV}
+DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter"
+SRC_URI="http://dspam.nuclearelephant.com/sources/${PN}-${MY_PV}.tar.gz
+	http://dspam.nuclearelephant.com/sources/extras/dspam_sa_trainer.tar.gz"
+HOMEPAGE="http://dspam.nuclearelephant.com/"
+LICENSE="GPL-2"
+
+IUSE="debug mysql neural oci8 postgres sqlite sqlite3 large-domain"
+DEPEND="mysql? ( >=dev-db/mysql-3.23 )
+		sqlite? ( <dev-db/sqlite-3 )
+		sqlite3? ( >=dev-db/sqlite-3 )
+		postgres? ( >=dev-db/postgresql-7.4.3 )
+		>=sys-libs/db-4.0
+		"
+RDEPEND="sys-process/cronbase
+		app-admin/logrotate"
+KEYWORDS="~x86 ~ppc ~alpha"
+SLOT="0"
+
+# some FHS-like structure
+HOMEDIR="/etc/mail/dspam"
+DATADIR="/var/spool/dspam"
+LOGDIR="/var/log/dspam"
+
+pkg_setup() {
+	if (use mysql && use postgres) || \
+		(use mysql && use oci8) || \
+		(use mysql && use sqlite) || \
+		(use mysql && use sqlite3) || \
+		(use postgres && use oci8) || \
+		(use postgres && use sqlite) || \
+		(use postgres && use sqlite3) || \
+		(use sqlite && use oci8) || \
+		(use sqlite3 && use oci8); then
+		echo
+		ewarn "You have two of either \"mysql\", \"postgres\", \"oci8\", \"sqlite\" or \"sqlite3\" in your USE flags."
+		ewarn "Will default to MySQL as your dspam database backend."
+		ewarn "If you want to build with Postgres/Oracle/SQLite support; hit Control-C now."
+		ewarn "Change your USE flag -mysql and emerge again."
+		echo
+		has_version ">=sys-apps/portage-2.0.50" && (
+		einfo "It would be best practice to add the set of USE flags that you use for this"
+		einfo "package to the file: /etc/portage/package.use. Example:"
+		einfo "\`echo \"mail-filter/dspam -mysql postgres -oci8 -sqlite -sqlite3\" >> /etc/portage/package.use\`"
+		einfo "to build dspam with Postgres database as your dspam backend."
+		)
+		echo
+		ewarn "Waiting 30 seconds before starting..."
+		ewarn "(Control-C to abort)..."
+		epause 30
+	fi
+	id dspam 2>/dev/null || enewgroup dspam 26
+	id dspam 2>/dev/null || enewuser dspam 26 /bin/bash ${HOMEDIR} dspam
+}
+
+src_compile() {
+	local myconf
+
+	# these are the default settings
+	#myconf="${myconf} --enable-daemon"
+	myconf="${myconf} --enable-homedir"
+	myconf="${myconf} --enable-long-username"
+	# Note: The author recommends that if you enable chi square,
+	#       you also DISABLE graham and burton bayesian tests.
+	#myconf="${myconf} --enable-chi-square"
+	#myconf="${myconf} --disable-graham-bayesian --disable-burton-bayesian"
+	#myconf="${myconf} --enable-robinson-pvalues"
+	use large-domain && myconf="${myconf} --enable-large-scale" ||\
+		myconf="${myconf} --enable-domain-scale"
+
+	myconf="${myconf} --with-dspam-mode=4755"
+	myconf="${myconf} --with-dspam-owner=dspam"
+	myconf="${myconf} --with-dspam-group=dspam"
+	myconf="${myconf} --with-dspam-home=${HOMEDIR} --sysconfdir=${HOMEDIR}"
+	myconf="${myconf} --with-logdir=${LOGDIR}"
+
+	use debug && myconf="${myconf} --enable-debug --enable-verbose-debug"
+
+	# select storage driver
+	if use mysql; then
+		myconf="${myconf} --with-storage-driver=mysql_drv"
+		myconf="${myconf} --with-mysql-includes=/usr/include/mysql"
+		myconf="${myconf} --with-mysql-libraries=/usr/lib/mysql"
+		myconf="${myconf} --enable-virtual-users"
+		myconf="${myconf} --enable-preferences-extension"
+
+		# an experimental feature available with MySQL and PgSQL backend
+		if use neural ; then
+			myconf="${myconf} --enable-neural-networking"
+		fi
+	elif use postgres ; then
+		myconf="${myconf} --with-storage-driver=pgsql_drv"
+		myconf="${myconf} --with-pgsql-includes=/usr/include/postgresql"
+		myconf="${myconf} --with-pgsql-libraries=/usr/lib/postgresql"
+		myconf="${myconf} --enable-virtual-users"
+		myconf="${myconf} --enable-preferences-extension"
+
+		# an experimental feature available with MySQL and PgSQL backend
+		if use neural ; then
+			myconf="${myconf} --enable-neural-networking"
+		fi
+	elif use oci8 ; then
+		myconf="${myconf} --with-storage-driver=ora_drv"
+		myconf="${myconf} --with-oracle-home=${ORACLE_HOME}"
+		myconf="${myconf} --enable-virtual-users"
+		myconf="${myconf} --enable-preferences-extension"
+
+		# I am in no way a Oracle specialist. If someone knows
+		# how to query the version of Oracle, then let me know.
+		if (expr ${ORACLE_HOME/*\/} : 10 1>/dev/null 2>&1)
+		then
+			--with-oracle-version=MAJOR
+			myconf="${myconf} --with-oracle-version=10"
+		fi
+	elif use sqlite3 ; then
+		myconf="${myconf} --with-storage-driver=sqlite3_drv"
+		myconf="${myconf} --enable-virtual-users"
+	elif use sqlite ; then
+		myconf="${myconf} --with-storage-driver=sqlite_drv"
+		myconf="${myconf} --enable-virtual-users"
+
+	else
+		myconf="${myconf} --with-storage-driver=libdb4_drv"
+	fi
+
+	econf ${myconf} || die
+	emake || die
+
+}
+
+src_install () {
+	# open up perms on /etc/mail/dspam
+	diropts -m0775 -o dspam -g dspam
+	dodir ${HOMEDIR}
+	keepdir ${HOMEDIR}
+
+	# keeps dspam data in /var
+	diropts -m0775 -o dspam -g dspam
+	dodir ${DATADIR}
+	keepdir ${DATADIR}
+
+	# keeps dspam log in /var/log
+	diropts -m0775 -o dspam -g dspam
+	dodir ${LOGDIR}
+	keepdir ${LOGDIR}
+	# ${HOMEDIR}/data is a symlink to ${DATADIR}
+	dosym ${DATADIR} ${HOMEDIR}/data
+
+	# make install
+	sed -e 's/rm -f ..mandir.\(.*\)/rm -f ${D}${mandir}\1/g' \
+		-e 's/ln -s ..mandir.\(.*\) ..mandir.\(.*3\)/ln -s ${mandir}\1.gz ${D}${mandir}\2.gz/g' \
+		-i Makefile
+	make DESTDIR=${D} install || die
+	chmod 4755 ${D}/usr/bin/dspam
+	chmod 4755 ${D}/usr/bin/dspam_stats
+
+	# documentation
+	if use mysql; then
+		cp src/tools.mysql_drv/README README.mysql_drv
+	elif use postgres ; then
+		cp src/tools.pgsql_drv/README README.pgsql_drv
+	elif use oci8 ; then
+		cp src/tools.ora_drv/README README.ora_drv
+	elif use sqlite ; then
+		cp src/tools.sqlite_drv/README README.sqlite_drv
+	fi
+	dodoc CHANGELOG LICENSE README* RELEASE.NOTES UPGRADING
+	dodoc ${DISTDIR}/dspam_sa_trainer.tar.gz
+	docinto gentoo
+	dodoc ${FILESDIR}/README.postfix ${FILESDIR}/README.qmail
+	doman man/dspam*
+
+	# build some initial configuration data
+	# Copy existing dspam.conf
+	[ -f ${HOMEDIR}/dspam.conf ] && cp ${HOMEDIR}/dspam.conf ${T}/dspam.conf
+	# If no existing dspam.conf
+	if [ ! -f ${HOMEDIR}/dspam.conf ]; then
+		cp ${D}${HOMEDIR}/dspam.conf ${T}/dspam.conf
+		if use cyrus; then
+			echo "UntrustedDeliveryAgent /usr/lib/cyrus/deliver %u" >> ${T}/dspam.conf
+			dosed 's:/usr/bin/procmail:/usr/lib/cyrus/deliver %u:g' ${T}/dspam.conf
+		elif use exim; then
+			echo "UntrustedDeliveryAgent /usr/sbin/exim -oMr spam-scanned %u" >> ${T}/dspam.conf
+			dosed 's:/usr/bin/procmail:/usr/sbin/exim -oMr spam-scanned %u:g' ${T}/dspam.conf
+		elif use maildrop; then
+			echo "UntrustedDeliveryAgent /usr/bin/maildrop -d %u" >> ${T}/dspam.conf
+			dosed 's:/usr/bin/procmail:/usr/bin/maildrop -d %u:g' ${T}/dspam.conf
+		elif use procmail; then
+			echo "UntrustedDeliveryAgent /usr/bin/procmail" >> ${T}/dspam.conf
+		else
+			echo "UntrustedDeliveryAgent /usr/sbin/sendmail" >> ${T}/dspam.conf
+			sed 's:/usr/bin/procmail:/usr/sbin/sendmail:g' ${T}/dspam.conf
+		fi
+	fi
+
+	local PASSWORD="${RANDOM}${RANDOM}${RANDOM}${RANDOM}"
+
+	# database related configuration and scripts
+	insinto ${HOMEDIR}
+	insopts -m644 -o dspam -g dspam
+	if use mysql; then
+
+		if [ -f ${HOMEDIR}/mysql.data ]; then
+			# Use an existing password
+			PASSWORD="$(tail -n 2 ${HOMEDIR}/mysql.data | head -n 1 )"
+		else
+			# Create the mysql.data file
+			echo "MySQLServer    /var/run/mysqld/mysqld.sock" >> ${T}/mysql.data
+			echo "MySQLPort"                                  >> ${T}/mysql.data
+			echo "MySQLUser      dspam"                       >> ${T}/mysql.data
+			echo "MySQLPass      ${PASSWORD}"                 >> ${T}/mysql.data
+			echo "MySQLDb        dspam"                       >> ${T}/mysql.data
+			echo "MySQLCompress  true"                        >> ${T}/mysql.data
+			[ -z "`grep '^MySQL' ${D}/${HOMEDIR}/dspam.conf`" ] && cat ${T}/mysql.data >> ${T}/dspam.conf
+			sed -e 's/^MySQL[A-Za-z]* *//g' -i ${T}/mysql.data
+			doins ${T}/mysql.data
+		fi
+
+		newins src/tools.mysql_drv/mysql_objects-space.sql mysql_objects-space.sql
+		newins src/tools.mysql_drv/mysql_objects-speed.sql mysql_objects-speed.sql
+		newins src/tools.mysql_drv/mysql_objects-4.1.sql mysql_objects-4.1.sql
+		newins src/tools.mysql_drv/virtual_users.sql mysql_virtual_users.sql
+		newins src/tools.mysql_drv/neural.sql mysql_neural.sql
+		newins src/tools.mysql_drv/purge.sql mysql_purge.sql
+		newins src/tools.mysql_drv/purge-4.1.sql mysql_purge-4.1.sql
+	elif use postgres ; then
+		if [ -f ${HOMEDIR}/pgsql.data ]; then
+			# Use an existing password
+			PASSWORD="$(tail -n 2 ${HOMEDIR}/pgsql.data | head -n 1 )"
+		else
+			# Create the pgsql.data file
+			echo "PgSQLServer    127.0.0.1"    >> ${T}/pgsql.data
+			echo "PgSQLPort      5432"         >> ${T}/pgsql.data
+			echo "PgSQLUser      dspam"        >> ${T}/pgsql.data
+			echo "PgSQLPass      ${PASSWORD}"  >> ${T}/pgsql.data
+			echo "PgSQLDb        dspam"        >> ${T}/pgsql.data
+			[ -z "`grep '^PgSQL' ${D}/${HOMEDIR}/dspam.conf`" ] && cat ${T}/pgsql.data >> ${T}/dspam.conf
+			sed -e 's/^PgSQL[A-Za-z]* *//g' -i ${T}/pgsql.data
+			doins ${T}/pgsql.data
+		fi
+
+		newins src/tools.pgsql_drv/pgsql_objects.sql pgsql_objects.sql
+		newins src/tools.pgsql_drv/virtual_users.sql pgsql_virtual_users.sql
+		newins src/tools.pgsql_drv/purge.sql pgsql_purge.sql
+
+	elif use oci8 ; then
+		if [ -f ${HOMEDIR}/oracle.data ]; then
+			# Use an existing password
+			PASSWORD="$(tail -n 2 ${HOMEDIR}/oracle.data | head -n 1 )"
+		else
+			# Create the pgsql.data file
+			echo "OraServer      (DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=1521))(CONNECT_DATA=(SID=PROD)))" >>${T}/oracle.data
+			echo "OraUser        dspam" >>${T}/oracle.data
+			echo "OraPass        ${PASSWORD}" >>${T}/oracle.data
+			echo "OraSchema      dspam" >>${T}/oracle.data
+			[ -z "`grep '^Ora' ${D}/${HOMEDIR}/dspam.conf`" ] && cat ${T}/oracle.data >> ${T}/dspam.conf
+			sed -e 's/^Ora[A-Za-z]* *//g' -i ${T}/oracle.data
+			doins ${T}/oracle.data
+		fi
+
+		newins src/tools.ora_drv/oral_objects.sql ora_objects.sql
+		newins src/tools.ora_drv/virtual_users.sql ora_virtual_users.sql
+		newins src/tools.ora_drv/purge.sql ora_purge.sql
+	elif use sqlite ; then
+		newins src/tools.sqlite_drv/purge.sql sqlite_purge.sql
+	fi
+	insinto ${HOMEDIR}
+	insopts -m644 -o dspam -g dspam
+	doins ${T}/dspam.conf
+
+	# installs the logrotation scripts to the logrotate.d directory
+	diropts -m0755 -o dspam -g dspam
+	dodir /etc/logrotate.d
+	keepdir /etc/logrotate.d
+	insinto /etc/logrotate.d
+	newins ${FILESDIR}/logrotate.dspam dspam
+
+	# installs the cron job to the cron directory
+	diropts -m0755 -o dspam -g dspam
+	dodir /etc/cron.daily
+	keepdir /etc/cron.daily
+	exeinto /etc/cron.daily
+	exeopts -m0755 -o dspam -g dspam
+	doexe ${FILESDIR}/dspam.cron
+
+	# installs the notification messages
+	diropts -m0775 -o dspam -g dspam
+	dodir ${HOMEDIR}/txt
+	keepdir ${HOMEDIR}/txt
+	insinto ${HOMEDIR}/txt
+	insopts -m644 -o dspam -g dspam
+	for foo in ${S}/txt/*.txt; do
+		if [ ! -f "$(basename ${foo})" ]; then
+			doins ${foo}
+		fi
+	done
+
+	# dspam enviroment
+	echo -ne "CONFIG_PROTECT_MASK=\"${HOMEDIR}\"\n\n" > ${T}/40dspam
+	doenvd ${T}/40dspam || die
+}
+
+pkg_postinst() {
+	if use mysql || use postgres; then
+		einfo "To setup dspam to run out-of-the-box on your system with a mysql or pgsql database, run:"
+		einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
+	fi
+	if use exim ; then
+		echo
+		einfo "To use dspam in conjunction with your exim system, you should read the README"
+	fi
+}
+
+pkg_config () {
+	if use mysql ; then
+		[[ -f ${HOMEDIR}/mysql.data ]] && mv -f ${HOMEDIR}/mysql.data ${HOMEDIR}
+		DSPAM_MySQL_USER="$(head -n 3 ${HOMEDIR}/mysql.data|tail -n 1)"
+		DSPAM_MySQL_PWD="$(head -n 4 ${HOMEDIR}/mysql.data|tail -n 1)"
+		DSPAM_MySQL_DB="$(head -n 5 ${HOMEDIR}/mysql.data|tail -n 1)"
+
+		ewarn "When prompted for a password, please enter your MySQL root password"
+		ewarn ""
+
+		einfo "Creating DSPAM MySQL database \"${DSPAM_MySQL_DB}\""
+		/usr/bin/mysqladmin -u root -p create ${DSPAM_MySQL_DB}
+
+		einfo "Creating DSPAM MySQL tables for data objects"
+		einfo "  Please select what kind of object database you like to use."
+		einfo "    [1] Space optimized database"
+		einfo "    [2] Speed optimized database"
+		einfo
+		while true
+		do
+			read -n 1 -s -p "  Press 1 or 2 on the keyboard to select database" DSPAM_MySQL_DB_Type
+			[[ "${DSPAM_MySQL_DB_Type}" == "1" || "${DSPAM_MySQL_DB_Type}" == "2" ]] && break
+		done
+
+		if [ "${DSPAM_MySQL_DB_Type}" == "1" ]
+		then
+			/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${HOMEDIR}/mysql_objects-space.sql
+		else
+			/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${HOMEDIR}/mysql_objects-speed.sql
+		fi
+
+		einfo "Creating DSPAM MySQL database for virtual users"
+		/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${HOMEDIR}/mysql_virtual_users.sql
+
+		if use neural ; then
+			/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${HOMEDIR}/mysql_neural.sql
+		fi
+
+		einfo "Creating DSPAM MySQL user \"${DSPAM_MySQL_USER}\""
+		/usr/bin/mysql -u root -p -e "GRANT SELECT,INSERT,UPDATE,DELETE ON ${DSPAM_MySQL_DB}.* TO ${DSPAM_MySQL_USER}@localhost IDENTIFIED BY '${DSPAM_MySQL_PWD}';FLUSH PRIVILEGES;" -D mysql
+	elif use postgres ; then
+		[[ -f ${HOMEDIR}/pgsql.data ]] && mv -f ${HOMEDIR}/pgsql.data ${HOMEDIR}
+		DSPAM_PgSQL_USER="$(head -n 3 ${HOMEDIR}/pgsql.data|tail -n 1)"
+		DSPAM_PgSQL_PWD="$(head -n 4 ${HOMEDIR}/pgsql.data|tail -n 1)"
+		DSPAM_PgSQL_DB="$(head -n 5 ${HOMEDIR}/pgsql.data|tail -n 1)"
+
+		ewarn "When prompted for a password, please enter your PgSQL postgres password"
+		ewarn ""
+
+		einfo "Creating DSPAM PostgreSQL user \"${DSPAM_PgSQL_USER}\""
+		/usr/bin/psql -d template1 -U postgres -c "CREATE USER ${DSPAM_PgSQL_USER} WITH PASSWORD '${DSPAM_PgSQL_PWD}' NOCREATEDB NOCREATEUSER;" 1>/dev/null 2>&1
+
+		einfo "Creating DSPAM PostgreSQL database \"${DSPAM_PgSQL_DB}\""
+		/usr/bin/psql -d template1 -U postgres -c "CREATE DATABASE ${DSPAM_PgSQL_DB};" 1>/dev/null 2>&1
+
+		einfo "Getting DSPAM PostgreSQL userid for \"${DSPAM_PgSQL_USER}\""
+		DSPAM_PgSQL_USERID=$(/usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -t -c "SELECT usesysid FROM pg_user WHERE usename='${DSPAM_PgSQL_USER}';" | head -n1 | sed "s/^[ ]*\([^ ]*\).*/\1/g")
+		einfo "  UserID: ${DSPAM_PgSQL_USERID}"
+
+		einfo "Getting DSPAM PostgreSQL databaseid for \"${DSPAM_PgSQL_DB}\""
+		DSPAM_PgSQL_DBID=$(/usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -t -c "SELECT datdba FROM pg_database WHERE datname='${DSPAM_PgSQL_DB}';" | head -n1 | sed "s/^[ ]*\([^ ]*\).*/\1/g")
+		einfo "  DBID: ${DSPAM_PgSQL_DBID}"
+
+		einfo "Changing owner of DSPAM PostgreSQL database \"${DSPAM_PgSQL_DB}\" to \"${DSPAM_PgSQL_USER}\""
+		/usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -c "UPDATE pg_database SET datdba=${DSPAM_PgSQL_USERID} WHERE datname='${DSPAM_PgSQL_DB}';" 1>/dev/null 2>&1
+
+		einfo "Creating DSPAM PostgreSQL tables"
+		PGUSER=${DSPAM_PgSQL_USER} PGPASSWORD=${DSPAM_PgSQL_PWD} /usr/bin/psql -d ${DSPAM_PgSQL_DB} -U ${DSPAM_PgSQL_USER} -f ${HOMEDIR}/pgsql_objects.sql 1>/dev/null 2>&1
+		PGUSER=${DSPAM_PgSQL_USER} PGPASSWORD=${DSPAM_PgSQL_PWD} /usr/bin/psql -d ${DSPAM_PgSQL_DB} -U ${DSPAM_PgSQL_USER} -f ${HOMEDIR}/pgsql_virtual_users.sql 1>/dev/null 2>&1
+
+		einfo "Grant privileges to DSPAM PostgreSQL objects to \"${DSPAM_PgSQL_USER}\""
+		for foo in $(/usr/bin/psql -t -d ${DSPAM_PgSQL_DB} -U postgres -c "SELECT tablename FROM pg_tables WHERE tablename LIKE 'dspam\%';")
+		do
+			/usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -c "GRANT ALL PRIVILEGES ON TABLE ${foo} TO ${DSPAM_PgSQL_USER};" 1>/dev/null 2>&1
+		done
+		/usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE ${DSPAM_PgSQL_DB} TO ${DSPAM_PgSQL_USER};" 1>/dev/null 2>&1
+		/usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -c "GRANT ALL PRIVILEGES ON SCHEMA public TO ${DSPAM_PgSQL_USER};" 1>/dev/null 2>&1
+	elif use oci8 ; then
+		[[ -f ${HOMEDIR}/oracle.data ]] && mv -f ${HOMEDIR}/oracle.data ${HOMEDIR}
+	elif use sqlite3 ; then
+		einfo "sqlite3_drv will automatically create the necessary database"
+		einfo "objects for each user upon first use of DSPAM by that user."
+	elif use sqlite ; then
+		einfo "sqlite_drv will automatically create the necessary database"
+		einfo "objects for each user upon first use of DSPAM by that user."
+	fi
+
+}
diff --git a/mail-filter/dspam/files/digest-dspam-3.4_rc3 b/mail-filter/dspam/files/digest-dspam-3.4_rc3
new file mode 100644
index 000000000000..e729bd1357f6
--- /dev/null
+++ b/mail-filter/dspam/files/digest-dspam-3.4_rc3
@@ -0,0 +1,2 @@
+MD5 6fd75bee56adbff457ef9bae7dcf6bc8 dspam-3.4.pr1.tar.gz 684032
+MD5 8ffe9d41e6104a4c6d19067528193145 dspam_sa_trainer.tar.gz 1230