smeserver-qpsmtpd/sme10/smeserver-qpsmtpd-2.6.0-add_uribl_support.patch

diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/createlinks mezzanine_patched_smeserver-qpsmtpd-2.6.0/createlinks
--- smeserver-qpsmtpd-2.6.0/createlinks 2016-04-18 21:39:12.700109873 +0200
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/createlinks       2016-04-18 21:31:37.464138086 +0200
@@ -83,6 +83,7 @@
                                badrcptto
                                dnsbl_zones
                                dnsbl_allow
+                               uribl_zones
                                loglevel
                                memory_threshold
                                plugins
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/UBLList mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/UBLList
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/UBLList  1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/UBLList        2016-04-18 21:24:37.080163504 +0200
@@ -0,0 +1 @@
+multi.surbl.org:8-16-64-128,black.uribl.com,rhsbl.sorbs.net
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/URIBL mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/URIBL
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/URIBL    1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/URIBL  2016-04-18 20:54:09.796362597 +0200
@@ -0,0 +1 @@
+disabled
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/24uribl mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/24uribl
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/24uribl       1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/24uribl     2016-04-18 21:38:09.640113822 +0200
@@ -0,0 +1,5 @@
+{
+    return "# uribl disabled" unless (${qpsmtpd}{URIBL} eq "enabled");
+
+    "uribl action deny";
+}
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/uribl_zones/10URIBLList mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/uribl_zones/10URIBLList
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/uribl_zones/10URIBLList       1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/uribl_zones/10URIBLList     2016-04-18 21:18:44.800188535 +0200
@@ -0,0 +1,19 @@
+{
+    my @ubllist = split /[,]/, ${qpsmtpd}{UBLList} || '';
+
+    return "# No URIBLs are defined" unless (scalar @ubllist);
+
+    $OUT .= '';
+    foreach my $bl (@ubllist){
+        my @l = split /[:]/, $bl;
+        $OUT .= $l[0];
+        if ($l[1]){
+            $l[1] =~ s/-/,/g;
+            $OUT .= " $l[1]";
+            if ($l[2] && $l[2] =~ m/^add\-header|deny(soft)?$/){
+                $OUT .= " $l[2]";
+            }
+        }
+        $OUT .= "\n";
+    }
+}
1	diff -Nur -x '.orig' -x '.rej' smeserver-qpsmtpd-2.6.0/createlinks mezzanine_patched_smeserver-qpsmtpd-2.6.0/createlinks
2	--- smeserver-qpsmtpd-2.6.0/createlinks 2016-04-18 21:39:12.700109873 +0200
3	+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/createlinks 2016-04-18 21:31:37.464138086 +0200
4	@@ -83,6 +83,7 @@
5	badrcptto
6	dnsbl_zones
7	dnsbl_allow
8	+ uribl_zones
9	loglevel
10	memory_threshold
11	plugins
12	diff -Nur -x '.orig' -x '.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/UBLList mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/UBLList
13	--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/UBLList 1970-01-01 01:00:00.000000000 +0100
14	+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/UBLList 2016-04-18 21:24:37.080163504 +0200
15	@@ -0,0 +1 @@
16	+multi.surbl.org:8-16-64-128,black.uribl.com,rhsbl.sorbs.net
17	diff -Nur -x '.orig' -x '.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/URIBL mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/URIBL
18	--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/URIBL 1970-01-01 01:00:00.000000000 +0100
19	+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/URIBL 2016-04-18 20:54:09.796362597 +0200
20	@@ -0,0 +1 @@
21	+disabled
22	diff -Nur -x '.orig' -x '.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/24uribl mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/24uribl
23	--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/24uribl 1970-01-01 01:00:00.000000000 +0100
24	+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/24uribl 2016-04-18 21:38:09.640113822 +0200
25	@@ -0,0 +1,5 @@
26	+{
27	+ return "# uribl disabled" unless (${qpsmtpd}{URIBL} eq "enabled");
28	+
29	+ "uribl action deny";
30	+}
31	diff -Nur -x '.orig' -x '.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/uribl_zones/10URIBLList mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/uribl_zones/10URIBLList
32	--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/uribl_zones/10URIBLList 1970-01-01 01:00:00.000000000 +0100
33	+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/uribl_zones/10URIBLList 2016-04-18 21:18:44.800188535 +0200
34	@@ -0,0 +1,19 @@
35	+{
36	+ my @ubllist = split /[,]/, ${qpsmtpd}{UBLList} \|\| '';
37	+
38	+ return "# No URIBLs are defined" unless (scalar @ubllist);
39	+
40	+ $OUT .= '';
41	+ foreach my $bl (@ubllist){
42	+ my @l = split /[:]/, $bl;
43	+ $OUT .= $l[0];
44	+ if ($l[1]){
45	+ $l[1] =~ s/-/,/g;
46	+ $OUT .= " $l[1]";
47	+ if ($l[2] && $l[2] =~ m/^add\-header\|deny(soft)?$/){
48	+ $OUT .= " $l[2]";
49	+ }
50	+ }
51	+ $OUT .= "\n";
52	+ }
53	+}