proper handling of X-Postponed header

[etc/mailfilter.git] / config / spamtraps

diff --git a/config/spamtraps b/config/spamtraps
index 55c90c6a7f77da3118f9abeb2f409115e0d56bdc..c9c5f402349101dcf58f2e46b10c5d4070e7d9af 100644 (file)
--- a/config/spamtraps
+++ b/config/spamtraps
@@ -1,3 +1,58 @@
-^[[:alpha:]]{2}[[:xdigit:]]+@(piper|lapse)\.madduck\.net$

 .+@(diamond|cirrus)\.madduck\.net$
 .+@(diamond|cirrus)\.madduck\.net$

+^[[:alpha:]]{2}[[:xdigit:]]+@(piper|lapse)\.madduck\.net$
+^(webmaster|info|sales)@belligerence\.net$
+^(webmaster|info|sales)@krafftwerk\.(de|com|net|eu|ch)$
+^(webmaster|info|sales)@limerence\.org$
+^(webmaster|info|sales)@madduck\.(ch|net|eu)$
+^(webmaster|info|sales)@martin-krafft\.(de|com|net|eu|ch)$
+^(webmaster|info|sales)@pantsfullofunix\.net$
+^(contact|webmaster|sales)@debian-?(book|system)\.info$
+^3dpostfix\.org@mass\.madduck\.net$
+^adultfriendfinder\.com@pobox\.madduck\.net$
+^alt\.cellular\.nokia@usenet\.madduck\.net$
+^alt\.tv\.twin-peaks@usenet\.madduck\.net$
+^apache-crew@pantsfullofunix\.net$
+^blackstar\.co\.uk@pobox\.madduck\.net$
+^blog@pobox\.madduck\.net$
+^c-plus-plus-archiv\.de@pobox\.madduck\.net$
+^debian-apache@pantsfullofunix\.net$
+^debian-java@pantsfullofunix\.net$
+^erotikdirect\.com@pobox\.madduck\.net$
+^erotische-kontaktanzeigen\.com@pobox\.madduck\.net$
+^friendscout24\.de@pobox\.madduck\.net$
+^ipeek\.ch@pobox\.madduck\.net$
+^madduck@condor\.swarthmore\.edu$
+^madduck@klecker\.debian\.org$
+^madduck@merlin\.sccs\.swarthmore\.edu$
+^madduck@usenet\.madduck\.net$
+^madduck\+aff@madduck\.net$
+^madduck\+buy\.com@madduck\.net$
+^madduck\+ebay@madduck\.net$
+^madduck\+euromusic@madduck.net$
+^madduck\+gandi@madduck\.net$
+^madduck\+gff@madduck\.net$
+^madduck\+googlegroups@madduck\.net$
+^madduck\+paypal-de@madduck\.net$
+^madduck\+search\.ch@madduck\.net$

 ^mass@madduck\.net$
 ^mass@madduck\.net$

+^mass\+deb-bsd@madduck\.net$
+^mass\+deb-firewall@madduck\.net$
+^mass\+deb-laptop@madduck\.net$
+^mass\+deb-mentors@madduck\.net$
+^mass\+deb-private@madduck\.net$
+^mass\+deb-project@madduck\.net$
+^mass\+deb-user@madduck\.net$
+^mass\+debian-mentors=lists\.debian\.org@madduck\.net$
+^mass\+fhs-discuss@madduck\.net$
+^mass\+fw1-wizards@madduck\.net$
+^mass\+mlug@madduck\.net$
+^mass\+mole@madduck\.net$
+^mass\+sain@madduck\.net$
+^mass\+snns@madduck\.net$
+^mass\+zope-users@madduck\.net$
+^metrodate\.com@pobox\.madduck\.net$
+^sales@sudetia\.de$
+^someone_else@pantsfullofunix\.net$
+^superbookdeals\.com@pobox\.madduck\.net$
+^tilllate\.ch@pobox\.madduck\.net$
+^vl401-keysigning@pobox\.madduck\.net$