1 |
diff -ruN smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/defaults/qpsmtpd/RBLList smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/RBLList |
2 |
--- smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/defaults/qpsmtpd/RBLList 2008-10-07 08:05:18.000000000 -0700 |
3 |
+++ smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/RBLList 2014-02-23 19:21:05.000000000 -0800 |
4 |
@@ -1 +1 @@ |
5 |
-bl.spamcop.net:combined.njabl.org:dnsbl.ahbl.org:dnsbl-1.uceprotect.net:dnsbl-2.uceprotect.net:list.dsbl.org:multihop.dsbl.org:psbl.surriel.com:zen.spamhaus.org |
6 |
+bl.spamcop.net:dnsbl.ahbl.org:dnsbl-1.uceprotect.net:dnsbl-2.uceprotect.net:psbl.surriel.com:zen.spamhaus.org |
7 |
diff -ruN smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/defaults/qpsmtpd/SBLList smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/SBLList |
8 |
--- smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/defaults/qpsmtpd/SBLList 2008-10-07 08:05:18.000000000 -0700 |
9 |
+++ smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/SBLList 2014-02-23 19:21:51.000000000 -0800 |
10 |
@@ -1 +1 @@ |
11 |
-bogusmx.rfc-ignorant.org:multi.surbl.org:black.uribl.com:rhsbl.sorbs.net:bulk.rhs.mailpolice.com:fraud.rhs.mailpolice.com:porn.rhs.mailpolice.com:adult.rhs.mailpolice.com:ex.dnsbl.org |
12 |
+multi.surbl.org:black.uribl.com:rhsbl.sorbs.net |
13 |
diff -ruN smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/migrate/20ordb.org smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/migrate/20ordb.org |
14 |
--- smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/migrate/20ordb.org 2008-10-07 08:05:18.000000000 -0700 |
15 |
+++ smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/migrate/20ordb.org 1969-12-31 16:00:00.000000000 -0800 |
16 |
@@ -1,8 +0,0 @@ |
17 |
-{ |
18 |
- $qpsmtpd = $DB->get('qpsmtpd'); |
19 |
- return unless $qpsmtpd; |
20 |
- return unless $qpsmtpd->prop('RBLList'); |
21 |
- |
22 |
- @rbl = grep { !/ordb.org$/ && !/ordb.net$/ } split /[,:]/, $qpsmtpd->prop('RBLList'); |
23 |
- $qpsmtpd->set_prop('RBLList', join ':', @rbl); |
24 |
-} |
25 |
diff -ruN smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/migrate/20RBLList smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/migrate/20RBLList |
26 |
--- smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/migrate/20RBLList 1969-12-31 16:00:00.000000000 -0800 |
27 |
+++ smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/migrate/20RBLList 2014-02-24 19:52:38.000000000 -0800 |
28 |
@@ -0,0 +1,15 @@ |
29 |
+{ |
30 |
+ $qpsmtpd = $DB->get('qpsmtpd'); |
31 |
+ return unless $qpsmtpd; |
32 |
+ return unless $qpsmtpd->prop('RBLList'); |
33 |
+ |
34 |
+ my %obsolete = map { $_ => 1} qw( |
35 |
+ combined.njabl.org |
36 |
+ list.dsbl.org |
37 |
+ multihop.dsbl.org |
38 |
+ ); |
39 |
+ |
40 |
+ @rbl = grep { ! $obsolete{$_} } split /[,:]/, $qpsmtpd->prop('RBLList'); |
41 |
+ $qpsmtpd->set_prop('RBLList', join ':', @rbl); |
42 |
+} |
43 |
+ |
44 |
diff -ruN smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/migrate/20SBLLIST smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/migrate/20SBLLIST |
45 |
--- smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/migrate/20SBLLIST 1969-12-31 16:00:00.000000000 -0800 |
46 |
+++ smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/migrate/20SBLLIST 2014-02-24 20:00:35.000000000 -0800 |
47 |
@@ -0,0 +1,18 @@ |
48 |
+{ |
49 |
+ $qpsmtpd = $DB->get('qpsmtpd'); |
50 |
+ return unless $qpsmtpd; |
51 |
+ return unless $qpsmtpd->prop('SBLList'); |
52 |
+ |
53 |
+ my %obsolete = map { $_ => 1} qw( |
54 |
+ blackhole.securitysage.com |
55 |
+ bulk.rhs.mailpolice.com |
56 |
+ fraud.rhs.mailpolice.com |
57 |
+ porn.rhs.mailpolice.com |
58 |
+ adult.rhs.mailpolice.com |
59 |
+ bogusmx.rfc-ignorant.org |
60 |
+ ex.dnsbl.org |
61 |
+ ); |
62 |
+ |
63 |
+ @sbl = grep { !$obsolete{$_} } split /[,:]/, $qpsmtpd->prop('SBLList'); |
64 |
+ $qpsmtpd->set_prop('SBLList', join ':', @sbl); |
65 |
+} |
66 |
diff -ruN smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/migrate/20securitysage smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/migrate/20securitysage |
67 |
--- smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/migrate/20securitysage 2008-10-07 08:05:18.000000000 -0700 |
68 |
+++ smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/migrate/20securitysage 1969-12-31 16:00:00.000000000 -0800 |
69 |
@@ -1,8 +0,0 @@ |
70 |
-{ |
71 |
- $qpsmtpd = $DB->get('qpsmtpd'); |
72 |
- return unless $qpsmtpd; |
73 |
- return unless $qpsmtpd->prop('SBLList'); |
74 |
- |
75 |
- @sbl = grep { !/blackhole.securitysage.com$/ } split /[,:]/, $qpsmtpd->prop('SBLList'); |
76 |
- $qpsmtpd->set_prop('SBLList', join ':', @sbl); |
77 |
-} |
78 |
diff -ruN smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/migrate/20spamhaus smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/migrate/20spamhaus |
79 |
--- smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/migrate/20spamhaus 2008-10-07 08:05:18.000000000 -0700 |
80 |
+++ smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/migrate/20spamhaus 1969-12-31 16:00:00.000000000 -0800 |
81 |
@@ -1,12 +0,0 @@ |
82 |
-{ |
83 |
- $qpsmtpd = $DB->get('qpsmtpd'); |
84 |
- return unless $qpsmtpd; |
85 |
- return unless $qpsmtpd->prop('RBLList'); |
86 |
- |
87 |
- @rbl = split /[,:]/, $qpsmtpd->prop('RBLList'); |
88 |
- if ( grep { /^sbl-xbl.spamhaus.org$/ } @rbl ) { |
89 |
- @rbl = grep { !/^sbl-xbl.spamhaus.org$/ } @rbl; |
90 |
- push @rbl, 'zen.spamhaus.org'; |
91 |
- $qpsmtpd->set_prop('RBLList', join ':', @rbl); |
92 |
- } |
93 |
-} |