From: martin f. krafft <madduck@madduck.net>
Date: Wed, 12 Sep 2007 14:14:49 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/mailfilter
X-Git-Url: https://git.madduck.net/etc/mailfilter.git/commitdiff_plain/4aa8bb22b96309475f5f0445e3501e14664758d3?hp=8800da281e9f2341b55bc8fab4afe3961079a656

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 2336aa1..fa2b9b3 100644
--- 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 27af1c5..e88e8f9 100644
--- 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