# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1240492821 -7200
# Node ID 62106debeb759baf066e6dbcc4da659aa5033ad8
# Parent  d980506f80fc78323446b3904a9d0e007f09ab47
Specify options in configuration and adapt package for virtual users.

diff -r d980506f80fc -r 62106debeb75 spamassassin/local.cf
--- a/spamassassin/local.cf	Thu Apr 23 15:16:09 2009 +0200
+++ b/spamassassin/local.cf	Thu Apr 23 15:20:21 2009 +0200
@@ -13,3 +13,29 @@
 #whitelist_from         *@example.com
 #whitelist_to           *@example.com
 
+#   use a terse header instead of X-Spam-Report
+remove_header all Report
+
+#   encapsulate spam in an attachment
+report_safe             0
+
+#   enable the Bayes system
+use_bayes               1
+
+#   enable Bayes autolearning
+bayes_auto_learn        1
+
+#   enable or disable network checks
+#skip_rbl_checks         1
+#use_razor2              1
+#use_dcc                 1
+#use_pyzor               1
+
+#   mail using languages used in these country codes will not
+#   be marked as being possibly spam in a foreign language.
+#ok_languages            all
+
+#   mail using locales used in these country codes will not
+#   be marked as being possibly spam in a foreign language.
+#ok_locales              all
+
diff -r d980506f80fc -r 62106debeb75 spamassassin/rc.spamassassin
--- a/spamassassin/rc.spamassassin	Thu Apr 23 15:16:09 2009 +0200
+++ b/spamassassin/rc.spamassassin	Thu Apr 23 15:20:21 2009 +0200
@@ -7,7 +7,7 @@
     spamassassin_enable="$openpkg_rc_def"
     spamassassin_bind="127.0.0.1"
     spamassassin_port="783"
-    spamassassin_flags="-A 127. --local"
+    spamassassin_flags="-x -u @l_rusr@ -A 127. --local --virtual-config-dir=@l_prefix@/var/spamassassin/spool/%u"
     spamassassin_stop_delay="2"
     spamassassin_log_prolog="true"
     spamassassin_log_epilog="true"
diff -r d980506f80fc -r 62106debeb75 spamassassin/spamassassin.spec
--- a/spamassassin/spamassassin.spec	Thu Apr 23 15:16:09 2009 +0200
+++ b/spamassassin/spamassassin.spec	Thu Apr 23 15:20:21 2009 +0200
@@ -37,7 +37,7 @@
 Group:        Mail
 License:      ASF
 Version:      %{V_here}
-Release:      20090420
+Release:      20080612
 
 #   package options
 %option       with_fsl  yes
@@ -112,16 +112,17 @@
         %{SOURCE local.cf} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/spamassassin/
 
-    #   create directory for PID file
+    #   create directories for PID file and virtual users
     %{l_shtool} mkdir -f -p -m 755 \
-        $RPM_BUILD_ROOT%{l_prefix}/var/spamassassin
+        $RPM_BUILD_ROOT%{l_prefix}/var/spamassassin \
+        $RPM_BUILD_ROOT%{l_prefix}/var/spamassassin/spool
 
     #   strip installation
     chmod u+w $RPM_BUILD_ROOT%{l_prefix}/bin/*
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/man/man3
 
-    #   install run-command script
+    #   install runcommand script
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
     %{l_shtool} install -c -m 755 %{l_value -s -a} \
@@ -142,6 +143,7 @@
         '%config %{l_prefix}/etc/fsl/fsl.spamassassin' \
         '%config %{l_prefix}/etc/spamassassin/*' \
         '%attr(775,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/spamassassin' \
+        '%attr(755,%{l_susr},%{l_sgrp}) %{l_prefix}/var/spamassassin/spool' \
         '%attr(4755,%{l_rusr},%{l_mgrp}) %{l_prefix}/bin/spamc' \
         `cat perl-openpkg-files`