new version, fixes bug# 51522 (thanks to j. <merkaba@quantumfish.com>)

6 files changed, 260 insertions, 5 deletions

diff --git a/mail-filter/spambayes/ChangeLog b/mail-filter/spambayes/ChangeLog
index bbae87c074c4..c0b2ad28f6fa 100644
--- a/mail-filter/spambayes/ChangeLog
+++ b/mail-filter/spambayes/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/spambayes
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/ChangeLog,v 1.2 2004/06/04 23:02:59 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/ChangeLog,v 1.3 2004/06/07 15:23:54 lordvan Exp $
+
+*spambayes-1.0_rc1 (07 Jun 2004)
+
+  07 Jun 2004; Thomas Raschbacher <lordvan@gentoo.org>
+  +files/bayescustomize.ini, +files/spambayespop3proxy.rc,
+  +spambayes-1.0_rc1.ebuild:
+  new version, fixes bug# 51522 (thanks to j. <merkaba@quantumfish.com>)
+  adds init script for pop3 proxy and config file
 
   05 Jun 2004; David Holm <dholm@gentoo.org> spambayes-1.0_beta1.ebuild:
   Added to ~ppc.
diff --git a/mail-filter/spambayes/Manifest b/mail-filter/spambayes/Manifest
index dac66a48bec2..77616df71743 100644
--- a/mail-filter/spambayes/Manifest
+++ b/mail-filter/spambayes/Manifest
@@ -1,6 +1,10 @@
-MD5 6aea1daf9380a62317847c18f6268a76 ChangeLog 947
-MD5 19df39ef54fc4a8677998f19bb6046ac metadata.xml 218
-MD5 0e8de636f19895020c5e24a3a283c9b1 spambayes-1.0_alpha9.ebuild 590
+MD5 5edf0dbf7881c687be01911ff3f2003f spambayes-1.0_rc1.ebuild 1422
 MD5 7c303c0abd542498cc3381d825ead4ec spambayes-1.0_beta1.ebuild 1264
-MD5 bb0d1706a516be043cf42592fab906bb files/digest-spambayes-1.0_alpha9 67
+MD5 0e8de636f19895020c5e24a3a283c9b1 spambayes-1.0_alpha9.ebuild 590
+MD5 5d0ed09edd8fd82ffd0a519dc41a5e06 ChangeLog 1250
+MD5 19df39ef54fc4a8677998f19bb6046ac metadata.xml 218
+MD5 e493796b04c4c8ab5e2a0e50bbd4f3fd files/bayescustomize.ini 3968
+MD5 52c534163bb7d37f2b179098aa65339c files/digest-spambayes-1.0_rc1 68
+MD5 db1c70a28b43b22081f4954855b6d5ec files/spambayespop3proxy.rc 713
 MD5 3c91b3be373a22e3af5205120586c3ac files/digest-spambayes-1.0_beta1 69
