Request 2110 (superseded)

kolab-syncroton.spec Changed

@@ -17,12 +17,6 @@
 
 %{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d}
 
-%if 0%{?suse_version} < 1 && 0%{?fedora} < 1 && 0%{?rhel} < 7
-%global with_systemd 0
-%else
-%global with_systemd 1
-%endif
-
 %if 0%{?suse_version}
 %global httpd_group www
 %global httpd_name apache2
@@ -40,57 +34,69 @@
 %endif
 
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
-%global upstream_version 2.4.2
 
 Name:           kolab-syncroton
-Version: 2.4.2.36
-Release:        1%{?dist}
+Version:        2.3.6
+Release:        2%{?dist}
 Summary:        ActiveSync for Kolab Groupware
 
 Group:          Applications/Internet
 License:        LGPLv2
 URL:            http://www.syncroton.org
 
-Source0:        %{name}-%{upstream_version}.tar.gz
+Source0:        https://mirror.kolabenterprise.com/pub/releases/%{name}-%{version}.tar.gz
 Source1:        kolab-syncroton.logrotate
-Source2:        plesk.kolab_syncroton.inc.php
+
+Patch0001:      0001-Add-ready-hook-for-Kolab-plugins-Bifrost-T36327.patch
+Patch0002:      0002-Fix-LDAP-connection-errors-in-Ping-when-using-active.patch
+Patch0003:      0003-Bump-SEQUENCE-number-on-update-Outlook-only.patch
+Patch0004:      0004-Return-Invalid-item-6-status-on-SMS-entries-instead-.patch
+Patch0005:      0005-implement-setAttendeeStatus.patch
 
 BuildArch:      noarch
 
-%if 0%{?rhel} < 8
+# Use this build requirement to make sure we are using
+# up to date vendorized copies of the plugins.
+%if 0%{?plesk} < 1
+BuildRequires:  roundcubemail-plugin-kolab_auth >= 3.2
+%endif
+BuildRequires:  roundcubemail-plugin-kolab_folders >= 3.2
+BuildRequires:  roundcubemail-plugin-libkolab >= 3.2
+
 %if 0%{?suse_version}
 BuildRequires:  roundcubemail
 Requires:       php
 Requires:       php-pear-Auth_SASL
 Requires:       php-pear-MDB2_Driver_mysqli
+Requires:       php-pear-Net_IDNA2
 Requires:       php-pear-Net_SMTP
 Requires:       php-pear-Net_Socket
 %else
-BuildRequires:  roundcubemail >= 1.5
 Requires:       php-common >= 5.3
 Requires:       php-pear-Auth-SASL
 Requires:       php-pear-MDB2-Driver-mysqli
+Requires:       php-pear-Net-IDNA2
 Requires:       php-pear-Net-SMTP
 Requires:       php-pear-Net-Socket
 %endif
-%endif
 
-Requires:       roundcubemail
 Requires:       logrotate
-%if 0%{?rhel} < 8
+Requires:       roundcubemail(core)
+%if 0%{?plesk} < 1
+Requires:       roundcubemail-plugin-kolab_auth >= 3.2
+%endif
+Requires:       roundcubemail-plugin-kolab_folders >= 3.2
+Requires:       roundcubemail-plugin-libkolab >= 3.2
 Requires:       php-kolabformat
 Requires:       php-pear-MDB2
 Requires:       php-ZendFramework
-%endif
-
 
 %description
 Kolab Groupware provides ActiveSync for Calendars, Address Books
 and Tasks though this package - based on Syncroton technology.
 
 %prep
-%setup -q -n %{name}-%{upstream_version}
-#%patch0 -p1
+%setup -q -n %{name}-%{version}
 
 %build
 
@@ -100,7 +106,7 @@
 %if 0%{?plesk} < 1
     %{buildroot}/%{_ap_sysconfdir}/conf.d/ \
 %endif
-    %{buildroot}/%{_sysconfdir}/roundcubemail/ \
+    %{buildroot}/%{_sysconfdir}/%{name} \
     %{buildroot}/%{_var}/log/%{name}
 
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
@@ -112,13 +118,6 @@
 
 cp -a lib %{buildroot}/%{_datadir}/%{name}/.
 cp -a index.php %{buildroot}/%{_datadir}/%{name}/.
-cp -a bin %{buildroot}/%{_datadir}/%{name}/.
-
-%if 0%{?plesk}
-cp -a %SOURCE2 %{buildroot}/%{_sysconfdir}/roundcubemail/kolab_syncroton.inc.php
-%else
-cp -a config/config.inc.php.dist %{buildroot}/%{_sysconfdir}/roundcubemail/kolab_syncroton.inc.php
-%endif
 
 pushd %{buildroot}/%{_datadir}/%{name}
 ln -s ../../..%{_sysconfdir}/roundcubemail config
@@ -126,10 +125,43 @@
 pushd lib/ext
 ln -s ../../../roundcubemail/program/lib/Roundcube
 popd
-pushd lib
-ln -s ../../roundcubemail/plugins plugins
-popd
 ln -s ../roundcubemail/vendor vendor
