From a22e8eb0c5d7f64137b3cdf255c967706cda5dcd Mon Sep 17 00:00:00 2001
From: Stephan Holl <stephan@holl-land.de>
Date: Thu, 26 Dec 2019 20:29:45 +0100
Subject: [PATCH 1/2] Added carddav-Plugin for roundcube.

---
 webmails/roundcube/Dockerfile     | 6 ++++++
 webmails/roundcube/config.inc.php | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/webmails/roundcube/Dockerfile b/webmails/roundcube/Dockerfile
index 94a831c0..608298c6 100644
--- a/webmails/roundcube/Dockerfile
+++ b/webmails/roundcube/Dockerfile
@@ -18,6 +18,8 @@ RUN pip3 install socrate
 
 ENV ROUNDCUBE_URL https://github.com/roundcube/roundcubemail/releases/download/1.4.1/roundcubemail-1.4.1-complete.tar.gz
 
+ENV CARDDAV_URL https://github.com/blind-coder/rcmcarddav/releases/download/v3.0.3/carddav-3.0.3.tar.bz2
+
 RUN apt-get update && apt-get install -y \
       zlib1g-dev libzip4 libzip-dev \
       python3-jinja2 \
@@ -26,9 +28,13 @@ RUN apt-get update && apt-get install -y \
  && rm -rf /var/www/html/ \
  && cd /var/www \
  && curl -L -O ${ROUNDCUBE_URL} \
+ && curl -L -O ${CARDDAV_URL} \
  && tar -xf *.tar.gz \
+ && tar -xf *.tar.bz2 \
  && rm -f *.tar.gz \
+ && rm -f *.tar.bz2 \
  && mv roundcubemail-* html \
+ && mv carddav html/plugins/ \
  && cd html \
  && rm -rf CHANGELOG INSTALL LICENSE README.md UPGRADING composer.json-dist installer \
  && sed -i 's,mod_php5.c,mod_php7.c,g' .htaccess \
diff --git a/webmails/roundcube/config.inc.php b/webmails/roundcube/config.inc.php
index d3f38bc4..58eaaee1 100644
--- a/webmails/roundcube/config.inc.php
+++ b/webmails/roundcube/config.inc.php
@@ -16,7 +16,8 @@ $config['plugins'] = array(
     'zipdownload',
     'markasjunk',
     'managesieve',
-    'enigma'
+    'enigma',
+    'carddav'
 );
 
 $front = getenv('FRONT_ADDRESS') ? getenv('FRONT_ADDRESS') : 'front';

From 432ba92a0df283cfb45009e8a62700d277ede12d Mon Sep 17 00:00:00 2001
From: Stephan Holl <stephan@holl-land.de>
Date: Thu, 26 Dec 2019 21:45:59 +0100
Subject: [PATCH 2/2] Added news for PR #1298

---
 towncrier/newsfragments/1298.feature | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 towncrier/newsfragments/1298.feature

diff --git a/towncrier/newsfragments/1298.feature b/towncrier/newsfragments/1298.feature
new file mode 100644
index 00000000..48d66d36
--- /dev/null
+++ b/towncrier/newsfragments/1298.feature
@@ -0,0 +1 @@
+Added CardDAV-Plugin for webmail roundcube.
\ No newline at end of file