From 53a9fc0e4822df83268a13fb850b9e67fb5cbd55 Mon Sep 17 00:00:00 2001
From: Felix <0xFelix@users.noreply.github.com>
Date: Fri, 4 Sep 2015 09:18:12 +0200
Subject: [PATCH 1/4] Set 'LOCALONLY' to 0 in /etc/default/spampd

---
 setup/spamassassin.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup/spamassassin.sh b/setup/spamassassin.sh
index 35cab605..d69cc346 100755
--- a/setup/spamassassin.sh
+++ b/setup/spamassassin.sh
@@ -42,9 +42,11 @@ echo "public.pyzor.org:24441" > /etc/spamassassin/pyzor/servers
 #   want to lose track of it. (We've configured Dovecot to listen on this port elsewhere.)
 # * Increase the maximum message size of scanned messages from the default of 64KB to 500KB, which
 #   is Spamassassin (spamc)'s own default. Specified in KBytes.
+# * Disable localmode so Pyzor, DKIM and DNS checks can be used.
 tools/editconf.py /etc/default/spampd \
 	DESTPORT=10026 \
-	ADDOPTS="\"--maxsize=500\""
+	ADDOPTS="\"--maxsize=500\"" \
+	LOCALONLY=0
 
 # Spamassassin normally wraps spam as an attachment inside a fresh
 # email with a report about the message. This also protects the user

From b6f7a105691f33486b32046fd0c23913608df505 Mon Sep 17 00:00:00 2001
From: Felix <0xFelix@users.noreply.github.com>
Date: Fri, 4 Sep 2015 09:25:49 +0200
Subject: [PATCH 2/4] Add missing dependencies for DKIM validation

---
 setup/spamassassin.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/spamassassin.sh b/setup/spamassassin.sh
index d69cc346..61114740 100755
--- a/setup/spamassassin.sh
+++ b/setup/spamassassin.sh
@@ -17,7 +17,8 @@ source setup/functions.sh # load our functions
 
 # Install packages.
 echo "Installing SpamAssassin..."
-apt_install spampd razor pyzor dovecot-antispam
+apt_install spampd razor pyzor dovecot-antispam libcrypt-openssl-bignum-perl \
+        libcrypt-openssl-rsa-perl libmail-dkim-perl libcrypt-openssl-random-perl
 
 # Allow spamassassin to download new rules.
 tools/editconf.py /etc/default/spamassassin \

From bd7728ac94cb78e653aae8e7c2a80e0f50b403f8 Mon Sep 17 00:00:00 2001
From: Felix <0xFelix@users.noreply.github.com>
Date: Fri, 4 Sep 2015 15:45:47 +0200
Subject: [PATCH 3/4] Add documentation for additional packages, remove
 unneeded package libcrypt-openssl-random-perl

---
 setup/spamassassin.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/setup/spamassassin.sh b/setup/spamassassin.sh
index 61114740..795edc08 100755
--- a/setup/spamassassin.sh
+++ b/setup/spamassassin.sh
@@ -16,9 +16,14 @@ source setup/functions.sh # load our functions
 # ----------------------------------------
 
 # Install packages.
+# libmail-dkim-perl is needed to make the spamassassin DKIM module work.
+# For more information see Debian Bug #689414:
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=689414
+# libcrypt-openssl-bignum-perl and libcrypt-openssl-rsa-perl are
+# direct dependencies of libmail-dkim-perl.
 echo "Installing SpamAssassin..."
 apt_install spampd razor pyzor dovecot-antispam libcrypt-openssl-bignum-perl \
-        libcrypt-openssl-rsa-perl libmail-dkim-perl libcrypt-openssl-random-perl
+        libcrypt-openssl-rsa-perl libmail-dkim-perl
 
 # Allow spamassassin to download new rules.
 tools/editconf.py /etc/default/spamassassin \

From 18efae970308e798063b68366ed6eab0fbb00f9f Mon Sep 17 00:00:00 2001
From: Felix <0xFelix@users.noreply.github.com>
Date: Sat, 5 Sep 2015 09:08:47 +0200
Subject: [PATCH 4/4] Remove direct dependencies as they get installed
 automatically

---
 setup/spamassassin.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/setup/spamassassin.sh b/setup/spamassassin.sh
index 795edc08..27576766 100755
--- a/setup/spamassassin.sh
+++ b/setup/spamassassin.sh
@@ -19,11 +19,8 @@ source setup/functions.sh # load our functions
 # libmail-dkim-perl is needed to make the spamassassin DKIM module work.
 # For more information see Debian Bug #689414:
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=689414
-# libcrypt-openssl-bignum-perl and libcrypt-openssl-rsa-perl are
-# direct dependencies of libmail-dkim-perl.
 echo "Installing SpamAssassin..."
-apt_install spampd razor pyzor dovecot-antispam libcrypt-openssl-bignum-perl \
-        libcrypt-openssl-rsa-perl libmail-dkim-perl
+apt_install spampd razor pyzor dovecot-antispam libmail-dkim-perl
 
 # Allow spamassassin to download new rules.
 tools/editconf.py /etc/default/spamassassin \