+
+for plugin in kolab_auth kolab_folders libcalendaring libkolab; do
+    if  ! -d "/usr/share/roundcubemail/plugins/$plugin" ; then
+        continue
+    fi
+    mkdir -p lib/plugins/$plugin
+    pushd lib/plugins/$plugin
+    if  -d "/usr/share/roundcubemail/plugins/" ; then
+        find /usr/share/roundcubemail/plugins/$plugin/ -mindepth 1 -maxdepth 1 ! -name "config.inc.php" | while read link_target; do
+            ln -sv "$(echo ${link_target} | sed -e 's|/usr/share/roundcubemail/|../../../../roundcubemail/|g')"
+        done
+    else
+        find ../../../../roundcubemail/plugins/$plugin/ -mindepth 1 -maxdepth 1 ! -name "config.inc.php" -exec ln -sv {} \;
+    fi
+    popd
+done
+popd
+
+# Kolab Authentication plugin
+%if 0%{?plesk} < 1
+pushd %{buildroot}/%{_datadir}/%{name}/lib/plugins/kolab_auth
+rm -rf config.inc.php.dist
+ln -s ../../../../../..%{_sysconfdir}/roundcubemail/kolab_auth.inc.php config.inc.php
+popd
+%endif
+
+# Kolab Folders plugin
+pushd %{buildroot}/%{_datadir}/%{name}/lib/plugins/kolab_folders
+rm -rf config.inc.php.dist
+ln -s ../../../../../..%{_sysconfdir}/roundcubemail/kolab_folders.inc.php config.inc.php
+popd
+
+# Libkolab plugin
+pushd %{buildroot}/%{_datadir}/%{name}/lib/plugins/libkolab
+rm -rf config.inc.php.dist
+ln -s ../../../../../..%{_sysconfdir}/roundcubemail/libkolab.inc.php config.inc.php
 popd
 
 %if 0%{?plesk} < 1
@@ -158,20 +190,18 @@
 if  -d "/usr/share/kolab-syncroton/lib/ext/Roundcube" -a ! -L "/usr/share/kolab-syncroton/lib/ext/Roundcube" ; then
     rm -rf "/usr/share/kolab-syncroton/lib/ext/Roundcube"
 fi
-
-%pretrans
-if  -d "/usr/share/kolab-syncroton/lib/plugins" -a ! -L "/usr/share/kolab-syncroton/lib/plugins" ; then
-    find /usr/share/kolab-syncroton/lib/plugins/ \
-        -type l -exec rm -f {} \;
-    rm -rf /usr/share/kolab-syncroton/lib/plugins/
-    pushd /usr/share/kolab-syncroton/lib/
-    ln -s ../../roundcubemail/plugins
+if  -d "/usr/share/kolab-syncroton/lib/plugins/" ; then
+    find /usr/share/kolab-syncroton/lib/plugins/ -mindepth 2 -maxdepth 2 | while read file; do
+        if  ! -L "${file}" ; then
+            rm -rf "${file}"
+        fi
+    done
 fi
 
 %post
 if  -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ; then
-    if  ! -z "`grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null`" ; then
-%if 0%{?with_systemd}
+    if  ! -z "`grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini`" ; then
+%if 0%{?fedora} > 15
         /bin/systemctl condrestart %{httpd_name}.service
 %else
         /sbin/service %{httpd_name} condrestart
@@ -179,40 +209,8 @@
     fi
 fi
 
-if  -f "/usr/lib/systemd/system/php-fpm.service" ; then
-    /bin/systemctl reload php-fpm.service || :
-fi
-
-if  -f "/usr/lib/systemd/system/plesk-php74-fpm.service" ; then
-    /bin/systemctl reload plesk-php74-fpm.service || :
-fi
-
-if  -f "/usr/lib/systemd/system/plesk-php80-fpm.service" ; then
-    /bin/systemctl reload plesk-php80-fpm.service || :
-fi
-
-if  -f "/usr/lib/systemd/system/plesk-php81-fpm.service" ; then
-    /bin/systemctl reload plesk-php81-fpm.service || :
-fi
-
-if  -f "/usr/lib/systemd/system/plesk-php82-fpm.service" ; then
-    /bin/systemctl reload plesk-php82-fpm.service || :
-fi
-
-if  -f "/usr/lib/systemd/system/plesk-php83-fpm.service" ; then
-    /bin/systemctl reload plesk-php83-fpm.service || :
-fi
-
-
-
-%if 0%{?plesk} > 0 && 0%{?rhel} == 7
-php="/opt/plesk/php/7.4/bin/php"
-%else
-php="/usr/bin/php"
-%endif
-
-${php} /usr/share/roundcubemail/bin/updatedb.sh \
-    --dir /usr/share/doc/kolab-syncroton/SQL/ \
+/usr/share/roundcubemail/bin/updatedb.sh \
+    --dir /usr/share/doc/kolab-syncroton-%{version}/SQL/ \
     --package syncroton \
     >/dev/null 2>&1 || :
 
@@ -228,72 +226,10 @@
 %config(noreplace) %{_ap_sysconfdir}/conf.d/kolab-syncroton.conf
 %endif
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%config(noreplace) %{_sysconfdir}/roundcubemail/kolab_syncroton.inc.php
 %{_datadir}/%{name}
 %attr(0770,%{httpd_user},%{httpd_group}) %{_var}/log/%{name}
 
 %changelog
