Removed many unnecessary files, version bump, removed 3.3.9.

15 files changed, 33 insertions, 76 deletions

diff --git a/mail-filter/dspam/ChangeLog b/mail-filter/dspam/ChangeLog
index 2a373719db40..5f3d6d8b8c9e 100644
--- a/mail-filter/dspam/ChangeLog
+++ b/mail-filter/dspam/ChangeLog
@@ -1,6 +1,10 @@
 # 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.34 2005/01/05 01:17:46 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.35 2005/01/12 08:50:45 st_lim Exp $
+
+  12 Jan 2005; Lim Swee Tat <st_lim@gentoo.org> :
+  Version bump to 3.3.11. May need to support bnr and libdclassify and
+  nodalcore engine. Removed many unneeded files from files directory.
 
 *dspam-3.2.3 (05 Jan 2005)
 
diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest
index f5ac1de577fe..f25373b71713 100644
--- a/mail-filter/dspam/Manifest
+++ b/mail-filter/dspam/Manifest
@@ -1,22 +1,14 @@
-MD5 33d0b176b47e12e6f83e5e5682b9cd30 ChangeLog 7051
-MD5 455e041c22771d506be8ee070817d3e5 dspam-3.2.4.ebuild 15739
-MD5 6c5807c5b4023fba43a9479ddc5d3ca3 dspam-3.3.8.ebuild 15811
-MD5 e81394692ceae2b5ab3755579e74c762 dspam-3.3.9.ebuild 15811
+MD5 54a30a1361bc29c7072f98f10156c8ed ChangeLog 7192
+MD5 b18131ea64d7f2e81bfc275494fcc23e dspam-3.2.4.ebuild 15740
+MD5 eb3c5c900df6e83bfd584ecb35989a03 dspam-3.3.11.ebuild 15600
+MD5 0f47e53b2f67566820576c18780e415e dspam-3.3.8.ebuild 15812
 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 b457f9c7626e31c5d8ad41e09b735602 files/digest-dspam-3.3.11 130
 MD5 9a2fda6789f0db17b6a32ca84e9e3884 files/dspam.cron 2501
 MD5 2163ca41de383f09f4d754e2d35cb158 files/logrotate.dspam 156
-MD5 84ec40b77696359ae49560588db9b948 files/mysql.data 52
-MD5 5bcf982f468f4843ef3aa51213cc0023 files/mysql_create_user.sql 194
-MD5 2a79c945ef6c7e7bd45aa1d46ae99e69 files/mysql_install_db 114
-MD5 9fed58b73e35e02ecc3f9a08dcd94eaa files/mysql_purge_db 73
-MD5 a6fc685d30abb83a1ab5ac0181ad1f7c files/pgsql.data 51
-MD5 e6d1b8232199f288fe75501251ade317 files/trusted.users 19
-MD5 2cd345708a9889a04c472a9e5be7400e files/untrusted.mailer_args 24
-MD5 8b68501138fbe92e10bbd93a03c9f2ab files/upgrade.sql 807
 MD5 ea56d34fd80be48f9b308655b5620c2f files/digest-dspam-3.2.4 63
 MD5 ad704c9a2372dd9ab4d112a8c687873e files/digest-dspam-3.3.8 63
-MD5 82573c9fd08e0adbfc7fa0936fde6498 files/digest-dspam-3.3.9 63
diff --git a/mail-filter/dspam/dspam-3.2.4.ebuild b/mail-filter/dspam/dspam-3.2.4.ebuild
index ef9067b2eeb9..c272d7cd0eaa 100644
--- a/mail-filter/dspam/dspam-3.2.4.ebuild
+++ b/mail-filter/dspam/dspam-3.2.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/dspam/dspam-3.2.4.ebuild,v 1.2 2005/01/05 01:17:46 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.2.4.ebuild,v 1.3 2005/01/12 08:50:45 st_lim Exp $
 
 inherit eutils
 
