summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-06-24 18:02:17 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-06-24 18:02:17 (GMT)
commit16773e22cb39e27064517fdafadc041552386f8d (patch)
tree79eeb86ece84481ee8a04f377759f0f2df6cb0a8
parenta46ef5a7db6d79db5ee63252ff6c3bd04b70faad (diff)
downloadserver-16773e22cb39e27064517fdafadc041552386f8d.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--php-kolab/Kolab_Freebusy/ChangeLog7
-rw-r--r--php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec4
-rw-r--r--php-kolab/Kolab_Freebusy/Makefile2
-rw-r--r--php-kolab/Kolab_Freebusy/issue4395.patch36
-rw-r--r--release-notes.txt5
5 files changed, 52 insertions, 2 deletions
diff --git a/php-kolab/Kolab_Freebusy/ChangeLog b/php-kolab/Kolab_Freebusy/ChangeLog
index 8dd3d07..639f748 100644
--- a/php-kolab/Kolab_Freebusy/ChangeLog
+++ b/php-kolab/Kolab_Freebusy/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-24 Gunnar Wrobel <p@rdus.de>
+
+ * issue4395.patch, Kolab_FreeBusy.spec, Makefile:
+
+ kolab/issue4395 (freebusy list contains time of an event, which is
+ from a now *not* shared, before shared calendar folder)
+
2009-03-20 Gunnar Wrobel <p@rdus.de>
* issue3450.patch, Kolab_FreeBusy.spec, Makefile: Fix kolab/issue3450
diff --git a/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec b/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec
index 4384c19..cf7caa4 100644
--- a/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec
+++ b/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec
@@ -1,7 +1,7 @@
# Variables
%define V_package Kolab_FreeBusy
%define V_version 0.1.2
-%define V_release 20090406
+%define V_release 20100624
# Package Information
Name: %{V_package}
@@ -23,6 +23,7 @@ Patch0: kolab_issue3313.patch
Patch1: issue3438.patch
Patch2: issue3450.patch
Patch3: issue3537.patch
+Patch4: issue4395.patch
# Build Info
Prefix: %{l_prefix}
@@ -59,6 +60,7 @@ for a particular user.
%patch -p3 -P 1
%patch -p3 -P 2
%patch -p1 -P 3
+ %patch -p3 -P 4
cp %{S:1} .
%build
diff --git a/php-kolab/Kolab_Freebusy/Makefile b/php-kolab/Kolab_Freebusy/Makefile
index cfa9175..6ef0761 100644
--- a/php-kolab/Kolab_Freebusy/Makefile
+++ b/php-kolab/Kolab_Freebusy/Makefile
@@ -6,7 +6,7 @@ RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\
SOURCE_URL=http://pear.horde.org/get
SOURCE_0=$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog kolab_issue3313.patch issue3438.patch issue3450.patch issue3537.patch package.xml
+EXTRA=ChangeLog kolab_issue3313.patch issue3438.patch issue3450.patch issue3537.patch issue4395.patch package.xml
.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
diff --git a/php-kolab/Kolab_Freebusy/issue4395.patch b/php-kolab/Kolab_Freebusy/issue4395.patch
new file mode 100644
index 0000000..083ae59
--- /dev/null
+++ b/php-kolab/Kolab_Freebusy/issue4395.patch
@@ -0,0 +1,36 @@
+From: Gunnar Wrobel <wrobel@pardus.de>
+Subject: [PATCH] issue4395.patch
+
+Fixes handling of ACLs when triggering folders.
+
+STATUS: UNMERGED
+
+REF: http://issues.kolab.org/issue4395
+
+Signed-off-by: Gunnar Wrobel <wrobel@pardus.de>
+
+diff -Naur --exclude='*~' a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache.php a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache.php
+--- a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache.php 2010-01-23 23:00:42.000000000 +0100
++++ b/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache.php 2010-03-25 15:49:15.000000000 +0100
+@@ -148,11 +148,9 @@
+ * it has been triggered by the folder owner before.
+ */
+ $append = false;
+- if (isset($acl[$access->user])) {
+- $myacl = $acl[$access->user];
+- if (strpos($myacl, 'a') !== false) {
++ if (isset($acl[$access->user])
++ && (strpos($acl[$access->user], 'a') === false)) {
+ $append = true;
+- }
+ }
+
+ $result = $c_acl->storeACL($acl, $relevance, $append);
+@@ -1342,7 +1340,6 @@
+ if (is_a($oldacl, 'PEAR_Error')) {
+ $oldacl = array();
+ }
+- $acl = array_merge($oldacl, $acl);
+ } else {
+ $oldacl = array();
+ }
diff --git a/release-notes.txt b/release-notes.txt
index 0475e9d..ae85158 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -74,6 +74,11 @@ Changes between 2.2.3 and 2.2.4:
Fixed invalid package dependency on the Kolab package.
+ - Kolab_FreeBusy-0.1.2-20100624
+
+ kolab/issue4395 (freebusy list contains time of an event, which is
+ from a now *not* shared, before shared calendar folder)
+
- kolab-webadmin-2.2.4-20100624
kolab/issue3499 (Kolab web admin does not use LDAP escaping)