diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Authentication mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Authentication
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Authentication	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Authentication	2016-04-22 17:36:53.020247688 +0200
@@ -0,0 +1 @@
+enabled
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Instances mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Instances
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Instances	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Instances	2016-04-22 17:36:53.020247688 +0200
@@ -0,0 +1 @@
+40
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/InstancesPerIP mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/InstancesPerIP
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/InstancesPerIP	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/InstancesPerIP	2016-04-22 17:36:53.020247688 +0200
@@ -0,0 +1 @@
+5
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/PatternsScan mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/PatternsScan
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/PatternsScan	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/PatternsScan	2016-04-22 17:36:53.020247688 +0200
@@ -0,0 +1 @@
+disabled
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Proxy mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Proxy
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Proxy	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Proxy	2016-04-22 17:36:53.020247688 +0200
@@ -0,0 +1 @@
+blocked
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/TCPPort mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/TCPPort
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/TCPPort	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/TCPPort	2016-04-22 17:36:55.188247486 +0200
@@ -0,0 +1 @@
+25
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/TCPProxyPort mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/TCPProxyPort
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/TCPProxyPort	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/TCPProxyPort	2016-04-22 17:36:55.188247486 +0200
@@ -0,0 +1 @@
+25
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/VirusScan mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/VirusScan
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/VirusScan	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/VirusScan	2016-04-22 17:36:56.449247369 +0200
@@ -0,0 +1 @@
+enabled
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/MaximumDateOffset mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/MaximumDateOffset
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/MaximumDateOffset	2005-08-19 23:31:02.000000000 +0200
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/MaximumDateOffset	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-0
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/tnef2mime mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/tnef2mime
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/tnef2mime	2005-08-19 23:31:02.000000000 +0200
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/tnef2mime	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-enabled
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/Authentication mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/Authentication
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/Authentication	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/Authentication	2016-04-22 17:37:17.042245462 +0200
@@ -0,0 +1 @@
+enabled
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/Instances mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/Instances
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/Instances	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/Instances	2016-04-22 17:37:17.042245462 +0200
@@ -0,0 +1 @@
+10
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/TCPPort mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/TCPPort
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/TCPPort	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/TCPPort	2016-04-22 17:37:17.442245422 +0200
@@ -0,0 +1 @@
+465
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/migrate/80Qpsmtpd mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/migrate/80Qpsmtpd
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/migrate/80Qpsmtpd	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/migrate/80Qpsmtpd	2016-04-22 19:12:11.467465954 +0200
@@ -0,0 +1,19 @@
+{
+  my $smtpd = $DB->get("smtpd");
+  if ($smtpd){
+    my $qpsmtpd = $DB->get("qpsmtpd") ||
+        $DB->new_record("qpsmtpd", { type => "service" });
+
+    $qpsmtpd->merge_props($smtpd->props);
+    $smtpd->delete;
+  }
+
+  my $ssmtpd = $DB->get("ssmtpd");
+  if ($ssmtpd){
+    my $sqpsmtpd = $DB->get("sqpsmtpd") ||
+        $DB->new_record("sqpsmtpd", { type => "service" });
+
+    $sqpsmtpd->merge_props($ssmtpd->props);
+    $ssmtpd->delete;
+  }
+}
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/05auth_cvm_unix_local mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/05auth_cvm_unix_local
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/05auth_cvm_unix_local	2005-08-19 23:31:01.000000000 +0200
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/05auth_cvm_unix_local	2016-04-22 17:44:12.515207939 +0200
@@ -1,6 +1,6 @@
 {
-    my $auth_smtp = ($smtpd{Authentication} eq 'enabled') ? 'yes' : 'no';
-    my $auth_ssmtp = ($ssmtpd{Authentication} eq 'enabled') ? 'yes' : 'no';
+    my $auth_smtp = ($qpsmtpd{Authentication} eq 'enabled') ? 'yes' : 'no';
+    my $auth_ssmtp = ($sqpsmtpd{Authentication} eq 'enabled') ? 'yes' : 'no';
 
     $OUT = "auth/auth_cvm_unix_local";
     $OUT .= " cvm_socket /var/lib/cvm/cvm-unix-local.socket";
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/17headers mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/17headers
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/17headers	2016-04-22 23:03:14.196638643 +0200
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/17headers	2016-04-22 18:27:30.981905475 +0200
@@ -2,7 +2,7 @@
     $OUT = "headers";
 
     # Note: You can't specify a maximum offset of 0 days, but that's fair
-    my $days = $smtpd{MaximumDateOffset} || '';
+    my $days = $qpsmtpd{MaximumDateOffset} || '';
 
     $OUT .= " future $days past $days" if ($days);
 }
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/62pattern_filter mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/62pattern_filter
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/62pattern_filter	2005-08-19 23:31:01.000000000 +0200
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/62pattern_filter	2016-04-22 18:28:27.155898934 +0200
@@ -1,6 +1,6 @@
 {
     return "# pattern_filter disabled" 
-	unless ($smtpd{PatternsScan} eq "enabled");
+	unless ($qpsmtpd{PatternsScan} eq "enabled");
 
     return "virus/pattern_filter check=patterns action=deny";
 }
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/62tnef2mime mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/62tnef2mime
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/62tnef2mime	2008-10-07 17:05:17.000000000 +0200
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/62tnef2mime	2016-04-22 18:28:05.263901477 +0200
@@ -1,6 +1,6 @@
 {
     return "# tnef to mime conversion disabled" 
-	unless ($smtpd{tnef2mime} eq "enabled");
+	unless ($qpsmtpd{tnef2mime} eq "enabled");
     return "tnef2mime";
 }
 
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/65disclaimer mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/65disclaimer
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/65disclaimer	2008-10-07 17:05:18.000000000 +0200
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/65disclaimer	2016-04-22 18:28:16.170900207 +0200
@@ -1,6 +1,6 @@
 {
     return "# disclaimer disabled" 
-	unless ($smtpd{disclaimer} || 'disabled') eq "enabled";
+	unless ($qpsmtpd{disclaimer} || 'disabled') eq "enabled";
     return "disclaimer";
 }
 
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/80clamav mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/80clamav
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/80clamav	2016-04-22 23:03:14.209638646 +0200
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/80clamav	2016-04-22 18:27:56.581902487 +0200
@@ -3,7 +3,7 @@
 
     my $s = $clamd{status} || 'disabled';
     return "# clamd disabled" unless ($s eq "enabled");
