rework debian filters

[etc/mailfilter.git] / procmail / rules / debian

diff --git a/procmail/rules/debian b/procmail/rules/debian
index 9e36a794ac41922fa9984d0556bbaf1f3000051c..d42f8a96a3eb49f3bd57d03042686c6b975de6d8 100644 (file)
--- a/procmail/rules/debian
+++ b/procmail/rules/debian
@@ -1,18 +1,32 @@
 :0
-* ^X-Debian-PR-Source: \/.+
-* ? grep -q "^${MATCH}$" $CONF/debian-packages
-{ 
-  LOG="debian:      message related to package $MATCH$NL"
-  DEST=debian.$MATCH
+* FROM ?? ^owner@bugs\.debian\.org \(Debian Bug Tracking System\)$
+* MESSAGE ?? ^ack-info
+{
+  LOG="debian:      discarding BTS reply acknowledgement$NL"
+  SWITCHRC=$PMDIR/discard
 }
 
-:0 E
+:0
+*$ ^X-Debian-PR-Package:$RE_EXTRACT_HEADER_VALUE
+{ PACKAGE="$MATCH" }
+
+:0
+*$ ^X-Debian-PR-Source:$RE_EXTRACT_HEADER_VALUE
+{ SRCPACKAGE="$MATCH" }
+
+:0
+*$ ^X-Debian-PR-Message:$RE_EXTRACT_HEADER_VALUE
+{ MESSAGE="$MATCH" }
+
+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 }
+{ DEST=debian.libkdtree++ }
 
 :0 E
 * EQ_TO ?? ^pkg-mdadm-(devel|commits)@lists\.alioth\.debian\.org$
@@ -23,7 +37,20 @@
 { DEST=debian.netconf }
 
 :0 E
-* EQ_TO ?? ^madduck@deb(ian\.(org|ch|net)|conf\.org)
+* SRCPACKAGE ?? .
+* ? $FGREP -q "${SRCPACKAGE}" $CONF/debian-packages
+{ 
+  LOG="debian:      message related to package $MATCH$NL"
+  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
+* EQ_TO ?? ^.+@debian\.(org|ch|net)$
 { DEST=debian }
 
 # delay messages until next weekend
@@ -33,6 +60,12 @@
 * -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
+
 # vim:ft=procmail