/[smecontribs]/rpms/smeserver-mailsorting/contribs7/smeserver-mailsorting-1.2-zarafaprocmail2.patch
ViewVC logotype

Annotation of /rpms/smeserver-mailsorting/contribs7/smeserver-mailsorting-1.2-zarafaprocmail2.patch

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

Revision 1.1 - (hide annotations) (download)
Fri Jun 12 13:18:59 2009 UTC (14 years, 11 months ago) by dungog
Branch: MAIN
CVS Tags: smeserver-mailsorting-1_2-40_el4_sme, smeserver-mailsorting-1_2-39_el4_sme, smeserver-mailsorting-1_2-35_el4_sme, smeserver-mailsorting-1_2-38_el4_sme, HEAD 
* Fri Jun 12 2009 Stephen Noble <support@dungog.net> 1.2-35
- don't escape spaces in folder names with zarafa enabled [SME: 5164]
1 dungog 1.1 diff -urN smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.procmailrc/40global smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.procmailrc/40global
2     --- smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.procmailrc/40global 2009-06-12 21:53:52.000000000 +1000
3     +++ smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.procmailrc/40global 2009-06-12 22:01:25.000000000 +1000
4     @@ -33,8 +33,12 @@
5     my $copy = db_get_prop(\%processmail, $pmGlobRule, "copy") || '';
6     my $action = db_get_prop(\%processmail, $pmGlobRule, "action") || '';
7     my $action2 = db_get_prop(\%processmail, $pmGlobRule, "action2") || '';
8     - $deliver =~ s/ /\\ /g;
9     - $deliver2 =~ s/ /\\ /g;
10     +
11     + unless (($zarafa1 eq 'enabled') || ($zarafa2 eq 'enabled'))
12     + {
13     + $deliver =~ s/ /\\ /g;
14     + $deliver2 =~ s/ /\\ /g;
15     + }
16    
17     foreach ($basis, $basis2)
18     {
19     diff -urN smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.procmailrc/60user smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.procmailrc/60user
20     --- smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.procmailrc/60user 2009-06-12 21:53:52.000000000 +1000
21     +++ smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.procmailrc/60user 2009-06-12 22:01:48.000000000 +1000
22     @@ -33,9 +33,13 @@
23     my $copy = db_get_prop(\%processmail, $pmRule, "copy") || '';
24     my $action = db_get_prop(\%processmail, $pmRule, "action") || '';
25     my $action2 = db_get_prop(\%processmail, $pmRule, "action2") || '';
26     +
27     #allow for spaces _ to \_
28     - $deliver =~ s/ /\\ /g;
29     - $deliver2 =~ s/ /\\ /g;
30     + unless (($zarafa1 eq 'enabled') || ($zarafa2 eq 'enabled'))
31     + {
32     + $deliver =~ s/ /\\ /g;
33     + $deliver2 =~ s/ /\\ /g;
34     + }
35    
36     foreach ($basis, $basis2)
37     {
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed