summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2009-03-03 16:25:07 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2009-03-03 16:25:07 (GMT)
commit202723aa5f8a2ef728422583cc4cc32975dd884e (patch)
treedbb35e5b73b179d3328fb5e961773a7856be5e39
parent78afc6ef97a7e4befffa15aa2ae1f63a4fb74101 (diff)
downloadserver-202723aa5f8a2ef728422583cc4cc32975dd884e.tar.gz
Add patches for kolab/issue3192 and kolab/issue3441:
kolab/issue3192 (Forwarding an invitation with Outlook failed) kolab/issue3441 (Resources with policy "always accept" do not work if domain != kolabhost)
-rw-r--r--php-kolab/Kolab_Filter/ChangeLog7
-rw-r--r--php-kolab/Kolab_Filter/Kolab_Filter.spec6
-rw-r--r--php-kolab/Kolab_Filter/Makefile2
-rw-r--r--php-kolab/Kolab_Filter/issue3192.patch13
-rw-r--r--php-kolab/Kolab_Filter/issue3441.patch12
-rw-r--r--release-notes.txt4
6 files changed, 41 insertions, 3 deletions
diff --git a/php-kolab/Kolab_Filter/ChangeLog b/php-kolab/Kolab_Filter/ChangeLog
index b35cfb4..308b636 100644
--- a/php-kolab/Kolab_Filter/ChangeLog
+++ b/php-kolab/Kolab_Filter/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-03 Thomas Arendsen Hein <thomas@intevation.de>
+
+ * issue3192.patch, issue3441.patch, Kolab_Filter.spec, Makefile: Add
+ patches for kolab/issue3192 (Forwarding an invitation with Outlook
+ failed) and kolab/issue3441 (Resources with policy "always accept" do
+ not work if domain != kolabhost) and bump release number.
+
2009-02-26 Gunnar Wrobel <p@rdus.de>
* issue3435.patch: Fix kolab/issue3435 (Delivery of invitations
diff --git a/php-kolab/Kolab_Filter/Kolab_Filter.spec b/php-kolab/Kolab_Filter/Kolab_Filter.spec
index 177daea..9be29db 100644
--- a/php-kolab/Kolab_Filter/Kolab_Filter.spec
+++ b/php-kolab/Kolab_Filter/Kolab_Filter.spec
@@ -1,7 +1,7 @@
# Variables
%define V_package Kolab_Filter
%define V_version 0.1.4
-%define V_release 20090226
+%define V_release 20090303
# Package Information
Name: %{V_package}
@@ -20,6 +20,8 @@ Source1: package.xml
# List of patches
Patch0: issue3435.patch
+Patch1: issue3192.patch
+Patch2: issue3441.patch
# Build Info
Prefix: %{l_prefix}
@@ -55,6 +57,8 @@ resource management as well as some Kolab server sender policies.
%setup -n %{V_package}-%{V_version}
%patch -p3 -P 0
+ %patch -p1 -P 1
+ %patch -p1 -P 2
cp %{S:1} .
%build
diff --git a/php-kolab/Kolab_Filter/Makefile b/php-kolab/Kolab_Filter/Makefile
index b81da3a..1f369e7 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 package.xml
+EXTRA=ChangeLog issue3435.patch issue3192.patch issue3441.patch package.xml
.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
diff --git a/php-kolab/Kolab_Filter/issue3192.patch b/php-kolab/Kolab_Filter/issue3192.patch
new file mode 100644
index 0000000..249f03a
--- /dev/null
+++ b/php-kolab/Kolab_Filter/issue3192.patch
@@ -0,0 +1,13 @@
+diff -urN Kolab_Filter-0.1.4.orig/lib/Horde/Kolab/Filter/Outlook.php Kolab_Filter-0.1.4/lib/Horde/Kolab/Filter/Outlook.php
+--- Kolab_Filter-0.1.4.orig/lib/Horde/Kolab/Filter/Outlook.php 2009-02-24 12:20:50.000000000 +0100
++++ Kolab_Filter-0.1.4/lib/Horde/Kolab/Filter/Outlook.php 2009-03-03 16:44:54.365444005 +0100
+@@ -104,7 +104,8 @@
+ $iCal->parsevCalendar($icaltxt);
+ $vevent =& $iCal->findComponent('VEVENT');
+ if ($vevent) {
+- if (!$vevent->organizerName()) {
++ $organizer = $vevent->getAttribute('ORGANIZER', true);
++ if (is_a($organizer, 'PEAR_Error')) {
+ $adrs = imap_rfc822_parse_adrlist($from, $email_domain);
+ if (count($adrs) > 0) {
+ $org_email = 'mailto:'.$adrs[0]->mailbox.'@'.$adrs[0]->host;
diff --git a/php-kolab/Kolab_Filter/issue3441.patch b/php-kolab/Kolab_Filter/issue3441.patch
new file mode 100644
index 0000000..4154fde
--- /dev/null
+++ b/php-kolab/Kolab_Filter/issue3441.patch
@@ -0,0 +1,12 @@
+diff -urN Kolab_Filter-0.1.4.orig/lib/Horde/Kolab/Filter/Base.php Kolab_Filter-0.1.4/lib/Horde/Kolab/Filter/Base.php
+--- Kolab_Filter-0.1.4.orig/lib/Horde/Kolab/Filter/Base.php 2009-02-24 12:20:50.000000000 +0100
++++ Kolab_Filter-0.1.4/lib/Horde/Kolab/Filter/Base.php 2009-03-03 16:51:34.667295919 +0100
+@@ -253,7 +253,7 @@
+ /* This is used as the default domain for unqualified adresses */
+ global $_SERVER;
+ if (!array_key_exists('SERVER_NAME', $_SERVER)) {
+- $_SERVER['SERVER_NAME'] = $conf['kolab']['filter']['email_domain'];
++ $_SERVER['SERVER_NAME'] = $conf['kolab']['imap']['server'];
+ }
+
+ if (!array_key_exists('REMOTE_ADDR', $_SERVER)) {
diff --git a/release-notes.txt b/release-notes.txt
index c501fd7..2defa4b 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -67,13 +67,15 @@ Changes between 2.2.1-beta-1 and 2.2.1-???
New package needed for running unit tests of Kolab PHP packages.
- - Kolab_Filter-0.1.4-20090226
+ - Kolab_Filter-0.1.4-20090303
kolab/issue3192 (Forwarding an invitation with Outlook failed)
kolab/issue3299 (Kolab_Filter: big.eml is too big)
kolab/issue3364 (manpages for kolabfilter and kolabmailboxfilter)
kolab/issue3426 (php error when sending mail with enabled mail filter
checking)
+ kolab/issue3441 (Resources with policy "always accept" do not work if
+ domain != kolabhost)
kolab/issue3435 (Delivery of invitations fails with no
"kolabInvitationPolicy" in ldap)