1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
diff -ur /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Conf.pm ./lib/Mail/SpamAssassin/Conf.pm
--- /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Conf.pm Mon Jun 10 00:59:38 2002
+++ ./lib/Mail/SpamAssassin/Conf.pm Sat Jun 15 01:35:42 2002
@@ -135,6 +135,8 @@
$self->{allow_user_rules} = 0;
$self->{user_rules_to_compile} = 0;
+ $self->{use_dcc} = 1;
+
$self->{dcc_body_max} = 999999;
$self->{dcc_fuz1_max} = 999999;
$self->{dcc_fuz2_max} = 999999;
@@ -613,6 +615,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 ok_locales xx [ yy zz ... ] (default: en)
diff -ur /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Dns.pm ./lib/Mail/SpamAssassin/Dns.pm
--- /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Dns.pm Wed Jun 12 02:10:43 2002
+++ ./lib/Mail/SpamAssassin/Dns.pm Sat Jun 15 01:37:22 2002
@@ -301,6 +301,10 @@
sub is_dcc_available {
my ($self) = @_;
+
+ # Added by FreeBSD ports
+ return 0 unless $self->{conf}->{use_dcc};
+
my (@resp);
if ($self->{main}->{local_tests_only}) {
@@ -324,6 +328,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 /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/EvalTests.pm ./lib/Mail/SpamAssassin/EvalTests.pm
--- /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/EvalTests.pm Fri Jun 14 10:21:47 2002
+++ ./lib/Mail/SpamAssassin/EvalTests.pm Sat Jun 15 01:37:34 2002
@@ -1430,6 +1430,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 /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Reporter.pm ./lib/Mail/SpamAssassin/Reporter.pm
--- /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Reporter.pm Fri Jun 14 11:52:17 2002
+++ ./lib/Mail/SpamAssassin/Reporter.pm Sat Jun 15 00:56:39 2002
@@ -147,6 +147,10 @@
sub is_dcc_available {
my ($self) = @_;
+
+ # Added by FreeBSD ports
+ return 0 unless $self->{conf}->{use_dcc};
+
my (@resp);
if ($self->{main}->{local_tests_only}) {
diff -ur /usr/local/home/doug/Mail-SpamAssassin-2.30/rules/10_misc.cf ./rules/10_misc.cf
--- /usr/local/home/doug/Mail-SpamAssassin-2.30/rules/10_misc.cf Thu May 30 19:12:10 2002
+++ ./rules/10_misc.cf Sat Jun 15 00:56:39 2002
@@ -102,6 +102,9 @@
# test, so it is set to "all" so the test will not be used by default.
ok_languages all
+# 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 .prefs file for explanations.
|
