diff options
author | Doug Barton <dougb@FreeBSD.org> | 2003-01-30 10:58:07 +0000 |
---|---|---|
committer | Doug Barton <dougb@FreeBSD.org> | 2003-01-30 10:58:07 +0000 |
commit | c6c698d792a66bfe341d49a031c4fc4b7a180e78 (patch) | |
tree | 527ed191b707f08362274f8b0608bd515a7e84da /mail/p5-Mail-SpamAssassin-snapshot | |
parent | - fix isWarning (diff) |
Re-generate to match newer code
Notes
Notes:
svn path=/head/; revision=74269
Diffstat (limited to 'mail/p5-Mail-SpamAssassin-snapshot')
-rw-r--r-- | mail/p5-Mail-SpamAssassin-snapshot/files/patch-use_dcc-option | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/mail/p5-Mail-SpamAssassin-snapshot/files/patch-use_dcc-option b/mail/p5-Mail-SpamAssassin-snapshot/files/patch-use_dcc-option index e806dcd0567c..b0a0714b75ec 100644 --- a/mail/p5-Mail-SpamAssassin-snapshot/files/patch-use_dcc-option +++ b/mail/p5-Mail-SpamAssassin-snapshot/files/patch-use_dcc-option @@ -1,19 +1,19 @@ -diff -ur ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Conf.pm ./lib/Mail/SpamAssassin/Conf.pm ---- ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Conf.pm Fri Oct 4 05:54:15 2002 -+++ ./lib/Mail/SpamAssassin/Conf.pm Thu Oct 17 22:12:05 2002 -@@ -144,6 +144,9 @@ - $self->{user_rules_to_compile} = 0; - $self->{fold_headers} = 1; +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->{use_dcc} = 1; + $self->{dcc_path} = undef; # Browse PATH $self->{dcc_body_max} = 999999; $self->{dcc_fuz1_max} = 999999; -@@ -763,6 +766,16 @@ +@@ -1249,6 +1251,16 @@ - if (/^rbl[-_]timeout\s+(\d+)$/) { + if (/^rbl_timeout\s+(\d+)$/) { $self->{rbl_timeout} = $1+0; next; + } + @@ -23,15 +23,15 @@ diff -ur ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Conf.pm ./lib/Mail/Spam + +=cut + -+ if (/^use[-_]dcc\s+(\d+)$/) { ++ if (/^use_dcc\s+(\d+)$/) { + $self->{use_dcc} = $1+0; next; } - =item ok_locales xx [ yy zz ... ] (default: all) -diff -ur ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Dns.pm ./lib/Mail/SpamAssassin/Dns.pm ---- ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Dns.pm Fri Oct 4 05:54:16 2002 -+++ ./lib/Mail/SpamAssassin/Dns.pm Thu Oct 17 22:12:51 2002 -@@ -449,6 +449,9 @@ + =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) = @_; @@ -41,7 +41,7 @@ diff -ur ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Dns.pm ./lib/Mail/SpamA if ($self->{main}->{local_tests_only}) { dbg ("local tests only, ignoring DCC"); return 0; -@@ -476,6 +479,10 @@ +@@ -532,6 +535,10 @@ sub dcc_lookup { my ($self, $fulltext) = @_; @@ -52,10 +52,10 @@ diff -ur ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Dns.pm ./lib/Mail/SpamA my $response = undef; my %count; my $left; -diff -ur ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/EvalTests.pm ./lib/Mail/SpamAssassin/EvalTests.pm ---- ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/EvalTests.pm Fri Oct 4 05:54:16 2002 -+++ ./lib/Mail/SpamAssassin/EvalTests.pm Thu Oct 17 22:10:46 2002 -@@ -2026,6 +2026,9 @@ +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) = @_; @@ -65,10 +65,10 @@ diff -ur ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/EvalTests.pm ./lib/Mail return 0 unless ($self->is_dcc_available()); return 0 if ($self->{already_checked_dcc}); -diff -ur ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Reporter.pm ./lib/Mail/SpamAssassin/Reporter.pm ---- ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Reporter.pm Mon Oct 14 09:44:35 2002 -+++ ./lib/Mail/SpamAssassin/Reporter.pm Thu Oct 17 22:13:19 2002 -@@ -238,6 +238,9 @@ +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) = @_; @@ -78,16 +78,16 @@ diff -ur ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Reporter.pm ./lib/Mail/ if ($self->{main}->{local_tests_only}) { dbg ("local tests only, ignoring DCC"); return 0; -diff -ur ../Mail-SpamAssassin-2.43/rules/10_misc.cf ./rules/10_misc.cf ---- ../Mail-SpamAssassin-2.43/rules/10_misc.cf Thu Sep 26 03:50:25 2002 -+++ ./rules/10_misc.cf Thu Oct 17 22:10:46 2002 -@@ -107,6 +107,9 @@ - # test, so it is set to "all" so the test will not be used by default. - ok_languages all +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 .prefs file for explanations. - + # unless the user override them. See the user_prefs.template file for + # explanations. |