From cecbbe9e827bf300c57820d135fdacb85821272f Mon Sep 17 00:00:00 2001
From: Michael Kuron <mkuron@users.noreply.github.com>
Date: Tue, 16 Jul 2019 20:03:37 +0200
Subject: [PATCH 1/3] Remove score from R_DKIM_PERMFAIL

This error happens when there is no public key in DNS for that selector.
---
 data/conf/rspamd/local.d/policies_group.conf | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/data/conf/rspamd/local.d/policies_group.conf b/data/conf/rspamd/local.d/policies_group.conf
index 76b0699e..bb915975 100644
--- a/data/conf/rspamd/local.d/policies_group.conf
+++ b/data/conf/rspamd/local.d/policies_group.conf
@@ -11,9 +11,6 @@ symbols = {
     "R_DKIM_REJECT" {
         score = 10.0;
     }
-    "R_DKIM_PERMFAIL" {
-        score = 10.0;
-    }
     "DMARC_POLICY_REJECT" {
         weight = 20.0;
         description = "DMARC reject policy";

From 197f27b705e204c63bf788c696700fb0e59d4ca5 Mon Sep 17 00:00:00 2001
From: Patrik Kernstock <patrik@kernstock.net>
Date: Tue, 16 Jul 2019 20:15:11 +0200
Subject: [PATCH 2/3] Remove DMARC descriptions from polices_group

Remove descriptions as they are inherited from the default rspamd configuration anyway
---
 data/conf/rspamd/local.d/policies_group.conf | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/data/conf/rspamd/local.d/policies_group.conf b/data/conf/rspamd/local.d/policies_group.conf
index 76b0699e..f35603b3 100644
--- a/data/conf/rspamd/local.d/policies_group.conf
+++ b/data/conf/rspamd/local.d/policies_group.conf
@@ -16,14 +16,11 @@ symbols = {
     }
     "DMARC_POLICY_REJECT" {
         weight = 20.0;
-        description = "DMARC reject policy";
     }
     "DMARC_POLICY_QUARANTINE" {
         weight = 10.0;
-        description = "DMARC quarantine policy";
     }
     "DMARC_POLICY_SOFTFAIL" {
         weight = 2.0;
-        description = "DMARC failed";
     }
 }

From a5756716e0b34575a77782806fb94e2c8358d43d Mon Sep 17 00:00:00 2001
From: mkapra <34742358+mkapra@users.noreply.github.com>
Date: Tue, 16 Jul 2019 22:24:19 +0200
Subject: [PATCH 3/3] Fixing duplicated port for profile downloading.

---
 data/web/user.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/web/user.php b/data/web/user.php
index a6bbe97d..abd8b318 100644
--- a/data/web/user.php
+++ b/data/web/user.php
@@ -77,7 +77,7 @@ elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == '
   $username = $_SESSION['mailcow_cc_username'];
   $mailboxdata = mailbox('get', 'mailbox_details', $username);
 
-  $clientconfigstr = "host=" . urlencode($mailcow_hostname) . "&email=" . urlencode($username) . "&name=" . urlencode($mailboxdata['name']) . "&ui=" . strtok(urlencode($_SERVER['HTTP_HOST']), ':') . "&port=" . urlencode($autodiscover_config['caldav']['port']);
+  $clientconfigstr = "host=" . urlencode($mailcow_hostname) . "&email=" . urlencode($username) . "&name=" . urlencode($mailboxdata['name']) . "&ui=" . urlencode(strtok($_SERVER['HTTP_HOST'], ':')) . "&port=" . urlencode($autodiscover_config['caldav']['port']);
   if ($autodiscover_config['useEASforOutlook'] == 'yes')
   $clientconfigstr .= "&outlookEAS=1";
   if (file_exists('thunderbird-plugins/version.csv')) {