76 lines
4 KiB
Text
76 lines
4 KiB
Text
$NetBSD: patch-ba,v 1.2 2007/04/22 07:17:30 briandealwis Exp $
|
|
|
|
--- mailreaver.crm.orig 2007-04-22 00:37:28.000000000 -0600
|
|
+++ mailreaver.crm
|
|
@@ -384,21 +384,21 @@ isolate (:cacheid:) //
|
|
match [:spam:] /SET/
|
|
{
|
|
isolate (:tmp:) //
|
|
- syscall () (:tmp:) /\/bin\/ls :*:long_cacheid:/
|
|
+ syscall () (:tmp:) /\/bin\/ls :*:fileprefix::*:long_cacheid:/
|
|
match [:tmp:] /:*:cacheid:/
|
|
#
|
|
# remember this file on a permanent basis by linking it into
|
|
# the known-spam directory.
|
|
- syscall /:*:cache_dupe_command: :*:text_cache:\/texts\/:*:cacheid: :*:text_cache:\/known_spam\/:*:cacheid: /
|
|
+ syscall /:*:cache_dupe_command: :*:fileprefix::*:text_cache:\/texts\/:*:cacheid: :*:fileprefix::*:text_cache:\/known_spam\/:*:cacheid: /
|
|
#
|
|
# Now run mailtrainer.crm on the new copy
|
|
isolate (:mailtrainer_output:)
|
|
- syscall /:*:fileprefix::*:trainer_invoke_command: --fileprefix=:*:fileprefix: --spam=:*:text_cache:\/known_spam\/:*:cacheid: --good=:*:text_cache:\/empty\/ / () (:mailtrainer_output:)
|
|
+ syscall /:*:trainer_invoke_command: --fileprefix=:*:fileprefix: --spam=:*:fileprefix::*:text_cache:\/known_spam\/:*:cacheid: --good=:*:fileprefix::*:text_cache:\/empty\/ / () (:mailtrainer_output:)
|
|
#output /mailtrainer output: ':*:mailtrainer_output:'\n/
|
|
# and remove it from the prob_* directories, as
|
|
# now it's known
|
|
- syscall /\/bin\/rm -rf :*:text_cache:\/prob_spam\/:*:cacheid:/
|
|
- syscall /\/bin\/rm -rf :*:text_cache:\/prob_good\/:*:cacheid:/
|
|
+ syscall /\/bin\/rm -rf :*:fileprefix::*:text_cache:\/prob_spam\/:*:cacheid:/
|
|
+ syscall /\/bin\/rm -rf :*:fileprefix::*:text_cache:\/prob_good\/:*:cacheid:/
|
|
#
|
|
# now it's trained; put in a marker in the headers
|
|
call /:mungmail_delete:/ [X-CRM114-Status: ]
|
|
@@ -436,21 +436,21 @@ isolate (:cacheid:) //
|
|
match [:good:] /SET/
|
|
{
|
|
isolate (:tmp:) //
|
|
- syscall () (:tmp:) /\/bin\/ls :*:long_cacheid:/
|
|
+ syscall () (:tmp:) /\/bin\/ls :*:fileprefix::*:long_cacheid:/
|
|
match [:tmp:] /:*:cacheid:/
|
|
#
|
|
# remember this file on a permanent basis by linking it into
|
|
# the known-good directory.
|
|
- syscall /:*:cache_dupe_command: :*:text_cache:\/texts\/:*:cacheid: :*:text_cache:\/known_good\/:*:cacheid: /
|
|
+ syscall /:*:cache_dupe_command: :*:fileprefix::*:text_cache:\/texts\/:*:cacheid: :*:fileprefix::*:text_cache:\/known_good\/:*:cacheid: /
|
|
#
|
|
# Now run mailtrainer.crm on the new copy
|
|
isolate (:mailtrainer_output:)
|
|
- syscall /:*:fileprefix::*:trainer_invoke_command: --fileprefix=:*:fileprefix: --good=:*:text_cache:\/known_good\/:*:cacheid: --spam=:*:text_cache:\/empty\/ / () (:mailtrainer_output:)
|
|
+ syscall /:*:trainer_invoke_command: --fileprefix=:*:fileprefix: --good=:*:fileprefix::*:text_cache:\/known_good\/:*:cacheid: --spam=:*:fileprefix::*:text_cache:\/empty\/ / () (:mailtrainer_output:)
|
|
#output /mailtrainer output: ':*:mailtrainer_output:'\n/
|
|
# and remove it from the prob_* directories, as
|
|
# now it's known
|
|
- syscall /\/bin\/rm -rf :*:text_cache:\/prob_spam\/:*:cacheid:/
|
|
- syscall /\/bin\/rm -rf :*:text_cache:\/prob_good\/:*:cacheid:/
|
|
+ syscall /\/bin\/rm -rf :*:fileprefix::*:text_cache:\/prob_spam\/:*:cacheid:/
|
|
+ syscall /\/bin\/rm -rf :*:fileprefix::*:text_cache:\/prob_good\/:*:cacheid:/
|
|
#
|
|
# now it's trained; put in a marker in the headers
|
|
call /:mungmail_delete:/ [X-CRM114-Status: ]
|
|
@@ -582,7 +582,7 @@ input (:priolist:) [:*:fileprefix:prioli
|
|
{
|
|
match [:text_cache:] /./
|
|
match [:cacheid:] /./
|
|
- syscall /:*:cache_dupe_command: :*:text_cache:\/texts\/:*:cacheid: :*:text_cache:\/prob_spam\/:*:cacheid: /
|
|
+ syscall /:*:cache_dupe_command: :*:fileprefix::*:text_cache:\/texts\/:*:cacheid: :*:fileprefix::*:text_cache:\/prob_spam\/:*:cacheid: /
|
|
}
|
|
|
|
# flag the subject line
|
|
@@ -619,7 +619,7 @@ goto /:finish_up:/
|
|
{
|
|
match [:text_cache:] /./
|
|
match [:cacheid:] /./
|
|
- syscall /:*:cache_dupe_command: :*:text_cache:\/texts\/:*:cacheid: :*:text_cache:\/prob_good\/:*:cacheid: /
|
|
+ syscall /:*:cache_dupe_command: :*:fileprefix::*:text_cache:\/texts\/:*:cacheid: :*:fileprefix::*:text_cache:\/prob_good\/:*:cacheid: /
|
|
}
|
|
|
|
|