D'oh! The developers added a use_dcc option, so this patch is now obsolete

This commit is contained in:
Doug Barton 2003-01-30 12:11:42 +00:00
parent 1f7c63303b
commit e3a75e6845
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=74275

View file

@ -1,93 +0,0 @@
diff -ur ../Mail-SpamAssassin-2.50-clean/lib/Mail/SpamAssassin/Conf.pm ./lib/Mail/SpamAssassin/Conf.pm
--- ../Mail-SpamAssassin-2.50-clean/lib/Mail/SpamAssassin/Conf.pm Tue Jan 28 17:25:14 2003
+++ ./lib/Mail/SpamAssassin/Conf.pm Thu Jan 30 01:52:31 2003
@@ -157,7 +157,9 @@
$self->{always_add_headers} = 1;
$self->{always_add_report} = 0;
+ # Added by FreeBSD ports
$self->{use_dcc} = 1;
+
$self->{dcc_path} = undef; # Browse PATH
$self->{dcc_body_max} = 999999;
$self->{dcc_fuz1_max} = 999999;
@@ -1249,6 +1251,16 @@
if (/^rbl_timeout\s+(\d+)$/) {
$self->{rbl_timeout} = $1+0; next;
+ }
+
+=item use_dcc { 0 | 1 } (default: 1)
+
+Should we use dccproc, or not.
+
+=cut
+
+ if (/^use_dcc\s+(\d+)$/) {
+ $self->{use_dcc} = $1+0; next;
}
=item check_mx_attempts n (default: 2)
diff -ur ../Mail-SpamAssassin-2.50-clean/lib/Mail/SpamAssassin/Dns.pm ./lib/Mail/SpamAssassin/Dns.pm
--- ../Mail-SpamAssassin-2.50-clean/lib/Mail/SpamAssassin/Dns.pm Mon Jan 27 17:24:26 2003
+++ ./lib/Mail/SpamAssassin/Dns.pm Thu Jan 30 01:47:46 2003
@@ -510,6 +510,9 @@
sub is_dcc_available {
my ($self) = @_;
+ # Added by FreeBSD ports
+ return 0 unless $self->{conf}->{use_dcc};
+
if ($self->{main}->{local_tests_only}) {
dbg ("local tests only, ignoring DCC");
return 0;
@@ -532,6 +535,10 @@
sub dcc_lookup {
my ($self, $fulltext) = @_;
+
+ # Added by FreeBSD ports
+ return 0 unless $self->{conf}->{use_dcc};
+
my $response = undef;
my %count;
my $left;
diff -ur ../Mail-SpamAssassin-2.50-clean/lib/Mail/SpamAssassin/EvalTests.pm ./lib/Mail/SpamAssassin/EvalTests.pm
--- ../Mail-SpamAssassin-2.50-clean/lib/Mail/SpamAssassin/EvalTests.pm Wed Jan 29 17:24:00 2003
+++ ./lib/Mail/SpamAssassin/EvalTests.pm Thu Jan 30 01:47:46 2003
@@ -2318,6 +2318,9 @@
sub check_dcc {
my ($self, $fulltext) = @_;
+ # Added by FreeBSD ports
+ return 0 unless $self->{conf}->{use_dcc};
+
return 0 unless ($self->is_dcc_available());
return 0 if ($self->{already_checked_dcc});
diff -ur ../Mail-SpamAssassin-2.50-clean/lib/Mail/SpamAssassin/Reporter.pm ./lib/Mail/SpamAssassin/Reporter.pm
--- ../Mail-SpamAssassin-2.50-clean/lib/Mail/SpamAssassin/Reporter.pm Tue Jan 14 17:56:07 2003
+++ ./lib/Mail/SpamAssassin/Reporter.pm Thu Jan 30 01:47:46 2003
@@ -251,6 +251,9 @@
sub is_dcc_available {
my ($self) = @_;
+ # Added by FreeBSD ports
+ return 0 unless $self->{conf}->{use_dcc};
+
if ($self->{main}->{local_tests_only}) {
dbg ("local tests only, ignoring DCC");
return 0;
diff -ur ../Mail-SpamAssassin-2.50-clean/rules/10_misc.cf ./rules/10_misc.cf
--- ../Mail-SpamAssassin-2.50-clean/rules/10_misc.cf Fri Jan 3 17:40:43 2003
+++ ./rules/10_misc.cf Thu Jan 30 01:47:46 2003
@@ -127,6 +127,9 @@
# Set this to 0 to turn off auto-learning.
auto_learn 1
+# Added by FreeBSD ports
+use_dcc 0
+
# Some common prefs settings can be set here, to take effect site-wide
# unless the user override them. See the user_prefs.template file for
# explanations.