--- rpms/smeserver-qpsmtpd/sme9/smeserver-qpsmtpd-2.4.0-RBLSBLupdate.patch	2014/04/15 14:55:57	1.1
+++ rpms/smeserver-qpsmtpd/sme9/smeserver-qpsmtpd-2.4.0-RBLSBLupdate.patch	2014/05/06 19:36:42	1.2
@@ -24,27 +24,43 @@ diff -ruN smeserver-qpsmtpd-2.2.0.old/ro
 -}
 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
 --- 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/root/etc/e-smith/db/configuration/migrate/20RBLList	2014-02-23 19:25:50.000000000 -0800
-@@ -0,0 +1,9 @@
++++ smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/migrate/20RBLList	2014-02-24 19:52:38.000000000 -0800
+@@ -0,0 +1,15 @@
 +{
 +    $qpsmtpd = $DB->get('qpsmtpd');
 +    return unless $qpsmtpd;
 +    return unless $qpsmtpd->prop('RBLList');
 +
-+    @rbl = grep { !/ordb.org$/ && !/ordb.net$/ && !/njabl.org$/ && !/dsbl.org$/ } split /[,:]/, $qpsmtpd->prop('RBLList');
++    my %obsolete = map { $_ => 1} qw(
++       combined.njabl.org
++       list.dsbl.org
++       multihop.dsbl.org
++    );
++
++    @rbl = grep { ! $obsolete{$_} } split /[,:]/, $qpsmtpd->prop('RBLList');
 +    $qpsmtpd->set_prop('RBLList', join ':', @rbl);
 +}
 +
 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
 --- 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/root/etc/e-smith/db/configuration/migrate/20SBLLIST	2014-02-23 19:28:31.000000000 -0800
-@@ -0,0 +1,8 @@
++++ smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/migrate/20SBLLIST	2014-02-24 20:00:35.000000000 -0800
+@@ -0,0 +1,18 @@
 +{
 +    $qpsmtpd = $DB->get('qpsmtpd');
 +    return unless $qpsmtpd;
 +    return unless $qpsmtpd->prop('SBLList');
 +
-+    @sbl = grep { !/blackhole.securitysage.com$/ && !/mailpolice.com$/ && !/bogusmx.rfc-ignorant.org$/  && !/dnsbl.org$/} split /[,:]/, $qpsmtpd->prop('SBLList');
++    my %obsolete = map { $_ => 1} qw(
++       blackhole.securitysage.com
++       bulk.rhs.mailpolice.com
++       fraud.rhs.mailpolice.com
++       porn.rhs.mailpolice.com
++       adult.rhs.mailpolice.com
++       bogusmx.rfc-ignorant.org
++       ex.dnsbl.org
++    );
++
++    @sbl = grep { !$obsolete{$_} } split /[,:]/, $qpsmtpd->prop('SBLList');
 +    $qpsmtpd->set_prop('SBLList', join ':', @sbl);
 +}
 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