diff -Nur -x '*.orig' -x '*.rej' e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/access mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/access --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/access 2005-05-05 17:17:20.000000000 +0200 +++ mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/access 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -public diff -Nur -x '*.orig' -x '*.rej' e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/Authentication mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/Authentication --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/Authentication 2013-02-06 22:56:01.000000000 +0100 +++ mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/Authentication 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -enabled diff -Nur -x '*.orig' -x '*.rej' e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/Instances mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/Instances --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/Instances 2005-05-05 17:17:20.000000000 +0200 +++ mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/Instances 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -40 diff -Nur -x '*.orig' -x '*.rej' e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/InstancesPerIP mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/InstancesPerIP --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/InstancesPerIP 2005-05-05 17:17:20.000000000 +0200 +++ mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/InstancesPerIP 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -5 diff -Nur -x '*.orig' -x '*.rej' e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/PatternsScan mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/PatternsScan --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/PatternsScan 2005-05-05 17:17:20.000000000 +0200 +++ mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/PatternsScan 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -disabled diff -Nur -x '*.orig' -x '*.rej' e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/Proxy mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/Proxy --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/Proxy 2013-02-06 22:56:01.000000000 +0100 +++ mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/Proxy 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -blocked diff -Nur -x '*.orig' -x '*.rej' e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/status mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/status --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/status 2005-05-05 17:17:20.000000000 +0200 +++ mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/status 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -enabled diff -Nur -x '*.orig' -x '*.rej' e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/TCPPort mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/TCPPort --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/TCPPort 2005-05-05 17:17:20.000000000 +0200 +++ mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/TCPPort 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -25 diff -Nur -x '*.orig' -x '*.rej' e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/TCPProxyPort mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/TCPProxyPort --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/TCPProxyPort 2005-08-02 23:13:38.000000000 +0200 +++ mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/TCPProxyPort 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -25 diff -Nur -x '*.orig' -x '*.rej' e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/type mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/type --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/type 2005-05-05 17:17:20.000000000 +0200 +++ mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/type 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -service diff -Nur -x '*.orig' -x '*.rej' e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/VirusScan mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/VirusScan --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/VirusScan 2005-05-05 17:17:20.000000000 +0200 +++ mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/VirusScan 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -enabled diff -Nur -x '*.orig' -x '*.rej' e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/access mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/access --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/access 2005-05-05 17:17:20.000000000 +0200 +++ mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/access 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -public diff -Nur -x '*.orig' -x '*.rej' e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/Authentication mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/Authentication --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/Authentication 2005-05-05 17:17:20.000000000 +0200 +++ mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/Authentication 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -enabled diff -Nur -x '*.orig' -x '*.rej' e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/Instances mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/Instances --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/Instances 2005-05-05 17:17:20.000000000 +0200 +++ mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/Instances 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -10 diff -Nur -x '*.orig' -x '*.rej' e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/status mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/status --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/status 2005-05-05 17:17:20.000000000 +0200 +++ mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/status 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -enabled diff -Nur -x '*.orig' -x '*.rej' e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/TCPPort mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/TCPPort --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/TCPPort 2005-05-05 17:17:20.000000000 +0200 +++ mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/TCPPort 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -465 diff -Nur -x '*.orig' -x '*.rej' e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/type mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/type --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/type 2005-05-05 17:17:20.000000000 +0200 +++ mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/type 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -service diff -Nur -x '*.orig' -x '*.rej' e-smith-email-5.6.0/root/etc/e-smith/db/configuration/migrate/20smtpd-auth mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/migrate/20smtpd-auth --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/migrate/20smtpd-auth 2006-03-14 20:23:58.000000000 +0100 +++ mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/migrate/20smtpd-auth 2016-04-22 18:03:48.598082626 +0200 @@ -1,7 +1,7 @@ { - my $smtpd = $DB->get('smtpd') or return; + my $qpsmtpd = $DB->get('qpsmtpd') or return; - my $auth = $DB->get_prop_and_delete('smtpd','authentication') or return; + my $auth = $DB->get_prop_and_delete('qpsmtpd','authentication') or return; - $smtpd->merge_props('Authentication',$auth); + $qpsmtpd->merge_props('Authentication',$auth); } diff -Nur -x '*.orig' -x '*.rej' e-smith-email-5.6.0/root/etc/e-smith/db/configuration/migrate/20smtpfront-qmail mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/migrate/20smtpfront-qmail --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/migrate/20smtpfront-qmail 2005-05-05 17:17:20.000000000 +0200 +++ mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/migrate/20smtpfront-qmail 2016-04-22 18:10:36.254029377 +0200 @@ -1,12 +1,12 @@ { my $mailfront = $DB->get("smtpfront-qmail") or return; - my $smtpd = $DB->get("smtpd") || - $DB->new_record("smtpd", { type => "service" }); + my $qpsmtpd = $DB->get("qpsmtpd") || + $DB->new_record("qpsmtpd", { type => "service" }); - $smtpd->merge_props($mailfront->props); + $qpsmtpd->merge_props($mailfront->props); - $smtpd->delete_prop($_) for ( qw(Patterns PatternsFile) ); + $qpsmtpd->delete_prop($_) for ( qw(Patterns PatternsFile) ); $mailfront->delete; } diff -Nur -x '*.orig' -x '*.rej' e-smith-email-5.6.0/root/etc/e-smith/db/configuration/migrate/20smtpProxy mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/migrate/20smtpProxy --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/migrate/20smtpProxy 2016-04-22 18:26:57.938909339 +0200 +++ mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/migrate/20smtpProxy 2016-04-22 18:11:52.328019690 +0200 @@ -3,11 +3,11 @@ # In SME Server 8 the UI uses enabled but the configuration value is transparent. # This migrate fragment is needed to allow upgrades from SME Server 7. - my $proxy = $DB->get_prop('smtpd','Proxy') or return; + my $proxy = $DB->get_prop('qpsmtpd','Proxy') or return; if ($proxy eq 'enabled') { - $DB->set_prop('smtpd','Proxy', 'blocked'); - $DB->set_prop('smtpd','Authentication', 'enabled'); + $DB->set_prop('qpsmtpd','Proxy', 'blocked'); + $DB->set_prop('qpsmtpd','Authentication', 'enabled'); } } diff -Nur -x '*.orig' -x '*.rej' e-smith-email-5.6.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/emailsettings.pm mezzanine_patched_e-smith-email-5.6.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/emailsettings.pm --- e-smith-email-5.6.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/emailsettings.pm 2016-04-22 18:26:57.945909338 +0200 +++ mezzanine_patched_e-smith-email-5.6.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/emailsettings.pm 2016-04-22 17:43:42.989210542 +0200 @@ -231,14 +231,14 @@ my $smtpAuth = ($q->param('SMTPAuth') || 'public'); if ($smtpAuth eq 'public') { - $db->set_prop("smtpd", "Authentication", "enabled" ); - $db->set_prop("ssmtpd", "Authentication", "enabled" ); + $db->set_prop("qpsmtpd", "Authentication", "enabled" ); + $db->set_prop("sqpsmtpd", "Authentication", "enabled" ); } elsif ($smtpAuth eq 'publicSSL') { - $db->set_prop("smtpd", "Authentication", "disabled" ); - $db->set_prop("ssmtpd", "Authentication", "enabled" ); + $db->set_prop("qpsmtpd", "Authentication", "disabled" ); + $db->set_prop("sqpsmtpd", "Authentication", "enabled" ); } else { - $db->set_prop("smtpd", "Authentication", "disabled" ); - $db->set_prop("ssmtpd", "Authentication", "disabled" ); + $db->set_prop("qpsmtpd", "Authentication", "disabled" ); + $db->set_prop("sqpsmtpd", "Authentication", "disabled" ); } unless ( system( "/sbin/e-smith/signal-event", "email-update" ) == 0 ) @@ -381,7 +381,7 @@ my $q = $fm->{'cgi'}; my $virus_status = ( $q->param('VirusStatus') || 'disabled' ); - $db->set_prop("smtpd", 'VirusScan', $virus_status); + $db->set_prop("qpsmtpd", 'VirusScan', $virus_status); for my $param ( qw( status @@ -396,7 +396,7 @@ } my $patterns_status = $fm->adjust_patterns() ? 'enabled' : 'disabled'; - $db->set_prop("smtpd", 'PatternsScan', $patterns_status); + $db->set_prop("qpsmtpd", 'PatternsScan', $patterns_status); unless ( system( "/sbin/e-smith/signal-event", "email-update" ) == 0 ) { @@ -536,11 +536,11 @@ my ($fm, $localise) = @_; - my $smtpStatus = $db->get_prop('smtpd', 'status') || 'enabled'; - my $smtpAuth = $db->get_prop('smtpd', 'Authentication') || 'enabled'; + my $smtpStatus = $db->get_prop('qpsmtpd', 'status') || 'enabled'; + my $smtpAuth = $db->get_prop('qpsmtpd', 'Authentication') || 'enabled'; - my $smtpsStatus = $db->get_prop('ssmtpd', 'status') || 'enabled'; - my $smtpsAuth = $db->get_prop('ssmtpd', 'Authentication') || 'enabled'; + my $smtpsStatus = $db->get_prop('sqpsmtpd', 'status') || 'enabled'; + my $smtpsAuth = $db->get_prop('sqpsmtpd', 'Authentication') || 'enabled'; my $options = get_smtp_auth_options(); @@ -664,7 +664,7 @@ { my ($self, $localise) = @_; - my $status = $db->get_prop("smtpd", 'PatternsScan') || 'disabled'; + my $status = $db->get_prop("qpsmtpd", 'PatternsScan') || 'disabled'; return $localise ? $self->localise_status($status) : $status; } @@ -776,7 +776,7 @@ { my ($self, $localise) = @_; - my $status = $db->get_prop("smtpd", 'VirusScan') || 'disabled'; + my $status = $db->get_prop("qpsmtpd", 'VirusScan') || 'disabled'; return $localise ? $self->localise_status($status) : $status; }