Request 3087 (accepted)

Overview

Request 3087 (accepted)

Fixed timezone issue

Created by mollekopf almost 2 years ago
In state accepted
Open review for Admin
Open review for vanmeeuwen
Open review for mollekopf
Open review for kolab-developers

Submit kolab-syncroton

Submit package Kolab:16:Testing / kolab-syncroton to package Kolab:16 / kolab-syncroton

kolab-syncroton.spec Changed

@@ -47,46 +47,28 @@
 Source0:        https://mirror.kolabenterprise.com/pub/releases/%{name}-%{version}.tar.gz
 Source1:        kolab-syncroton.logrotate
 Source2:        plesk.kolab_syncroton.inc.php
-Patch0:         0002-Report-INVALID_SOURCE-if-the-move-fails.patch
 
 BuildArch:      noarch
 
-# 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-libcalendaring >= 3.2
-BuildRequires:  roundcubemail-plugin-libkolab >= 3.2
-
 %if 0%{?rhel} < 8
 %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:       logrotate
-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-libcalendaring >= 3.2
-Requires:       roundcubemail-plugin-libkolab >= 3.2
 %if 0%{?rhel} < 8
 Requires:       php-kolabformat
 Requires:       php-pear-MDB2
@@ -100,7 +82,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
+#%patch0 -p1
 
 %build

0002-Report-INVALID_SOURCE-if-the-move-fails.patch Deleted

@@ -1,36 +0,0 @@
-From 0a8e797ea62be331a2530440e45cc1c9edc786ee Mon Sep 17 00:00:00 2001
-From: Christian Mollekopf <mollekopf@apheleia-it.ch>
-Date: Tue, 30 Aug 2022 16:21:45 +0200
-Subject: PATCH 2/2 Report INVALID_SOURCE if the move fails
-
-A nonexistent source message is at least one reason for the failure,
-and returning SUCCESS without a destination msgid is clearly not
-correct.
-May fix an iphone issue where it keeps sending the same move command
-over and over.
----
- lib/ext/Syncroton/Command/MoveItems.php | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/lib/ext/Syncroton/Command/MoveItems.php b/lib/ext/Syncroton/Command/MoveItems.php
-index 73e57dd..3f89b34 100644
---- a/lib/ext/Syncroton/Command/MoveItems.php
-+++ b/lib/ext/Syncroton/Command/MoveItems.php
-@@ -79,9 +79,12 @@ class Syncroton_Command_MoveItems extends Syncroton_Command_Wbxml
-                 $dataController = Syncroton_Data_Factory::factory($sourceFolder->class, $this->_device, $this->_syncTimeStamp);
-                 $newId          = $dataController->moveItem($move'srcFldId', $move'srcMsgId', $move'dstFldId');
- 
-+                if (!$newId) {
-+                    throw new Syncroton_Exception_Status_MoveItems(Syncroton_Exception_Status_MoveItems::INVALID_SOURCE);
-+                }
-+
-                 $response->appendChild($this->_outputDom->createElementNS('uri:Move', 'Status', Syncroton_Command_MoveItems::STATUS_SUCCESS));
--                if ($newId)
--                    $response->appendChild($this->_outputDom->createElementNS('uri:Move', 'DstMsgId', $newId));
-+                $response->appendChild($this->_outputDom->createElementNS('uri:Move', 'DstMsgId', $newId));
-             } catch (Syncroton_Exception_Status $e) {
-                 $response->appendChild($this->_outputDom->createElementNS('uri:Move', 'Status', $e->getCode()));
-             } catch (Exception $e) {
--- 
-2.37.1
-

debian.changelog Changed

debian.control Changed

kolab-syncroton-2.3.22.tar.gz/lib/ext/Syncroton/Command/MoveItems.php Changed

@@ -79,9 +79,12 @@
                 $dataController = Syncroton_Data_Factory::factory($sourceFolder->class, $this->_device, $this->_syncTimeStamp);
                 $newId          = $dataController->moveItem($move'srcFldId', $move'srcMsgId', $move'dstFldId');
 
+                if (!$newId) {
+                    throw new Syncroton_Exception_Status_MoveItems(Syncroton_Exception_Status_MoveItems::INVALID_SOURCE);
+                }
+
                 $response->appendChild($this->_outputDom->createElementNS('uri:Move', 'Status', Syncroton_Command_MoveItems::STATUS_SUCCESS));
-                if ($newId)
-                    $response->appendChild($this->_outputDom->createElementNS('uri:Move', 'DstMsgId', $newId));
+                $response->appendChild($this->_outputDom->createElementNS('uri:Move', 'DstMsgId', $newId));
             } catch (Syncroton_Exception_Status $e) {
                 $response->appendChild($this->_outputDom->createElementNS('uri:Move', 'Status', $e->getCode()));
             } catch (Exception $e) {

kolab-syncroton-2.3.22.tar.gz/lib/ext/Syncroton/Command/Sync.php Changed

kolab-syncroton-2.3.22.tar.gz/lib/kolab_sync_timezone_converter.php Changed

kolab-syncroton-2.3.22.tar.gz/tests/timezone_converter.php Changed

@@ -30,7 +30,7 @@
         $this->assertTrue(isset($output'America/Los_Angeles'));
 
         $converter = timezone_converter_test::getInstance();
-        $output = $converter->getListOfTimezones('Lv///0kAcgBhAG4AIABTAHQAYQBuAGQAYQByAGQAIABUAGkAbQBlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkAAgADABcAOwA7AOcDAAAAAEkAcgBhAG4AIABEAGEAeQBsAGkAZwBoAHQAIABUAGkAbQBlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAQAEAAAAAAAAAAAAxP///w==');
+        $output = $converter->getListOfTimezones('Lv///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkAAwADABcAOwA7AOcDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAgAEAAAAAAAAAAAAxP///w==');
 
         $this->assertTrue(is_array($output));
         $this->assertTrue(isset($output'Asia/Tehran'));
@@ -115,19 +115,19 @@
         $this->assertSame($output'standardBias', 0);
         $this->assertSame($output'standardMonth', 9);
         $this->assertSame($output'standardWeek', 3);
-        $this->assertSame($output'standardDayOfWeek', 2);
+        $this->assertSame($output'standardDayOfWeek', 3);
         $this->assertSame($output'standardHour', 24);
         $this->assertSame($output'daylightBias', -60);
         $this->assertSame($output'daylightMonth', 3);
         $this->assertSame($output'daylightWeek', 4);
-        $this->assertSame($output'daylightDayOfWeek', 1);
+        $this->assertSame($output'daylightDayOfWeek', 2);
         $this->assertSame($output'daylightHour', 0);
     }
 
     function data_timezone_conversion()
     {
         return array(
-            array('Asia/Tehran', 'Lv///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkAAgADABcAOwA7AOcDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAQAEAAAAAAAAAAAAxP///w=='),
+            array('Asia/Tehran', 'Lv///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkAAwADABcAOwA7AOcDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAgAEAAAAAAAAAAAAxP///w=='),
             array('Pacific/Pago_Pago', 'lAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=='),
             array('Europe/Warsaw', 'xP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAFAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAFAAIAAAAAAAAAxP///w=='),
         );

kolab-syncroton.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 3087 0

Request History

mollekopf created request almost 2 years ago

Fixed timezone issue

mollekopf accepted request almost 2 years ago