You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
36 lines
1.7 KiB
Diff
36 lines
1.7 KiB
Diff
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
|
|
--- Mail-SpamAssassin-4.0.0.old/lib/Mail/SpamAssassin/Plugin/Razor2.pm 2023-02-14 10:53:50.114090965 +0000
|
|
+++ Mail-SpamAssassin-4.0.0/lib/Mail/SpamAssassin/Plugin/Razor2.pm 2023-02-14 10:57:47.790054543 +0000
|
|
@@ -185,7 +185,9 @@
|
|
$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 -ruN Mail-SpamAssassin-4.0.0.old/spamd/spamd.raw Mail-SpamAssassin-4.0.0/spamd/spamd.raw
|
|
--- Mail-SpamAssassin-4.0.0.old/spamd/spamd.raw 2023-02-14 10:53:50.110090898 +0000
|
|
+++ Mail-SpamAssassin-4.0.0/spamd/spamd.raw 2023-02-14 10:59:43.150978995 +0000
|
|
@@ -378,6 +378,8 @@
|
|
# 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'} },
|
|
'configpath|C=s' => \$opt{'configpath'},
|
|
@@ -1195,6 +1197,8 @@
|
|
|
|
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 ),
|