gunnar: server/php-kolab/Kolab_Freebusy issue4395.patch, NONE, 1.1.2.1 ChangeLog, 1.25.2.1, 1.25.2.2 Kolab_FreeBusy.spec, 1.18.2.3, 1.18.2.4 Makefile, 1.6.2.4, 1.6.2.5
cvs at kolab.org
cvs at kolab.org
Thu Jun 24 20:02:19 CEST 2010
Author: gunnar
Update of /kolabrepository/server/php-kolab/Kolab_Freebusy
In directory doto:/tmp/cvs-serv10561/d/Kolab_Freebusy
Modified Files:
Tag: kolab_2_2_branch
ChangeLog Kolab_FreeBusy.spec Makefile
Added Files:
Tag: kolab_2_2_branch
issue4395.patch
Log Message:
kolab/issue4395 (freebusy list contains time of an event, which is from a now *not* shared, before shared calendar folder)
--- NEW FILE: issue4395.patch ---
From: Gunnar Wrobel <wrobel at 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 at 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();
}
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/ChangeLog,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -u -d -r1.25.2.1 -r1.25.2.2
--- ChangeLog 31 Mar 2009 12:43:26 -0000 1.25.2.1
+++ ChangeLog 24 Jun 2010 18:02:17 -0000 1.25.2.2
@@ -1,3 +1,10 @@
+2010-06-24 Gunnar Wrobel <p at 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 at rdus.de>
* issue3450.patch, Kolab_FreeBusy.spec, Makefile: Fix kolab/issue3450
Index: Kolab_FreeBusy.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec,v
retrieving revision 1.18.2.3
retrieving revision 1.18.2.4
diff -u -d -r1.18.2.3 -r1.18.2.4
--- Kolab_FreeBusy.spec 6 Apr 2009 13:59:22 -0000 1.18.2.3
+++ Kolab_FreeBusy.spec 24 Jun 2010 18:02:17 -0000 1.18.2.4
@@ -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 @@
Patch1: issue3438.patch
Patch2: issue3450.patch
Patch3: issue3537.patch
+Patch4: issue4395.patch
# Build Info
Prefix: %{l_prefix}
@@ -59,6 +60,7 @@
%patch -p3 -P 1
%patch -p3 -P 2
%patch -p1 -P 3
+ %patch -p3 -P 4
cp %{S:1} .
%build
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Makefile,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -u -d -r1.6.2.4 -r1.6.2.5
--- Makefile 9 Nov 2009 17:08:45 -0000 1.6.2.4
+++ Makefile 24 Jun 2010 18:02:17 -0000 1.6.2.5
@@ -6,7 +6,7 @@
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
More information about the commits
mailing list