@@ -67,7 +67,7 @@ src_compile() {
 	myconf="${myconf} --enable-long-username"
 	myconf="${myconf} --enable-robinson"
 	#myconf="${myconf} --enable-chi-square"
-	myconf="${myconf} --enable-robinson-pvalues"
+	#myconf="${myconf} --enable-robinson-pvalues"
 	#myconf="${myconf} --enable-broken-mta"
 	use large-domain && myconf="${myconf} --enable-large-scale" || myconf="${myconf} --enable-domain-scale"
 
diff --git a/mail-filter/dspam/dspam-3.3.9.ebuild b/mail-filter/dspam/dspam-3.3.11.ebuild
index 488b60829833..fd7ab77f7b4d 100644
--- a/mail-filter/dspam/dspam-3.3.9.ebuild
+++ b/mail-filter/dspam/dspam-3.3.11.ebuild
@@ -1,12 +1,13 @@
 # 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.3.9.ebuild,v 1.1 2005/01/05 01:17:46 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.3.11.ebuild,v 1.1 2005/01/12 08:50:45 st_lim Exp $
 
 inherit eutils
 
 S=${WORKDIR}/${PN}-${PV}
 DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter"
-SRC_URI="http://dspam.nuclearelephant.com/sources/${PN}-${PV}.tar.gz"
+SRC_URI="http://dspam.nuclearelephant.com/sources/${PN}-${PV}.tar.gz
+	http://dspam.nuclearelephant.com/sources/extras/dspam_sa_trainer.tar.gz"
 HOMEPAGE="http://dspam.nuclearelephant.com/"
 LICENSE="GPL-2"
 
@@ -61,15 +62,15 @@ src_compile() {
 	local myconf
 
 	# these are the default settings
-	myconf="${myconf} --with-signature-life=14"
-	myconf="${myconf} --enable-broken-return-codes"
-	myconf="${myconf} --enable-experimental"
+	myconf="${myconf} --enable-daemon"
+	#myconf="${myconf} --enable-nodalcore"
+	myconf="${myconf} --enable-homedir"
 	myconf="${myconf} --enable-long-username"
 	myconf="${myconf} --enable-robinson"
 	#myconf="${myconf} --enable-chi-square"
-	myconf="${myconf} --enable-robinson-pvalues"
-	#myconf="${myconf} --enable-broken-mta"
-	use large-domain && myconf="${myconf} --enable-large-scale" || myconf="${myconf} --enable-domain-scale"
+	#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"
@@ -77,8 +78,6 @@ src_compile() {
 	myconf="${myconf} --with-dspam-home=${HOMEDIR} --sysconfdir=${HOMEDIR}"
 	myconf="${myconf} --with-logdir=${LOGDIR}"
 
-	# enables support for debugging (touch /etc/dspam/.debug to turn on)
-	# optional: even MORE debugging output, use with extreme caution!
 	use debug && myconf="${myconf} --enable-debug --enable-verbose-debug"
 
 	# select storage driver
@@ -86,7 +85,6 @@ src_compile() {
 		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} --with-client-compression"
 		myconf="${myconf} --enable-virtual-users"
 		myconf="${myconf} --enable-preferences-extension"
 
@@ -169,6 +167,7 @@ src_install () {
 		dodoc src/tools.sqlite_drv/README
 	fi
 	doman man/dspam*
+	dodoc ${DISTDIR}/dspam_sa_trainer.tar.gz
 
 	# build some initial configuration data
 	# Copy existing dspam.conf
@@ -223,7 +222,6 @@ src_install () {
 		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
-		newins ${FILESDIR}/upgrade.sql mysql_upgrade.sql
 	elif use postgres ; then
 		if [ -f ${HOMEDIR}/pgsql.data ]; then
 			# Use an existing password
@@ -269,6 +267,13 @@ src_install () {
 	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
@@ -277,14 +282,6 @@ src_install () {
 	exeopts -m0755 -o dspam -g dspam
 	doexe ${FILESDIR}/dspam.cron
 
-	# 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
-	insopts -m0755 -o dspam -g dspam
-	newins ${FILESDIR}/logrotate.dspam dspam
-
 	# dspam enviroment
 	echo -ne "CONFIG_PROTECT_MASK=\"${HOMEDIR}\"\n\n" > ${T}/40dspam
 	doenvd ${T}/40dspam || die
diff --git a/mail-filter/dspam/dspam-3.3.8.ebuild b/mail-filter/dspam/dspam-3.3.8.ebuild
index b5f6a4d94ada..ded8c0dbfe9d 100644
--- a/mail-filter/dspam/dspam-3.3.8.ebuild
+++ b/mail-filter/dspam/dspam-3.3.8.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.3.8.ebuild,v 1.3 2005/01/05 01:17:46 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.3.8.ebuild,v 1.4 2005/01/12 08:50:45 st_lim Exp $
 
 inherit eutils
 
@@ -67,7 +67,7 @@ src_compile() {
 	myconf="${myconf} --enable-long-username"
 	myconf="${myconf} --enable-robinson"
 	#myconf="${myconf} --enable-chi-square"
-	myconf="${myconf} --enable-robinson-pvalues"
+	#myconf="${myconf} --enable-robinson-pvalues"
 	#myconf="${myconf} --enable-broken-mta"
 	use large-domain && myconf="${myconf} --enable-large-scale" || myconf="${myconf} --enable-domain-scale"
 
diff --git a/mail-filter/dspam/files/digest-dspam-3.3.11 b/mail-filter/dspam/files/digest-dspam-3.3.11
new file mode 100644
index 000000000000..a1553c098c82
--- /dev/null
+++ b/mail-filter/dspam/files/digest-dspam-3.3.11
@@ -0,0 +1,2 @@
+MD5 c459a4622b18862e85103a06110fdd3f dspam-3.3.11.tar.gz 657885
+MD5 8ffe9d41e6104a4c6d19067528193145 dspam_sa_trainer.tar.gz 1230
diff --git a/mail-filter/dspam/files/digest-dspam-3.3.9 b/mail-filter/dspam/files/digest-dspam-3.3.9
deleted file mode 100644
index 9ae794b514e3..000000000000
--- a/mail-filter/dspam/files/digest-dspam-3.3.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 827a3613202c8685baaeb6bd012f82b1 dspam-3.3.9.tar.gz 656327
diff --git a/mail-filter/dspam/files/mysql.data b/mail-filter/dspam/files/mysql.data
deleted file mode 100644
index 5cd72638273d..000000000000
--- a/mail-filter/dspam/files/mysql.data
+++ /dev/null
@@ -1,5 +0,0 @@
-/var/run/mysqld/mysqld.sock
-
-dspam
-@password@
-dspam
diff --git a/mail-filter/dspam/files/mysql_create_user.sql b/mail-filter/dspam/files/mysql_create_user.sql
deleted file mode 100644
index b443db6c6fdd..000000000000
--- a/mail-filter/dspam/files/mysql_create_user.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-CREATE DATABASE IF NOT EXISTS dspam;
-GRANT USAGE ON dspam.* TO 'dspam'@'localhost' IDENTIFIED BY '@password@';
-GRANT SELECT, INSERT, UPDATE, DELETE ON dspam.* TO 'dspam'@'localhost';
-USE dspam;
diff --git a/mail-filter/dspam/files/mysql_install_db b/mail-filter/dspam/files/mysql_install_db
deleted file mode 100644
index 39f9f08403d2..000000000000
--- a/mail-filter/dspam/files/mysql_install_db
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-echo Type your mysql root password at the prompt
-/usr/bin/mysql -u root -p < @confdir@/mysql_setup.sql 
diff --git a/mail-filter/dspam/files/mysql_purge_db b/mail-filter/dspam/files/mysql_purge_db
deleted file mode 100644
index 5bc1a112fad2..000000000000
--- a/mail-filter/dspam/files/mysql_purge_db
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/mysql -u dspam -p'@password@' dspam < @confdir@/mysql_purge.sql
diff --git a/mail-filter/dspam/files/pgsql.data b/mail-filter/dspam/files/pgsql.data
deleted file mode 100644
index 0799e5e5c410..000000000000
--- a/mail-filter/dspam/files/pgsql.data
+++ /dev/null
@@ -1,5 +0,0 @@
-@HOSTNAME@
-@PORT@
-@USERNAME@
-@PASSWORD@
-@DATABASE@
diff --git a/mail-filter/dspam/files/trusted.users b/mail-filter/dspam/files/trusted.users
deleted file mode 100644
index eeeb26b4d533..000000000000
--- a/mail-filter/dspam/files/trusted.users
+++ /dev/null
@@ -1,3 +0,0 @@
-nobody
-root
-apache
diff --git a/mail-filter/dspam/files/untrusted.mailer_args b/mail-filter/dspam/files/untrusted.mailer_args
deleted file mode 100644
index 697e37f43b55..000000000000
--- a/mail-filter/dspam/files/untrusted.mailer_args
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/procmail -d %u
diff --git a/mail-filter/dspam/files/upgrade.sql b/mail-filter/dspam/files/upgrade.sql
deleted file mode 100644
index 160f686764e1..000000000000
--- a/mail-filter/dspam/files/upgrade.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-alter table dspam_stats add spam_learned int;
-alter table dspam_stats add innocent_learned int;
-alter table dspam_stats add spam_classified int;
-alter table dspam_stats add innocent_classified int;
-update dspam_stats set spam_learned = total_spam;
-update dspam_stats set innocent_learned = total_innocent;
-update dspam_stats set spam_classified = 0, innocent_classified = 0;
-alter table dspam_stats drop column total_spam;
-alter table dspam_stats drop column total_innocent;
-alter table dspam_stats add spam_misclassified int;
-alter table dspam_stats add innocent_misclassified int;
-update dspam_stats set spam_misclassified = spam_misses;
-update dspam_stats set innocent_misclassified = false_positives;
-alter table dspam_stats drop column spam_misses;
-alter table dspam_stats drop column false_positives;