From 25e483e79c4bddd4a4f1f76e4462c7362a9db245 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Fri, 17 Aug 2007 16:05:05 +0200 Subject: [PATCH 1/1] rename marknew to dejavu --- procmail/autoreplies | 2 +- procmail/defines | 6 +++--- procmail/dejavu | 9 +++++++++ procmail/duplicates | 2 +- procmail/marknew | 9 --------- procmail/procmailrc | 2 +- procmail/spamfilter | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 procmail/dejavu delete mode 100644 procmail/marknew diff --git a/procmail/autoreplies b/procmail/autoreplies index cc1bd62..02e29f0 100644 --- a/procmail/autoreplies +++ b/procmail/autoreplies @@ -1,4 +1,4 @@ :0 -*$ !$REPROC_MESSAGE +*$ !$MSG_DEJAVU { } diff --git a/procmail/defines b/procmail/defines index 4d3a188..2d77555 100644 --- a/procmail/defines +++ b/procmail/defines @@ -133,11 +133,11 @@ INCLUDERC=$PMDIR/normalise ### run-time variables -# REPROC_MESSAGE +# MSG_DEJAVU # 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). -REPROC_MESSAGE=! +MSG_DEJAVU=! # SKIP_SPAMCHECKS # if set, cuases spamchecks to be skipped, value lists reason diff --git a/procmail/dejavu b/procmail/dejavu new file mode 100644 index 0000000..c25f156 --- /dev/null +++ b/procmail/dejavu @@ -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" diff --git a/procmail/duplicates b/procmail/duplicates index fc47f03..eb14d4b 100644 --- a/procmail/duplicates +++ b/procmail/duplicates @@ -3,7 +3,7 @@ MID_CACHE_FILE = $PMVAR/msgid.cache LOCKFILE = $MID_CACHE_FILE$LOCKEXT :0 *$ !SKIP_DUP ?? . -*$ !$REPROC_MESSAGE +*$ !$MSG_DEJAVU * ^Message-ID: * ? $FORMAIL -D 16384 $MID_CACHE_FILE { diff --git a/procmail/marknew b/procmail/marknew deleted file mode 100644 index 63236c0..0000000 --- a/procmail/marknew +++ /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" diff --git a/procmail/procmailrc b/procmail/procmailrc index 55565ef..0d32247 100755 --- a/procmail/procmailrc +++ b/procmail/procmailrc @@ -51,7 +51,7 @@ INCLUDERC=$PMDIR/smsmail INCLUDERC=$PMDIR/logging -INCLUDERC=$PMDIR/marknew +INCLUDERC=$PMDIR/dejavu INCLUDERC=$PMDIR/eqdomains INCLUDERC=$PMDIR/duplicates diff --git a/procmail/spamfilter b/procmail/spamfilter index 66a725e..1b0d0d1 100755 --- a/procmail/spamfilter +++ b/procmail/spamfilter @@ -32,7 +32,7 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail} # 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" -- 2.39.5