From c258e8bebb141fef67a26e75d16a06c7357fda4d Mon Sep 17 00:00:00 2001 From: root Date: Mon, 5 Nov 2018 21:10:12 +0100 Subject: [PATCH] committing changes in /etc after apt run Package changes: +binutils 2.30-21ubuntu1~18.04 amd64 +binutils-common 2.30-21ubuntu1~18.04 amd64 +binutils-x86-64-linux-gnu 2.30-21ubuntu1~18.04 amd64 +cpp 4:7.3.0-3ubuntu2.1 amd64 +cpp-7 7.3.0-27ubuntu1~18.04 amd64 +gcc 4:7.3.0-3ubuntu2.1 amd64 +gcc-7 7.3.0-27ubuntu1~18.04 amd64 +gcc-7-base 7.3.0-27ubuntu1~18.04 amd64 +libasan4 7.3.0-27ubuntu1~18.04 amd64 +libatomic1 8.2.0-1ubuntu2~18.04 amd64 +libbinutils 2.30-21ubuntu1~18.04 amd64 +libc-dev-bin 2.27-3ubuntu1 amd64 +libc6-dev 2.27-3ubuntu1 amd64 +libcc1-0 8.2.0-1ubuntu2~18.04 amd64 +libcilkrts5 7.3.0-27ubuntu1~18.04 amd64 +libgcc-7-dev 7.3.0-27ubuntu1~18.04 amd64 +libgomp1 8.2.0-1ubuntu2~18.04 amd64 +libisl19 0.19-1 amd64 +libitm1 8.2.0-1ubuntu2~18.04 amd64 +liblsan0 8.2.0-1ubuntu2~18.04 amd64 +libmail-spf-perl 2.9.0-4 all +libmpc3 1.1.0-1 amd64 +libmpfr6 4.0.1-1 amd64 +libmpx2 8.2.0-1ubuntu2~18.04 amd64 +libnetaddr-ip-perl 4.079+dfsg-1build2 amd64 +libquadmath0 8.2.0-1ubuntu2~18.04 amd64 +libsys-hostname-long-perl 1.5-1 all +libtsan0 8.2.0-1ubuntu2~18.04 amd64 +libubsan0 7.3.0-27ubuntu1~18.04 amd64 +linux-libc-dev 4.15.0-38.41 amd64 +make 4.1-9.1ubuntu1 amd64 +manpages-dev 4.15-1 all +re2c 1.0.1-1 amd64 +sa-compile 3.4.1-8build1 all +spamassassin 3.4.1-8build1 all +spamc 3.4.1-8build1 amd64 --- .etckeeper | 13 +++++ alternatives/c89 | 1 + alternatives/c89.1.gz | 1 + alternatives/c99 | 1 + alternatives/c99.1.gz | 1 + alternatives/cc | 1 + alternatives/cc.1.gz | 1 + alternatives/cpp | 1 + cron.daily/spamassassin | 104 ++++++++++++++++++++++++++++++++++++ default/spamassassin | 34 ++++++++++++ group | 1 + group- | 1 + gshadow | 1 + gshadow- | 1 + init.d/spamassassin | 92 +++++++++++++++++++++++++++++++ mail/spamassassin | 1 + passwd | 1 + passwd- | 3 +- rc0.d/K01spamassassin | 1 + rc1.d/K01spamassassin | 1 + rc2.d/S01spamassassin | 1 + rc3.d/S01spamassassin | 1 + rc4.d/S01spamassassin | 1 + rc5.d/S01spamassassin | 1 + rc6.d/K01spamassassin | 1 + shadow | 1 + shadow- | 1 + spamassassin/65_debian.cf | 34 ++++++++++++ spamassassin/init.pre | 36 +++++++++++++ spamassassin/local.cf | 89 ++++++++++++++++++++++++++++++ spamassassin/sa-compile.pre | 3 ++ spamassassin/v310.pre | 78 +++++++++++++++++++++++++++ spamassassin/v312.pre | 29 ++++++++++ spamassassin/v320.pre | 64 ++++++++++++++++++++++ spamassassin/v330.pre | 28 ++++++++++ spamassassin/v340.pre | 21 ++++++++ spamassassin/v341.pre | 28 ++++++++++ 37 files changed, 677 insertions(+), 1 deletion(-) create mode 120000 alternatives/c89 create mode 120000 alternatives/c89.1.gz create mode 120000 alternatives/c99 create mode 120000 alternatives/c99.1.gz create mode 120000 alternatives/cc create mode 120000 alternatives/cc.1.gz create mode 120000 alternatives/cpp create mode 100755 cron.daily/spamassassin create mode 100644 default/spamassassin create mode 100755 init.d/spamassassin create mode 120000 mail/spamassassin create mode 120000 rc0.d/K01spamassassin create mode 120000 rc1.d/K01spamassassin create mode 120000 rc2.d/S01spamassassin create mode 120000 rc3.d/S01spamassassin create mode 120000 rc4.d/S01spamassassin create mode 120000 rc5.d/S01spamassassin create mode 120000 rc6.d/K01spamassassin create mode 100644 spamassassin/65_debian.cf create mode 100644 spamassassin/init.pre create mode 100644 spamassassin/local.cf create mode 100644 spamassassin/sa-compile.pre create mode 100644 spamassassin/v310.pre create mode 100644 spamassassin/v312.pre create mode 100644 spamassassin/v320.pre create mode 100644 spamassassin/v330.pre create mode 100644 spamassassin/v340.pre create mode 100644 spamassassin/v341.pre diff --git a/.etckeeper b/.etckeeper index abe7c742e..c1f78e0d8 100755 --- a/.etckeeper +++ b/.etckeeper @@ -503,6 +503,7 @@ maybe chmod 0755 'cron.daily/man-db' maybe chmod 0755 'cron.daily/mlocate' maybe chmod 0755 'cron.daily/passwd' maybe chmod 0755 'cron.daily/popularity-contest' +maybe chmod 0755 'cron.daily/spamassassin' maybe chmod 0755 'cron.daily/ubuntu-advantage-tools' maybe chmod 0755 'cron.hourly' maybe chmod 0644 'cron.hourly/.placeholder' @@ -550,6 +551,7 @@ maybe chmod 0644 'default/opendkim' maybe chmod 0644 'default/redis-server' maybe chmod 0644 'default/rsync' maybe chmod 0644 'default/rsyslog' +maybe chmod 0644 'default/spamassassin' maybe chmod 0644 'default/ssh' maybe chmod 0644 'default/ufw' maybe chmod 0644 'default/useradd' @@ -756,6 +758,7 @@ maybe chmod 0755 'init.d/redis-server' maybe chmod 0755 'init.d/rsync' maybe chmod 0755 'init.d/rsyslog' maybe chmod 0755 'init.d/screen-cleanup' +maybe chmod 0755 'init.d/spamassassin' maybe chmod 0755 'init.d/ssh' maybe chmod 0755 'init.d/udev' maybe chmod 0755 'init.d/ufw' @@ -1277,8 +1280,18 @@ maybe chmod 0644 'skel/.bash_logout' maybe chmod 0644 'skel/.bashrc' maybe chmod 0644 'skel/.profile' maybe chmod 0755 'spamassassin' +maybe chmod 0644 'spamassassin/65_debian.cf' +maybe chmod 0644 'spamassassin/init.pre' +maybe chmod 0644 'spamassassin/local.cf' +maybe chmod 0644 'spamassassin/sa-compile.pre' maybe chmod 0755 'spamassassin/sa-update-hooks.d' maybe chmod 0755 'spamassassin/sa-update-hooks.d/amavisd-new' +maybe chmod 0644 'spamassassin/v310.pre' +maybe chmod 0644 'spamassassin/v312.pre' +maybe chmod 0644 'spamassassin/v320.pre' +maybe chmod 0644 'spamassassin/v330.pre' +maybe chmod 0644 'spamassassin/v340.pre' +maybe chmod 0644 'spamassassin/v341.pre' maybe chmod 0755 'ssh' maybe chmod 0644 'ssh/moduli' maybe chmod 0644 'ssh/ssh_config' diff --git a/alternatives/c89 b/alternatives/c89 new file mode 120000 index 000000000..9e67d743b --- /dev/null +++ b/alternatives/c89 @@ -0,0 +1 @@ +/usr/bin/c89-gcc \ No newline at end of file diff --git a/alternatives/c89.1.gz b/alternatives/c89.1.gz new file mode 120000 index 000000000..3a742380e --- /dev/null +++ b/alternatives/c89.1.gz @@ -0,0 +1 @@ +/usr/share/man/man1/c89-gcc.1.gz \ No newline at end of file diff --git a/alternatives/c99 b/alternatives/c99 new file mode 120000 index 000000000..323b6db25 --- /dev/null +++ b/alternatives/c99 @@ -0,0 +1 @@ +/usr/bin/c99-gcc \ No newline at end of file diff --git a/alternatives/c99.1.gz b/alternatives/c99.1.gz new file mode 120000 index 000000000..e033f2d45 --- /dev/null +++ b/alternatives/c99.1.gz @@ -0,0 +1 @@ +/usr/share/man/man1/c99-gcc.1.gz \ No newline at end of file diff --git a/alternatives/cc b/alternatives/cc new file mode 120000 index 000000000..cd91449a4 --- /dev/null +++ b/alternatives/cc @@ -0,0 +1 @@ +/usr/bin/gcc \ No newline at end of file diff --git a/alternatives/cc.1.gz b/alternatives/cc.1.gz new file mode 120000 index 000000000..406b60dd8 --- /dev/null +++ b/alternatives/cc.1.gz @@ -0,0 +1 @@ +/usr/share/man/man1/gcc.1.gz \ No newline at end of file diff --git a/alternatives/cpp b/alternatives/cpp new file mode 120000 index 000000000..00fc3c4ea --- /dev/null +++ b/alternatives/cpp @@ -0,0 +1 @@ +/usr/bin/cpp \ No newline at end of file diff --git a/cron.daily/spamassassin b/cron.daily/spamassassin new file mode 100755 index 000000000..333caf749 --- /dev/null +++ b/cron.daily/spamassassin @@ -0,0 +1,104 @@ +#!/bin/sh + +# Duncan Findlay +# duncf@debian.org + +# Daily cronjob for SpamAssassin updates. This isn't pretty but it +# should do the job. + +CRON=0 + +test -f /etc/default/spamassassin && . /etc/default/spamassassin + +test -x /usr/bin/sa-update || exit 0 +test -x /etc/init.d/spamassassin || exit 0 +command -v gpg > /dev/null || exit 0 + +if [ "$CRON" = "0" ] ; then + exit 0 +fi + +# If there's a problem with the ruleset or configs, print the output +# of spamassassin --lint (which will typically get emailed to root) +# and abort. +die_with_lint() { + env -i LANG="$LANG" PATH="$PATH" start-stop-daemon \ + --chuid debian-spamd:debian-spamd --start \ + --exec /usr/bin/spamassassin -- -D --lint 2>&1 + exit 1 +} + +do_compile() { +# Compile rules if the required tools are available. Prior to version +# 3.3.2-8, there was an additional check to verify that an sa-compile +# run had previously been executed by hand. With sa-learn now +# distributed in a separate, optional, package, this check is no +# longer necessary. + if [ -x /usr/bin/re2c -a -x /usr/bin/sa-compile ]; then + env -i LANG="$LANG" PATH="$PATH" start-stop-daemon \ + --chuid debian-spamd:debian-spamd --start \ + --exec /usr/bin/sa-compile -- --quiet + + # Fixup perms -- group and other should be able to + # read and execute, but never write. Works around + # sa-compile's failure to obey umask. + chmod -R go-w,go+rX /var/lib/spamassassin/compiled + fi +} + +# Tell a running spamd to reload its configs and rules. +reload() { + # Reload + if which invoke-rc.d >/dev/null 2>&1; then + invoke-rc.d --quiet spamassassin status > /dev/null && \ + invoke-rc.d spamassassin reload > /dev/null + else + /etc/init.d/spamassassin reload > /dev/null + fi + if [ -d /etc/spamassassin/sa-update-hooks.d ]; then + run-parts --lsbsysinit /etc/spamassassin/sa-update-hooks.d + fi +} + +# Sleep for up to 3600 seconds if not running interactively +if [ ! -t 0 ]; then + RANGE=3600 + number=`od -vAn -N2 -tu4 < /dev/urandom` + number=`expr $number "%" $RANGE` + sleep $number +fi + +# Update +umask 022 +env -i LANG="$LANG" PATH="$PATH" http_proxy="$http_proxy" \ + start-stop-daemon --chuid debian-spamd:debian-spamd --start \ + --exec /usr/bin/sa-update -- \ + --gpghomedir /var/lib/spamassassin/sa-update-keys 2>&1 + +case $? in + 0) + # got updates! + env -i LANG="$LANG" PATH="$PATH" start-stop-daemon \ + --chuid debian-spamd:debian-spamd --start \ + --exec /usr/bin/spamassassin -- --lint 2>&1 || die_with_lint + do_compile + reload + ;; + 1) + # no updates + exit 0 + ;; + 2) + # lint failed! + die_with_lint + ;; + *) + echo "sa-update failed for unknown reasons" 1>&2 + ;; +esac + +# Local variables: +# mode: shell-script +# tab-width: 4 +# indent-tabs-mode: nil +# end: diff --git a/default/spamassassin b/default/spamassassin new file mode 100644 index 000000000..1e957b770 --- /dev/null +++ b/default/spamassassin @@ -0,0 +1,34 @@ +# /etc/default/spamassassin +# Duncan Findlay + +# WARNING: please read README.spamd before using. +# There may be security risks. + +# If you're using systemd (default for jessie), the ENABLED setting is +# not used. Instead, enable spamd by issuing: +# systemctl enable spamassassin.service +# Change to "1" to enable spamd on systems using sysvinit: +ENABLED=0 + +# Options +# See man spamd for possible options. The -d option is automatically added. + +# SpamAssassin uses a preforking model, so be careful! You need to +# make sure --max-children is not set to anything higher than 5, +# unless you know what you're doing. + +OPTIONS="--create-prefs --max-children 5 --helper-home-dir" + +# Pid file +# Where should spamd write its PID to file? If you use the -u or +# --username option above, this needs to be writable by that user. +# Otherwise, the init script will not be able to shut spamd down. +PIDFILE="/var/run/spamd.pid" + +# Set nice level of spamd +#NICE="--nicelevel 15" + +# Cronjob +# Set to anything but 0 to enable the cron job to automatically update +# spamassassin's rules on a nightly basis +CRON=0 diff --git a/group b/group index 34b8d76e3..8d1f65170 100644 --- a/group +++ b/group @@ -58,3 +58,4 @@ dovecot:x:117: dovenull:x:118: opendkim:x:119: amavis:x:120: +debian-spamd:x:121: diff --git a/group- b/group- index 7ca7f3174..34b8d76e3 100644 --- a/group- +++ b/group- @@ -57,3 +57,4 @@ vmail:x:1000: dovecot:x:117: dovenull:x:118: opendkim:x:119: +amavis:x:120: diff --git a/gshadow b/gshadow index 7dbad1307..b0728aebd 100644 --- a/gshadow +++ b/gshadow @@ -58,3 +58,4 @@ dovecot:!:: dovenull:!:: opendkim:!:: amavis:!:: +debian-spamd:!:: diff --git a/gshadow- b/gshadow- index c8eccb7b9..7dbad1307 100644 --- a/gshadow- +++ b/gshadow- @@ -57,3 +57,4 @@ vmail:!:: dovecot:!:: dovenull:!:: opendkim:!:: +amavis:!:: diff --git a/init.d/spamassassin b/init.d/spamassassin new file mode 100755 index 000000000..9fb9c0627 --- /dev/null +++ b/init.d/spamassassin @@ -0,0 +1,92 @@ +#! /bin/sh + +### BEGIN INIT INFO +# Provides: spamassassin +# Required-Start: $remote_fs +# Required-Stop: $remote_fs +# Should-Start: $network $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +### END INIT INFO + +# Spamd init script +# June 2002 +# Duncan Findlay + +# Based on skeleton by Miquel van Smoorenburg and Ian Murdock + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/spamd +NAME=spamd +SNAME=spamassassin +DESC="SpamAssassin Mail Filter Daemon" +PIDFILE="/var/run/$NAME.pid" + +export TMPDIR=/tmp +# Apparently people have trouble if this isn't explicitly set... + +# Defaults - don't touch, edit /etc/default/spamassassin +ENABLED=0 +OPTIONS="" +NICE= + +. /lib/lsb/init-functions + +test -f /etc/default/spamassassin && . /etc/default/spamassassin + +DOPTIONS="-d --pidfile=$PIDFILE" + +check_enabled() { + if [ "$ENABLED" = "0" ]; then + echo "$DESC: disabled, see /etc/default/spamassassin" + exit 0 + fi +} + +test -f $DAEMON || exit 0 + +set -e + +case "$1" in + start) + check_enabled + echo -n "Starting $DESC: " + start-stop-daemon --start --pidfile $PIDFILE --name $DAEMON \ + $NICE --oknodo --startas $DAEMON -- $OPTIONS $DOPTIONS + echo "$NAME." + ;; + + stop) + echo -n "Stopping $DESC: " + start-stop-daemon --stop --pidfile $PIDFILE --name $DAEMON --oknodo + echo "$NAME." + ;; + + reload|force-reload) + check_enabled + echo -n "Reloading $DESC: " + start-stop-daemon --stop --pidfile $PIDFILE --signal HUP --name $DAEMON + echo "$NAME." + ;; + + restart) + check_enabled + echo -n "Restarting $DESC: " + start-stop-daemon --stop --pidfile $PIDFILE --name $DAEMON \ + --retry 5 --oknodo + start-stop-daemon --start --pidfile $PIDFILE --name $DAEMON \ + $NICE --oknodo --startas $DAEMON -- $OPTIONS $DOPTIONS + + echo "$NAME." + ;; + status) + status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $? + ;; + *) + N=/etc/init.d/$SNAME + echo "Usage: $N {start|stop|restart|reload|force-reload|status}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/mail/spamassassin b/mail/spamassassin new file mode 120000 index 000000000..8e60f1109 --- /dev/null +++ b/mail/spamassassin @@ -0,0 +1 @@ +../spamassassin \ No newline at end of file diff --git a/passwd b/passwd index 18a3a40cc..a2df7aa7c 100644 --- a/passwd +++ b/passwd @@ -32,3 +32,4 @@ dovecot:x:111:117:Dovecot mail server,,,:/usr/lib/dovecot:/usr/sbin/nologin dovenull:x:112:118:Dovecot login user,,,:/nonexistent:/usr/sbin/nologin opendkim:x:113:119::/var/run/opendkim:/usr/sbin/nologin amavis:x:114:120:AMaViS system user,,,:/var/lib/amavis:/bin/sh +debian-spamd:x:115:121::/var/lib/spamassassin:/bin/sh diff --git a/passwd- b/passwd- index 29c30dda4..a2df7aa7c 100644 --- a/passwd- +++ b/passwd- @@ -31,4 +31,5 @@ vmail:x:1000:1000:vmail,,,:/var/vmail:/bin/bash dovecot:x:111:117:Dovecot mail server,,,:/usr/lib/dovecot:/usr/sbin/nologin dovenull:x:112:118:Dovecot login user,,,:/nonexistent:/usr/sbin/nologin opendkim:x:113:119::/var/run/opendkim:/usr/sbin/nologin -amavis:x:114:120::/var/lib/amavis:/bin/sh +amavis:x:114:120:AMaViS system user,,,:/var/lib/amavis:/bin/sh +debian-spamd:x:115:121::/var/lib/spamassassin:/bin/sh diff --git a/rc0.d/K01spamassassin b/rc0.d/K01spamassassin new file mode 120000 index 000000000..f3a6fff8a --- /dev/null +++ b/rc0.d/K01spamassassin @@ -0,0 +1 @@ +../init.d/spamassassin \ No newline at end of file diff --git a/rc1.d/K01spamassassin b/rc1.d/K01spamassassin new file mode 120000 index 000000000..f3a6fff8a --- /dev/null +++ b/rc1.d/K01spamassassin @@ -0,0 +1 @@ +../init.d/spamassassin \ No newline at end of file diff --git a/rc2.d/S01spamassassin b/rc2.d/S01spamassassin new file mode 120000 index 000000000..f3a6fff8a --- /dev/null +++ b/rc2.d/S01spamassassin @@ -0,0 +1 @@ +../init.d/spamassassin \ No newline at end of file diff --git a/rc3.d/S01spamassassin b/rc3.d/S01spamassassin new file mode 120000 index 000000000..f3a6fff8a --- /dev/null +++ b/rc3.d/S01spamassassin @@ -0,0 +1 @@ +../init.d/spamassassin \ No newline at end of file diff --git a/rc4.d/S01spamassassin b/rc4.d/S01spamassassin new file mode 120000 index 000000000..f3a6fff8a --- /dev/null +++ b/rc4.d/S01spamassassin @@ -0,0 +1 @@ +../init.d/spamassassin \ No newline at end of file diff --git a/rc5.d/S01spamassassin b/rc5.d/S01spamassassin new file mode 120000 index 000000000..f3a6fff8a --- /dev/null +++ b/rc5.d/S01spamassassin @@ -0,0 +1 @@ +../init.d/spamassassin \ No newline at end of file diff --git a/rc6.d/K01spamassassin b/rc6.d/K01spamassassin new file mode 120000 index 000000000..f3a6fff8a --- /dev/null +++ b/rc6.d/K01spamassassin @@ -0,0 +1 @@ +../init.d/spamassassin \ No newline at end of file diff --git a/shadow b/shadow index dfac7b54d..1c0ef49d1 100644 --- a/shadow +++ b/shadow @@ -32,3 +32,4 @@ dovecot:*:17840:0:99999:7::: dovenull:*:17840:0:99999:7::: opendkim:*:17840:0:99999:7::: amavis:*:17840:0:99999:7::: +debian-spamd:*:17840:0:99999:7::: diff --git a/shadow- b/shadow- index dfac7b54d..1c0ef49d1 100644 --- a/shadow- +++ b/shadow- @@ -32,3 +32,4 @@ dovecot:*:17840:0:99999:7::: dovenull:*:17840:0:99999:7::: opendkim:*:17840:0:99999:7::: amavis:*:17840:0:99999:7::: +debian-spamd:*:17840:0:99999:7::: diff --git a/spamassassin/65_debian.cf b/spamassassin/65_debian.cf new file mode 100644 index 000000000..c92da6f75 --- /dev/null +++ b/spamassassin/65_debian.cf @@ -0,0 +1,34 @@ +# Special SpamAssassin rules for Debian +# Duncan Findlay + +header D_SENT_BY_DEBCONF Subject =~ /^Debconf:/ +score D_SENT_BY_DEBCONF -5.0 +describe D_SENT_BY_DEBCONF Sent by Debconf + +body D_SENT_BY_AFBACKUP /^\[Afbackup\]: Overall exit status:/ +score D_SENT_BY_AFBACKUP -5.0 +describe D_SENT_BY_AFBACKUP Sent by Afbackup + +header D_SENT_BY_APTLC Subject =~ /^apt-listchanges: (changelogs|news) for/ +score D_SENT_BY_APTLC -5.0 +describe D_SENT_BY_APTLC Sent by apt-listchanges + +header __ANACRON_SUBJ Subject =~ /^Anacron job '[a-z0-9_.-]+' on/i +header __ANACRON_FROM From =~ /^Anacron/ +meta D_SENT_BY_ANACRON __ANACRON_SUBJ && __ANACRON_FROM +score D_SENT_BY_ANACRON -5.0 +describe D_SENT_BY_ANACRON Sent by Anacron Daemon + + +header __CRON_FROM From =~ /^Cron Daemon/ +header __CRON_HEADER X-Cron-Env =~ /./ +meta D_SENT_BY_CRON __CRON_FROM && __CRON_HEADER +score D_SENT_BY_CRON -5.0 +describe D_SENT_BY_CRON Sent by Cron Daemon + +# As documented in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=861671, +# the bb.barracudacentral.org blacklist requires users to register, making it +# unsuitable for use in the default configuration. If you've registered your +# use of this blacklist, remove the following line in order to re-activate +# this service: +score RCVD_IN_BRBL_LASTEXT 0 diff --git a/spamassassin/init.pre b/spamassassin/init.pre new file mode 100644 index 000000000..a330badc3 --- /dev/null +++ b/spamassassin/init.pre @@ -0,0 +1,36 @@ +# This is the right place to customize your installation of SpamAssassin. +# +# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be +# tweaked. +# +# This file contains plugin activation commands for plugins included +# in SpamAssassin 3.0.x releases. It will not be installed if you +# already have a file in place called "init.pre". +# +# There are now multiple files read to enable plugins in the +# /etc/mail/spamassassin directory; previously only one, "init.pre" was +# read. Now both "init.pre", "v310.pre", and any other files ending in +# ".pre" will be read. As future releases are made, new plugins will be +# added to new files, named according to the release they're added in. +########################################################################### + +# RelayCountry - add metadata for Bayes learning, marking the countries +# a message was relayed through +# +# Note: This requires the Geo::IP Perl module +# +# loadplugin Mail::SpamAssassin::Plugin::RelayCountry + +# URIDNSBL - look up URLs found in the message against several DNS +# blocklists. +# +loadplugin Mail::SpamAssassin::Plugin::URIDNSBL + +# Hashcash - perform hashcash verification. +# +loadplugin Mail::SpamAssassin::Plugin::Hashcash + +# SPF - perform SPF verification. +# +loadplugin Mail::SpamAssassin::Plugin::SPF + diff --git a/spamassassin/local.cf b/spamassassin/local.cf new file mode 100644 index 000000000..95bc49419 --- /dev/null +++ b/spamassassin/local.cf @@ -0,0 +1,89 @@ +# This is the right place to customize your installation of SpamAssassin. +# +# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be +# tweaked. +# +# Only a small subset of options are listed below +# +########################################################################### + +# Add *****SPAM***** to the Subject header of spam e-mails +# +# rewrite_header Subject *****SPAM***** + + +# Save spam messages as a message/rfc822 MIME attachment instead of +# modifying the original message (0: off, 2: use text/plain instead) +# +# report_safe 1 + + +# Set which networks or hosts are considered 'trusted' by your mail +# server (i.e. not spammers) +# +# trusted_networks 212.17.35. + + +# Set file-locking method (flock is not safe over NFS, but is faster) +# +# lock_method flock + + +# Set the threshold at which a message is considered spam (default: 5.0) +# +# required_score 5.0 + + +# Use Bayesian classifier (default: 1) +# +# use_bayes 1 + + +# Bayesian classifier auto-learning (default: 1) +# +# bayes_auto_learn 1 + + +# Set headers which may provide inappropriate cues to the Bayesian +# classifier +# +# bayes_ignore_header X-Bogosity +# bayes_ignore_header X-Spam-Flag +# bayes_ignore_header X-Spam-Status + + +# Whether to decode non- UTF-8 and non-ASCII textual parts and recode +# them to UTF-8 before the text is given over to rules processing. +# +# normalize_charset 1 + +# Some shortcircuiting, if the plugin is enabled +# +ifplugin Mail::SpamAssassin::Plugin::Shortcircuit +# +# default: strongly-whitelisted mails are *really* whitelisted now, if the +# shortcircuiting plugin is active, causing early exit to save CPU load. +# Uncomment to turn this on +# +# shortcircuit USER_IN_WHITELIST on +# shortcircuit USER_IN_DEF_WHITELIST on +# shortcircuit USER_IN_ALL_SPAM_TO on +# shortcircuit SUBJECT_IN_WHITELIST on + +# the opposite; blacklisted mails can also save CPU +# +# shortcircuit USER_IN_BLACKLIST on +# shortcircuit USER_IN_BLACKLIST_TO on +# shortcircuit SUBJECT_IN_BLACKLIST on + +# if you have taken the time to correctly specify your "trusted_networks", +# this is another good way to save CPU +# +# shortcircuit ALL_TRUSTED on + +# and a well-trained bayes DB can save running rules, too +# +# shortcircuit BAYES_99 spam +# shortcircuit BAYES_00 ham + +endif # Mail::SpamAssassin::Plugin::Shortcircuit diff --git a/spamassassin/sa-compile.pre b/spamassassin/sa-compile.pre new file mode 100644 index 000000000..e20236afb --- /dev/null +++ b/spamassassin/sa-compile.pre @@ -0,0 +1,3 @@ +# Rule2XSBody - speedup by compilation of ruleset to native code +# +loadplugin Mail::SpamAssassin::Plugin::Rule2XSBody diff --git a/spamassassin/v310.pre b/spamassassin/v310.pre new file mode 100644 index 000000000..56e5b2ff2 --- /dev/null +++ b/spamassassin/v310.pre @@ -0,0 +1,78 @@ +# This is the right place to customize your installation of SpamAssassin. +# +# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be +# tweaked. +# +# This file was installed during the installation of SpamAssassin 3.1.0, +# and contains plugin loading commands for the new plugins added in that +# release. It will not be overwritten during future SpamAssassin installs, +# so you can modify it to enable some disabled-by-default plugins below, +# if you so wish. +# +# There are now multiple files read to enable plugins in the +# /etc/mail/spamassassin directory; previously only one, "init.pre" was +# read. Now both "init.pre", "v310.pre", and any other files ending in +# ".pre" will be read. As future releases are made, new plugins will be +# added to new files, named according to the release they're added in. +########################################################################### + +# DCC - perform DCC message checks. +# +# DCC is disabled here because it is not open source. See the DCC +# license for more details. +# +#loadplugin Mail::SpamAssassin::Plugin::DCC + +# Pyzor - perform Pyzor message checks. +# +loadplugin Mail::SpamAssassin::Plugin::Pyzor + +# Razor2 - perform Razor2 message checks. +# +loadplugin Mail::SpamAssassin::Plugin::Razor2 + +# SpamCop - perform SpamCop message reporting +# +loadplugin Mail::SpamAssassin::Plugin::SpamCop + +# AntiVirus - some simple anti-virus checks, this is not a replacement +# for an anti-virus filter like Clam AntiVirus +# +#loadplugin Mail::SpamAssassin::Plugin::AntiVirus + +# AWL - do auto-whitelist checks +# +#loadplugin Mail::SpamAssassin::Plugin::AWL + +# AutoLearnThreshold - threshold-based discriminator for Bayes auto-learning +# +loadplugin Mail::SpamAssassin::Plugin::AutoLearnThreshold + +# TextCat - language guesser +# +#loadplugin Mail::SpamAssassin::Plugin::TextCat + +# AccessDB - lookup from-addresses in access database +# +#loadplugin Mail::SpamAssassin::Plugin::AccessDB + +# WhitelistSubject - Whitelist/Blacklist certain subject regular expressions +# +loadplugin Mail::SpamAssassin::Plugin::WhiteListSubject + +########################################################################### +# experimental plugins + +# DomainKeys - perform DomainKeys verification +# +# This plugin has been removed as of v3.3.0. Use the DKIM plugin instead, +# which supports both Domain Keys and DKIM. + +# MIMEHeader - apply regexp rules against MIME headers in the message +# +loadplugin Mail::SpamAssassin::Plugin::MIMEHeader + +# ReplaceTags +# +loadplugin Mail::SpamAssassin::Plugin::ReplaceTags + diff --git a/spamassassin/v312.pre b/spamassassin/v312.pre new file mode 100644 index 000000000..cba5d7dbc --- /dev/null +++ b/spamassassin/v312.pre @@ -0,0 +1,29 @@ +# This is the right place to customize your installation of SpamAssassin. +# +# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be +# tweaked. +# +# This file was installed during the installation of SpamAssassin 3.1.2, +# and contains plugin loading commands for the new plugins added in that +# release. It will not be overwritten during future SpamAssassin installs, +# so you can modify it to enable some disabled-by-default plugins below, +# if you so wish. +# +# There are now multiple files read to enable plugins in the +# /etc/mail/spamassassin directory; previously only one, "init.pre" was +# read. Now both "init.pre", "v310.pre", and any other files ending in +# ".pre" will be read. As future releases are made, new plugins will be +# added to new files, named according to the release they're added in. + +########################################################################### +# experimental plugins + +# DKIM - perform DKIM verification +# +# Mail::DKIM module required for use, see INSTALL for more information. +# +# Note that if C version 0.20 or later is installed, this +# renders the DomainKeys plugin redundant. +# +loadplugin Mail::SpamAssassin::Plugin::DKIM + diff --git a/spamassassin/v320.pre b/spamassassin/v320.pre new file mode 100644 index 000000000..846c73ab2 --- /dev/null +++ b/spamassassin/v320.pre @@ -0,0 +1,64 @@ +# This is the right place to customize your installation of SpamAssassin. +# +# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be +# tweaked. +# +# This file was installed during the installation of SpamAssassin 3.2.0, +# and contains plugin loading commands for the new plugins added in that +# release. It will not be overwritten during future SpamAssassin installs, +# so you can modify it to enable some disabled-by-default plugins below, +# if you so wish. +# +# There are now multiple files read to enable plugins in the +# /etc/mail/spamassassin directory; previously only one, "init.pre" was +# read. Now both "init.pre", "v310.pre", and any other files ending in +# ".pre" will be read. As future releases are made, new plugins will be +# added to new files, named according to the release they're added in. +########################################################################### + +# Check - Provides main check functionality +# +loadplugin Mail::SpamAssassin::Plugin::Check + +# HTTPSMismatch - find URI mismatches between href and anchor text +# +loadplugin Mail::SpamAssassin::Plugin::HTTPSMismatch + +# URIDetail - test URIs using detailed URI information +# +loadplugin Mail::SpamAssassin::Plugin::URIDetail + +# Shortcircuit - stop evaluation early if high-accuracy rules fire +# +# loadplugin Mail::SpamAssassin::Plugin::Shortcircuit + +# Plugins which used to be EvalTests.pm +# broken out into separate plugins +loadplugin Mail::SpamAssassin::Plugin::Bayes +loadplugin Mail::SpamAssassin::Plugin::BodyEval +loadplugin Mail::SpamAssassin::Plugin::DNSEval +loadplugin Mail::SpamAssassin::Plugin::HTMLEval +loadplugin Mail::SpamAssassin::Plugin::HeaderEval +loadplugin Mail::SpamAssassin::Plugin::MIMEEval +loadplugin Mail::SpamAssassin::Plugin::RelayEval +loadplugin Mail::SpamAssassin::Plugin::URIEval +loadplugin Mail::SpamAssassin::Plugin::WLBLEval + +# VBounce - anti-bounce-message rules, see rules/20_vbounce.cf +# +loadplugin Mail::SpamAssassin::Plugin::VBounce + +# Rule2XSBody - speedup by compilation of ruleset to native code +# +# loadplugin Mail::SpamAssassin::Plugin::Rule2XSBody + +# ASN - Look up the Autonomous System Number of the connecting IP +# and create a header containing ASN data for bayes tokenization. +# See plugin's POD docs for usage info. +# +# loadplugin Mail::SpamAssassin::Plugin::ASN + +# ImageInfo - rules to match metadata of image attachments +# +loadplugin Mail::SpamAssassin::Plugin::ImageInfo + diff --git a/spamassassin/v330.pre b/spamassassin/v330.pre new file mode 100644 index 000000000..1e2335a60 --- /dev/null +++ b/spamassassin/v330.pre @@ -0,0 +1,28 @@ +# This is the right place to customize your installation of SpamAssassin. +# +# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be +# tweaked. +# +# This file was installed during the installation of SpamAssassin 3.3.0, +# and contains plugin loading commands for the new plugins added in that +# release. It will not be overwritten during future SpamAssassin installs, +# so you can modify it to enable some disabled-by-default plugins below, +# if you so wish. +# +# There are now multiple files read to enable plugins in the +# /etc/mail/spamassassin directory; previously only one, "init.pre" was +# read. Now both "init.pre", "v310.pre", and any other files ending in +# ".pre" will be read. As future releases are made, new plugins will be +# added to new files, named according to the release they're added in. +########################################################################### + +# PhishTag - allows sites to rewrite suspect phish-mail URLs +# (Note: this requires configuration, see http://umut.topkara.org/PhishTag) +# +#loadplugin Mail::SpamAssassin::Plugin::PhishTag + +# FreeMail - detect email addresses using free webmail services, +# usable as input for other rules +# +loadplugin Mail::SpamAssassin::Plugin::FreeMail + diff --git a/spamassassin/v340.pre b/spamassassin/v340.pre new file mode 100644 index 000000000..cf7beb1b5 --- /dev/null +++ b/spamassassin/v340.pre @@ -0,0 +1,21 @@ +# This is the right place to customize your installation of SpamAssassin. +# +# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be +# tweaked. +# +# This file was installed during the installation of SpamAssassin 3.4.0, +# and contains plugin loading commands for the new plugins added in that +# release. It will not be overwritten during future SpamAssassin installs, +# so you can modify it to enable some disabled-by-default plugins below, +# if you so wish. +# +# There are now multiple files read to enable plugins in the +# /etc/mail/spamassassin directory; previously only one, "init.pre" was +# read. Now both "init.pre", "v310.pre", and any other files ending in +# ".pre" will be read. As future releases are made, new plugins will be +# added to new files, named according to the release they're added in. +########################################################################### + +# AskDNS - forms a DNS query based on 'tags' as supplied by other plugins +# +loadplugin Mail::SpamAssassin::Plugin::AskDNS diff --git a/spamassassin/v341.pre b/spamassassin/v341.pre new file mode 100644 index 000000000..489dd4c37 --- /dev/null +++ b/spamassassin/v341.pre @@ -0,0 +1,28 @@ +# This is the right place to customize your installation of SpamAssassin. +# +# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be +# tweaked. +# +# This file was installed during the installation of SpamAssassin 3.4.1, +# and contains plugin loading commands for the new plugins added in that +# release. It will not be overwritten during future SpamAssassin installs, +# so you can modify it to enable some disabled-by-default plugins below, +# if you so wish. +# +# There are now multiple files read to enable plugins in the +# /etc/mail/spamassassin directory; previously only one, "init.pre" was +# read. Now both "init.pre", "v310.pre", and any other files ending in +# ".pre" will be read. As future releases are made, new plugins will be +# added to new files, named according to the release they're added in. +########################################################################### + +# TxRep - Reputation database that replaces AWL +# loadplugin Mail::SpamAssassin::Plugin::TxRep + +# URILocalBL - Provides ISP and Country code based filtering as well as +# quick IP based blocks without a full RBL implementation - Bug 7060 + +# loadplugin Mail::SpamAssassin::Plugin::URILocalBL + +# PDFInfo - Use several methods to detect a PDF file's ham/spam traits +# loadplugin Mail::SpamAssassin::Plugin::PDFInfo -- 2.43.0