1 |
wellsi |
1.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-23 19:25:50.000000000 -0800 |
28 |
|
|
@@ -0,0 +1,9 @@ |
29 |
|
|
+{ |
30 |
|
|
+ $qpsmtpd = $DB->get('qpsmtpd'); |
31 |
|
|
+ return unless $qpsmtpd; |
32 |
|
|
+ return unless $qpsmtpd->prop('RBLList'); |
33 |
|
|
+ |
34 |
|
|
+ @rbl = grep { !/ordb.org$/ && !/ordb.net$/ && !/njabl.org$/ && !/dsbl.org$/ } split /[,:]/, $qpsmtpd->prop('RBLList'); |
35 |
|
|
+ $qpsmtpd->set_prop('RBLList', join ':', @rbl); |
36 |
|
|
+} |
37 |
|
|
+ |
38 |
|
|
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 |
39 |
|
|
--- smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/migrate/20SBLLIST 1969-12-31 16:00:00.000000000 -0800 |
40 |
|
|
+++ smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/migrate/20SBLLIST 2014-02-23 19:28:31.000000000 -0800 |
41 |
|
|
@@ -0,0 +1,8 @@ |
42 |
|
|
+{ |
43 |
|
|
+ $qpsmtpd = $DB->get('qpsmtpd'); |
44 |
|
|
+ return unless $qpsmtpd; |
45 |
|
|
+ return unless $qpsmtpd->prop('SBLList'); |
46 |
|
|
+ |
47 |
|
|
+ @sbl = grep { !/blackhole.securitysage.com$/ && !/mailpolice.com$/ && !/bogusmx.rfc-ignorant.org$/ && !/dnsbl.org$/} split /[,:]/, $qpsmtpd->prop('SBLList'); |
48 |
|
|
+ $qpsmtpd->set_prop('SBLList', join ':', @sbl); |
49 |
|
|
+} |
50 |
|
|
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 |
51 |
|
|
--- smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/migrate/20securitysage 2008-10-07 08:05:18.000000000 -0700 |
52 |
|
|
+++ smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/migrate/20securitysage 1969-12-31 16:00:00.000000000 -0800 |
53 |
|
|
@@ -1,8 +0,0 @@ |
54 |
|
|
-{ |
55 |
|
|
- $qpsmtpd = $DB->get('qpsmtpd'); |
56 |
|
|
- return unless $qpsmtpd; |
57 |
|
|
- return unless $qpsmtpd->prop('SBLList'); |
58 |
|
|
- |
59 |
|
|
- @sbl = grep { !/blackhole.securitysage.com$/ } split /[,:]/, $qpsmtpd->prop('SBLList'); |
60 |
|
|
- $qpsmtpd->set_prop('SBLList', join ':', @sbl); |
61 |
|
|
-} |
62 |
|
|
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 |
63 |
|
|
--- smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/migrate/20spamhaus 2008-10-07 08:05:18.000000000 -0700 |
64 |
|
|
+++ smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/migrate/20spamhaus 1969-12-31 16:00:00.000000000 -0800 |
65 |
|
|
@@ -1,12 +0,0 @@ |
66 |
|
|
-{ |
67 |
|
|
- $qpsmtpd = $DB->get('qpsmtpd'); |
68 |
|
|
- return unless $qpsmtpd; |
69 |
|
|
- return unless $qpsmtpd->prop('RBLList'); |
70 |
|
|
- |
71 |
|
|
- @rbl = split /[,:]/, $qpsmtpd->prop('RBLList'); |
72 |
|
|
- if ( grep { /^sbl-xbl.spamhaus.org$/ } @rbl ) { |
73 |
|
|
- @rbl = grep { !/^sbl-xbl.spamhaus.org$/ } @rbl; |
74 |
|
|
- push @rbl, 'zen.spamhaus.org'; |
75 |
|
|
- $qpsmtpd->set_prop('RBLList', join ':', @rbl); |
76 |
|
|
- } |
77 |
|
|
-} |