]> git.madduck.net Git - etc/mailfilter.git/blobdiff - procmail/handlespam

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

remove fuzzyocr
[etc/mailfilter.git] / procmail / handlespam
index 4095f60844eb53ff2ae1710df4b74ff7e46edd01..e20a4914c6a7f767500e68bc72accf0c53f6b68e 100644 (file)
 #     symptom:  $IS_SPAM is set
 #     reaction: file as spam
 #
-# 4a. message needs to be retrained as spam
-#     symptom:  $CRM_RETRAIN is set to spam
+# 4. message needs to be retrained as spam
+#     symptom:  $RETRAIN is set to spam
 #     reaction: retrain filters, report, and file as spam
 #
-# 4b.  message is spamtrapped
-#     symptom:  $SPAMTRAPPED is set
-#     reaction: train filters, report, and file as spam
-#
 # 5.  message needs to be retrained as ham
-#     symptom:  $CRM_RETRAIN is set to ham
+#     symptom:  $RETRAIN is set to ham
 #     reaction: retrain crm114 and resubmit the message to the spamfilter
 #
 # 6.  spam degree is unknown:
@@ -38,7 +34,7 @@
 {
   LOG="spamfilter:  filing as unsure$NL"
   :0
-  $INBOX/.retrain.unsure/
+  { DEST=retrain.unsure }
 }
 
 :0 E
 {
   LOG="spamfilter:  filing as disagreed$NL"
   :0
-  $INBOX/.retrain.disagree/
+  { DEST=retrain.disagree }
 }
 
 :0 E
-* 1^0 CRM_RETRAIN ?? spam
-* 1^0 SPAMTRAPPED ?? .
+* RETRAIN ?? spam
 {
   LOG="spamfilter:  (re)training as spam$NL"
   :0 fw
@@ -60,7 +55,7 @@
 }
 
 :0 E
-* CRM_RETRAIN ?? ham
+* RETRAIN ?? ham
 {
   LOG="spamfilter:  retraining as ham$NL"
   :0 fw
 {
   LOG="spamfilter:  filing as spam$NL"
   :0
-  $INBOX/.spam/
+  $SPAM
 }
 
-:0
+:0 E
 { LOG="spamfilter:  allowed to pass$NL" }
 
 #:0 E