]> 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:

rename marknew to dejavu
authormartin f. krafft <madduck@seamus.madduck.net>
Fri, 17 Aug 2007 14:05:05 +0000 (16:05 +0200)
committermartin f. krafft <madduck@seamus.madduck.net>
Fri, 17 Aug 2007 14:05:05 +0000 (16:05 +0200)
procmail/autoreplies
procmail/defines
procmail/dejavu [new file with mode: 0644]
procmail/duplicates
procmail/marknew [deleted file]
procmail/procmailrc
procmail/spamfilter

index cc1bd62fa87f6df969c77520817bee39f3212efe..02e29f0f7624fe58033e79d03cb8d6a861f8e9f6 100644 (file)
@@ -1,4 +1,4 @@
 :0
 :0
-*$ !$REPROC_MESSAGE
+*$ !$MSG_DEJAVU
 {
 }
 {
 }
index 4d3a1882b610e894985f121bfcf01b90391de6c7..2d775554818e1a245a341929ea5a309746be95c7 100644 (file)
@@ -133,11 +133,11 @@ INCLUDERC=$PMDIR/normalise
 
 ### run-time variables
 
 
 ### run-time variables
 
-# REPROC_MESSAGE
+# MSG_DEJAVU
 # a procmail-style flag, which is true if unset and false if set (to !).
 # a procmail-style flag, which is true if unset and false if set (to !).
-# unset by marknew if the message has already been seen by the filter (according
+# unset by dejavu if the message has already been seen by the filter (according
 # to the X-Been-There header).
 # to the X-Been-There header).
-REPROC_MESSAGE=!
+MSG_DEJAVU=!
 
 # SKIP_SPAMCHECKS
 # if set, cuases spamchecks to be skipped, value lists reason
 
 # SKIP_SPAMCHECKS
 # if set, cuases spamchecks to be skipped, value lists reason
diff --git a/procmail/dejavu b/procmail/dejavu
new file mode 100644 (file)
index 0000000..c25f156
--- /dev/null
@@ -0,0 +1,9 @@
+:0
+*$ ^X-Been-There: $ID
+{
+  LOG="dejavu:      re-processing message $MSGID$NL"
+  MSG_DEJAVU
+}
+
+:0 Efw
+|$FORMAIL -A"X-Been-There: $ID"
index fc47f03a280cd992004b90b97957437e887e0eb0..eb14d4bb73190859d30a9d7a629b4ac4b51388f2 100644 (file)
@@ -3,7 +3,7 @@ MID_CACHE_FILE = $PMVAR/msgid.cache
 LOCKFILE = $MID_CACHE_FILE$LOCKEXT
 :0
 *$ !SKIP_DUP ?? .
 LOCKFILE = $MID_CACHE_FILE$LOCKEXT
 :0
 *$ !SKIP_DUP ?? .
-*$ !$REPROC_MESSAGE
+*$ !$MSG_DEJAVU
 * ^Message-ID:
 * ? $FORMAIL -D 16384 $MID_CACHE_FILE
 {
 * ^Message-ID:
 * ? $FORMAIL -D 16384 $MID_CACHE_FILE
 {
diff --git a/procmail/marknew b/procmail/marknew
deleted file mode 100644 (file)
index 63236c0..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-:0
-*$ ^X-Been-There: $ID
-{
-  LOG="marknew:     re-processing message $MSGID$NL"
-  REPROC_MESSAGE
-}
-
-:0 Efw
-|$FORMAIL -A"X-Been-There: $ID"
index 55565efbc1aae70a9c6ef803fd93f82e5fe584ec..0d322477a69c5b0d91ca102caccfe5d9f101f49f 100755 (executable)
@@ -51,7 +51,7 @@ INCLUDERC=$PMDIR/smsmail
 
 INCLUDERC=$PMDIR/logging
 
 
 INCLUDERC=$PMDIR/logging
 
-INCLUDERC=$PMDIR/marknew
+INCLUDERC=$PMDIR/dejavu
 INCLUDERC=$PMDIR/eqdomains
 
 INCLUDERC=$PMDIR/duplicates
 INCLUDERC=$PMDIR/eqdomains
 
 INCLUDERC=$PMDIR/duplicates
index 66a725e37e5cb406e3ff76bef1887d2c5697c275..1b0d0d1b83a5e339190e98d1a3d39d84a033887e 100755 (executable)
@@ -32,7 +32,7 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
 # check whether this message is being reinjected
 TRAINED_AS
 :0
 # check whether this message is being reinjected
 TRAINED_AS
 :0
-*$ $REPROC_MESSAGE
+*$ $MSG_DEJAVU
 * ^X-Trained-As: \/(h|sp)am
 {
   LOG="spamfilter:  skipping already trained $MATCH$NL"
 * ^X-Trained-As: \/(h|sp)am
 {
   LOG="spamfilter:  skipping already trained $MATCH$NL"