do discarding in a central place

diff --git a/procmail/discard b/procmail/discard
new file mode 100644 (file)
index 0000000..abe46be
--- /dev/null
+++ b/procmail/discard
@@ -0,0 +1,6 @@
+INCLUDERC=$PMDIR/addheaders
+
+:0
+$DISCARD
+
+# vim:ft=procmail

diff --git a/procmail/ignore b/procmail/ignore
index b207b044eb7a0b4fcb5d18b9d69bb7900fe19787..e49b667488ca991817565658929f2ff975c8bbcd 100644 (file)
--- a/procmail/ignore
+++ b/procmail/ignore
@@ -2,8 +2,7 @@
 * ? $EGREP -qif $CONF/ignore
 {
   LOG="ignore:      discarding ignored message $MSGID from $FROM to $ORIGINAL_TO$NL"
-  :0
-  $DISCARD
+  SWITCHRC=$PMDIR/discard
 }
 
 :0 H

diff --git a/procmail/justme b/procmail/justme
index 3d5f6fc7c7bf9c47e54be132b858b9b61cbf59b5..ac3dbd6868d926666be4b9d7d0c145af255f2808 100644 (file)
--- a/procmail/justme
+++ b/procmail/justme
@@ -66,6 +66,14 @@
       LOG="justme:      passing; $JUSTME$NL"
     }
 
+    :0 E
+    * FROM ?? -bounces@
+    * SUBJECT ?? ^You have been unsubscribed
+    {
+      JUSTME="mailman confirmation"
+      LOG="justme:      passing; $JUSTME$NL"
+    }
+
     :0 E
     * FROM ?? -bounces@
     * SUBJECT ?? .+ mailing list reminder$
@@ -96,11 +104,7 @@
   :0 E
   {
     LOG="justme:      discarding$NL"
-
-    INCLUDERC=$PMDIR/addheaders
-
-    :0
-    $DISCARD
+    SWITCHRC=$PMDIR/discard
   }
 }
 

diff --git a/procmail/rules/ul b/procmail/rules/ul
index 1d5aaf8a007e33a5c7a05950faf3dc1eb1a9605f..11281b69d032ad4e50d1dfa7af52cdfbb4d71f4c 100644 (file)
--- a/procmail/rules/ul
+++ b/procmail/rules/ul
@@ -15,8 +15,7 @@
   *$ 1^0 ^TO_ResearchInformationRISS@$RE_UL_DOMAIN
   {
     LOG="ul:          discard unwanted list mail$NL"
-    :0
-    $DISCARD
+    SWITCHRC=$PMDIR/discard
   }
   RE_UL_DOMAIN