gunnar: server/php-kolab/Kolab_Filter issue3464.patch, NONE, 1.1.2.1 issue3768.patch, NONE, 1.1.2.1 ChangeLog, 1.29.2.11, 1.29.2.12 Kolab_Filter.spec, 1.19.2.14, 1.19.2.15 Makefile, 1.8.2.12, 1.8.2.13

cvs at kolab.org cvs at kolab.org
Mon Nov 16 22:19:48 CET 2009


Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv2301

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog Kolab_Filter.spec Makefile 
Added Files:
      Tag: kolab_2_2_branch
	issue3464.patch issue3768.patch 
Log Message:
 kolab/issue3464 (kolab-filter inserts double encoded utf-8 code  into From: header)

--- NEW FILE: issue3464.patch ---
diff -u -B -r1.4.2.4 -r1.4.2.7
--- Kolab_Filter/lib/Horde/Kolab/Filter/Content.php	6 Nov 2009 11:07:57 -0000	1.4.2.4
+++ Kolab_Filter/lib/Horde/Kolab/Filter/Content.php	16 Nov 2009 21:05:49 -0000	1.4.2.7
@@ -428,6 +428,9 @@
                                                       $from), __FILE__, __LINE__, PEAR_LOG_DEBUG);
                             return false;
                         } else {
+                            require_once 'Horde/String.php';
+                            require_once 'Horde/MIME.php';
+
                             /* Rewrite */
                             Horde::logMessage(sprintf("%s is not an allowed From address for unauthenticated users, rewriting.", 
                                                       $from), __FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -435,12 +438,12 @@
                                 if (property_exists($adr, 'personal')) {
                                     $name = str_replace(array("\\", '"'), 
                                                         array("\\\\",'\"'), 
-                                                        $adr->personal);
+                                                        MIME::decode($adr->personal, 'utf-8'));
                                 } else {
                                     $name = '';
                                 }
-                                $new_from = '"' . $name . ' ' . $untrusted . '"';
-                                return '=?utf-8?B?' . base64_encode($new_from) . '?= <' . $from . '>';
+                                $new_from = '"' . MIME::encode($name . ' ' . $untrusted) . '"';
+                                return  $new_from . ' <' . $from . '>';
                             } else {
                                 return true;
                             }

--- NEW FILE: issue3768.patch ---
diff -u -B -r1.15.2.8 -r1.15.2.9
--- Kolab_Filter/lib/Horde/Kolab/Resource.php	16 Nov 2009 10:18:05 -0000	1.15.2.8
+++ Kolab_Filter/lib/Horde/Kolab/Resource.php	16 Nov 2009 17:23:06 -0000	1.15.2.9
@@ -286,6 +286,20 @@
                 if (isset($attendees_params[$i]['ROLE'])) {
                     $attendee['role'] = $attendees_params[$i]['ROLE'];
                 }
+
+                if (isset($attendees_params[$i]['PARTSTAT'])) {
+                    $status = strtolower($attendees_params[$i]['PARTSTAT']);
+                    switch ($status) {
+                    case 'needs-action':
+                    case 'delegated':
+                        $attendee['status'] = 'none';
+                        break;
+                    default:
+                        $attendee['status'] = $status;
+                        break;
+                    }
+                }
+
                 $object['attendee'][] = $attendee;
             }
         }

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.29.2.11
retrieving revision 1.29.2.12
diff -u -d -r1.29.2.11 -r1.29.2.12
--- ChangeLog	16 Nov 2009 18:39:14 -0000	1.29.2.11
+++ ChangeLog	16 Nov 2009 21:19:46 -0000	1.29.2.12
@@ -16,7 +16,10 @@
 
 	kolab/issue3767 (Kolab server 2.2.0 resmgr creates incorrect event
 	attendee status values)
-	
+
+	kolab/issue3464 (kolab-filter inserts double encoded utf-8 code
+	into From: header)
+
 2009-11-07  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_Filter.spec: kolab/issue2499 (Notification messages by the

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.19.2.14
retrieving revision 1.19.2.15
diff -u -d -r1.19.2.14 -r1.19.2.15
--- Kolab_Filter.spec	16 Nov 2009 18:39:15 -0000	1.19.2.14
+++ Kolab_Filter.spec	16 Nov 2009 21:19:46 -0000	1.19.2.15
@@ -31,6 +31,7 @@
 Patch9:    revert_issue2495.patch
 Patch10:   issue3610.patch
 Patch11:   issue3768.patch
+Patch12:   issue3464.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -77,6 +78,7 @@
 	%patch -p1 -P 9
 	%patch -p1 -P 10
 	%patch -p1 -P 11
+	%patch -p1 -P 12
 	cp %{S:1} .
 %build
 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.8.2.12
retrieving revision 1.8.2.13
diff -u -d -r1.8.2.12 -r1.8.2.13
--- Makefile	16 Nov 2009 18:39:15 -0000	1.8.2.12
+++ Makefile	16 Nov 2009 21:19:46 -0000	1.8.2.13
@@ -6,7 +6,7 @@
 
 SOURCE_URL=http://pear.horde.org/get
 SOURCE_0=$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog issue3521.patch revert_issue2495.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3558.patch issue3568.patch issue3610.patch issue3768.patch issue3868.patch dovecotlda-quoting.patch package.xml
+EXTRA=ChangeLog revert_issue2495.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3464.patch issue3521.patch issue3558.patch issue3568.patch issue3610.patch issue3768.patch issue3868.patch dovecotlda-quoting.patch package.xml
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm





More information about the commits mailing list