import spamassassin-3.4.2-6.el8
This commit is contained in:
commit
3394aabca1
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
SOURCES/Mail-SpamAssassin-3.4.2.tar.bz2
|
||||
SOURCES/Mail-SpamAssassin-rules-3.4.2.r1840640.tgz
|
2
.spamassassin.metadata
Normal file
2
.spamassassin.metadata
Normal file
@ -0,0 +1,2 @@
|
||||
9d3128dfe943be5e429edbd77883179138f40536 SOURCES/Mail-SpamAssassin-3.4.2.tar.bz2
|
||||
c93006e1572297f816a0e186a98cbbae246a4945 SOURCES/Mail-SpamAssassin-rules-3.4.2.r1840640.tgz
|
44
SOURCES/0001-Drop-the-ResourceLimits-plugin.patch
Normal file
44
SOURCES/0001-Drop-the-ResourceLimits-plugin.patch
Normal file
@ -0,0 +1,44 @@
|
||||
diff --git a/MANIFEST b/MANIFEST
|
||||
index 95e2af5..d1aa471 100644
|
||||
--- a/MANIFEST
|
||||
+++ b/MANIFEST
|
||||
@@ -100,7 +100,6 @@ lib/Mail/SpamAssassin/Plugin/Pyzor.pm
|
||||
lib/Mail/SpamAssassin/Plugin/Razor2.pm
|
||||
lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
|
||||
lib/Mail/SpamAssassin/Plugin/RelayEval.pm
|
||||
-lib/Mail/SpamAssassin/Plugin/ResourceLimits.pm
|
||||
lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm
|
||||
lib/Mail/SpamAssassin/Plugin/Reuse.pm
|
||||
lib/Mail/SpamAssassin/Plugin/Rule2XSBody.pm
|
||||
diff --git a/lib/Mail/SpamAssassin/Util/DependencyInfo.pm b/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
|
||||
index 7467744..3d92c7d 100644
|
||||
--- a/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
|
||||
+++ b/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
|
||||
@@ -257,12 +257,6 @@ our @OPTIONAL_MODULES = (
|
||||
check for both Net::DNS and Net::DNS::Nameserver. However,
|
||||
Net::DNS::Nameserver is only used in make test as of June 2014.',
|
||||
},
|
||||
-{
|
||||
- module => 'BSD::Resource',
|
||||
- version => 0,
|
||||
- desc => 'BSD::Resource provides BSD process resource limit and priority
|
||||
- functions. It is used by the optional ResourceLimits Plugin.',
|
||||
-},
|
||||
);
|
||||
|
||||
our @BINARIES = ();
|
||||
diff --git a/rules/v342.pre b/rules/v342.pre
|
||||
index 4ab7736..9b425fd 100644
|
||||
--- a/rules/v342.pre
|
||||
+++ b/rules/v342.pre
|
||||
@@ -19,10 +19,6 @@
|
||||
# HashBL - Use EBL email blocklist
|
||||
# loadplugin Mail::SpamAssassin::Plugin::HashBL
|
||||
|
||||
-# ResourceLimits - assure your spamd child processes
|
||||
-# do not exceed specified CPU or memory limit
|
||||
-# loadplugin Mail::SpamAssassin::Plugin::ResourceLimits
|
||||
-
|
||||
|
||||
# FromNameSpoof - help stop spam that tries to spoof other domains using
|
||||
# the from name
|
46
SOURCES/README.RHEL.Fedora
Normal file
46
SOURCES/README.RHEL.Fedora
Normal file
@ -0,0 +1,46 @@
|
||||
Notes for Spamassassin for RHEL or Fedora
|
||||
=========================================
|
||||
spamassassin-3.3.x RPM package for RHEL 5+ or Fedora 11+ contains some new
|
||||
functionality beyond the upstream spamassassin documentation.
|
||||
|
||||
Upstream spamassassin-3.3.0 is no longer distributed with rules. Our package
|
||||
contains rules in order to be less of a surprise to system administrators.
|
||||
However just as you wouldn't rely on antivirus software without signature
|
||||
updates, spamassassin cannot be relied upon without regular rule updates.
|
||||
|
||||
1) For these reasons, our RPM package now runs nightly sa-update by default.
|
||||
|
||||
/etc/cron.d/sa-update
|
||||
The default cron runs sa-update once every night. You may edit this cron
|
||||
file to change the schedule of sa-update or to disable it entirely. If you
|
||||
had modified this file in the past you may need to restore the new file
|
||||
from /etc/cron.d/sa-update.rpmnew
|
||||
|
||||
2) /usr/share/spamassassin/sa-update.cron
|
||||
This script is executed by cron. It runs sa-update only if a known spam
|
||||
daemon is running: spamd, amavisd, or mimedefang. If you do not run any
|
||||
of these spam daemons but wish to have nightly sa-update, you may
|
||||
override the daemon check in /etc/sysconfig/sa-update
|
||||
|
||||
3) /etc/mail/spamassassin/channel.d
|
||||
All sa-update channels are defined in files contained in this directory.
|
||||
See the existing config files as examples for writing your own config file.
|
||||
|
||||
4) SOUGHT Anti-Fraud Rule Channel is Enabled by Default
|
||||
http://wiki.apache.org/spamassassin/SoughtRules
|
||||
|
||||
General Warnings
|
||||
================
|
||||
* DO NOT USE SARE or OpenProtect rules. They are old and outdated, and
|
||||
can be dangerous. Many of the useful rules have been integrated into
|
||||
upstream spamassassin.
|
||||
|
||||
Note about -d option
|
||||
====================
|
||||
|
||||
With spamassassin 3.4.0, this package has switched the way spamd is started.
|
||||
You should no longer use the '-d' option in /etc/sysconfig/spamassassin. Doing
|
||||
so will result in spamd starting and stopping in a loop. The default
|
||||
/etc/sysconfig/spamassassin file has been adjusted for this, please merge
|
||||
this change into that file if you have made any changes to it.
|
||||
|
10
SOURCES/redhat_local.cf
Normal file
10
SOURCES/redhat_local.cf
Normal file
@ -0,0 +1,10 @@
|
||||
# These values can be overridden by editing ~/.spamassassin/user_prefs.cf
|
||||
# (see spamassassin(1) for details)
|
||||
|
||||
# These should be safe assumptions and allow for simple visual sifting
|
||||
# without risking lost emails.
|
||||
|
||||
required_hits 5
|
||||
report_safe 0
|
||||
rewrite_header Subject [SPAM]
|
||||
|
102
SOURCES/sa-update.cronscript
Normal file
102
SOURCES/sa-update.cronscript
Normal file
@ -0,0 +1,102 @@
|
||||
#!/bin/bash
|
||||
# *** DO NOT MODIFY THIS FILE ***
|
||||
#
|
||||
# /etc/mail/spamassassin/channel.d/*.conf
|
||||
# Place files here to add custom channels.
|
||||
#
|
||||
|
||||
# Proceed with sa-update if spam daemon is running or forced in /etc/sysconfig/sa-update
|
||||
unset SAUPDATE OPTIONS DEBUG NOTIFY_UPD
|
||||
[ -f /etc/sysconfig/sa-update ] && . /etc/sysconfig/sa-update
|
||||
[ "$SAUPDATE" = "no" ] && exit 0
|
||||
for daemon in mimedefang spamd amavisd spampd; do
|
||||
/usr/bin/pgrep -f $daemon >& /dev/null
|
||||
[ $? -eq 0 ] && SAUPDATE=yes
|
||||
done
|
||||
|
||||
# Skip sa-update if daemon not detected
|
||||
[ -z "$SAUPDATE" ] && exit 0
|
||||
|
||||
# sa-update must create keyring
|
||||
if [ ! -d /etc/mail/spamassassin/sa-update-keys ]; then
|
||||
sa-update
|
||||
fi
|
||||
|
||||
# Initialize Channels and Keys
|
||||
CHANNELLIST=""
|
||||
KEYLIST=""
|
||||
# Process each channel defined in /etc/mail/spamassassin/channel.d/
|
||||
for file in /etc/mail/spamassassin/channel.d/*.conf; do
|
||||
[ ! -f "$file" ] && continue
|
||||
# Validate config file
|
||||
PREFIXES="CHANNELURL KEYID BEGIN"
|
||||
for prefix in $PREFIXES; do
|
||||
if ! grep -q "$prefix" $file; then
|
||||
echo "ERROR: $file missing $prefix"
|
||||
exit 255
|
||||
fi
|
||||
done
|
||||
. "$file"
|
||||
#echo "CHANNELURL=$CHANNELURL"
|
||||
#echo "KEYID=$KEYID"
|
||||
CHANNELLIST="$CHANNELLIST $CHANNELURL"
|
||||
KEYLIST="$KEYLIST $KEYID"
|
||||
sa-update --import "$file"
|
||||
done
|
||||
|
||||
# Sleep random amount of time before proceeding to avoid overwhelming the servers
|
||||
sleep $(expr $RANDOM % 7200)
|
||||
|
||||
unset arglist
|
||||
# Run sa-update on each channel, restart spam daemon if success
|
||||
for channel in $CHANNELLIST; do
|
||||
arglist="$arglist --channel $channel"
|
||||
done
|
||||
for keyid in $KEYLIST; do
|
||||
arglist="$arglist --gpgkey $keyid"
|
||||
done
|
||||
/usr/bin/sa-update $OPTIONS $arglist
|
||||
status=$?
|
||||
now=`date +"%d-%b-%Y %T"`
|
||||
# cron runs this script tee /var/log/sa-update.log
|
||||
# We want to always write to the log, but only send mail
|
||||
# as configured.
|
||||
if [ $status -eq 0 ]; then
|
||||
if [ -n "$DEBUG" -o -n "$NOTIFY_UPD" ]; then
|
||||
echo "$now: SpamAssassin: Update processed successfully"
|
||||
else
|
||||
echo "$now: SpamAssassin: Update processed successfully" >>/var/log/sa-update.log
|
||||
fi
|
||||
if [ -f /usr/bin/systemctl ]; then
|
||||
systemctl condrestart spamassassin.service >& /dev/null
|
||||
[ -f /usr/lib/systemd/system/amavisd.service ] && systemctl condrestart amavisd.service >& /dev/null
|
||||
systemctl --quiet is-active mimedefang.service; [ $? -eq 0 ] && systemctl reload mimedefang.service >& /dev/null
|
||||
[ -f /usr/lib/systemd/system/spampd.service ] && systemctl condrestart spampd.service >& /dev/null
|
||||
else
|
||||
service spamassassin condrestart >& /dev/null
|
||||
[ -f /etc/rc.d/init.d/amavisd ] && service amavisd-new condrestart >& /dev/null
|
||||
[ -f /etc/rc.d/init.d/mimedefang ] && service mimedefang condrestart >& /dev/null
|
||||
[ -f /etc/rc.d/init.d/spampd ] && service spampd condrestart >& /dev/null
|
||||
fi
|
||||
|
||||
exit $status
|
||||
fi
|
||||
if [ $status -eq 1 ]; then
|
||||
if [ -n "$DEBUG" ]; then
|
||||
echo "$now: SpamAssassin: No update available"
|
||||
else
|
||||
echo "$now: SpamAssassin: No update available" >>/var/log/sa-update.log
|
||||
fi
|
||||
exit $status
|
||||
fi
|
||||
if [ $status -eq 2 ]; then
|
||||
echo "$now: SpamAssassin: Problem applying update - pre files failed lint check"
|
||||
exit $status
|
||||
fi
|
||||
if [ $status -eq 4 ]; then
|
||||
echo "$now: SpamAssassin: Update available, but download or extract failed"
|
||||
exit $status
|
||||
fi
|
||||
|
||||
echo "$now: SpamAssassin: Unknown error code $status from sa-update"
|
||||
exit $status
|
12
SOURCES/sa-update.crontab
Normal file
12
SOURCES/sa-update.crontab
Normal file
@ -0,0 +1,12 @@
|
||||
# *** DO NOT MODIFY THIS FILE ***
|
||||
### Spamassassin Rules Updates ###
|
||||
#
|
||||
# http://wiki.apache.org/spamassassin/RuleUpdates
|
||||
#
|
||||
# sa-update automatically updates your rules once per day if a spam daemon like
|
||||
# spamd or amavisd are running. You can force sa-update to run in
|
||||
# /etc/sysconfig/sa-update
|
||||
#
|
||||
# /var/log/sa-update.log contains a history log of sa-update runs
|
||||
|
||||
10 4 * * * root /usr/share/spamassassin/sa-update.cron 2>&1 | tee -a /var/log/sa-update.log
|
23
SOURCES/sa-update.force-sysconfig
Normal file
23
SOURCES/sa-update.force-sysconfig
Normal file
@ -0,0 +1,23 @@
|
||||
# sa-update configuration
|
||||
#
|
||||
# Note that the opposite of "yes" is the empty string, NOT "no"
|
||||
|
||||
# Don't run sa-update even if it's in /etc/cron.d/ - as installed
|
||||
#SAUPDATE=no
|
||||
|
||||
# Run sa-update even if no daemon is detected
|
||||
#SAUPDATE=yes
|
||||
|
||||
# Default: Run only if a daemon is detected
|
||||
|
||||
# Options for the actual sa-update command
|
||||
# These are added to the channel configuration from
|
||||
# /etc/mail/spamassassin/channel.d/*.conf
|
||||
# OPTIONS=-v
|
||||
|
||||
# Debug script - send mail even if no update available
|
||||
# DEBUG=yes
|
||||
|
||||
# Send mail when updates successfully processed
|
||||
# Default: send mail only on error
|
||||
#NOTIFY_UPD=yes
|
5
SOURCES/sa-update.logrotate
Normal file
5
SOURCES/sa-update.logrotate
Normal file
@ -0,0 +1,5 @@
|
||||
/var/log/sa-update.log {
|
||||
monthly
|
||||
notifempty
|
||||
missingok
|
||||
}
|
28
SOURCES/sa-update.service
Normal file
28
SOURCES/sa-update.service
Normal file
@ -0,0 +1,28 @@
|
||||
### Spamassassin Rules Updates ###
|
||||
#
|
||||
# http://wiki.apache.org/spamassassin/RuleUpdates
|
||||
#
|
||||
# sa-update automatically updates your rules once per day if a spam daemon like
|
||||
# spamd or amavisd are running.
|
||||
|
||||
[Unit]
|
||||
Description=Spamassassin Rules Update
|
||||
Documentation=man:sa-update(1)
|
||||
|
||||
[Service]
|
||||
# Note that the opposite of "yes" is the empty string, NOT "no"
|
||||
# Options for the actual sa-update command
|
||||
# These are added to the channel configuration from
|
||||
# /etc/mail/spamassassin/channel.d/*.conf
|
||||
Environment=OPTIONS=-v
|
||||
|
||||
# Debug script - send mail even if no update available
|
||||
#Environment=DEBUG=yes
|
||||
|
||||
# Send mail when updates successfully processed
|
||||
# Default: send mail only on error
|
||||
#Environment=NOTIFY_UPD=yes
|
||||
|
||||
ExecStart=/usr/share/spamassassin/sa-update.cron
|
||||
|
||||
SuccessExitStatus=1
|
16
SOURCES/sa-update.timer
Normal file
16
SOURCES/sa-update.timer
Normal file
@ -0,0 +1,16 @@
|
||||
### Spamassassin Rules Updates ###
|
||||
#
|
||||
# http://wiki.apache.org/spamassassin/RuleUpdates
|
||||
#
|
||||
# sa-update automatically updates your rules once per day if a spam daemon like
|
||||
# spamd or amavisd are running.
|
||||
|
||||
[Unit]
|
||||
Description=Spamassassin Rules Update timer
|
||||
Documentation=man:sa-update(1)
|
||||
|
||||
[Timer]
|
||||
OnCalendar=daily
|
||||
|
||||
[Install]
|
||||
WantedBy=spamassassin.service
|
47
SOURCES/sought.conf
Normal file
47
SOURCES/sought.conf
Normal file
@ -0,0 +1,47 @@
|
||||
# http://wiki.apache.org/spamassassin/SoughtRules
|
||||
CHANNELURL=sought.rules.yerp.org
|
||||
KEYID=6C6191E3
|
||||
# Ignore everything below.
|
||||
return 0
|
||||
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Version: GnuPG v1.4.1 (GNU/Linux)
|
||||
|
||||
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
|
||||
=nK43
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
12
SOURCES/spamassassin-3.3.2-gnupg2.patch
Normal file
12
SOURCES/spamassassin-3.3.2-gnupg2.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -Nur Mail-SpamAssassin-3.3.2.orig/sa-update.raw Mail-SpamAssassin-3.3.2/sa-update.raw
|
||||
--- Mail-SpamAssassin-3.3.2.orig/sa-update.raw 2011-06-06 17:59:19.000000000 -0600
|
||||
+++ Mail-SpamAssassin-3.3.2/sa-update.raw 2014-01-28 13:29:33.933526585 -0700
|
||||
@@ -281,7 +281,7 @@
|
||||
if ($GPG_ENABLED || $opt{'import'}) {
|
||||
# find GPG in the PATH
|
||||
# bug 4958: for *NIX it's "gpg", in Windows it's "gpg.exe"
|
||||
- $GPGPath = 'gpg' . $Config{_exe};
|
||||
+ $GPGPath = 'gpg2' . $Config{_exe};
|
||||
dbg("gpg: Searching for '$GPGPath'");
|
||||
|
||||
if ($GPGPath = Mail::SpamAssassin::Util::find_executable_in_env_path($GPGPath)) {
|
43
SOURCES/spamassassin-3.4.1-add-logfile-homedir-options.patch
Normal file
43
SOURCES/spamassassin-3.4.1-add-logfile-homedir-options.patch
Normal file
@ -0,0 +1,43 @@
|
||||
commit bb177c93c8852417fc5a522cbcc45abbab4b3c3d
|
||||
Author: Tomas Korbar <tomas.korb@seznam.cz>
|
||||
Date: Thu Jun 7 20:57:07 2018 +0200
|
||||
|
||||
Add razor log path and home directory option
|
||||
|
||||
diff --git a/lib/Mail/SpamAssassin/Plugin/Razor2.pm b/lib/Mail/SpamAssassin/Plugin/Razor2.pm
|
||||
index e24252c..935b3ac 100644
|
||||
--- a/lib/Mail/SpamAssassin/Plugin/Razor2.pm
|
||||
+++ b/lib/Mail/SpamAssassin/Plugin/Razor2.pm
|
||||
@@ -165,7 +165,9 @@ sub razor2_access {
|
||||
$rc->{opt} = {
|
||||
debug => (would_log('dbg', $debug) > 1),
|
||||
foreground => 1,
|
||||
- config => $self->{main}->{conf}->{razor_config}
|
||||
+ config => $self->{main}->{conf}->{razor_config},
|
||||
+ logfile => $self->{main}->{razor_log_file},
|
||||
+ razorhome => $self->{main}->{razor_home_dir}
|
||||
};
|
||||
# no facility prefix on this die
|
||||
$rc->do_conf() or die "$debug: " . $rc->errstr;
|
||||
diff --git a/spamd/spamd.raw b/spamd/spamd.raw
|
||||
index 821f658..2afd6bb 100755
|
||||
--- a/spamd/spamd.raw
|
||||
+++ b/spamd/spamd.raw
|
||||
@@ -361,6 +361,8 @@ prepare_for_sighup_restart();
|
||||
# Parse the command line
|
||||
Getopt::Long::Configure("bundling");
|
||||
GetOptions(
|
||||
+ 'razor-home-dir=s' => \$opt{'razor_home_dir'},
|
||||
+ 'razor-log-file=s' => \$opt{'razor_log_file'},
|
||||
'allow-tell' => \$opt{'tell'},
|
||||
'allowed-ips|A=s' => \@{ $opt{'allowed-ip'} },
|
||||
'auth-ident' => \$opt{'auth-ident'},
|
||||
@@ -1149,6 +1151,8 @@ if ( defined $opt{'pidfile'} ) {
|
||||
|
||||
my $spamtest = Mail::SpamAssassin->new(
|
||||
{
|
||||
+ razor_home_dir => $opt{'razor_home_dir'},
|
||||
+ razor_log_file => $opt{'razor_log_file'},
|
||||
dont_copy_prefs => $dontcopy,
|
||||
rules_filename => ( $opt{'configpath'} || 0 ),
|
||||
site_rules_filename => ( $opt{'siteconfigpath'} || 0 ),
|
1059
SOURCES/spamassassin-3.4.2-drop-geoip.patch
Normal file
1059
SOURCES/spamassassin-3.4.2-drop-geoip.patch
Normal file
File diff suppressed because it is too large
Load Diff
18
SOURCES/spamassassin-3.4.2-fix-file-handle-leaks.patch
Normal file
18
SOURCES/spamassassin-3.4.2-fix-file-handle-leaks.patch
Normal file
@ -0,0 +1,18 @@
|
||||
--- a/spamc/spamc.c 2018/10/02 16:54:17 1842644
|
||||
+++ b/spamc/spamc.c 2018/10/02 17:40:43 1842645
|
||||
@@ -616,6 +616,7 @@
|
||||
fprintf(stderr,"Exceeded max line size (%d) in %s\n",
|
||||
CONFIG_MAX_LINE_SIZE-2, config_file);
|
||||
}
|
||||
+ fclose(config);
|
||||
return EX_CONFIG;
|
||||
}
|
||||
|
||||
@@ -629,6 +630,7 @@
|
||||
if (*combo_argc >= COMBO_ARGV_SIZE) {
|
||||
fprintf(stderr,"Exceeded max number of arguments (%d) in %s\n",
|
||||
COMBO_ARGV_SIZE, config_file);
|
||||
+ fclose(config);
|
||||
return EX_CONFIG;
|
||||
}
|
||||
combo_argv[*combo_argc] = strdup(tok);
|
10
SOURCES/spamassassin-3.4.2-fix-use-after-free.patch
Normal file
10
SOURCES/spamassassin-3.4.2-fix-use-after-free.patch
Normal file
@ -0,0 +1,10 @@
|
||||
--- a/spamc/getopt.c 2018/09/20 06:52:49 1841432
|
||||
+++ b/spamc/getopt.c 2018/09/20 07:18:53 1841433
|
||||
@@ -274,7 +274,6 @@
|
||||
} else if(longopts[i].has_arg == optional_argument) {
|
||||
if(((spamc_optind < argc) && (argv[spamc_optind]) && (argv[spamc_optind][0] != '-')) ||
|
||||
(opt != NULL)) {
|
||||
- free(opt);
|
||||
if(opt != NULL) {
|
||||
spamc_optarg = opt;
|
||||
} else {
|
3
SOURCES/spamassassin-default.rc
Normal file
3
SOURCES/spamassassin-default.rc
Normal file
@ -0,0 +1,3 @@
|
||||
# send mail through spamassassin
|
||||
:0fw
|
||||
| /usr/bin/spamassassin
|
2
SOURCES/spamassassin-helper.sh
Executable file
2
SOURCES/spamassassin-helper.sh
Executable file
@ -0,0 +1,2 @@
|
||||
#!/bin/sh
|
||||
/usr/bin/spamassassin -e
|
86
SOURCES/spamassassin-official.conf
Normal file
86
SOURCES/spamassassin-official.conf
Normal file
@ -0,0 +1,86 @@
|
||||
# http://wiki.apache.org/spamassassin/RuleUpdates
|
||||
CHANNELURL=updates.spamassassin.org
|
||||
KEYID=5244EC45
|
||||
# Ignore everything below.
|
||||
return 0
|
||||
|
||||
This is the GPG key that updates are signed with (currently,
|
||||
as of Wed Dec 21 19:31:38 PST 2005. Please contact <dev /at/
|
||||
spamassassin.apache.org> with any questions.
|
||||
|
||||
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Version: GnuPG v1.4.2 (SunOS)
|
||||
|
||||
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
|
||||
aB8EKy5bg4U6
|
||||
=IbYW
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
3
SOURCES/spamassassin-spamc.rc
Normal file
3
SOURCES/spamassassin-spamc.rc
Normal file
@ -0,0 +1,3 @@
|
||||
# send mail through spamassassin
|
||||
:0fw
|
||||
| /usr/bin/spamc
|
14
SOURCES/spamassassin.service
Normal file
14
SOURCES/spamassassin.service
Normal file
@ -0,0 +1,14 @@
|
||||
[Unit]
|
||||
Description=Spamassassin daemon
|
||||
After=syslog.target network.target
|
||||
Wants=sa-update.timer
|
||||
|
||||
[Service]
|
||||
EnvironmentFile=-/etc/sysconfig/spamassassin
|
||||
ExecStart=/usr/bin/spamd $SPAMDOPTIONS
|
||||
StandardOutput=null
|
||||
StandardError=null
|
||||
Restart=always
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
2
SOURCES/spamassassin.sysconfig
Normal file
2
SOURCES/spamassassin.sysconfig
Normal file
@ -0,0 +1,2 @@
|
||||
# Options to spamd
|
||||
SPAMDOPTIONS="-c -m5 -H --razor-home-dir='/var/lib/razor/' --razor-log-file='sys-syslog'"
|
2
SOURCES/spamassassin.sysconfig.el
Normal file
2
SOURCES/spamassassin.sysconfig.el
Normal file
@ -0,0 +1,2 @@
|
||||
# Options to spamd
|
||||
SPAMDOPTIONS="-d -c -m5 -H --razor-home-dir='/var/lib/razor/' --razor-log-file='sys-syslog'"
|
1149
SPECS/spamassassin.spec
Normal file
1149
SPECS/spamassassin.spec
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user