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:

write justme headers at the end
authormartin f. krafft <madduck@seamus.madduck.net>
Fri, 17 Aug 2007 14:17:46 +0000 (16:17 +0200)
committermartin f. krafft <madduck@seamus.madduck.net>
Fri, 17 Aug 2007 14:17:46 +0000 (16:17 +0200)
procmail/addheaders [new file with mode: 0644]
procmail/defines
procmail/justme
procmail/procmailrc

diff --git a/procmail/addheaders b/procmail/addheaders
new file mode 100644 (file)
index 0000000..dc37f13
--- /dev/null
@@ -0,0 +1,5 @@
+:0 fw
+* JUSTME ?? .
+|$FORMAIL -A"X-Justme: $JUSTME"
+
+# vim:set ft=procmail
index 2d775554818e1a245a341929ea5a309746be95c7..7df70cd0996212dc0dd61cd8df74baf67a69a02a 100644 (file)
@@ -171,3 +171,7 @@ SPAM_UNKNOWN
 # RETRAIN
 # if set, causes spamfilters to be retrained, according to the variable's value
 RETRAIN
+
+# JUSTME
+# if set, contains reason why justme message was passed
+JUSTME
index f6edc50d32b7590a727f52950a81b380540524aa..e4b9c60c0155681b30da1c802de85396eadd0ade 100644 (file)
@@ -4,61 +4,54 @@
   :0 H
   *$ MSGID ?? ^<.+@$RE_MYDOMAIN>
   {
-    LOG="justme:      passing; from machine in my domain$NL"
-    :0 fw
-    |$FORMAIL -I'X-Justme: from machine in my domain'
+    JUSTME="from machine in my domain"
+    LOG="justme:      passing; $JUSTME$NL"
     SKIP_SPAMCHECKS=from-mydomain
   }
 
   :0 EH
   *$ ^(References|In-Reply-To):.*<.+@$RE_MYDOMAIN>
   {
-    LOG="justme:      passing; in-reply-to/referenced$NL"
-    :0 fw
-    |$FORMAIL -I'X-Justme: in-reply-to/referenced'
+    JUSTME="in-reply-to/referenced"
+    LOG="justme:      passing; $JUSTME$NL"
     SKIP_SPAMCHECKS=in-reply-to/referenced
   }
 
   :0 E
   * ? echo "$ORIGINAL_TO" | $EGREP -qif $CONF/justme-address-exceptions
   { 
-    LOG="justme:      passing; explicitly excepted address$NL"
-    :0 fw
-    |$FORMAIL -I'X-Justme: in-reply-to/referenced'
+    JUSTME="explicitly excepted address"
+    LOG="justme:      passing; $JUSTME$NL"
   }
 
   :0 EBH
   *$ 1^0 B ?? $RE_FIRSTNAME$RE_SPACE_NEWLINE+$RE_LASTNAME
   *$ 1^0 B ?? $RE_LASTNAME[,]?$RE_SPACE_NEWLINE*$RE_FIRSTNAME
   {
-    LOG="justme:      passing; full name reference$NL"
-    :0 fw
-    |$FORMAIL -I'X-Justme: full name reference'
+    JUSTME="full name reference"
+    LOG="justme:      passing; $JUSTME$NL"
   }
 
   :0 EBH
   *$ B ?? $RE_LASTNAME
   {
-    LOG="justme:      passing; last name reference$NL"
-    :0 fw
-    |$FORMAIL -I'X-Justme: last name reference'
+    JUSTME="last name reference"
+    LOG="justme:      passing; $JUSTME$NL"
   }
 
   :0 EBH
   *  1^0 B ?? madduck
   * -1^0 B ?? mass\.madduck\.net
   {
-    LOG="justme:      passing; nickname reference$NL"
-    :0 fw
-    |$FORMAIL -I'X-Justme: nickname reference'
+    JUSTME="nickname reference"
+    LOG="justme:      passing; $JUSTME$NL"
   }
 
   :0 EBH
   *$ ? $EGREP -qif $CONF/justme-keyword-exceptions
   {
-    LOG="justme:      passing; keyword reference$NL"
-    :0 fw
-    |$FORMAIL -I'X-Justme: keyword reference'
+    JUSTME="keyword reference"
+    LOG="justme:      passing; $JUSTME$NL"
   }
 
   :0 E
index 0d322477a69c5b0d91ca102caccfe5d9f101f49f..35dbd26ae491c51a0e0a5bbeaacb1304d84a3c0e 100755 (executable)
@@ -66,6 +66,8 @@ INCLUDERC=$PMDIR/spamfilter
 
 #INCLUDERC=$PMDIR/autoreplies
 
+INCLUDERC=$PMDIR/addheaders
+
 INCLUDERC=$PMDIR/lurker
 
 INCLUDERC=$PMRULES/all