Workaround to make calendars writable (fixes MMMMALT-1017)

.s2i/bin/assemble

@@ -11,5 +11,8 @@ sed -ri \
     -e '/The configured LOGERRORFILE can not be modified./ s/^.*$/true;/' \
     ./lib/core/zpush.php
 
+# Workaround to make calendars actually writable
+patch -p2 < 01_fix_caldav_events.patch
+
 echo "Assembling"
 /usr/libexec/s2i/assemble

Dockerfile

@@ -25,5 +25,8 @@ RUN sed -ri \
 RUN rm /etc/httpd/conf.d/welcome.conf \
   /etc/httpd/conf.d/userdir.conf
 
+# Add Z-Push patches
+ADD patches/01_fix_caldav_events.patch /opt/app-root/src/
+
 # Make sure the final image runs as unprivileged user
 USER 1001

patches/01_fix_caldav_events.patch

+From ccba9e6394ab7e388cb9b112e7e37b273d5b62b6 Mon Sep 17 00:00:00 2001
+From: Giacomo Tenaglia <Giacomo.Tenaglia@cern.ch>
+Date: Tue, 8 Dec 2020 14:28:26 +0100
+Subject: [PATCH] CalDAV: add missing DESCRIPTION for VALARM of ACTION:DISPLAY
+ as per RFC 5545
+
+---
+ src/backend/caldav/caldav.php | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/backend/caldav/caldav.php b/src/backend/caldav/caldav.php
+index b2469c19..4b6d1e90 100644
+--- a/src/backend/caldav/caldav.php
++++ b/src/backend/caldav/caldav.php
+@@ -1146,6 +1146,7 @@ class BackendCalDAV extends BackendDiff {
+             $valarm = new iCalComponent();
+             $valarm->SetType("VALARM");
+             $valarm->AddProperty("ACTION", "DISPLAY");
++            $valarm->AddProperty("DESCRIPTION", "Default Z-Push description");
+             $trigger = "-PT" . $data->reminder . "M";
+             $valarm->AddProperty("TRIGGER", $trigger);
+             $vevent->AddComponent($valarm);
+@@ -1520,6 +1521,7 @@ class BackendCalDAV extends BackendDiff {
+             $valarm = new iCalComponent();
+             $valarm->SetType("VALARM");
+             $valarm->AddProperty("ACTION", "DISPLAY");
++            $valarm->AddProperty("DESCRIPTION", "Default Z-Push description");
+             $valarm->AddProperty("TRIGGER;VALUE=DATE-TIME", gmdate("Ymd\THis\Z", $data->remindertime));
+             $vtodo->AddComponent($valarm);
+         }
+-- 
+2.29.2
+