summaryrefslogtreecommitdiff
path: root/php-kolab/Kolab_Filter
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2009-03-20 07:05:09 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2009-03-20 07:05:09 (GMT)
commit34f09eb935f18ce93190c1eda4ac24d4368027e8 (patch)
tree0bd0021f567e185cbf974a6f174be6a80864d859 /php-kolab/Kolab_Filter
parent6db886ecdeb22680e4e90afb9613e45d64662aac (diff)
downloadserver-34f09eb935f18ce93190c1eda4ac24d4368027e8.tar.gz
Reverted changes for kolab/issue2499 (Notification messages by
the resource manager sould be localized). A solution to this issue had been included in upstream release Kolab_Filter-0.1.4 but did not work properly yet.
Diffstat (limited to 'php-kolab/Kolab_Filter')
-rw-r--r--php-kolab/Kolab_Filter/Kolab_Filter.spec2
-rw-r--r--php-kolab/Kolab_Filter/Makefile2
-rw-r--r--php-kolab/Kolab_Filter/revert_issue2499.patch31
3 files changed, 34 insertions, 1 deletions
diff --git a/php-kolab/Kolab_Filter/Kolab_Filter.spec b/php-kolab/Kolab_Filter/Kolab_Filter.spec
index b2eae3c..31dabd2 100644
--- a/php-kolab/Kolab_Filter/Kolab_Filter.spec
+++ b/php-kolab/Kolab_Filter/Kolab_Filter.spec
@@ -23,6 +23,7 @@ Patch0: issue3435.patch
Patch1: issue3192.patch
Patch2: issue3441.patch
Patch3: dovecotlda-quoting.patch
+Patch4: revert_issue2499.patch
# Build Info
Prefix: %{l_prefix}
@@ -61,6 +62,7 @@ resource management as well as some Kolab server sender policies.
%patch -p1 -P 1
%patch -p1 -P 2
%patch -p1 -P 3
+ %patch -p3 -P 4
cp %{S:1} .
%build
diff --git a/php-kolab/Kolab_Filter/Makefile b/php-kolab/Kolab_Filter/Makefile
index fb18a5e..e594c2e 100644
--- a/php-kolab/Kolab_Filter/Makefile
+++ b/php-kolab/Kolab_Filter/Makefile
@@ -21,7 +21,7 @@ endif
SOURCE_URL=http://pear.horde.org/get
SOURCE_0=$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog issue3435.patch issue3192.patch issue3441.patch dovecotlda-quoting.patch package.xml
+EXTRA=ChangeLog revert_issue2499.patch issue3435.patch issue3192.patch issue3441.patch dovecotlda-quoting.patch package.xml
.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
diff --git a/php-kolab/Kolab_Filter/revert_issue2499.patch b/php-kolab/Kolab_Filter/revert_issue2499.patch
new file mode 100644
index 0000000..0dc874a
--- /dev/null
+++ b/php-kolab/Kolab_Filter/revert_issue2499.patch
@@ -0,0 +1,31 @@
+diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Base.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Base.php
+index baf33a4..865132a 100644
+--- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Base.php
++++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Base.php
+@@ -243,12 +243,6 @@ class Horde_Kolab_Filter_Base
+ Horde::logMessage(sprintf("Arguments: %s", print_r($values, true)),
+ __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
+- if (!empty($conf['kolab']['filter']['locale_path'])
+- && !empty($conf['kolab']['filter']['locale'])) {
+- require_once 'Horde/NLS.php';
+- NLS::setTextdomain('Kolab_Filter', $conf['kolab']['filter']['locale_path'], NLS::getCharset());
+- setlocale(LC_ALL, $conf['kolab']['filter']['locale']);
+- }
+
+ /* This is used as the default domain for unqualified adresses */
+ global $_SERVER;
+diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Content.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Content.php
+index f2c9976..89419f0 100644
+--- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Content.php
++++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Content.php
+@@ -438,8 +438,7 @@ class Horde_Kolab_Filter_Content extends Horde_Kolab_Filter_Base
+ } else {
+ $name = '';
+ }
+- $new_from = '"' . $name . ' ' . $untrusted . '" <' . $from . '>';
+- return '=?utf-8?B?' . base64_encode($new_from) . '?=';
++ return '"' . $name . ' ' . $untrusted . '" <' . $from . '>';
+ } else {
+ return true;
+ }