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 |
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 |
--- 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 |
+++ 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,9 @@ |
@@ -0,0 +1,15 @@ |
29 |
+{ |
+{ |
30 |
+ $qpsmtpd = $DB->get('qpsmtpd'); |
+ $qpsmtpd = $DB->get('qpsmtpd'); |
31 |
+ return unless $qpsmtpd; |
+ return unless $qpsmtpd; |
32 |
+ return unless $qpsmtpd->prop('RBLList'); |
+ return unless $qpsmtpd->prop('RBLList'); |
33 |
+ |
+ |
34 |
+ @rbl = grep { !/ordb.org$/ && !/ordb.net$/ && !/njabl.org$/ && !/dsbl.org$/ } split /[,:]/, $qpsmtpd->prop('RBLList'); |
+ 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); |
+ $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 |
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 |
--- 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-23 19:28:31.000000000 -0800 |
+++ 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,8 @@ |
@@ -0,0 +1,18 @@ |
48 |
+{ |
+{ |
49 |
+ $qpsmtpd = $DB->get('qpsmtpd'); |
+ $qpsmtpd = $DB->get('qpsmtpd'); |
50 |
+ return unless $qpsmtpd; |
+ return unless $qpsmtpd; |
51 |
+ return unless $qpsmtpd->prop('SBLList'); |
+ return unless $qpsmtpd->prop('SBLList'); |
52 |
+ |
+ |
53 |
+ @sbl = grep { !/blackhole.securitysage.com$/ && !/mailpolice.com$/ && !/bogusmx.rfc-ignorant.org$/ && !/dnsbl.org$/} split /[,:]/, $qpsmtpd->prop('SBLList'); |
+ 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); |
+ $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 |
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 |