1 |
jcrisp |
1.1 |
diff -ruN Mail-SpamAssassin-4.0.0.old/lib/Mail/SpamAssassin/Plugin/Razor2.pm Mail-SpamAssassin-4.0.0/lib/Mail/SpamAssassin/Plugin/Razor2.pm |
2 |
|
|
--- Mail-SpamAssassin-4.0.0.old/lib/Mail/SpamAssassin/Plugin/Razor2.pm 2023-02-14 10:53:50.114090965 +0000 |
3 |
|
|
+++ Mail-SpamAssassin-4.0.0/lib/Mail/SpamAssassin/Plugin/Razor2.pm 2023-02-14 10:57:47.790054543 +0000 |
4 |
|
|
@@ -185,7 +185,9 @@ |
5 |
|
|
$rc->{opt} = { |
6 |
|
|
debug => (would_log('dbg', $debug) > 1), |
7 |
|
|
foreground => 1, |
8 |
|
|
- config => $self->{main}->{conf}->{razor_config} |
9 |
|
|
+ config => $self->{main}->{conf}->{razor_config}, |
10 |
|
|
+ logfile => $self->{main}->{razor_log_file}, |
11 |
|
|
+ razorhome => $self->{main}->{razor_home_dir} |
12 |
|
|
}; |
13 |
|
|
# no facility prefix on this die |
14 |
|
|
$rc->do_conf() or die "$debug: " . $rc->errstr; |
15 |
|
|
diff -ruN Mail-SpamAssassin-4.0.0.old/spamd/spamd.raw Mail-SpamAssassin-4.0.0/spamd/spamd.raw |
16 |
|
|
--- Mail-SpamAssassin-4.0.0.old/spamd/spamd.raw 2023-02-14 10:53:50.110090898 +0000 |
17 |
|
|
+++ Mail-SpamAssassin-4.0.0/spamd/spamd.raw 2023-02-14 10:59:43.150978995 +0000 |
18 |
|
|
@@ -378,6 +378,8 @@ |
19 |
|
|
# Parse the command line |
20 |
|
|
Getopt::Long::Configure("bundling"); |
21 |
|
|
GetOptions( |
22 |
|
|
+ 'razor-home-dir=s' => \$opt{'razor_home_dir'}, |
23 |
|
|
+ 'razor-log-file=s' => \$opt{'razor_log_file'}, |
24 |
|
|
'allow-tell' => \$opt{'tell'}, |
25 |
|
|
'allowed-ips|A=s' => \@{ $opt{'allowed-ip'} }, |
26 |
|
|
'configpath|C=s' => \$opt{'configpath'}, |
27 |
|
|
@@ -1195,6 +1197,8 @@ |
28 |
|
|
|
29 |
|
|
my $spamtest = Mail::SpamAssassin->new( |
30 |
|
|
{ |
31 |
|
|
+ razor_home_dir => $opt{'razor_home_dir'}, |
32 |
|
|
+ razor_log_file => $opt{'razor_log_file'}, |
33 |
|
|
dont_copy_prefs => $dontcopy, |
34 |
|
|
rules_filename => ( $opt{'configpath'} || 0 ), |
35 |
|
|
site_rules_filename => ( $opt{'siteconfigpath'} || 0 ), |