/[smeserver]/rpms/e-smith-email/sme10/e-smith-email-5.6.0-smtpd_to_qpsmtpd.patch
ViewVC logotype

Contents of /rpms/e-smith-email/sme10/e-smith-email-5.6.0-smtpd_to_qpsmtpd.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (show annotations) (download)
Fri Apr 22 21:26:31 2016 UTC (8 years, 9 months ago) by vip-ire
Branch: MAIN
CVS Tags: e-smith-email-5_6_0-5_el7_sme, e-smith-email-5_6_0-16_el7_sme, e-smith-email-5_6_0-15_el7_sme, e-smith-email-5_6_0-10_el7_sme, e-smith-email-5_6_0-17_el7_sme, e-smith-email-5_6_0-12_el7_sme, e-smith-email-5_6_0-11_el7_sme, e-smith-email-5_6_0-2_el7_sme, e-smith-email-5_6_0-8_el7_sme, e-smith-email-5_6_0-18_el7_sme, e-smith-email-5_6_0-3_el7_sme, e-smith-email-5_6_0-19_el7_sme, e-smith-email-5_6_0-14_el7_sme, e-smith-email-5_6_0-9_el7_sme, e-smith-email-5_6_0-7_el7_sme, e-smith-email-5_6_0-13_el7_sme, e-smith-email-5_6_0-6_el7_sme, e-smith-email-5_6_0-4_el7_sme, HEAD 
* Fri Apr 22 2016 Daniel Berteaud <daniel@firewall-services.com> 5.6.0-2.sme
- Merge smtpd entry into qpsmtpd, same for ssmtpd into sqpsmtpd [SME: 9478]
1 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
2 --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/access 2005-05-05 17:17:20.000000000 +0200
3 +++ 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
4 @@ -1 +0,0 @@
5 -public
6 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
7 --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/Authentication 2013-02-06 22:56:01.000000000 +0100
8 +++ 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
9 @@ -1 +0,0 @@
10 -enabled
11 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
12 --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/Instances 2005-05-05 17:17:20.000000000 +0200
13 +++ 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
14 @@ -1 +0,0 @@
15 -40
16 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
17 --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/InstancesPerIP 2005-05-05 17:17:20.000000000 +0200
18 +++ 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
19 @@ -1 +0,0 @@
20 -5
21 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
22 --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/PatternsScan 2005-05-05 17:17:20.000000000 +0200
23 +++ 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
24 @@ -1 +0,0 @@
25 -disabled
26 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
27 --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/Proxy 2013-02-06 22:56:01.000000000 +0100
28 +++ 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
29 @@ -1 +0,0 @@
30 -blocked
31 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
32 --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/status 2005-05-05 17:17:20.000000000 +0200
33 +++ 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
34 @@ -1 +0,0 @@
35 -enabled
36 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
37 --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/TCPPort 2005-05-05 17:17:20.000000000 +0200
38 +++ 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
39 @@ -1 +0,0 @@
40 -25
41 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
42 --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/TCPProxyPort 2005-08-02 23:13:38.000000000 +0200
43 +++ 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
44 @@ -1 +0,0 @@
45 -25
46 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
47 --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/type 2005-05-05 17:17:20.000000000 +0200
48 +++ 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
49 @@ -1 +0,0 @@
50 -service
51 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
52 --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/VirusScan 2005-05-05 17:17:20.000000000 +0200
53 +++ 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
54 @@ -1 +0,0 @@
55 -enabled
56 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
57 --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/access 2005-05-05 17:17:20.000000000 +0200
58 +++ 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
59 @@ -1 +0,0 @@
60 -public
61 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
62 --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/Authentication 2005-05-05 17:17:20.000000000 +0200
63 +++ 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
64 @@ -1 +0,0 @@
65 -enabled
66 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
67 --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/Instances 2005-05-05 17:17:20.000000000 +0200
68 +++ 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
69 @@ -1 +0,0 @@
70 -10
71 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
72 --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/status 2005-05-05 17:17:20.000000000 +0200
73 +++ 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
74 @@ -1 +0,0 @@
75 -enabled
76 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
77 --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/TCPPort 2005-05-05 17:17:20.000000000 +0200
78 +++ 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
79 @@ -1 +0,0 @@
80 -465
81 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
82 --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/defaults/ssmtpd/type 2005-05-05 17:17:20.000000000 +0200
83 +++ 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
84 @@ -1 +0,0 @@
85 -service
86 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
87 --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/migrate/20smtpd-auth 2006-03-14 20:23:58.000000000 +0100
88 +++ 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
89 @@ -1,7 +1,7 @@
90 {
91 - my $smtpd = $DB->get('smtpd') or return;
92 + my $qpsmtpd = $DB->get('qpsmtpd') or return;
93
94 - my $auth = $DB->get_prop_and_delete('smtpd','authentication') or return;
95 + my $auth = $DB->get_prop_and_delete('qpsmtpd','authentication') or return;
96
97 - $smtpd->merge_props('Authentication',$auth);
98 + $qpsmtpd->merge_props('Authentication',$auth);
99 }
100 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
101 --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/migrate/20smtpfront-qmail 2005-05-05 17:17:20.000000000 +0200
102 +++ 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
103 @@ -1,12 +1,12 @@
104 {
105 my $mailfront = $DB->get("smtpfront-qmail") or return;
106
107 - my $smtpd = $DB->get("smtpd") ||
108 - $DB->new_record("smtpd", { type => "service" });
109 + my $qpsmtpd = $DB->get("qpsmtpd") ||
110 + $DB->new_record("qpsmtpd", { type => "service" });
111
112 - $smtpd->merge_props($mailfront->props);
113 + $qpsmtpd->merge_props($mailfront->props);
114
115 - $smtpd->delete_prop($_) for ( qw(Patterns PatternsFile) );
116 + $qpsmtpd->delete_prop($_) for ( qw(Patterns PatternsFile) );
117
118 $mailfront->delete;
119 }
120 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
121 --- e-smith-email-5.6.0/root/etc/e-smith/db/configuration/migrate/20smtpProxy 2016-04-22 18:26:57.938909339 +0200
122 +++ mezzanine_patched_e-smith-email-5.6.0/root/etc/e-smith/db/configuration/migrate/20smtpProxy 2016-04-22 18:11:52.328019690 +0200
123 @@ -3,11 +3,11 @@
124 # In SME Server 8 the UI uses enabled but the configuration value is transparent.
125 # This migrate fragment is needed to allow upgrades from SME Server 7.
126
127 - my $proxy = $DB->get_prop('smtpd','Proxy') or return;
128 + my $proxy = $DB->get_prop('qpsmtpd','Proxy') or return;
129
130 if ($proxy eq 'enabled')
131 {
132 - $DB->set_prop('smtpd','Proxy', 'blocked');
133 - $DB->set_prop('smtpd','Authentication', 'enabled');
134 + $DB->set_prop('qpsmtpd','Proxy', 'blocked');
135 + $DB->set_prop('qpsmtpd','Authentication', 'enabled');
136 }
137 }
138 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
139 --- 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
140 +++ 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
141 @@ -231,14 +231,14 @@
142
143 my $smtpAuth = ($q->param('SMTPAuth') || 'public');
144 if ($smtpAuth eq 'public') {
145 - $db->set_prop("smtpd", "Authentication", "enabled" );
146 - $db->set_prop("ssmtpd", "Authentication", "enabled" );
147 + $db->set_prop("qpsmtpd", "Authentication", "enabled" );
148 + $db->set_prop("sqpsmtpd", "Authentication", "enabled" );
149 } elsif ($smtpAuth eq 'publicSSL') {
150 - $db->set_prop("smtpd", "Authentication", "disabled" );
151 - $db->set_prop("ssmtpd", "Authentication", "enabled" );
152 + $db->set_prop("qpsmtpd", "Authentication", "disabled" );
153 + $db->set_prop("sqpsmtpd", "Authentication", "enabled" );
154 } else {
155 - $db->set_prop("smtpd", "Authentication", "disabled" );
156 - $db->set_prop("ssmtpd", "Authentication", "disabled" );
157 + $db->set_prop("qpsmtpd", "Authentication", "disabled" );
158 + $db->set_prop("sqpsmtpd", "Authentication", "disabled" );
159 }
160
161 unless ( system( "/sbin/e-smith/signal-event", "email-update" ) == 0 )
162 @@ -381,7 +381,7 @@
163 my $q = $fm->{'cgi'};
164
165 my $virus_status = ( $q->param('VirusStatus') || 'disabled' );
166 - $db->set_prop("smtpd", 'VirusScan', $virus_status);
167 + $db->set_prop("qpsmtpd", 'VirusScan', $virus_status);
168
169 for my $param ( qw(
170 status
171 @@ -396,7 +396,7 @@
172 }
173
174 my $patterns_status = $fm->adjust_patterns() ? 'enabled' : 'disabled';
175 - $db->set_prop("smtpd", 'PatternsScan', $patterns_status);
176 + $db->set_prop("qpsmtpd", 'PatternsScan', $patterns_status);
177
178 unless ( system( "/sbin/e-smith/signal-event", "email-update" ) == 0 )
179 {
180 @@ -536,11 +536,11 @@
181
182 my ($fm, $localise) = @_;
183
184 - my $smtpStatus = $db->get_prop('smtpd', 'status') || 'enabled';
185 - my $smtpAuth = $db->get_prop('smtpd', 'Authentication') || 'enabled';
186 + my $smtpStatus = $db->get_prop('qpsmtpd', 'status') || 'enabled';
187 + my $smtpAuth = $db->get_prop('qpsmtpd', 'Authentication') || 'enabled';
188
189 - my $smtpsStatus = $db->get_prop('ssmtpd', 'status') || 'enabled';
190 - my $smtpsAuth = $db->get_prop('ssmtpd', 'Authentication') || 'enabled';
191 + my $smtpsStatus = $db->get_prop('sqpsmtpd', 'status') || 'enabled';
192 + my $smtpsAuth = $db->get_prop('sqpsmtpd', 'Authentication') || 'enabled';
193
194 my $options = get_smtp_auth_options();
195
196 @@ -664,7 +664,7 @@
197 {
198 my ($self, $localise) = @_;
199
200 - my $status = $db->get_prop("smtpd", 'PatternsScan') || 'disabled';
201 + my $status = $db->get_prop("qpsmtpd", 'PatternsScan') || 'disabled';
202
203 return $localise ? $self->localise_status($status) : $status;
204 }
205 @@ -776,7 +776,7 @@
206 {
207 my ($self, $localise) = @_;
208
209 - my $status = $db->get_prop("smtpd", 'VirusScan') || 'disabled';
210 + my $status = $db->get_prop("qpsmtpd", 'VirusScan') || 'disabled';
211
212 return $localise ? $self->localise_status($status) : $status;
213 }
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed