Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/mailfilter

diff --git a/config/justme-address-exceptions b/config/justme-address-exceptions
index fe1cb8c7023229fb1f8d174f868cb300e53b724d..7ebcea46211bfab04635a1df1697fca56ef14610 100644 (file)
--- a/config/justme-address-exceptions
+++ b/config/justme-address-exceptions
@@ -20,3 +20,4 @@
 ^infodrom-fortunes=lists\.infodrom\.org@mass\.madduck\.net$
 ^linux=ifi\.uzh\.ch@mass\.madduck\.net$
 ^(announce|chat)=lists\.mel8ourne\.org@mass\.madduck\.net$
+^mtec\.sem=sympa\.ethz\.ch@mass\.madduck\.net$

diff --git a/config/skip-spamchecks b/config/skip-spamchecks
index 4ebe9806b91adb1d284e8bbdb6f1c319e7fd63f4..17a99e7d9644a12b19a92c790e18e6864b4f0d01 100644 (file)
--- a/config/skip-spamchecks
+++ b/config/skip-spamchecks
@@ -6,9 +6,9 @@
 ^To:.*\<icegold\.com@pobox\.madduck\.net\>
 ^To:.*\<e-gold\.com@pobox\.madduck\.net\>
 ^To:.*\<comparis\.ch@pobox\.madduck\.net\>
-^To:.*\<immoscout24\.ch@pobox\.madduck\.net\>
 ^To:.*\<homegate\.ch@pobox\.madduck\.net\>
 ^To:.*\<lufthansa\.com@pobox\.madduck\.net\>
+^To:.*\<swiss\.c(h|om)@pobox\.madduck\.net\>
 ^To:.*\<miles-and-more\.com@pobox\.madduck\.net\>
 ^To:.*\<united\.com@pobox\.madduck\.net\>
 ^To:.*\<easyjet\.com@pobox\.madduck\.net\>
@@ -25,6 +25,13 @@
 ^To:.*\<amazon\.com@pobox\.madduck\.net\>
 ^To:.*\<padi\.com@pobox\.madduck\.net\>
 ^To:.*\<klarmobil.de@pobox\.madduck\.net\>
+^To:.*\<z-7\.ch@pobox\.madduck\.net>
+^To:.*\<abart\.ch@pobox\.madduck\.net>
+^To:.*\<nebis\.ch@pobox\.madduck\.net>
+^To:.*\<leech\.ch@pobox\.madduck\.net>
+^To:.*\<riffraff\.ch@pobox\.madduck\.net>
+^To:.*\<doodle\.ch@pobox\.madduck\.net>
+^To:.*\<moveon\.org@pobox\.madduck\.net\>
 ^From:.*\<logcheck@
 ^From:.*\<installer@ftp-master\.debian\.org\>
 ^From:.*\<owner@bugs\.debian\.org\>

diff --git a/config/test-messages b/config/test-messages
index caaf04920b77e432252c13d907477efe8951a36e..7fa4b0c79a96093df0e8fd6a44fb0327561a9a1c 100644 (file)
--- a/config/test-messages
+++ b/config/test-messages
@@ -1,2 +1,3 @@
 ^X-Mailer: swaks v20[[:digit:].]+(-dev)? jetmore\.org/john/code/#swaks$
 ^X-madduck-test: yes$
+^X-Original-To: madduck\+test@madduck\.net$

diff --git a/procmail/rules/debian b/procmail/rules/debian
index 394623474f3470261fccdef37e767b587b217617..e74dd735275036e7d51c297a5b4f9ac92ecdbb2d 100644 (file)
--- a/procmail/rules/debian
+++ b/procmail/rules/debian
@@ -19,7 +19,7 @@
 { DEST=debian.netconf }
 
 :0 E
-* ORIGINAL_TO ?? ^madduck=debian\.org@forward\.madduck\.net$
+* ORIGINAL_TO ?? ^madduck=deb(ian|conf)\.org@forward\.madduck\.net$
 { DEST=debian }
 
 # delay messages until next weekend

diff --git a/procmail/rules/ul b/procmail/rules/ul
index bf9c4dfe86586c6cb9c7ca08382e8e5e4c8b1c7c..a6162e410540ec723868cb23d34b8def81de5de1 100644 (file)
--- a/procmail/rules/ul
+++ b/procmail/rules/ul
@@ -6,7 +6,7 @@
   *$     1 ^0 ^TO_Events@$RE_UL_DOMAIN
   *$     1 ^0 ^TO_Bereavements@$RE_UL_DOMAIN
   *$     1 ^0 ^TO_Timetables@$RE_UL_DOMAIN
-  *$     1 ^0 ^TO_(HR|BE|PO)Notices@$RE_UL_DOMAIN
+  *$     1 ^0 ^TO_(HR|BE|PO|HnS)Notices@$RE_UL_DOMAIN
   *$     1 ^0 ^TO_ITD(ChangeControlNotification|Notices)@$RE_UL_DOMAIN
   *$     1 ^0 ^TO_Opinions@$RE_UL_DOMAIN
   *$     1 ^0 ^TO_AllStaff@$RE_UL_DOMAIN