From 703531c343ced745521c697e6d8bc44fc302c345 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Mon, 3 Nov 2008 12:29:28 +0100 Subject: [PATCH 01/16] enable FT subscriptions --- config/ignore | 1 - 1 file changed, 1 deletion(-) diff --git a/config/ignore b/config/ignore index b94d569..b62f7ca 100644 --- a/config/ignore +++ b/config/ignore @@ -25,7 +25,6 @@ ^(To|Cc):.*\ ^To: lovesraymond@r2e\.madduck\.net$ ^To: boingboing\.net@r2e\.madduck\.net$ -^To: ft@r2e\.madduck\.net$ ^To: ftd\.de@r2e\.madduck\.net$ ^To: lifehacker\.com@r2e\.madduck\.net$ ^To: qotd=quotationspage\.com@r2e\.madduck\.net$ -- 2.39.5 From 1b246c55c3879b9b16e39ae30d768e08fc0fe214 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Wed, 5 Nov 2008 19:29:51 +0100 Subject: [PATCH 02/16] fix trusted_networks --- spamassassin/user_prefs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/spamassassin/user_prefs b/spamassassin/user_prefs index 1b02c64..0f3dfbb 100644 --- a/spamassassin/user_prefs +++ b/spamassassin/user_prefs @@ -86,15 +86,13 @@ add_header all Relays-Untrusted _RELAYSUNTRUSTED_ # the local host #trusted_networks 127. # madduck.net -trusted_networks 130.60.75.72 82.197.162.59 213.203.238.82 +trusted_networks 213.203.238.82 193.242.105.96 193.242.105.183 # debian: gluck master murphy spohr rietz liszt trusted_networks 192.25.206.10 70.103.162.29 70.103.162.31 192.25.206.33 140.211.166.43 82.195.75.100 # debian: alioth trusted_networks 217.196.43.134 -# ifi: bela miraculix nicolai -trusted_networks 130.60.156.10 130.60.156.214 130.60.155.10 -# ailab: gaia -trusted_networks 130.60.75.60 +# ifi: bela miraculix nicolai sergei +trusted_networks 130.60.156.10 130.60.156.214 130.60.155.10 130.60.155.11 # fortytwo trusted_networks 193.138.215.60 # aerasec: all of MNET-AERASEC -- 2.39.5 From d041bd3b95e8e7372a2ad197c94c920a648a4b6b Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Wed, 5 Nov 2008 19:30:02 +0100 Subject: [PATCH 03/16] add german locale --- spamassassin/user_prefs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spamassassin/user_prefs b/spamassassin/user_prefs index 0f3dfbb..2729bcd 100644 --- a/spamassassin/user_prefs +++ b/spamassassin/user_prefs @@ -120,7 +120,7 @@ whitelist_to *-owner@lists.madduck.net whitelist_from *-owner@lists.ailab.ch whitelist_to *-owner@lists.ailab.ch -ok_locales en +ok_locales en de ok_languages en de header MADDUCK_IN_REFERENCES References =~ /madduck\.net/ -- 2.39.5 From d9e421a509aad47b2a3a7715708d91ed92fedbb8 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Mon, 10 Nov 2008 14:00:18 +0100 Subject: [PATCH 04/16] drop duplicates from mhonarc list --- config/ignore-lists | 1 + 1 file changed, 1 insertion(+) diff --git a/config/ignore-lists b/config/ignore-lists index fc759e7..e0b24b5 100644 --- a/config/ignore-lists +++ b/config/ignore-lists @@ -3,5 +3,6 @@ ^Sender: vim_use@googlegroups\.com$ ^Sender: chat-bounces@lists\.mel8ourne\.org$ ^Sender: puppet-(dev|users)@googlegroups\.com$ +^Sender: mhonarc-users@mhonarc\.org$ $^ prevent CCs from git mailing list. ^([Tt]o|[Cc]{2}):.*git@vger\.kernel.org -- 2.39.5 From 2e33e8f9c77c9acc7b497847b2eadbe00dbffb6d Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Tue, 11 Nov 2008 19:21:44 +0100 Subject: [PATCH 05/16] add aspsms.com to skips --- config/skip-spamchecks | 1 + 1 file changed, 1 insertion(+) diff --git a/config/skip-spamchecks b/config/skip-spamchecks index eec742d..7e7763d 100644 --- a/config/skip-spamchecks +++ b/config/skip-spamchecks @@ -41,6 +41,7 @@ ^X-Original-To: blacknight\.com@pobox\.madduck\.net$ ^X-Original-To: hackontest\.org@pobox\.madduck\.net$ ^X-Original-To: dkb\.de@pobox\.madduck\.net$ +^X-Original-To: aspsms\.com@pobox\.madduck\.net$ ^X-Original-To: smokecds\.com@pobox\.madduck\.net$ ^X-Original-To: blacknight\.com@pobox\.madduck\.net$ ^X-Original-To: paypal\.com-(de|us|ie|ch)@pobox\.madduck\.net$ -- 2.39.5 From 44ddf331cb00ccefe35abe9ae882579fd291070d Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Wed, 12 Nov 2008 12:22:42 +0100 Subject: [PATCH 06/16] ignore bikeshed ikiwiki --- config/ignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ignore b/config/ignore index b62f7ca..7b0edf2 100644 --- a/config/ignore +++ b/config/ignore @@ -30,7 +30,7 @@ ^To: qotd=quotationspage\.com@r2e\.madduck\.net$ ^To: madduck\+sbuild@pulse\.madduck\.net$ ^To: track=ikiwiki\.info@r2e\.madduck\.net$ -^To: root@bikeshed\.debian-community\.org$ +^To: (root|ikiwiki)@bikeshed\.debian-community\.org$ ^To: wohnung@sudetia\.de$ ^From:.*$ ^From:.*$ -- 2.39.5 From b6c5281d8be45d403f8492a3dbd433f3c12b2cfb Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 13 Nov 2008 07:45:55 +0100 Subject: [PATCH 07/16] add powell and ipv6 addrs --- spamassassin/user_prefs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spamassassin/user_prefs b/spamassassin/user_prefs index 2729bcd..ed6683c 100644 --- a/spamassassin/user_prefs +++ b/spamassassin/user_prefs @@ -86,9 +86,9 @@ add_header all Relays-Untrusted _RELAYSUNTRUSTED_ # the local host #trusted_networks 127. # madduck.net -trusted_networks 213.203.238.82 193.242.105.96 193.242.105.183 -# debian: gluck master murphy spohr rietz liszt -trusted_networks 192.25.206.10 70.103.162.29 70.103.162.31 192.25.206.33 140.211.166.43 82.195.75.100 +trusted_networks 213.203.238.82 [2001:6f8:128a::1]/64 193.242.105.96 193.242.105.183 [2001:41e0:ff43::1]/64 +# debian: gluck master murphy spohr rietz liszt powell +trusted_networks 192.25.206.10 70.103.162.29 70.103.162.31 192.25.206.33 140.211.166.43 82.195.75.100 87.106.64.223 [2001:8d8:80:11::35d] # debian: alioth trusted_networks 217.196.43.134 # ifi: bela miraculix nicolai sergei @@ -96,7 +96,7 @@ trusted_networks 130.60.156.10 130.60.156.214 130.60.155.10 130.60.155.11 # fortytwo trusted_networks 193.138.215.60 # aerasec: all of MNET-AERASEC -trusted_networks 212.18.21.160/26 +trusted_networks 212.18.21.160/26 [2001:a60:9002:1::]/64 # swat: osprey.sccs, heron.sccs trusted_networks 130.58.218.6 130.58.218.10 # acm -- 2.39.5 From 3895c459f77e8b23a965e8959a66f559e03dd715 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 13 Nov 2008 08:15:16 +0100 Subject: [PATCH 08/16] remove ipv6 trusted_networks --- spamassassin/user_prefs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spamassassin/user_prefs b/spamassassin/user_prefs index ed6683c..2b07afc 100644 --- a/spamassassin/user_prefs +++ b/spamassassin/user_prefs @@ -86,9 +86,9 @@ add_header all Relays-Untrusted _RELAYSUNTRUSTED_ # the local host #trusted_networks 127. # madduck.net -trusted_networks 213.203.238.82 [2001:6f8:128a::1]/64 193.242.105.96 193.242.105.183 [2001:41e0:ff43::1]/64 +trusted_networks 213.203.238.82 193.242.105.96 193.242.105.183 # debian: gluck master murphy spohr rietz liszt powell -trusted_networks 192.25.206.10 70.103.162.29 70.103.162.31 192.25.206.33 140.211.166.43 82.195.75.100 87.106.64.223 [2001:8d8:80:11::35d] +trusted_networks 192.25.206.10 70.103.162.29 70.103.162.31 192.25.206.33 140.211.166.43 82.195.75.100 87.106.64.223 # debian: alioth trusted_networks 217.196.43.134 # ifi: bela miraculix nicolai sergei @@ -96,7 +96,7 @@ trusted_networks 130.60.156.10 130.60.156.214 130.60.155.10 130.60.155.11 # fortytwo trusted_networks 193.138.215.60 # aerasec: all of MNET-AERASEC -trusted_networks 212.18.21.160/26 [2001:a60:9002:1::]/64 +trusted_networks 212.18.21.160/26 # swat: osprey.sccs, heron.sccs trusted_networks 130.58.218.6 130.58.218.10 # acm -- 2.39.5 From 3fc8502a2d7d8c27ca0cf1313f1c349d5986760a Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Fri, 28 Nov 2008 09:50:51 +0100 Subject: [PATCH 09/16] undelay lesser verwaltung --- config/undelayed-senders | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/undelayed-senders b/config/undelayed-senders index 4efca1e..c444f61 100644 --- a/config/undelayed-senders +++ b/config/undelayed-senders @@ -8,7 +8,7 @@ ^penny@she\.geek\.nz$ ^penny@mjollnir\.org$ ^mw@opensourcepress\.de$ -^andreas\.lesser@toni-kg\.de$ +^andreas\.lesser@(toni-kg|lesser-verwaltung)\.de$ ^lesser\.andreas@t-online\.de$ ^.+@ardex\..+$ ^ez333@gmx\.net$ -- 2.39.5 From 22ae42b9d0e4e2fc052da922ae9c20bc4862940e Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Mon, 8 Dec 2008 20:30:14 +0100 Subject: [PATCH 10/16] ignore debbugs ackdone messages --- procmail/rules/debian | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/procmail/rules/debian b/procmail/rules/debian index 0b202f9..f6af473 100644 --- a/procmail/rules/debian +++ b/procmail/rules/debian @@ -10,6 +10,15 @@ SWITCHRC=$PMDIR/discard } +RE_DEBBUG="[0-9][0-9][0-9][0-9][0-9][0-9]" + +:0 +*$ MSGID ?? ^\ Date: Mon, 8 Dec 2008 20:31:16 +0100 Subject: [PATCH 11/16] subscribe to german FT instead of english --- config/ignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ignore b/config/ignore index 7b0edf2..3439ef7 100644 --- a/config/ignore +++ b/config/ignore @@ -25,7 +25,7 @@ ^(To|Cc):.*\ ^To: lovesraymond@r2e\.madduck\.net$ ^To: boingboing\.net@r2e\.madduck\.net$ -^To: ftd\.de@r2e\.madduck\.net$ +^To: ft@r2e\.madduck\.net$ ^To: lifehacker\.com@r2e\.madduck\.net$ ^To: qotd=quotationspage\.com@r2e\.madduck\.net$ ^To: madduck\+sbuild@pulse\.madduck\.net$ -- 2.39.5 From fcc88409f7a9092c7e3ca52f0320288ff7c11102 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 11 Dec 2008 09:17:52 +0100 Subject: [PATCH 12/16] undelay homegate --- bin/release-delayed-messages | 1 - config/undelayed-senders | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/release-delayed-messages b/bin/release-delayed-messages index 7ea142e..cdb6da4 100755 --- a/bin/release-delayed-messages +++ b/bin/release-delayed-messages @@ -1,6 +1,5 @@ #!/bin/sh set -eu -exit 0 DELAYED_QUEUE=$HOME/.maildir/.delayed diff --git a/config/undelayed-senders b/config/undelayed-senders index c444f61..1221a0c 100644 --- a/config/undelayed-senders +++ b/config/undelayed-senders @@ -13,3 +13,4 @@ ^.+@ardex\..+$ ^ez333@gmx\.net$ ^.+@zl-legal\.de$ +^search@homegate\.ch$ -- 2.39.5 From 48e14a5acfefb3e75a9eb77ba8867fea788deeea Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 11 Dec 2008 09:19:50 +0100 Subject: [PATCH 13/16] ignore xe.net ucc emails --- config/ignore | 1 + 1 file changed, 1 insertion(+) diff --git a/config/ignore b/config/ignore index 3439ef7..1b752da 100644 --- a/config/ignore +++ b/config/ignore @@ -34,3 +34,4 @@ ^To: wohnung@sudetia\.de$ ^From:.*$ ^From:.*$ +^To:.*\ -- 2.39.5 From 3878567da9a20690856c9557cf07920d587f450a Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 11 Dec 2008 15:47:24 +0100 Subject: [PATCH 14/16] let smartlist confirmations pass --- procmail/justme | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/procmail/justme b/procmail/justme index 7941e89..8e62a96 100644 --- a/procmail/justme +++ b/procmail/justme @@ -101,6 +101,15 @@ LOG="justme: passing; $JUSTME$NL" } + :0 E + * FROM ?? ^SmartList <.+-request@.+> + * ORIGINAL_TO ?? ^[^=]+=[^@]+@mass\.madduck\.net$ + * SUBJECT ?? ^CONFIRM s[0-9]+$ + { + JUSTME="smartlist confirmation" + LOG="justme: passing; $JUSTME$NL" + } + :0 E { LOG="justme: discarding$NL" -- 2.39.5 From 07724c922b00f962bcfbb471fe0650aa2f6e62a2 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Mon, 22 Dec 2008 16:29:36 +0100 Subject: [PATCH 15/16] add knipping --- config/undelayed-senders | 1 + 1 file changed, 1 insertion(+) diff --git a/config/undelayed-senders b/config/undelayed-senders index 1221a0c..e1bed6f 100644 --- a/config/undelayed-senders +++ b/config/undelayed-senders @@ -12,5 +12,6 @@ ^lesser\.andreas@t-online\.de$ ^.+@ardex\..+$ ^ez333@gmx\.net$ +^erhknipping@aol\.com$ ^.+@zl-legal\.de$ ^search@homegate\.ch$ -- 2.39.5 From 9cf11eefd3fe94a19792efe7ce7e680546aff226 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Mon, 22 Dec 2008 23:07:06 +0100 Subject: [PATCH 16/16] discard spool messages after spooling --- procmail/spool | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/procmail/spool b/procmail/spool index 128ba44..0600c9a 100644 --- a/procmail/spool +++ b/procmail/spool @@ -17,4 +17,8 @@ *$ $MSG_DEJAVU { LOG="spool: not saving resubmitted message$NL" } +:0 +* ORIGINAL_TO ?? ^madduck\+spool@madduck\.net$ +$NULL + # vim:ft=procmail -- 2.39.5