-    $s = $smtpd{VirusScan} || 'disabled';
+    $s = $qpsmtpd{VirusScan} || 'disabled';
     return "# clamav disabled" unless ($s eq "enabled");
 
     my $max_size = $qpsmtpd{MaxScannerSize} || 
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/runenv/INSTANCES mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/runenv/INSTANCES
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/runenv/INSTANCES	2005-08-19 23:31:01.000000000 +0200
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/runenv/INSTANCES	2016-04-22 17:15:33.881351910 +0200
@@ -1,3 +1,3 @@
 {
-    return "INSTANCES=" . ($smtpd{Instances} || "40");
+    return "INSTANCES=" . ($qpsmtpd{Instances} || "40");
 }
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/runenv/INSTANCES_PER_IP mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/runenv/INSTANCES_PER_IP
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/runenv/INSTANCES_PER_IP	2005-08-19 23:31:01.000000000 +0200
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/runenv/INSTANCES_PER_IP	2016-04-22 17:15:45.195351728 +0200
@@ -1,3 +1,3 @@
 {
-    return "INSTANCES_PER_IP=" . ($smtpd{InstancesPerIP} || "5");
+    return "INSTANCES_PER_IP=" . ($qpsmtpd{InstancesPerIP} || "5");
 }
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/runenv/PORT mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/runenv/PORT
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/runenv/PORT	2005-08-19 23:31:01.000000000 +0200
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/runenv/PORT	2016-04-22 17:15:23.645352072 +0200
@@ -1,3 +1,3 @@
 {
-    return "export PORT=" . ($smtpd{TCPPort} || "25");
+    return "export PORT=" . ($qpsmtpd{TCPPort} || "25");
 }
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/sqpsmtpd/runenv/INSTANCES mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/sqpsmtpd/runenv/INSTANCES
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/sqpsmtpd/runenv/INSTANCES	2005-08-19 23:31:01.000000000 +0200
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/sqpsmtpd/runenv/INSTANCES	2016-04-22 17:16:27.733351057 +0200
@@ -1,3 +1,3 @@
 {
-    return "INSTANCES=" . ($ssmtpd{Instances} || $smtpd{Instances} || "10");
+    return "INSTANCES=" . ($sqpsmtpd{Instances} || $qpsmtpd{Instances} || "10");
 }
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/sqpsmtpd/runenv/INSTANCES_PER_IP mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/sqpsmtpd/runenv/INSTANCES_PER_IP
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/sqpsmtpd/runenv/INSTANCES_PER_IP	2005-08-19 23:31:01.000000000 +0200
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/sqpsmtpd/runenv/INSTANCES_PER_IP	2016-04-22 17:16:38.748350883 +0200
@@ -1,4 +1,4 @@
 {
     return "INSTANCES_PER_IP=" . 
-	($ssmtpd{InstancesPerIP} || $smtpd{InstancesPerIP} || "5");
+	($sqpsmtpd{InstancesPerIP} || $qpsmtpd{InstancesPerIP} || "5");
 }
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/sqpsmtpd/runenv/PORT mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/sqpsmtpd/runenv/PORT
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/sqpsmtpd/runenv/PORT	2005-08-19 23:31:01.000000000 +0200
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/sqpsmtpd/runenv/PORT	2016-04-22 23:02:26.784627513 +0200
@@ -1,3 +1,3 @@
 {
-    return "export PORT=" . (${ssmtpd}{TCPPort} || "465");
+    return "export PORT=" . (${sqpsmtpd}{TCPPort} || "465");
 }