create a home directory for spamass-milter (Closes: #696861)

diff --git a/debian/changelog b/debian/changelog
index 841160af02832f70af92b54ea021de3f232b19d6..8dea5dd7915952193b143ecdc2577d68356187e9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ spamass-milter (0.4.0-2) unstable; urgency=medium
   * Do not remove the socket if spamass-milter is already running (closes:
     #782252)
   * Enable the hardening flags (closes: #879671)
+  * Create a home directory for the spamass-milter user, because we use it
+    as the default for spamassassin (Closes: #696861)
 
  -- Don Armstrong <don@debian.org>  Thu, 10 May 2018 12:13:11 -0700
 

diff --git a/debian/spamass-milter.postinst b/debian/spamass-milter.postinst
index 8d44b05938c6d8ee961c1f197313232d8556692a..5fb5ec853bddb0e5a71ae87984fe5ae25f30fe7e 100644 (file)
--- a/debian/spamass-milter.postinst
+++ b/debian/spamass-milter.postinst
@@ -10,7 +10,7 @@ case "$1" in
                addgroup --system spamass-milter;
            fi;
            if ! id -u spamass-milter >/dev/null 2>&1; then
-               adduser --system --ingroup spamass-milter --no-create-home --home /var/lib/spamass-milter spamass-milter;
+               adduser --system --ingroup spamass-milter --home /var/lib/spamass-milter spamass-milter;
                if [ -d /var/lib/spamass-milter ]; then 
                    chown spamass-milter:spamass-milter /var/lib/spamass-milter
                fi;
@@ -20,6 +20,14 @@ case "$1" in
                fi;
            fi;
        fi;
+    # create a home directory for spamass-milter if it does not exist,
+    # but only this once
+    if dpkg --compare-versions "$2" 'lt' '0.4.0-2'; then
+        if ! [ -d /var/lib/spamass-milter ]; then
+            mkdir /var/lib/spamass-milter &&
+                chown spamass-milter:spamass-milter /var/lib/spamass-milter;
+        fi;
+    fi;
        # Attempt to remove /var/run/spamass if it exists
 
        # If we're upgrading from -4 or earlier, we want to remove the