[mail-filter] bump amavis and spamassassin to new versions

mail-filter/spamassassin/files/3.0.0-spamd.conf

@@ -0,0 +1,46 @@
+# Config file for /etc/init.d/spamd
+
+
+# ***WARNING***
+# spamd was not designed to listed to an untrusted network. spamd
+# is vulnerable to DoS attacks (and eternal doom) if used to listen
+# to an untrusted network.
+#
+
+
+# Some options:
+#
+# -c          to create a per user configuration file
+# -H [dir]    to switch home dirs for helper apps, dir optional
+# -i [ip]     to listen on the specified IP,
+#             127.0.0.1 if omitted,
+#             0.0.0.0 (ie. all) if given without value;
+#             must be used in combination with -A to actually allow
+#             connections from anybody but localhost
+# -m limit    to set the number of children, default 5
+# -u user     the user to run spamd as
+# -L          if you want to run no net tests
+#
+# for more help look in man spamd
+#
+# Note: if you plan on using the -u flag to spamd you will need to
+# make sure the location of the PID file is writable by that user.
+# This can be done by making the directory /var/run/spamd and
+# changing the owner to the UID that runs spamd.  You will then
+# need to edit $pidfile in /etc/init.d/spamd. This should fix the
+# problem with stop/restart in the init scripts.
+#
+# See http://bugs.gentoo.org/show_bug.cgi?id=70124 for a full
+# explanation.
+
+SPAMD_OPTS="-m 5 -c -H"
+
+# spamd stores its pid in this file. If you use the -u option to
+# run spamd under another user, you might need to adjust it.
+
+PIDFILE="/run/spamd.pid"
+
+# SPAMD_NICELEVEL lets you set the 'nice'ness of the running 
+# spamd process
+
+# SPAMD_NICELEVEL=5

mail-filter/spamassassin/files/3.3.1-spamd.init

@@ -0,0 +1,46 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/files/3.3.1-spamd.init,v 1.6 2013/10/17 11:44:12 zlogene Exp $
+
+# NB: Config is in /etc/conf.d/spamd
+
+# Provide a default location if they haven't in /etc/conf.d/spamd
+PIDFILE=${PIDFILE:-/run/spamd.pid}
+
+extra_started_commands="reload"
+
+depend() {
+	need net
+	before mta
+	use logger
+@USEPOSTGRES@	use postgresql
+@USEMYSQL@	use mysql
+}
+
+start() {
+	ebegin "Starting spamd"
+	start-stop-daemon --start --quiet \
+		--name spamd \
+		--nicelevel ${SPAMD_NICELEVEL:-0} \
+		--pidfile ${PIDFILE} \
+		--exec /usr/sbin/spamd -- -d -r ${PIDFILE} \
+		${SPAMD_OPTS}
+	retval=$?
+	if ! [ -f "${PIDFILE}" ]; then
+		sleep 1
+	fi
+	eend ${retval} "Failed to start spamd"
+}
+
+stop() {
+	ebegin "Stopping spamd"
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
+	eend $? "Failed to stop spamd"
+}
+
+reload() {
+	ebegin "Reloading configuration"
+	start-stop-daemon --signal HUP --quiet --pidfile ${PIDFILE}
+	eend $?
+}

mail-filter/spamassassin/files/secrets.cf

@@ -0,0 +1,14 @@
+# The below sample from bug 91430 is an example of using mysql
+# for spam filter storage
+
+#(Tell Spamassissin to use MySQL for bayes data
+#bayes_store_module              Mail::SpamAssassin::BayesStore::SQL
+#bayes_sql_dsn                   DBI:mysql:sa_bayes:localhost:3306
+#bayes_sql_username              db_name
+#bayes_sql_password              another_very_secret_password
+
+#(Tell Spamassissin to use MySQL for AWL data
+#auto_whitelist_factory          Mail::SpamAssassin::SQLBasedAddrList
+#user_awl_dsn                    DBI:mysql:sa_bayes:localhost:3306
+#user_awl_sql_username           db_name
+#user_awl_sql_password           another_very_secret_password

mail-filter/spamassassin/files/spamassassin.service-r1

@@ -0,0 +1,15 @@
+[Unit]
+Description=Spamassassin daemon
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile=/run/spamd.pid
+ExecStart=/usr/sbin/spamd -d --pidfile /run/spamd.pid -m 5 $SPAMD_OPTS
+ExecReload=/bin/kill -HUP $MAINPID
+StandardOutput=syslog
+StandardError=syslog
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

mail-filter/spamassassin/files/spamassassin.service.conf

@@ -0,0 +1,10 @@
+# Here you can append some options to spamd process, please
+# double check that you make needed changes in service file if
+# you use options requiring it
+# Some options:
+#
+# -c          to create a per user configuration file
+# -H [dir]    to switch home dirs for helper apps, dir optional
+
+[Service]
+Environment="SPAMD_OPTS= -c -H"