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 2336aa1070337ea5215bd095ce3e792f534d19db..fa2b9b32807411ee93fa859a11772de6f33cdb23 100644 (file)
--- a/config/justme-address-exceptions
+++ b/config/justme-address-exceptions
@@ -1,7 +1,7 @@
 =lists\.madduck\.net@mass\.madduck\.net$
-=lists\.ailab\.ch@mass\.madduck\.net$
 =sudetia\.de@mass\.madduck\.net$
 -announce=[^@]+@mass\.madduck\.net$
+^(curiosa|cluster-.+|events|lib.+)=lists\.ailab\.ch@mass\.madduck\.net$
 ^debian-private=lists\.debian\.org@mass.madduck.net$
 ^jppy=zanu\.org\.uk@mass\.madduck\.net$
 ^os-renet=insel\.cs\.tu-berlin\.de@mass\.madduck\.net$

diff --git a/procmail/rules/ul b/procmail/rules/ul
index 27af1c5f743ad959d9f89f41d2e83e694dcb751f..e88e8f9b19b271ee831e278ab20521ba80095659 100644 (file)
--- a/procmail/rules/ul
+++ b/procmail/rules/ul
@@ -12,6 +12,7 @@
   *$ 1^0 ^TO_ResearchPostgraduates@$RE_UL_DOMAIN
   *$ 1^0 ^TO_NewsandOther@$RE_UL_DOMAIN
   *$ 1^0 ^TO_ForSaleorWanted@$RE_UL_DOMAIN
+  *$ 1^0 ^TO_ResearchInformationRISS@$RE_UL_DOMAIN
   $DISCARD
   RE_UL_DOMAIN