]> git.madduck.net Git - etc/mailfilter.git/commitdiff

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 trailing ws
authormartin f. krafft <madduck@seamus.madduck.net>
Fri, 17 Aug 2007 15:06:00 +0000 (17:06 +0200)
committermartin f. krafft <madduck@seamus.madduck.net>
Fri, 17 Aug 2007 15:06:00 +0000 (17:06 +0200)
procmail/justme
procmail/procmailrc
procmail/spamfilter

index e4b9c60c0155681b30da1c802de85396eadd0ade..9c1269786f6e8e3215e306330353bc6778757010 100644 (file)
@@ -19,7 +19,7 @@
 
   :0 E
   * ? echo "$ORIGINAL_TO" | $EGREP -qif $CONF/justme-address-exceptions
-  { 
+  {
     JUSTME="explicitly excepted address"
     LOG="justme:      passing; $JUSTME$NL"
   }
@@ -55,7 +55,7 @@
   }
 
   :0 E
-  { 
+  {
     LOG="justme:      discarding$NL"
     :0
     $DISCARD
index fc4b83dcba3145adb3a52a58dd6be72139cb7314..37530696ab61447c700555371c1167b0a087b888 100755 (executable)
@@ -27,7 +27,7 @@ FROM_ALBATROSS=!
     L
     D
   }
+
   :0 E
   * M ?? ^\/\+?[^@]*
   { OT="madduck$MATCH@madduck.net" }
index c960e7959d2238d5a6dfa21b4c1ca0d43f50af3b..066b9cbd7845ca878c43036ee08559eb33e55bd0 100755 (executable)
@@ -23,7 +23,7 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
 # Note: add E flag to next recipe when uncommenting
 #:0
 #* SPAMTRAPPED ?? .
-#{ 
+#{
 #  LOG="spamfilter:  skipping checks for spamtrapped message$NL"
 #  :0 fw
 #  |$FORMAIL -I"X-Spam: spamtrapped"
@@ -44,8 +44,8 @@ TRAINED_AS
 # let earlier parts of the mailfilter cause bypassing the checks
 :0 E
 * SKIP_SPAMCHECKS ?? .
-{ 
-  LOG="spamfilter:  skipping checks as requested: $SKIP_SPAMCHECKS$NL" 
+{
+  LOG="spamfilter:  skipping checks as requested: $SKIP_SPAMCHECKS$NL"
   :0 fw
   |$FORMAIL -I"X-Spam: unknown (skip requested)"
   SPAM_UNKNOWN=skip-requested
@@ -240,7 +240,7 @@ TRAINED_AS
   :0 E
   * CRM_SPAM ?? SPAM
   * SA_SPAM ?? Yes
-  { 
+  {
     IS_SPAM=sa+crm
     :0 fw
     |$FORMAIL -I"X-Spam: yes (crm114:$CRM_SCORE SA:$SA_SCORE)"
@@ -255,7 +255,7 @@ TRAINED_AS
 * SPAMTRAPPED ?? .
 * ! SKIP_SPAMCHECKS ?? .
 * ! IS_SPAM ?? .
-{ 
+{
   LOG="spamfilter:  found spamtrapped ham, retraining...$NL"
   :0 fw
   |$FORMAIL -I"X-Spam: spamtrapped ham"