/[smeserver]/rpms/e-smith-email/sme7/e-smith-email-4.18.0-add2general.patch
ViewVC logotype

Annotation of /rpms/e-smith-email/sme7/e-smith-email-4.18.0-add2general.patch

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


Revision 1.2 - (hide annotations) (download)
Mon Jul 28 18:23:52 2008 UTC (16 years, 3 months ago) by snetram
Branch: MAIN
CVS Tags: e-smith-email-4_18_0-5_el4_sme
Changes since 1.1: +2 -2 lines
* Mon Jul 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.0-5
- Fix patch to be in accordance with conventions in e-smith-formagick's general [SME: 4285]

1 snetram 1.1 diff -Nur -x '*.orig' -x '*.rej' e-smith-email-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings mezzanine_patched_e-smith-email-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings
2     --- e-smith-email-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings 2008-03-11 18:03:25.000000000 +0100
3     +++ mezzanine_patched_e-smith-email-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings 2008-04-27 10:48:43.000000000 +0200
4     @@ -174,14 +174,6 @@
5     <trans>Allow HTTPS (secure)</trans>
6     </entry>
7     <entry>
8     - <base>PUBLIC</base>
9     - <trans>Allow public access (entire Internet)</trans>
10     - </entry>
11     - <entry>
12     - <base>PRIVATE</base>
13     - <trans>Allow access only from local networks</trans>
14     - </entry>
15     - <entry>
16     <base>INSECURE_POP3</base>
17     <trans>Allow both POP3 and POP3S</trans>
18     </entry>
19     @@ -319,10 +311,6 @@
20     <base>LABEL_WEBMAIL</base>
21     <trans>Webmail access</trans>
22     </entry>
23     - <entry>
24     - <base>ERROR_UPDATING</base>
25     - <trans>Error occurred while updating system configuration.</trans>
26     - </entry>
27     <entry>
28     <base>LABEL_BLOCK_EXECUTABLE_CONTENT</base>
29     <trans>Executable content blocking</trans>
30     diff -Nur -x '*.orig' -x '*.rej' e-smith-email-4.18.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm mezzanine_patched_e-smith-email-4.18.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm
31     --- e-smith-email-4.18.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm 2008-03-11 18:03:25.000000000 +0100
32     +++ mezzanine_patched_e-smith-email-4.18.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm 2008-04-27 10:47:14.000000000 +0200
33     @@ -243,7 +243,7 @@
34    
35     unless ( system( "/sbin/e-smith/signal-event", "email-update" ) == 0 )
36     {
37     - $fm->error('ERROR_UPDATING');
38     + $fm->error('ERROR_UPDATING_CONFIGURATION');
39     return undef;
40     }
41     $fm->success('SUCCESS');
42     @@ -272,7 +272,7 @@
43    
44     unless ( system( "/sbin/e-smith/signal-event", "email-update" ) == 0 )
45     {
46     - $fm->error('ERROR_UPDATING');
47     + $fm->error('ERROR_UPDATING_CONFIGURATION');
48     return undef;
49     }
50     $fm->success('SUCCESS');
51     @@ -352,7 +352,7 @@
52    
53     unless ( system( "/sbin/e-smith/signal-event", "email-update" ) == 0 )
54     {
55     - $fm->error('ERROR_UPDATING');
56     + $fm->error('ERROR_UPDATING_CONFIGURATION');
57     return undef;
58     }
59    
60     @@ -383,7 +383,7 @@
61    
62     unless ( system( "/sbin/e-smith/signal-event", "email-update" ) == 0 )
63     {
64     - $fm->error('ERROR_UPDATING');
65     + $fm->error('ERROR_UPDATING_CONFIGURATION');
66     return undef;
67     }
68    
69     @@ -708,7 +708,7 @@
70     {
71     my %options = (
72     disabled => 'DISABLED',
73     - private => 'ALLOW_PRIVATE',
74 snetram 1.2 + private => 'NETWORKS_ALLOW_LOCAL',
75 snetram 1.1 publicSSL => 'SECURE_POP3'
76     );
77    
78     @@ -723,7 +723,7 @@
79     {
80     my %options = (
81     disabled => 'DISABLED',
82     - private => 'ALLOW_PRIVATE',
83 snetram 1.2 + private => 'NETWORKS_ALLOW_LOCAL',
84 snetram 1.1 publicSSL => 'SECURE_IMAP'
85     );
86    

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed