summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-06-14 06:42:28 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-06-14 06:42:28 (GMT)
commite264f7d83f6c024046a6b8f2510d2dd7061b565f (patch)
treeca654a82a5d634db67a4be87c1ab7d270e0771f5
parente955aa613ce9b92ef86ebcfc0dabf4ca4c253db9 (diff)
downloadserver-e264f7d83f6c024046a6b8f2510d2dd7061b565f.tar.gz
kolab/issue4395 (freebusy list contains time of an event, which is from a now *not* shared, before shared calendar folder)
-rw-r--r--kolab-webclient/ChangeLog6
-rw-r--r--kolab-webclient/Makefile2
-rw-r--r--kolab-webclient/activesync_conf.patch3
-rw-r--r--kolab-webclient/issue4395.patch24
-rw-r--r--kolab-webclient/kolab-webclient.spec11
-rw-r--r--release-notes.txt7
6 files changed, 47 insertions, 6 deletions
diff --git a/kolab-webclient/ChangeLog b/kolab-webclient/ChangeLog
index 069aa93..50b8737 100644
--- a/kolab-webclient/ChangeLog
+++ b/kolab-webclient/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-14 Gunnar Wrobel <p@rdus.de>
+
+ * issue4395.patch: kolab/issue4395 (freebusy list contains
+ time of an event, which is from a now *not* shared, before shared
+ calendar folder)
+
2010-06-08 Gunnar Wrobel <p@rdus.de>
* kolab-webclient.spec:
diff --git a/kolab-webclient/Makefile b/kolab-webclient/Makefile
index 1db05c3..79ede45 100644
--- a/kolab-webclient/Makefile
+++ b/kolab-webclient/Makefile
@@ -13,7 +13,7 @@ SOURCE_VERSION = $(shell grep "%define[ ]*V_source_version" *.spec | sed -e "s/.
PASSWD_VERSION = $(shell grep "%define[ ]*V_passwd_version" *.spec | sed -e "s/.*V_passwd_version\s*\([0-9._a-z]*\).*/\1/")
RELEASE = ${YEAR}${MONTH}${DAY}
-PATCHES = ../patches/horde-webmail/$(VERSION)/horde-webmail-$(VERSION)_kolab_openpkg.patch activesync_conf.patch
+PATCHES = ../patches/horde-webmail/$(VERSION)/horde-webmail-$(VERSION)_kolab_openpkg.patch activesync_conf.patch issue4395.patch
TEMPLATES = $(shell find . -name "*.template")
CONFIGS = $(shell find . -name "*.php")
diff --git a/kolab-webclient/activesync_conf.patch b/kolab-webclient/activesync_conf.patch
index a7e282f..8e31598 100644
--- a/kolab-webclient/activesync_conf.patch
+++ b/kolab-webclient/activesync_conf.patch
@@ -591,7 +591,8 @@ diff -Naur a/framework/Kolab_Storage/lib/Horde/Kolab/Storage.orig/Folder.php b/f
+ unset($params['xfbaccess']);
}
if (isset($params['fbrelevance'])) {
- $result = $this->setFbrelevance(join(' ', $params['fbrelevance']));
+- $result = $this->setFbrelevance(join(' ', $params['fbrelevance']));
++ $result = $this->setFbrelevance($params['fbrelevance']);
if (is_a($result, 'PEAR_Error')) {
return $result;
}
diff --git a/kolab-webclient/issue4395.patch b/kolab-webclient/issue4395.patch
new file mode 100644
index 0000000..ce77c4a
--- /dev/null
+++ b/kolab-webclient/issue4395.patch
@@ -0,0 +1,24 @@
+diff -Naur a/framework/Kolab_Storage/lib/Horde/Kolab/Storage.orig/Folder.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
+--- a/lib/Horde/Kolab/Storage/Folder.php 2010-05-04 23:44:49.522328256 +0200
++++ b/lib/Horde/Kolab/Storage/Folder.php 2010-05-06 07:46:01.507036608 +0200
+@@ -414,13 +414,19 @@
+ if (is_a($result, 'PEAR_Error')) {
+ return $result;
+ }
++ unset($params['xfbaccess']);
+ }
+ if (isset($params['fbrelevance'])) {
+- $result = $this->setFbrelevance(join(' ', $params['fbrelevance']));
++ $result = $this->setFbrelevance($params['fbrelevance']);
+ if (is_a($result, 'PEAR_Error')) {
+ return $result;
+ }
++ unset($params['fbrelevance']);
+ }
++ if (empty($params)) {
++ continue;
++ }
++ $value = serialize($params);
+ }
+
+ // setAnnotation apparently does not suppoort UTF-8 nor any special characters
diff --git a/kolab-webclient/kolab-webclient.spec b/kolab-webclient/kolab-webclient.spec
index 9b147e0..45b3b8e 100644
--- a/kolab-webclient/kolab-webclient.spec
+++ b/kolab-webclient/kolab-webclient.spec
@@ -1,9 +1,9 @@
# Versions
%define V_horde_name horde-webmail
%define V_package kolab-webclient
-%define V_year 2009
-%define V_month 12
-%define V_day 02
+%define V_year 2010
+%define V_month 06
+%define V_day 14
%define V_version 1.2.0
%define V_source_version 1.2
%define V_passwd_version 3.0.1
@@ -85,7 +85,8 @@ Source50: webclient-turba_sources.php.template
# List of Patches
Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde-webmail/%{V_version}/horde-webmail-%{V_version}_kolab_openpkg.patch
-Patch1: activesync_conf.patch
+Patch1: issue4395.patch
+Patch2: activesync_conf.patch
# Build Info
Prefix: %{l_prefix}
@@ -114,6 +115,8 @@ frontend to the Kolab server. The package is based on Horde.
cd %{V_horde_name}-%{V_source_version}
%patch -p2 -P 0
%if "%{with_activesync}" == "yes"
+ %patch -p1 -P 2
+%else
%patch -p1 -P 1
%endif
cd ..
diff --git a/release-notes.txt b/release-notes.txt
index 4781263..05cd81b 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -62,6 +62,13 @@ Changes between 2.2.3 and 2.2.x:
kolab/issue3499 (Kolab web admin does not use LDAP escaping)
kolab/issue4025 (Users can not change theire password (in 2.2.3))
+
+ - kolab-webclient-1.2.0-2010????
+
+ kolab/issue4395 (freebusy list contains time of an event,
+ which is from a now *not* shared, before
+ shared calendar folder)
+
- imapd-2.3.13-20081020_kolab?
kolab/issue1141 (Cannot give users from other domains access