Request 2159 (accepted)

Overview

Request 2159 (accepted)

Avoid unintentional RRULE modifications upon SNOOZE

Created by vanmeeuwen over 6 years ago
In state accepted
Open review for Admin

Submit php-sabre-vobject

Submit package Kolab:Winterfell / php-sabre-vobject to package Kolab:16 / php-sabre-vobject

php-sabre-vobject.spec Changed

@@ -15,7 +15,7 @@
 Name:           php-%{gh_project}
 Summary:        Library to parse and manipulate iCalendar and vCard objects
 Version:        3.5.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 URL:            http://sabre.io/vobject/
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}.tar.gz
@@ -24,6 +24,7 @@
 
 # replace composer autloader by PSR-O trivial one
 Patch0:         %{gh_project}-bin.patch
+Patch1:         T41247.patch
 
 BuildArch:      noarch
 %if %{with_tests}
@@ -59,6 +60,7 @@
 %setup -q -n %{gh_project}-%{?gh_commit:%{gh_commit}}%{!?gh_commit:%{version}}
 
 %patch0 -p0 -b .psr0
+%patch1 -p1 -b .T41247
 
 : Create trivial PSR0 autoloader for tests
 cat <<EOF | tee psr0.php
@@ -106,6 +108,9 @@
 
 
 %changelog
+* Wed Nov 15 2017 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.5.3-2
+- Avoid unintentional RRULE changes upon SNOOZE (T41247)
+
 * Sun Dec  4 2016 Daniel Hoffend <dh@dotlan.net> - 3.5.3-1
 - update to 3.5.3

T41247.patch Added

@@ -0,0 +1,43 @@
+diff -ur sabre-vobject-3.5.3.orig/lib/ITip/Broker.php sabre-vobject-3.5.3/lib/ITip/Broker.php
+--- sabre-vobject-3.5.3.orig/lib/ITip/Broker.php	2016-10-07 05:20:40.000000000 +0200
++++ sabre-vobject-3.5.3/lib/ITip/Broker.php	2017-11-15 10:12:07.157525075 +0100
+@@ -849,6 +849,7 @@
+                     throw new ITipException('If a calendar contained more than one event, they must have the same UID.');
+                 }
+             }
++            $rrule = [];
+ 
+             if (!isset($vevent->DTSTART)) {
+                 throw new ITipException('An event MUST have a DTSTART property.');
+@@ -881,6 +882,18 @@
+                 }
+                 sort($exdate);
+             }
++            if (isset($vevent->RRULE)) {
++                foreach ($vevent->select('RRULE') as $rr) {
++                    foreach ($rr->getParts() as $key => $val) {
++                        // ignore default values (https://github.com/sabre-io/vobject/issues/126)
++                        if ($key === 'INTERVAL' && $val == 1) {
++                            continue;
++                        }
++                        $rrule[] = "$key=$val";
++                    }
++                }
++                sort($rrule);
++            }
+             if (isset($vevent->STATUS)) {
+                 $status = strtoupper($vevent->STATUS->getValue());
+             }
+@@ -948,6 +961,9 @@
+ 
+                         $significantChangeHash.= implode(',', $exdate).';';
+ 
++                    } elseif ($prop === 'RRULE') {
++                        $significantChangeHash .= implode(',', $rrule) . ';';
++
+                     } else {
+ 
+                         foreach($propertyValues as $val) {
+Only in sabre-vobject-3.5.3/lib/ITip: Broker.php.orig
+Only in sabre-vobject-3.5.3/lib/ITip: Broker.php.rej
+Only in sabre-vobject-3.5.3/tests/VObject/ITip: BrokerSignificantChangesTest.php

debian.changelog Changed

debian.series Changed

php-sabre-vobject.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2159 0

Request History

vanmeeuwen created request over 6 years ago

Avoid unintentional RRULE modifications upon SNOOZE

vanmeeuwen accepted review over 6 years ago

vanmeeuwen accepted request over 6 years ago

Please add a comment