port spammers and spamtraps from albatross

diff --git a/config/spammers b/config/spammers
index 67651bb62465781b775b79db334159058995e83b..fb9cc731551eb409525c64fd98ec3515bd62e4af 100644 (file)
--- a/config/spammers
+++ b/config/spammers
@@ -1,3 +1,14 @@
 ^user@zodiac\.com$
-^newslog@intelog\.com\.br$
+^newslog@
 ^euridice@una\.br$
+^support@netbeat\.de$
+^noreply@simmarket\.com$
+^info@directinfo\.de$
+^lightwurks@spreadlight\.com$
+^lightwurks@lightwurks\.com$
+^anzeigen@techtex-verlag\.com$
+^postcards@postcards\.com$
+^info@nestrada\.de$
+^eda_news_letter@edacafe\.com$
+^jts@boxes\.co\.uk$
+^newsletter@news\.geld\.de$

diff --git a/config/spamtraps b/config/spamtraps
index 55c90c6a7f77da3118f9abeb2f409115e0d56bdc..0460ba2b47b9e7cd03c000ca59b22556d679a694 100644 (file)
--- a/config/spamtraps
+++ b/config/spamtraps
@@ -1,3 +1,61 @@
-^[[:alpha:]]{2}[[:xdigit:]]+@(piper|lapse)\.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$
+^(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$
+^easyjet\.com@pobox\.madduck\.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\+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$
+^moveon\.org@pobox\.madduck\.net$
+^opengroup\.org@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$