+MD5 bb0d1706a516be043cf42592fab906bb files/digest-spambayes-1.0_alpha9 67
diff --git a/mail-filter/spambayes/files/bayescustomize.ini b/mail-filter/spambayes/files/bayescustomize.ini
new file mode 100644
index 000000000000..b4eadc7a0a57
--- /dev/null
+++ b/mail-filter/spambayes/files/bayescustomize.ini
@@ -0,0 +1,171 @@
+[CV Driver]
+build_each_classifier_from_scratch: False
+
+[Categorization]
+ham_cutoff: 0.2
+spam_cutoff: 0.9
+
+[Classifier]
+max_discriminators: 150
+minimum_prob_strength: 0.1
+unknown_word_prob: 0.5
+unknown_word_strength: 0.45
+use_chi_squared_combining: True
+x-experimental_ham_spam_imbalance_adjustment: False
+x-use_bigrams: False
+
+[Hammie]
+train_on_filter: False
+
+[Headers]
+add_unique_id: True
+classification_header_name: X-Spambayes-Classification
+clue_mailheader_cutoff: 0.5
+evidence_header_name: X-Spambayes-Evidence
+header_ham_string: ham
+header_score_digits: 2
+header_score_logarithm: False
+header_spam_string: spam
+header_unsure_string: unsure
+include_evidence: False
+include_score: False
+include_thermostat: False
+include_trained: True
+mailid_header_name: X-Spambayes-MailId
+notate_subject: 
+notate_to: 
+score_header_name: X-Spambayes-Spam-Probability
+thermostat_header_name: X-Spambayes-Level
+trained_header_name: X-Spambayes-Trained
+
+[Storage]
+cache_expiry_days: 7
+cache_messages: True
+cache_use_gzip: False
+ham_cache: /var/lib/spambayes/pop3proxy-ham-cache
+messageinfo_storage_file: /var/lib/spambayes/spambayes.messageinfo.db
+no_cache_bulk_ham: False
+no_cache_large_messages: 0
+persistent_storage_file: /var/lib/spambayes/hammie.db
+persistent_use_database: dbm
+spam_cache: /var/lib/spambayes/pop3proxy-spam-cache
+unknown_cache: /var/lib/spambayes/pop3proxy-unknown-cache
+
+[TestDriver]
+best_cutoff_fn_weight: 1.0
+best_cutoff_fp_weight: 10.0
+best_cutoff_unsure_weight: 0.2
+compute_best_cutoffs_from_histograms: True
+ham_directories: Data/Ham/Set%d
+nbuckets: 200
+percentiles: 5 25 75 95
+pickle_basename: class
+save_histogram_pickles: False
+save_trained_pickles: False
+show_charlimit: 3000
+show_false_negatives: False
+show_false_positives: True
+show_ham_hi: 0.0
+show_ham_lo: 1.0
+show_histograms: True
+show_spam_hi: 0.0
+show_spam_lo: 1.0
+show_unsure: False
+spam_directories: Data/Spam/Set%d
+
+[Tokenizer]
+address_headers: from to cc sender reply-to
+basic_header_skip: received date x-.*
+basic_header_tokenize: False
+basic_header_tokenize_only: False
+check_octets: False
+count_all_header_lines: False
+generate_long_skips: True
+mine_received_headers: False
+octet_prefix_size: 5
+record_header_absence: False
+replace_nonascii_chars: False
+safe_headers: abuse-reports-to date errors-to from importance in-reply-to message-id mime-version organization received reply-to return-path subject to user-agent x-abuse-info x-complaints-to x-face
+skip_max_word_size: 12
+summarize_email_prefixes: False
+summarize_email_suffixes: False
+x-extract_dow: False
+x-fancy_url_recognition: False
+x-generate_time_buckets: False
+x-pick_apart_urls: False
+x-reduce_habeas_headers: False
+x-search_for_habeas_headers: False
+
+[URLRetriever]
+x-cache_directory: url-cache
+x-cache_expiry_days: 7
+x-only_slurp_base: False
+x-slurp_urls: False
+x-web_prefix: 
+
+[ZODB]
+cache_size: 2000
+event_log_file: 
+event_log_severity: 0
+folder_dir: 
+ham_folders: 
+spam_folders: 
+zeo_addr: 
+
+[globals]
+dbm_type: best
+proxy_password: 
+proxy_server: 
+proxy_username: 
+verbose: False
+
+[html_ui]
+allow_remote_connections: localhost
+default_ham_action: ham
+default_spam_action: spam
+default_unsure_action: defer
+display_adv_find: False
+display_headers: Subject From
+display_received_time: False
+display_score: False
+ham_discard_level: 0.0
+http_authentication: None
+http_password: admin
+http_user_name: admin
+launch_browser: False
+port: 8880
+rows_per_section: 10000
+spam_discard_level: 100.0
+
+[imap]
+expunge: False
+filter_folders: INBOX
+ham_train_folders: 
+move_trained_ham_to_folder: 
+move_trained_spam_to_folder: 
+password: 
+server: 
+spam_folder: 
+spam_train_folders: 
+unsure_folder: 
+use_ssl: False
+username: 
+
+[imapserver]
+password: 
+port: 143
+username: 
+
+[pop3proxy]
+allow_remote_connections: localhost
+listen_ports: 
+remote_servers: 
+
+[smtpproxy]
+allow_remote_connections: localhost
+ham_address: spambayes_ham@localhost
+listen_ports: 
+remote_servers: 
+spam_address: spambayes_spam@localhost
+use_cached_message: False
+
diff --git a/mail-filter/spambayes/files/digest-spambayes-1.0_rc1 b/mail-filter/spambayes/files/digest-spambayes-1.0_rc1
new file mode 100644
index 000000000000..43d240ada5f9
--- /dev/null
+++ b/mail-filter/spambayes/files/digest-spambayes-1.0_rc1
@@ -0,0 +1 @@
+MD5 815640be20e9f579fa4f864cd6b9e57c spambayes-1.0rc1.tar.gz 684857
diff --git a/mail-filter/spambayes/files/spambayespop3proxy.rc b/mail-filter/spambayes/files/spambayespop3proxy.rc
new file mode 100644
index 000000000000..c9a012ee6ff6
--- /dev/null
+++ b/mail-filter/spambayes/files/spambayespop3proxy.rc
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/files/spambayespop3proxy.rc,v 1.1 2004/06/07 15:23:54 lordvan Exp $
+
+customize_ini=/etc/bayescustomize.ini
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting SpamBayes POP3 Proxy daemon"
+	export BAYESCUSTOMIZE="${customize_ini}"
+	start-stop-daemon --start --quiet --background --pidfile /var/run/spambayes.pid --make-pidfile --exec /usr/bin/sb_server.py
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping SpamBayes POP3 Proxy daemon"
+	start-stop-daemon --stop --quiet --pidfile /var/run/spambayes.pid --name sb_server.py
+	eend $?
+}
diff --git a/mail-filter/spambayes/spambayes-1.0_rc1.ebuild b/mail-filter/spambayes/spambayes-1.0_rc1.ebuild
new file mode 100644
index 000000000000..bb86e1fda053
--- /dev/null
+++ b/mail-filter/spambayes/spambayes-1.0_rc1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/spambayes-1.0_rc1.ebuild,v 1.1 2004/06/07 15:23:54 lordvan Exp $
+
+inherit distutils
+
+# Very obscure source package naming, spambayes-1.0b1.1.tar.gz
+# replacing _beta with "b1." so file fetching will be correct.
+MY_PV=${PV/_rc/rc}
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="An anti-spam filter using on Bayesian filtering"
+HOMEPAGE="http://spambayes.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+RESTRICT="nomirror"
+
+LICENSE="PSF-2.2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/python-2.2.2"
+
+# removing ".1" from the work directory name
+S=${WORKDIR}/${MY_P/.1}
+
+src_install() {
+	distutils_src_install
+	dodoc *.txt || die "doc *.txt files failed"
+	# someone might have benefits of the other documetation too,
+	# therefore added.
+	docinto contrib || die "doc directory, contrib, fail"
+	dodoc contrib/* || die "doc contrib/* failed"
+	docinto utilities || die "doc directory, utilities, failed"
+	dodoc utilities/* || die "doc utilities/* failed"
+	docinto testtools || die "doc directory, testtools, failed"
+	dodoc testtools/* || die "doc testtools/* failed"
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/spambayespop3proxy.rc spambayespop3proxy
+
+	insinto /etc
+	doins ${FILESDIR}/bayescustomize.ini
+
+	keepdir /var/lib/spambayes
+
+}
+