-* Thu Jul 27 2023 Christian Mollekopf <mollekopf@apheleia-it.ch> - 2.4.2-1
-- Release version 2.4.2
-
-* Mon Jul 17 2023 Christian Mollekopf <mollekopf@apheleia-it.ch> - 2.4.1-1
-- Release version 2.4.1
-
-* Wed May 10 2023 Christian Mollekopf <mollekopf@apheleia-it.ch> - 2.4.0-1
-- Release version 2.4.0
-
-* Fri Feb 04 2022 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 2.3.22-1
-- Release version 2.3.22
-
-* Fri Jul 02 2021 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 2.3.21-1
-- Release version 2.3.21
-
-* Thu Jan 28 2021 Christian Mollekopf <mollekopf@kolabsys.com> - 2.3.19-1
-- Release version 2.3.19
-
-* Mon May  4 2020 Christian Mollekopf <mollekopf@kolabsys.com> - 2.3.17-1
-- Release version 2.3.17
-
-* Wed Dec  4 2019 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.3.16-1
-- Release version 2.3.16
-
-* Mon Jul 29 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.3.15-3
-- Fix MeetingResponse for Calendar events
-
-* Thu Apr 11 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.3.15-2
-- Update defaults
-
-* Fri Feb  1 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.3.15-1
-- Release 2.3.15
-
-* Thu Dec 27 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.3.14-1
-- Release 2.3.14
-
-* Fri Aug 17 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.3.13-1
-- Release 2.3.13
-
-* Wed Jun 13 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.3.12-1
-- Release 2.3.12
-
-* Thu Mar  8 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.3.10-1
-- Release 2.3.10
-
-* Fri Mar  2 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.3.9-1
-- Release 2.3.9
-
-* Fri Feb  2 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.3.8-3
-- Fix redundant GETMETADATA requests for mail folders
-
-* Wed Jan 24 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.3.8-2
-- Fix logging
-- Fix version number
-
-* Wed Dec 20 2017 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.3.8-1
-- Release 2.3.8
-
-* Sun Aug 27 2017 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.3.7-1
-- Release 2.3.7
-
 * Fri Aug 18 2017 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.3.6-2
 - Patch setAttendeeStatus for increased Outlook compatibility
 
@@ -386,6 +322,9 @@
 * Sun Sep  8 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.2.0-1
 - Release version 2.2.0
 
+* Wed Sep  3 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.1.0-1
+- Bug fixes for #1658, and attachment sending
+
 * Tue Mar 12 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.1-0.2.rc2
 - New upstream release

0001-Add-ready-hook-for-Kolab-plugins-Bifrost-T36327.patch Added

0002-Fix-LDAP-connection-errors-in-Ping-when-using-active.patch Added

