From 352ae803958e9478be21f2a163a4043cd12dc914 Mon Sep 17 00:00:00 2001
From: "Stefan M. Hessenauer" <shessenauer@gmail.com>
Date: Sun, 9 Feb 2020 15:17:44 +0100
Subject: [PATCH 1/2] fetchmail dovecot delivery

---
 ADDITIONS/fetchmail.pl | 9 ++++++++-
 CHANGELOG.TXT          | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 ADDITIONS/fetchmail.pl

diff --git a/ADDITIONS/fetchmail.pl b/ADDITIONS/fetchmail.pl
old mode 100644
new mode 100755
index 3a4a03a1..d18e1ed6
--- a/ADDITIONS/fetchmail.pl
+++ b/ADDITIONS/fetchmail.pl
@@ -105,7 +105,14 @@ map{
 
 	$cmd="user '${src_user}' there with password '".decode_base64($src_password)."'";
 	$cmd.=" folder '${src_folder}'" if ($src_folder);
-	$cmd.=" mda ".$mda if ($mda);
+
+	if ($mda) {
+		if ($mda eq "dovecot") {
+			$cmd.=" mda \"/usr/lib/dovecot/deliver -d ${mailbox}\" ";
+		} else {
+			$cmd.=" mda ".$mda 
+		}
+	}
 
 #	$cmd.=" mda \"/usr/local/libexec/dovecot/deliver -m ${mailbox}\"";
 	$cmd.=" is '${mailbox}' here";
diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index c5f20165..5d16bedb 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -22,6 +22,7 @@ Version X.X - master
    - Sqlite improvements (see https://github.com/postfixadmin/postfixadmin/issues/177 and https://github.com/postfixadmin/postfixadmin/issues/176 )
    - MySQL 8 compatibility (see https://github.com/postfixadmin/postfixadmin/pull/175 )
    - Internally the database functions have been refactored to use PDO rather than the lower level mysql_, mysqli_, pg_ etc functions. ( see: https://github.com/postfixadmin/postfixadmin/pull/231 )
+   - Usage of dovecot deliver as fetchmail mda
 
 Version 3.2 - 2018/05/02
 -------------------------------------------------

From 416a71d604aac411a1626383e44a21312960875f Mon Sep 17 00:00:00 2001
From: "Stefan M. Hessenauer" <shessenauer@gmail.com>
Date: Tue, 11 Feb 2020 23:49:50 +0100
Subject: [PATCH 2/2] short documentation added, path to deliver as
 configuration option

---
 ADDITIONS/fetchmail.pl | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ADDITIONS/fetchmail.pl b/ADDITIONS/fetchmail.pl
index d18e1ed6..916bdd81 100755
--- a/ADDITIONS/fetchmail.pl
+++ b/ADDITIONS/fetchmail.pl
@@ -29,6 +29,12 @@ our $db_password="CHANGE_ME!";
 # Where to create a lockfile; please ensure path exists.
 our $run_dir="/var/run/fetchmail";
 
+# in case you want to use dovecot deliver to put the mail directly into the users mailbox,
+# set "mda" in the fetchmail table to the keyword "dovecot".
+
+# Where the delivery binary is located
+$dovecot_deliver = "/usr/lib/dovecot/deliver";
+
 # instead of changing this script, you can put your settings to /etc/mail/postfixadmin/fetchmail.conf
 # just use perl syntax there to fill the variables listed above (without the "our" keyword). Example:
 # $db_username = 'mail';
@@ -108,7 +114,7 @@ map{
 
 	if ($mda) {
 		if ($mda eq "dovecot") {
-			$cmd.=" mda \"/usr/lib/dovecot/deliver -d ${mailbox}\" ";
+			$cmd.=" mda \"${dovecot_deliver} -d ${mailbox}\" ";
 		} else {
 			$cmd.=" mda ".$mda 
 		}