gunnar: server/php-kolab/Kolab_Filter issue2499_2.patch, NONE, 1.1.2.1 ChangeLog, 1.29.2.7, 1.29.2.8 Kolab_Filter.spec, 1.19.2.10, 1.19.2.11 Makefile, 1.8.2.6, 1.8.2.7 issue3568.patch, 1.1.2.1, 1.1.2.2 revert_issue2499.patch, 1.1.2.1, NONE
cvs at kolab.org
cvs at kolab.org
Sat Nov 7 21:46:40 CET 2009
Author: gunnar
Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv13687/php-kolab/Kolab_Filter
Modified Files:
Tag: kolab_2_2_branch
ChangeLog Kolab_Filter.spec Makefile issue3568.patch
Added Files:
Tag: kolab_2_2_branch
issue2499_2.patch
Removed Files:
Tag: kolab_2_2_branch
revert_issue2499.patch
Log Message:
kolab/issue2499 (Notification messages by the resource manager
should be localized)
kolab/issue3462 (DIMP does not decode UTF-8 encoded From: headers)
kolab/issue3464 (kolab-filter inserts wrong/undecodeable utf-8 code
into From: header)
--- NEW FILE: issue2499_2.patch ---
diff -u -B -r1.4.2.3 Content.php
--- Kolab_Filter/lib/Horde/Kolab/Filter/Content.php 5 Mar 2009 10:08:53 -0000 1.4.2.3
+++ Kolab_Filter/lib/Horde/Kolab/Filter/Content.php 6 Nov 2009 11:07:34 -0000
@@ -439,8 +439,8 @@
} else {
$name = '';
}
- $new_from = '"' . $name . ' ' . $untrusted . '" <' . $from . '>';
- return '=?utf-8?B?' . base64_encode($new_from) . '?=';
+ $new_from = '"' . $name . ' ' . $untrusted . '"';
+ return '=?utf-8?B?' . base64_encode($new_from) . '?= <' . $from . '>';
} else {
return true;
}
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.29.2.7
retrieving revision 1.29.2.8
diff -u -d -r1.29.2.7 -r1.29.2.8
--- ChangeLog 22 Sep 2009 16:28:07 -0000 1.29.2.7
+++ ChangeLog 7 Nov 2009 20:46:38 -0000 1.29.2.8
@@ -1,3 +1,13 @@
+2009-11-07 Gunnar Wrobel <p at rdus.de>
+
+ * Kolab_Filter.spec: kolab/issue2499 (Notification messages by the
+ resource manager should be localized)
+
+ kolab/issue3464 (kolab-filter inserts wrong/undecodeable utf-8
+ code into From: header)
+
+ kolab/issue3462 (DIMP does not decode UTF-8 encoded From: headers)
+
2009-09-22 Gunnar Wrobel <p at rdus.de>
* Kolab_Filter.spec: kolab/issue3868 (Resmgr eats up all memory
Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.19.2.10
retrieving revision 1.19.2.11
diff -u -d -r1.19.2.10 -r1.19.2.11
--- Kolab_Filter.spec 22 Sep 2009 16:28:07 -0000 1.19.2.10
+++ Kolab_Filter.spec 7 Nov 2009 20:46:38 -0000 1.19.2.11
@@ -1,7 +1,7 @@
# Variables
%define V_package Kolab_Filter
%define V_version 0.1.4
-%define V_release 20090922
+%define V_release 20091107
# Package Information
Name: %{V_package}
@@ -23,7 +23,7 @@
Patch1: issue3192.patch
Patch2: issue3441.patch
Patch3: dovecotlda-quoting.patch
-Patch4: revert_issue2499.patch
+Patch4: issue2499_2.patch
Patch5: issue3521.patch
Patch6: issue3558.patch
Patch7: issue3568.patch
@@ -66,7 +66,7 @@
%patch -p1 -P 1
%patch -p1 -P 2
%patch -p1 -P 3
- %patch -p3 -P 4
+ %patch -p1 -P 4
%patch -p3 -P 5
%patch -p1 -P 6
%patch -p1 -P 7
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.8.2.6
retrieving revision 1.8.2.7
diff -u -d -r1.8.2.6 -r1.8.2.7
--- Makefile 22 Sep 2009 16:28:07 -0000 1.8.2.6
+++ Makefile 7 Nov 2009 20:46:38 -0000 1.8.2.7
@@ -21,7 +21,7 @@
SOURCE_URL=http://pear.horde.org/get
SOURCE_0=$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog issue3521.patch revert_issue2499.patch issue3435.patch issue3192.patch issue3441.patch issue3558.patch issue3568.patch issue3868.patch dovecotlda-quoting.patch package.xml
+EXTRA=ChangeLog issue3521.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3558.patch issue3568.patch issue3868.patch dovecotlda-quoting.patch package.xml
.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
Index: issue3568.patch
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Attic/issue3568.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- issue3568.patch 29 Apr 2009 16:06:21 -0000 1.1.2.1
+++ issue3568.patch 7 Nov 2009 20:46:38 -0000 1.1.2.2
@@ -1,11 +1,12 @@
--- a/lib/Horde/Kolab/Filter/Base.php 2009-04-29 17:58:31.000000000 +0200
+++ b/lib/Horde/Kolab/Filter/Base.php 2009-04-29 17:59:09.000000000 +0200
-@@ -243,6 +243,8 @@
+@@ -243,6 +243,9 @@
Horde::logMessage(sprintf("Arguments: %s", print_r($values, true)),
__FILE__, __LINE__, PEAR_LOG_DEBUG);
+ require_once 'Horde/NLS.php';
+ NLS::setCharset('utf-8');
-
- /* This is used as the default domain for unqualified adresses */
- global $_SERVER;
++
+ if (!empty($conf['kolab']['filter']['locale_path'])
+ && !empty($conf['kolab']['filter']['locale'])) {
+ require_once 'Horde/NLS.php';
--- revert_issue2499.patch DELETED ---
More information about the commits
mailing list