@@ -0,0 +1,59 @@
+From ca089e32a5de5eea7766ec6ba69e037242f80f89 Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <machniak@kolabsys.com>
+Date: Wed, 2 Aug 2017 14:07:00 +0200
+Subject: PATCH 02/15 Fix LDAP connection errors in Ping when using
+ activesync_gal_sync
+
+When the LDAP addressbook is used for syncronization we have to
+deal with closing and re-creating LDAP connections on sleep().
+---
+ lib/kolab_sync.php          | 21 +++++++++++++++++++++
+ lib/kolab_sync_data_gal.php |  2 +-
+ 2 files changed, 22 insertions(+), 1 deletion(-)
+
+diff --git a/lib/kolab_sync.php b/lib/kolab_sync.php
+index 5e9d262..c6cb192 100644
+--- a/lib/kolab_sync.php
++++ b/lib/kolab_sync.php
+@@ -492,4 +492,25 @@ class kolab_sync extends rcube
+                 self::console($log);
+         }
+     }
++
++    /**
++     * When you're going to sleep the script execution for a longer time
++     * it is good to close all external connections (sql, memcache, SMTP, IMAP).
++     *
++     * No action is required on wake up, all connections will be
++     * re-established automatically.
++     */
++    public function sleep()
++    {
++        parent::sleep();
++
++        // We'll have LDAP addressbooks here if using activesync_gal_sync
++        if ($this->config->get('activesync_gal_sync')) {
++            foreach (kolab_sync_data_gal::$address_books as $book) {
++                $book->close();
++            }
++
++            kolab_sync_data_gal::$address_books = array();
++        }
++    }
+ }
+diff --git a/lib/kolab_sync_data_gal.php b/lib/kolab_sync_data_gal.php
+index 95894e7..09238f4 100644
+--- a/lib/kolab_sync_data_gal.php
++++ b/lib/kolab_sync_data_gal.php
+@@ -42,7 +42,7 @@ class kolab_sync_data_gal extends kolab_sync_data implements Syncroton_Data_IDat
+      *
+      * @var array
+      */
+-    protected static $address_books = array();
++    public static $address_books = array();
+ 
+     /**
+      * Mapping from ActiveSync Contacts namespace fields
+-- 
+2.13.2
+

0003-Bump-SEQUENCE-number-on-update-Outlook-only.patch Added

@@ -0,0 +1,43 @@
+From a68e0428fdb0b34cdc7de673e2d0737fddf0d355 Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <machniak@kolabsys.com>
+Date: Fri, 4 Aug 2017 12:10:30 +0200
+Subject: PATCH 03/15 Bump SEQUENCE number on update (Outlook only).
+
+It's been confirmed that any change of the event that has attendees specified
+bumps SEQUENCE number of the event (we can see this in sent iTips).
+---
+ lib/kolab_sync_data_calendar.php | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/lib/kolab_sync_data_calendar.php b/lib/kolab_sync_data_calendar.php
+index 946538a..8fab24d 100644
+--- a/lib/kolab_sync_data_calendar.php
++++ b/lib/kolab_sync_data_calendar.php
+@@ -332,6 +332,7 @@ class kolab_sync_data_calendar extends kolab_sync_data implements Syncroton_Data
+         $foldername   = isset($event'_mailbox') ? $event'_mailbox' : $this->getFolderName($folderid);
+         $config       = $this->getFolderConfig($foldername);
+         $is_exception = $data instanceof Syncroton_Model_EventException;
++        $last_update  = $event'changed';
+ 
+         $event'allday' = 0;
+ 
+@@ -483,6 +484,16 @@ class kolab_sync_data_calendar extends kolab_sync_data implements Syncroton_Data
+             $event'recurrence' = $this->recurrence_to_kolab($data, $folderid, $timezone);
+         }
+ 
++        // Bump SEQUENCE number on update (Outlook only).
++        // It's been confirmed that any change of the event that has attendees specified
++        // bumps SEQUENCE number of the event (we can see this in sent iTips).
++        if (!empty($entry) && !$is_exception && !empty($data->attendees)
++            && $data->dtStamp && $last_update && $data->dtStamp > $last_update
++            && stripos($this->device->devicetype, 'outlook') !== false
++        ) {
++            $event'sequence' += 1;
++        }
++
+         return $event;
+     }
+ 
+-- 
+2.13.2
+

0004-Return-Invalid-item-6-status-on-SMS-entries-instead-.patch Added

@@ -0,0 +1,28 @@
+From d32b2289c65d749e55ea97de87f0563d4f989881 Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <machniak@kolabsys.com>
+Date: Fri, 4 Aug 2017 16:58:13 +0200
+Subject: PATCH 04/15 Return "Invalid item" (6) status on SMS entries instead
+ of "Server error" (5)
+
+"Server error" status may cause client to try again and again,
+while "Invalid item" should thell the device to stop.
+---
+ lib/kolab_sync_data_email.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/kolab_sync_data_email.php b/lib/kolab_sync_data_email.php
+index e528f9e..8f4d7a4 100644
+--- a/lib/kolab_sync_data_email.php
++++ b/lib/kolab_sync_data_email.php
+@@ -570,7 +570,7 @@ class kolab_sync_data_email extends kolab_sync_data implements Syncroton_Data_ID
+     {
+         // Throw exception here for better handling of unsupported
+         // entry creation, it can be object of class Email or SMS here
+-        throw new Syncroton_Exception_Status_Sync(Syncroton_Exception_Status_Sync::SYNC_SERVER_ERROR);
++        throw new Syncroton_Exception_Status_Sync(Syncroton_Exception_Status_Sync::INVALID_ITEM);
+     }
+ 
+     /**
+-- 
+2.13.2
+

0005-implement-setAttendeeStatus.patch Added

@@ -0,0 +1,389 @@
+diff --git a/lib/kolab_sync.php b/lib/kolab_sync.php
+index c6cb192..823d927 100644
+--- a/lib/kolab_sync.php
++++ b/lib/kolab_sync.php
+@@ -82,7 +82,7 @@ class kolab_sync extends rcube
+         //          e.g. are not using output or rcmail objects or
+         //          doesn't throw errors when using them
+         $plugins = (array)$this->config->get('activesync_plugins', array('kolab_auth'));
+-        $plugins = array_unique(array_merge($plugins, array('libkolab')));
++        $plugins = array_unique(array_merge($plugins, array('libcalendaring', 'libkolab')));
+ 
+         // Initialize/load plugins
+         $this->plugins = kolab_sync_plugin_api::get_instance();
+diff --git a/lib/kolab_sync_data.php b/lib/kolab_sync_data.php
+index 2b91a7d..f1d723e 100644
+--- a/lib/kolab_sync_data.php
++++ b/lib/kolab_sync_data.php
+@@ -92,6 +92,11 @@ abstract class kolab_sync_data implements Syncroton_Data_IData
+     protected $imap_folders = array();
+ 
+     /**
++     * Shortcut to logging.
++     */
++    protected $log;
++
++    /**
+      * Timezone
+      *
+      * @var string
+@@ -186,6 +191,8 @@ abstract class kolab_sync_data implements Syncroton_Data_IData
+ 
+         $this->defaultRootFolder = $this->defaultFolder . '::Syncroton';
+ 
++        $this->log = Syncroton_Registry::get('loggerBackend');
++
+         // set internal timezone of kolab_format to user timezone
+         try {
+             $this->timezone = rcube::get_instance()->config->get('timezone', 'GMT');
+@@ -954,18 +961,16 @@ abstract class kolab_sync_data implements Syncroton_Data_IData
+                     $crc = $matches1;
+                     $uid = $matches2;
+ 
+-                    if (strlen($entryid) >= 64) {
+-                        foreach ($folder->select(array(array('uid', '~*', $uid))) as $object) {
+-                            if (($object'uid' == $uid || strpos($object'uid', $uid) === 0)
+-                                && $crc == $this->objectCRC($object'uid', $folder)
+-                            ) {
+-                                $object'_folderid' = $folderid;
+-                                return $object;
+-                            }
++                    foreach ($folder->select(array(array('uid', '~*', $uid))) as $object) {
++                        if (($object'uid' == $uid || strpos($object'uid', $uid) === 0)
++                            && $crc == $this->objectCRC($object'uid', $folder)
++                        ) {
++                            $object'_folderid' = $folderid;
++                            return $object;
+                         }
+-
+-                        continue;
+                     }
++
++                    continue;
+                 }
+ 
+                 // Or (faster) strict UID matching...
+diff --git a/lib/kolab_sync_data_calendar.php b/lib/kolab_sync_data_calendar.php
+index 8fab24d..621cb3c 100644
+--- a/lib/kolab_sync_data_calendar.php
++++ b/lib/kolab_sync_data_calendar.php
+@@ -180,6 +180,14 @@ class kolab_sync_data_calendar extends kolab_sync_data implements Syncroton_Data
+     public function getEntry(Syncroton_Model_SyncCollection $collection, $serverId, $as_array = false)
+     {
+         $event  = is_array($serverId) ? $serverId : $this->getObject($collection->collectionId, $serverId);
++
++        // If there is no such event, return NULL (otherwise this function
++        // returns a new Syncroton_Model_Event, that is further treated as if
++        // it were a valid, existing entry.
++        if (!$event) {
++            return NULL;
++        }
++
+         $config = $this->getFolderConfig($event'_mailbox');
+         $result = array();
+ 
+@@ -273,11 +281,11 @@ class kolab_sync_data_calendar extends kolab_sync_data implements Syncroton_Data
+                     if ($name = $attendee'name') {
+                         $result'organizerName' = $name;
+                     }
++
+                     if ($email = $attendee'email') {
+                         $result'organizerEmail' = $email;
+                     }
+ 
+-                    unset($event'attendees'$idx);
+                     break;
+                 }
+             }
+@@ -286,11 +294,15 @@ class kolab_sync_data_calendar extends kolab_sync_data implements Syncroton_Data
+         // Attendees
+         if (!empty($event'attendees')) {
+             foreach ($event'attendees' as $idx => $attendee) {
+-                $att = array();
++                if ($attendee'role' == 'ORGANIZER')
++                    continue;
++
++                $att = Array();
+ 
+                 if ($name = $attendee'name') {
+                     $att'name' = $name;
+                 }
++
+                 if ($email = $attendee'email') {
+                     $att'email' = $email;
+                 }
+@@ -450,32 +462,65 @@ class kolab_sync_data_calendar extends kolab_sync_data implements Syncroton_Data
+             $name  = $data->organizerName;
+             $email = $data->organizerEmail;
+             if ($name || $email) {
+-                $event'attendees' = array(
++                $_attendee = array(
+                     'role'  => 'ORGANIZER',
+                     'name'  => $name,
+                     'email' => $email,
+                 );
++
++                if ($this->asversion >= 12) {
++                    $_attendee'status' = $data->meetingStatus == 1 ? 'ACCEPTED' : 'DECLINED';
++                    $_attendee'rsvp' = FALSE;
++                }
++
++                $event'attendees' = $_attendee;
+             }
+         }
+ 
+         // Attendees
+         if (isset($data->attendees)) {
+             foreach ($data->attendees as $attendee) {
++                if ($attendee->email == $data->organizerEmail)
++                    continue;
++
+                 $role = false;
++
+                 if (isset($attendee->attendeeType)) {
+-                    $role = array_search($attendee->attendeeType, $this->attendeeTypeMap);
++                    $role = array_search(
++                        $attendee->attendeeType,
++                        $this->attendeeTypeMap
++                    );
++
+                 }
++
+                 if ($role === false) {
+-                    $role = array_search(self::ATTENDEE_TYPE_REQUIRED, $this->attendeeTypeMap);
++                    $role = array_search(
++                        self::ATTENDEE_TYPE_REQUIRED,
++                        $this->attendeeTypeMap
++                    );
+                 }
+ 
+-                // AttendeeStatus send only on repsonse (?)
+-
+-                $event'attendees' = array(
+-                    'role'  => $role,
+-                    'name'  => $attendee->name,
+-                    'email' => $attendee->email,
++                // AttendeeStatus send only on response (?)
++                $_attendee = array(
++                    'role'   => $role,
++                    'name'   => $attendee->name,
++                    'email'  => $attendee->email,
+                 );
++
++                if ($this->asversion >= 12) {
++                    if ($status = $attendee->attendeeStatus) {
++                        $_attendee'status' = array_search(
++                            $status,
++                            $this->attendeeStatusMap
++                        );
++
++                        if ($status == self::ATTENDEE_STATUS_UNKNOWN) {
++                            $_attendee'rsvp' = TRUE;
++                        }
++                    }
++                }
++
++                $event'attendees' = $_attendee;
+             }
+         }
+ 
+@@ -506,8 +551,141 @@ class kolab_sync_data_calendar extends kolab_sync_data implements Syncroton_Data
+      */
+     public function setAttendeeStatus(Syncroton_Model_MeetingResponse $request)
+     {
++        /*
++         * The request actually involves an iTip request.
++         *
++         * - Get to the iTip,
++         * - Extract the event UID,
++         * - If not already an event in the user's calendar(s), create the event,
++         * - If already an event, update that event.
++         */
++
++        $object = $this->parseMessageId($request->requestId);
++        $message = new rcube_message($object'uid', $object'foldername');
++
++        // Parse the message
++        $libcal = libcalendaring::get_instance();
++        $libcal->mail_message_load(array('object' => $message));
++        $ical_objects = $libcal->get_mail_ical_objects();
++
++        $itip = $ical_objects->objects0;
++        $uid = $itip'uid';
++
++        // Search the user's (event) folders
++        $folders = $this->listFolders();
++
++        $serverIds = Array();
++        foreach ($folders as $folder => $attrs) {
++            $serverIds = $this->serverId($uid, $attrs'imap_name');
++        }
++
++        // Go search for a match
++        $existing_event = NULL;
++
++        foreach ($serverIds as $serverId) {
++            foreach ($folders as $_folderid => $attrs) {
++                $collection = new Syncroton_Model_SyncCollection(
++                    Array(
++                        'collectionId' => $_folderid
++                    )
++                );
++
++                $existing_event = $this->getEntry(
++                    $collection,
++                    $serverId
++                );
++
++                if ($existing_event) {
++                    $folderId = $_folderid;
++                    break;
++                }
++            }
++
++            if ($existing_event) {
++                break;
++            }
++        }
++
++        /*
++            Consider;
++
++            - $existing_event->sensitivity (private, confidential, public)
++            - $existing_event->attendees$x->{role,rsvp,status}
++            - $request->userresponse
++        */
++
++        if ($existing_event) {
++            // This is an existing event that needs updating
++            $user_emails = kolab_sync::get_instance()->user->list_emails();
++            $user_emails  = array_map(
++                function($v) { return $v'email'; },
++                $user_emails
++            );
++
++            foreach ($existing_event->attendees as $idx => $attendee) {
++                if (in_array_nocase($attendee->email, $user_emails)) {
++                    $this->log->debug("found my record, updating status");
++                    switch ($request->userResponse) {
++                        case Syncroton_Model_MeetingResponse::RESPONSE_ACCEPTED:
++                            $existing_event->attendees$idx->attendeeStatus = self::ATTENDEE_STATUS_ACCEPTED;
++                            break;
++                        case Syncroton_Model_MeetingResponse::RESPONSE_DECLINED:
++                            $existing_event->attendees$idx->attendeeStatus = self::ATTENDEE_STATUS_DECLINED;
++                            break;
++                        case Syncroton_Model_MeetingResponse::RESPONSE_TENTATIVE:
++                            $existing_event->attendees$idx->attendeeStatus = self::ATTENDEE_STATUS_TENTATIVE;
++                            break;
++                    }
++                }
++            }
++
++            $this->updateEntry($folderId, $serverId, $existing_event);
++
++        } else {
++            // This is a new event
++            $this->log->debug("This is a new event");
++            $folderId = $this->getDefaultFolder()'realid';
++
++
++            $user_emails = kolab_sync::get_instance()->user->list_emails();
++            $user_emails  = array_map(
++                function($v) { return $v'email'; },
++                $user_emails
++            );
++
++            $attendees = Array();
++
++            foreach($itip'attendees' as $idx => $attendee) {
++                $att = $attendee;
++
++                if (in_array_nocase($att'email', $user_emails)) {
++                    switch ($request->userResponse) {
++                        case Syncroton_Model_MeetingResponse::RESPONSE_ACCEPTED:
++                            $att'status' = 'ACCEPTED';
++                            $att'rsvp' = FALSE;
++                            break;
++
++                        case Syncroton_Model_MeetingResponse::RESPONSE_DECLINED:
++                            $att'status' = 'DECLINED';
++                            $att'rsvp' = FALSE;
++                            break;
++
++                        case Syncroton_Model_MeetingResponse::RESPONSE_TENTATIVE:
++                            $att'status' = 'TENTATIVE';
++                            break;
++                    }
++                }
++
++                $attendees = $att;
++            }
++
++            $itip'attendees' = $attendees;
++
++            $data = $this->createObject($folderId, $itip);
++        }
++
+         // @TODO: not implemented
+-        throw new Syncroton_Exception_Status_MeetingResponse(Syncroton_Exception_Status_MeetingResponse::MEETING_ERROR);
++        throw new Syncroton_Exception_Status_MeetingResponse(1);
+     }
+ 
+     /**
+@@ -562,20 +740,25 @@ class kolab_sync_data_calendar extends kolab_sync_data implements Syncroton_Data
+             // TODO: Delegation/aliases support
+             $user_emails  = kolab_sync::get_instance()->user->list_emails();
+             $user_emails  = array_map(function($v) { return $v'email'; }, $user_emails);
+-            $is_organizer = true;
++            $is_organizer = false;
+ 
+             foreach ($event'attendees' as $attendee) {
++                if ($attendee'role' != 'ORGANIZER') {
++                    // Irrelevant, skip
++                    continue;
++                }
++
+                 if (in_array_nocase($attendee'email', $user_emails)) {
+-                    $is_organizer = false;
++                    $is_organizer = true;
+                     break;
+                 }
+             }
+ 
+             if ($event'status' == 'CANCELLED') {
+-                $status = !empty($is_organizer) ? 5 : 7;
++                $status = $is_organizer ? 5 : 7;
+             }
+             else {
+-                $status = !empty($is_organizer) ? 1 : 3;
++                $status = $is_organizer ? 1 : 3;
+             }
+         }
+ 
+@@ -698,4 +881,26 @@ class kolab_sync_data_calendar extends kolab_sync_data implements Syncroton_Data
+             $entry->endTime = $rounded;
+         }
+     }
++
++    private function parseMessageId($entryid)
++    {
++        // replyEmail/forwardEmail
++        if (is_array($entryid)) {
++            $entryid = $entryid'itemId';
++        }
++
++        list($folderid, $uid) = explode('::', $entryid);
++        $foldername = $this->backend->folder_id2name($folderid, $this->device->deviceid);
++
++        if ($foldername === null || $foldername === false) {
++            // @TODO exception?
++            return null;
++        }
++
++        return array(
++            'uid'        => $uid,
++            'folderid'   => $folderid,
++            'foldername' => $foldername,
++        );
++    }
+ }

buildtarball.sh Deleted

debian.changelog Changed

@@ -1,160 +1,3 @@
-kolab-syncroton (2.4.2.36-0~kolab1) unstable; urgency=low
-
-  * Release version 2.4.2
-
- -- Christian Mollekopf <mollekopf@apheleia-it.ch>  Thu, 27 July 2023 15:13:40 +0200
-
-kolab-syncroton (2.4.1-0~kolab1) unstable; urgency=low
-
-  * Release version 2.4.1
-
- -- Christian Mollekopf <mollekopf@apheleia-it.ch>  Mon, 17 July 2023 15:13:40 +0200
-
-kolab-syncroton (2.4.0-0~kolab1) unstable; urgency=low
-
-  * Release version 2.4.0
-
- -- Christian Mollekopf <mollekopf@apheleia-it.ch>  Wed, 10 May 2023 15:13:40 +0200
-
-kolab-syncroton (2.3.23-0~kolab1) unstable; urgency=low
-
-  * Release version 2.3.23
-
- -- Christian Mollekopf <mollekopf@apheleia-it.ch>  Wed, 19 Apr 2023 15:13:40 +0200
-
-kolab-syncroton (2.3.22-1~kolab1) unstable; urgency=low
-
-  * Fixed timezone issue
-
- -- Christian Mollekopf <mollekopf@apheleia-it.ch>  Mon, 19 Dec 2022 15:13:40 +0200
-
-kolab-syncroton (2.3.22-0~kolab1) unstable; urgency=low
-
-  * Release version 2.3.22
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Fri,  4 Feb 2022 15:13:40 +0200
-
-kolab-syncroton (2.3.21-0~kolab1) unstable; urgency=low
-
-  * Release version 2.3.21
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Fri,  2 Jul 2021 15:13:40 +0200
-
-kolab-syncroton (2.3.19-0~kolab1) unstable; urgency=low
-
-  * Release version 2.3.19
-
- -- Christian Mollekopf <mollekopf@kolabsys.com>  Thu, 28 Jan 2021 15:13:40 +0200
-
-kolab-syncroton (2.3.18-0~kolab2) unstable; urgency=low
-
-  * Release version 2.3.18
-
- -- Christian Mollekopf <mollekopf@kolabsys.com>  Wed, 16 Dec 2020 15:13:40 +0200
-
-kolab-syncroton (2.3.17-1~kolab3) unstable; urgency=low
-
-  * Adjusted kolab-syncroton.logrotate according to new filenames
-
- -- Christian Mollekopf <mollekopf@kolabsys.com>  Wed, 20 May 2020 15:13:40 +0200
-
-kolab-syncroton (2.3.17-0~kolab2) unstable; urgency=low
-
-  * Release version 2.3.17
-
- -- Christian Mollekopf <mollekopf@kolabsys.com>  Mon,  4 May 2020 15:13:40 +0200
-
-kolab-syncroton (2.3.16-0~kolab2) unstable; urgency=low
-
-  * Release version 2.3.16
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Wed,  4 Dec 2019 15:13:40 +0200
-
-kolab-syncroton (2.3.15-0~kolab6) unstable; urgency=low
-
-  * Fix MeetingResponse parsing for Calendar events
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 29 Jul 2019 15:13:40 +0200
-
-kolab-syncroton (2.3.15-0~kolab5) unstable; urgency=low
-
-  * Correctly clause dependency on kolab-auth
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 17 Apr 2019 15:13:40 +0200
-
-kolab-syncroton (2.3.15-0~kolab3) unstable; urgency=low
-
-  * Adjusted kolab-syncroton.logrotate according to new filenames
-
- -- Christian Mollekopf (Kolab Systems) <mollekopf@kolabys.com>  Mon, 15 Apr 2019 12:12:12 +0100
-
-kolab-syncroton (2.3.15-0~kolab2) unstable; urgency=low
-
-  * Update defaults
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 11 Apr 2019 15:13:40 +0200
-
-kolab-syncroton (2.3.15-0~kolab1) unstable; urgency=low
-
-  * Release 2.3.15
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri,  1 Feb 2019 15:13:40 +0200
-
-kolab-syncroton (2.3.14-0~kolab1) unstable; urgency=low
-
-  * Release 2.3.14
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 27 Dec 2018 15:13:40 +0200
-
-kolab-syncroton (2.3.13-0~kolab1) unstable; urgency=low
-
-  * Release 2.3.13
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 17 Aug 2018 15:13:40 +0200
-
-kolab-syncroton (2.3.12-0~kolab1) unstable; urgency=low
-
-  * Release 2.3.12
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 13 Jun 2018 15:13:40 +0200
-
-kolab-syncroton (2.3.10-0~kolab1) unstable; urgency=low
-
-  * Release 2.3.10
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu,  8 Mar 2018 15:13:40 +0200
-
-kolab-syncroton (2.3.9-0~kolab1) unstable; urgency=low
-
-  * Release 2.3.9
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri,  2 Mar 2018 15:13:40 +0200
-
-kolab-syncroton (2.3.8-0~kolab3) unstable; urgency=low
-
-  * Fix redundant GETMETADATA requests for mail folders
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, Feb  2 2018 15:13:40 +0200
-
-kolab-syncroton (2.3.8-0~kolab2) unstable; urgency=low
-
-  * Fix logging
-  * Fix version number
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, Jan 24 2018 15:13:40 +0200
-
-kolab-syncroton (2.3.8-0~kolab1) unstable; urgency=low
-
-  * Release 2.3.8
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 20 Dec 2017 15:13:40 +0200
-
-kolab-syncroton (2.3.7-0~kolab1) unstable; urgency=low
-
-  * Release 2.3.7
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sun, 27 Aug 2017 15:13:40 +0200
-
 kolab-syncroton (2.3.6-0~kolab2) unstable; urgency=low
 
   * Patch setAttendeeStatus for increased Outlook compatibility

debian.control Changed

@@ -3,14 +3,26 @@
 Priority: extra
 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
 Uploaders: Paul Klos <kolab@klos2day.nl>
-Build-Depends: debhelper (>= 8), po-debconf, psa | bash
+Build-Depends: debhelper (>= 8), po-debconf
 Homepage: http://www.kolab.org/
 Standards-Version: 3.9.3
 Vcs-Git: http://git.kolab.org/kolab-syncroton
 
 Package: kolab-syncroton
 Architecture: all
-Depends:    roundcubemail-core,
+Depends:    php-auth-sasl,
+            php-mail-mime,
+            php-mail-mimedecode,
+            php-mdb2 (>= 2.5.0),
+            php-net-idna2,
+            php-net-smtp,
+            php-net-socket,
+            php-cli | php5-cli,
+            php-mysql | php5-mysql,
+            roundcubemail-core,
+            roundcubemail-plugin-libcalendaring (>= 3.1.12),
+            roundcubemail-plugin-libkolab (>= 3.1.12),
+            zendframework | zend-framework,
             ${misc:Depends}
 Description: ActiveSync for Kolab Groupware
  Kolab Groupware provides ActiveSync for Calendars,

debian.rules Changed

debian.series Changed

debian.tar.gz/dirs Changed

debian.tar.gz/install Changed

debian.tar.gz/kolab-syncroton.logrotate Changed

kolab-syncroton-2.4.2.tar.gz -> kolab-syncroton-2.3.6.tar.gz Changed

kolab-syncroton.dsc Changed

kolab-syncroton.logrotate Changed

plesk.kolab_syncroton.inc.php Deleted

@@ -1,123 +0,0 @@
-<?php
-
-// This file lists all ActiveSync-related configuration options
-
-// Enables ActiveSync protocol debuging
-$config'activesync_debug' = false;
-
-// If specified all ActiveSync-related logs will be saved to this file
-// Note: This doesn't change Roundcube Framework log locations
-$config'activesync_log_file' = null;
-
-// Type of ActiveSync cache. Supported values: 'db', 'apc' and 'memcache'.
-// Note: This is only for some additional data like timezones mapping.
-$config'activesync_cache' = 'db';
-
-// lifetime of ActiveSync cache
-// possible units: s, m, h, d, w
-$config'activesync_cache_ttl' = '1d';
-
-// Type of ActiveSync Auth cache. Supported values: 'db', 'apc' and 'memcache'.
-// Note: This is only for username canonification map.
-$config'activesync_auth_cache' = 'db';
-
-// lifetime of ActiveSync Auth cache
-// possible units: s, m, h, d, w
-$config'activesync_auth_cache_ttl' = '1d';
-
-// List of global addressbooks (GAL)
-// Note: If empty 'autocomplete_addressbooks' setting will be used
-$config'activesync_addressbooks' = array();
-
-// ActiveSync => Roundcube contact fields map for GAL search
-/* Default: array(
-       'alias'         => 'nickname',
-       'company'       => 'organization',
-       'displayName'   => 'name',
-       'emailAddress'  => 'email',
-       'firstName'     => 'firstname',
-       'lastName'      => 'surname',
-       'mobilePhone'   => 'phone.mobile',
-       'office'        => 'office',
-       'picture'       => 'photo',
-       'phone'         => 'phone',
-       'title'         => 'jobtitle',
-);
-*/
-$config'activesync_gal_fieldmap' = null;
-
-// List of device types that will sync the LDAP addressbook(s) as a normal folder.
-// For devices that do not support GAL searching, e.g. Outlook.
-// Note: To make the LDAP addressbook sources working we need two additional
-//       fields ('uid' and 'changed') specified in the fieldmap array
-//       of the LDAP configuration ('ldap_public' option). For example:
-//          'uid'     => 'nsuniqueid',
-//          'changed' => 'modifytimestamp',
-// Examples:
-//     array('windowsoutlook')  # enable for Oultook only
-//     true                     # enable for all
-$config'activesync_gal_sync' = false;
-
-// GAL cache. As reading all contacts from LDAP may be slow, caching is recommended.
-$config'activesync_gal_cache' = 'db';
-
-// TTL of GAL cache entries. Technically this causes that synchronized
-// contacts will not be updated (queried) often than the specified interval.
-$config'activesync_gal_cache_ttl' = '1d';
-
-// List of Roundcube plugins
-// WARNING: Not all plugins used in Roundcube can be listed here
-$config'activesync_plugins' = array(
-    'libcalendaring',
-    'libkolab'
-);
-
-// Defines for how many seconds we'll sleep between every
-// action for detecting changes in folders. Default: 60
-$config'activesync_ping_timeout' = 60;
-
-// Defines maximum Ping interval in seconds. Default: 900 (15 minutes)
-$config'activesync_ping_interval' = 900;
-
-// We start detecting changes n seconds since the last sync of a folder
-// Default: 180
-$config'activesync_quiet_time' = 0;
-
-// Defines maximum number of folders in a single Sync/Ping request. Default: 100.
-$config'activesync_max_folders' = 100;
-
-// When a device is reqistered, by default a set of folders are
-// subscribed for syncronization, i.e. INBOX and personal folders with
-// defined folder type:
-//     mail.drafts, mail.wastebasket, mail.sentitems, mail.outbox,
-//     event, event.default,
-//     contact, contact.default,
-//     task, task.default
-// This default set can be extended by adding following values:
-//     1 - all subscribed folders in personal namespace
-//     2 - all folders in personal namespace
-//     4 - all subscribed folders in other users namespace
-//     8 - all folders in other users namespace
-//    16 - all subscribed folders in shared namespace
-//    32 - all folders in shared namespace
-$config'activesync_init_subscriptions' = 21;
-
-// Defines blacklist of devices (device type strings) that do not support folder hierarchies.
-// When set to an array folder hierarchies are used on all devices not listed here.
-// When set to null an old whitelist approach will be used where we do opposite
-// action and enable folder hierarchies only on device types known to support it.
-$config'activesync_multifolder_blacklist' = array();
-
-// Blacklist overwrites for specified object type. If set to an array
-// it will have a precedence over 'activesync_multifolder_blacklist' list only for that type.
-// Note: Outlook does not support multiple folders for contacts,
-//       in that case use $config'activesync_multifolder_blacklist_contact' = array('windowsoutlook');
-$config'activesync_multifolder_blacklist_mail' = null;
-$config'activesync_multifolder_blacklist_event' = null;
-$config'activesync_multifolder_blacklist_contact' = array('windowsoutlook');
-$config'activesync_multifolder_blacklist_note' = null;
-$config'activesync_multifolder_blacklist_task' = null;
-
-// Enables adding sender name in the From: header of send email
-// when a device uses email address only (e.g. iOS devices)
-$config'activesync_fix_from' = true;

release.sh Deleted

Overview

Request 2110 (superseded)

Request History