Kolab Groupware OBS

roundcubemail-plugins-kolab.spec Changed

@@ -24,7 +24,7 @@
 
 Name:           roundcubemail-plugins-kolab
 Version:        3.2.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Kolab Groupware plugins for Roundcube Webmail
 
 Group:          Applications/Internet
@@ -34,6 +34,8 @@
 Source0:        http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
 Source1:        comm.py
 
+Patch1:         fix-php-fatal-error.patch
+
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 
@@ -839,9 +841,10 @@
 
 %prep
 %setup -q  -c "%{name}-%{version}"
-
 pushd %{name}-%{version}
 
+%patch1 -p1
+
 # Remove the results of patching when there's an incidental offset
 find . -type f -name "*.orig" -delete
 
@@ -1931,6 +1934,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Sat Feb 28 2015 Daniel Hoffend <dh@dotlan.net> - 3.2.7-1
+- Fix PHP Fatal Error when Freebusy is using HTTP Authentication (#4751)
+
 * Wed Feb 25 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.2.7-1
 - Release of version 3.2.7

fix-php-fatal-error.patch Added

@@ -0,0 +1,25 @@
+From d91d6f98a7f4c03b55d7283873d935fde0b8d50f Mon Sep 17 00:00:00 2001
+From: Daniel Hoffend <dh@dotlan.net>
+Date: Sat, 28 Feb 2015 21:25:30 +0100
+Subject: [PATCH] fixed wrong rc->user call (php fatal error)
+
+---
+ plugins/calendar/drivers/kolab/kolab_user_calendar.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/calendar/drivers/kolab/kolab_user_calendar.php b/plugins/calendar/drivers/kolab/kolab_user_calendar.php
+index 3d53206..1f1d7ac 100644
+--- a/plugins/calendar/drivers/kolab/kolab_user_calendar.php
++++ b/plugins/calendar/drivers/kolab/kolab_user_calendar.php
+@@ -283,7 +283,7 @@ class kolab_user_calendar extends kolab_calendar
+ 
+       // authentication required
+       if ($response->getStatus() == 401) {
+-        $request->setAuth($this->rc->user->get_username(), $this->rc->decrypt($_SESSION['password']));
++        $request->setAuth($this->cal->rc->user->get_username(), $this->cal->rc->decrypt($_SESSION['password']));
+         $response = $request->send();
+       }
+ 
+-- 
+1.9.1
+

debian.changelog Changed

debian.series Changed

roundcubemail-plugins-kolab.dsc Changed

Changes of Revision 3