X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/ffd30324a02a87cf0108f842f402b4f05f4a40b4..432badd76997858ae849b0784e8247b77d5c46c8:/procmail/rules/debian

diff --git a/procmail/rules/debian b/procmail/rules/debian
index c4c71e3..c18d27e 100644
--- a/procmail/rules/debian
+++ b/procmail/rules/debian
@@ -8,15 +8,45 @@
 {
   LOG="debian:      discarding BTS reply acknowledgement$NL"
   SWITCHRC=$PMDIR/discard
-#}
+}
+
+RE_DEBBUG="[0-9][0-9][0-9][0-9][0-9][0-9]"
 
 :0
-*$ ^X-Debian-PR-Package:$RE_EXTRACT_HEADER_VALUE
-{ PACKAGE="$MATCH" }
+*$ MSGID ?? ^\<handler\.$RE_DEBBUG\.D$RE_DEBBUG\.[0-9]+\.ackdone@bugs\.debian\.org
+{
+  LOG="debian:      discarding BTS ackdone message$NL"
+  SWITCHRC=$PMDIR/discard
+}
 
 :0
-*$ ^X-Debian-PR-Source:$RE_EXTRACT_HEADER_VALUE
-{ SRCPACKAGE="$MATCH" }
+* ^X-Debian: PTS$
+{
+  :0
+  *$ ^X-Debian-Package:$RE_EXTRACT_HEADER_VALUE
+  { SRCPACKAGE="$MATCH" }
+
+  :0
+  *$ ^X-PTS-Keyword:$RE_EXTRACT_HEADER_VALUE
+  {
+    PTSKEYWORD="$MATCH"
+    LOG="debian:      PTS '$MATCH' message for ${SRCPACKAGE:-unknown package}$NL"
+  }
+}
+
+:0 E
+{
+  :0
+  *$ ^X-Debian-PR-Package:$RE_EXTRACT_HEADER_VALUE
+  { PACKAGE="$MATCH" }
+
+  :0
+  *$ ^X-Debian-PR-Source:$RE_EXTRACT_HEADER_VALUE
+  {
+    SRCPACKAGE="$MATCH"
+    LOG="debian:      message related to source package $MATCH$NL"
+  }
+}
 
 INCLUDERC=$PMRULES/debian-debbugs-autosubscribe
 
@@ -39,10 +69,7 @@ INCLUDERC=$PMRULES/debian-debbugs-autosubscribe
 :0 E
 * SRCPACKAGE ?? .
 * ? $FGREP -q "${SRCPACKAGE}" $CONF/debian-packages
-{ 
-  LOG="debian:      message related to package $MATCH$NL"
-  DEST=debian.$SRCPACKAGE
-}
+{ DEST=debian.$SRCPACKAGE }
 
 :0 E
 * 1^0 EQ_TO ?? ^(madduck|press)@debconf\.org$
@@ -51,21 +78,26 @@ INCLUDERC=$PMRULES/debian-debbugs-autosubscribe
 
 :0 E
 * EQ_TO ?? ^.+@debian\.(org|ch|net)$
-{ DEST=debian }
+{ 
+  DELAY
+  DEST=debian
+}
 
 # delay messages until next weekend
-:0
-*     1 ^0 ORIGINAL_TO ?? deb(ian\.(org|ch|net)|conf\.org)@
-*     1 ^0 ^X-Debian-
-* -1000 ^0 JUSTME ?? .
-*  1000 ^0 JUSTME ?? ^explicitly excepted address$
-* -1000 ^0 EQ_TO ?? ^debian-security-announce@lists\.debian\.org$
-* -1000 ^0 EQ_TO ?? ^debian-devel-announce@lists\.debian\.org$
-* -1000 ^0 EQ_TO ?? ^debian-announce@lists\.debian\.org$
-{ DELAY="$DELAY_NEXT_WEEKEND" }
+#:0
+#*     1 ^0 ORIGINAL_TO ?? deb(ian\.(org|ch|net)|conf\.org)@
+#*     1 ^0 ^X-Debian-
+#* -1000 ^0 JUSTME ?? .
+#*  1000 ^0 JUSTME ?? ^explicitly excepted address$
+#* -1000 ^0 EQ_TO ?? ^debian-security-announce@lists\.debian\.org$
+#* -1000 ^0 EQ_TO ?? ^debian-devel-announce@lists\.debian\.org$
+#* -1000 ^0 EQ_TO ?? ^debian-announce@lists\.debian\.org$
+#{ DELAY="$DELAY_NEXT_WEEKEND" }
 
 MESSAGE
 SRCPACKAGE
 PACKAGE
+PTSKEYWORD
+RE_DEBBUG
 
 # vim:ft=procmail