From 96768f1fcbd262dcd59249eae65cdb2bb7d0cf22 Mon Sep 17 00:00:00 2001 From: "github@kiekerjan.isdronken.nl" Date: Fri, 31 Dec 2021 00:33:34 +0100 Subject: [PATCH] backport fix for dns resolver in python3-dkim --- setup/dkim.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup/dkim.sh b/setup/dkim.sh index c3092753..4d8e44aa 100755 --- a/setup/dkim.sh +++ b/setup/dkim.sh @@ -11,7 +11,7 @@ source /etc/mailinabox.conf # load global vars # Install DKIM... echo Installing DKIMpy/OpenDMARC... -apt_install dkimpy-milter opendmarc +apt_install dkimpy-milter python3-dkim opendmarc # Make sure configuration directories exist. mkdir -p /etc/dkim; @@ -121,6 +121,9 @@ tools/editconf.py /etc/postfix/main.cf \ # We need to explicitly enable the opendmarc service, or it will not start hide_output systemctl enable opendmarc +# There is a fault in the dkim code for Ubuntu 20.04, let's fix it. Not necessary for Ubuntu 21.04 or newer +sed -i 's/return b""\.join(r\.items\[0\]\.strings)/return b""\.join(list(r\.items)\[0\]\.strings)/' /usr/lib/python3/dist-packages/dkim/dnsplug.py + # Restart services. restart_service dkimpy-milter restart_service opendmarc