[Limacute-commit] r44 - trunk/RPM/SRC/perl-kolab

[jhf at projects.linpro.no]

Author: jhf
Date: 2007-01-03 11:37:20 +0100 (Wed, 03 Jan 2007)
New Revision: 44

Added:
   trunk/RPM/SRC/perl-kolab/masquerade.patch
Modified:
   trunk/RPM/SRC/perl-kolab/perl-kolab.spec
Log:
Fix for masquerade of multiple domains and sub domains.

Added: trunk/RPM/SRC/perl-kolab/masquerade.patch
===================================================================
--- trunk/RPM/SRC/perl-kolab/masquerade.patch	2007-01-03 10:33:17 UTC (rev 43)
+++ trunk/RPM/SRC/perl-kolab/masquerade.patch	2007-01-03 10:37:20 UTC (rev 44)
@@ -0,0 +1,19 @@
+--- Kolab-Conf/Conf.pm.in.orig	2007-01-03 11:35:51.000000000 +0100
++++ Kolab-Conf/Conf.pm.in	2007-01-03 11:35:55.000000000 +0100
+@@ -279,9 +279,13 @@
+ 		SWITCH: {
+ 		    # Join function
+ 		    $fct eq 'join' && do {
+-		      $val = join $args, (ref $Kolab::config{$attr} eq "ARRAY")
+-			?@{$Kolab::config{$attr}}
+-			  :($Kolab::config{$attr});
++                      if (ref $Kolab::config{$attr} eq "ARRAY") {
++                          my @vals = @{$Kolab::config{$attr}} ;
++                          my @length_sorted_vals = sort {length $a cmp length $b} @vals;
++                          $val = join ($args, @length_sorted_vals) ;
++                      } else {
++                          $val = $Kolab::config{$attr};
++                      }
+ 		      last SWITCH;
+ 		    };
+ 		    # Quote function

Modified: trunk/RPM/SRC/perl-kolab/perl-kolab.spec
===================================================================
--- trunk/RPM/SRC/perl-kolab/perl-kolab.spec	2007-01-03 10:33:17 UTC (rev 43)
+++ trunk/RPM/SRC/perl-kolab/perl-kolab.spec	2007-01-03 10:37:20 UTC (rev 44)
@@ -42,6 +42,7 @@
 #   list of sources
 Source0:      perl-kolab-%{version}.tar.bz2
 Patch0:       anti_spam.patch
+Patch1:       masquerade.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -59,6 +60,7 @@
 
 %setup -n %{name}-%{version}
     %patch0
+    %patch1
 
 
 %build