X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/7b2885756942760b00a9c4453cc54154fdab005b..HEAD:/procmail/rules/debian

diff --git a/procmail/rules/debian b/procmail/rules/debian
index 4422ebf..1c350d7 100644
--- a/procmail/rules/debian
+++ b/procmail/rules/debian
@@ -1,53 +1,103 @@
-INCLUDERC=$PMRULES/debian-debbugs-autosubscribe
+:0
+*$ ^X-Debian-PR-Message:$RE_EXTRACT_HEADER_VALUE
+{ MESSAGE="$MATCH" }
 
 :0
 * FROM ?? ^owner@bugs\.debian\.org \(Debian Bug Tracking System\)$
-* ^X-Debian-PR-Message: ack-info
+* MESSAGE ?? ^ack-info
 {
   LOG="debian:      discarding BTS reply acknowledgement$NL"
   SWITCHRC=$PMDIR/discard
 }
 
-:0 E
-* ^X-Debian-Package: \/.+
-* ? grep -q "^${MATCH}$" $CONF/debian-packages
-{ 
-  LOG="debian:      message related to package $MATCH$NL"
-  DEST=debian.$MATCH
+RE_DEBBUG="[0-9][0-9][0-9][0-9][0-9][0-9]"
+
+:0
+*$ 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: 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
+
+:0
 * EQ_TO ?? ^logcheck-(devel|commits)@lists\.alioth\.debian\.org$
 { DEST=debian.logcheck }
 
-:0 E
-* EQ_TO ?? ^libkdtree-(devel|commits)@lists\.alioth\.debian\.org$
-{ DEST=debian.libkdtree++ }
-
 :0 E
 * EQ_TO ?? ^pkg-mdadm-(devel|commits)@lists\.alioth\.debian\.org$
 { DEST=debian.mdadm }
 
 :0 E
-* EQ_TO ?? ^netconf-(devel|commits)@lists\.alioth\.debian\.org$
-{ DEST=debian.netconf }
-
-:0 E
-* EQ_TO ?? ^.+@debian\.(org|ch|net)$
-{ DEST=debian }
+* SRCPACKAGE ?? .
+* ? $FGREP -q "${SRCPACKAGE}" $CONF/debian-packages
+{ DEST=debian.$SRCPACKAGE }
 
 :0 E
 * 1^0 EQ_TO ?? ^(madduck|press)@debconf\.org$
 * 1^0 EQ_TO ?? ^debconf-team@lists\.debconf\.org$
 { DEST=debian.debconf }
 
+:0 E
+* 1^0 EQ_TO ?? ^.+@debian-?(system|book)\.info$
+* 1^0 EQ_TO ?? ^debianbook-.+@opensourcepress\.de$
+{
+  DELAY
+  DEST=debian.book
+}
+
+:0 E
+* EQ_TO ?? ^.+@debian\.(org|ch|net)$
+{
+  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$
-{ 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