Re: [AMaViS-user] CRM114 spamassassin plugin
Am 05.08.2008 um 03:58 schrieb Martin Schütte: Jules M schrieb: If you want to try, my actual diff against v2.6.1 looks like this: If you do not mind I would like to publish that on the website. I did not find the time to update my own amavisd yet; that's why I still have no own patch for v2.6... Hi Martin, yes please feel free to do so, at least its all based on YOUR work. Thanks for that! The list strips attachments and Peter told me he had problems, probably due to line-breaks in the mail. So please grab the files from here: tejat.de/~neo/amavisd-stuff/ amavisd-2.6.1_crm114.patch is the patch itself. amavisd-new-2.6.1_crm114 is a already patched amavisd, chmod +x, rename it and copy it over your existing amavisd if you're brave. The other files are my current log_templ and my crm114.cf if anyone cares. regards Jules - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ AMaViS-user mailing list AMaViS-user@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/amavis-user AMaViS-FAQ:http://www.amavis.org/amavis-faq.php3 AMaViS-HowTos:http://www.amavis.org/howto/
[AMaViS-user] CRM114 spamassassin plugin
Hi, I would like to test the CRM114 spamassassin plugin. I have a question regarding this. Is it nessecary to patch amavisd-new to make this work - meaning make the X-CRM114-CacheID header generated by CRM114 available in the mail? Any hints to this? Regards Peter Sorensen/University of Southern Denmark/mail: [EMAIL PROTECTED] - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ AMaViS-user mailing list AMaViS-user@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/amavis-user AMaViS-FAQ:http://www.amavis.org/amavis-faq.php3 AMaViS-HowTos:http://www.amavis.org/howto/
Re: [AMaViS-user] CRM114 spamassassin plugin
Am 04.08.2008 um 15:04 schrieb Peter Sørensen:
Hi,
I would like to test the CRM114 spamassassin plugin.
I have a question regarding this.
Is it nessecary to patch amavisd-new to make this work - meaning
make the
X-CRM114-CacheID header generated by CRM114 available in the mail?
Any hints to this?
Regards
Peter Sorensen/University of Southern Denmark/mail: [EMAIL PROTECTED]
Hej,
i believe yes to get the autolearn thing working, at least thats what
i do.
I used the patch from mschuette.name/wp/crm114-spamassassin-plugin/
Its originally crafted for amavisd v2.5.2
If you want to try, my actual diff against v2.6.1 looks like this:
diff -u /usr/local/src/amavisd-new-2.6.1/amavisd /usr/sbin/amavisd-
new-2.6.1_crm114
--- /usr/local/src/amavisd-new-2.6.1/amavisd2008-06-29
02:37:58.0 +0200
+++ /usr/sbin/amavisd-new-2.6.1_crm114 2008-07-28 20:48:18.0
+0200
@@ -963,6 +963,7 @@
X-Amavis-PenPals X-Amavis-OS-Fingerprint X-Amavis-PolicyBank
X-Spam-Status X-Spam-Level X-Spam-Flag X-Spam-Score
X-Spam-Report X-Spam-Checker-Version X-Spam-Tests
+X-Spam-CRM114-Status X-Spam-CRM114-CacheID
X-DSPAM-Signature X-DSPAM-Result
X-DSPAM-Confidence X-DSPAM-Probability X-DSPAM-User X-DSPAM-
Factors
);
@@ -9796,12 +9797,15 @@
$virus_dejavu = 1;
}
if ($spam_presence_checked) {
-my($spam_level,$spam_status,$spam_report,$spam_summary) =
- @$cache_entry{'SL','SS','SR','SY'};
+ my($spam_level,$spam_status,$spam_report,$spam_summary,
$crm114_score,$crm114_status,$crm114_cacheid) =
+ @$cache_entry{'SL','SS','SR','SY','SCS','SCT','SCI'};
$msginfo-spam_level($spam_level);
$msginfo-spam_status($spam_status);
$msginfo-spam_report($spam_report);
$msginfo-spam_summary($spam_summary);
+ $msginfo-supplementary_info('CRM114SCORE', $crm114_score),
+ $msginfo-supplementary_info('CRM114STATUS', $crm114_status),
+ $msginfo-supplementary_info('CRM114CACHEID', $crm114_cacheid)
}
do_log(1,cached %s from %s (%s,%s), $body_digest, $sender,
$virus_presence_checked, $spam_presence_checked);
@@ -10052,9 +10056,13 @@
prolong_timer($which_section);
$elapsed{'TimeElapsedSpamCheck'} = Time::HiRes::time -
$t0_sect;
snmp_count('OpsSpamCheck');
-@$cache_entry{'St','SL','SS','SR','SY'} =
+ @$cache_entry{'St','SL','SS','SR','SY','SCS','SCT','SCI'} =
(int($now), $msginfo-spam_level, $msginfo-spam_status,
- $msginfo-spam_report, $msginfo-spam_summary);
+ $msginfo-spam_report, $msginfo-spam_summary,
+ $msginfo-supplementary_info('CRM114SCORE'),
+ $msginfo-supplementary_info('CRM114STATUS'),
+ $msginfo-supplementary_info('CRM114CACHEID')
+ );
$spam_presence_checked = 1;
}
}
@@ -11080,7 +11088,8 @@
if (c('remove_existing_spam_headers')) {
my(@which_headers) = qw(
X-Spam-Status X-Spam-Level X-Spam-Flag X-Spam-Score
- X-Spam-Report X-Spam-Checker-Version X-Spam-Tests);
+ X-Spam-Report X-Spam-Checker-Version X-Spam-Tests
+ X-Spam-CRM114-Status X-Spam-CRM114-CacheID);
push(@which_headers, qw(
X-DSPAM-Result X-DSPAM-Confidence X-DSPAM-Probability
X-DSPAM-Signature X-DSPAM-User X-DSPAM-Factors)) if
defined $dspam;
@@ -11285,6 +11294,13 @@
$allowed_hdrs $allowed_hdrs-{lc('X-Spam-Level')};
$hdr_edits-add_header('X-Spam-Status', $full_spam_status, 1)
if $allowed_hdrs $allowed_hdrs-{lc('X-Spam-Status')};
+ $hdr_edits-add_header('X-Spam-CRM114-Status', sprintf(%s
( %s ),
+ $msginfo-supplementary_info('CRM114STATUS'),
+ $msginfo-supplementary_info('CRM114SCORE')), 1)
+ if $allowed_hdrs $allowed_hdrs-{lc('X-Spam-CRM114-
Status')};
+ $hdr_edits-add_header('X-Spam-CRM114-CacheID',
+ $msginfo-supplementary_info('CRM114CACHEID'), 1)
+ if $allowed_hdrs $allowed_hdrs-{lc('X-Spam-CRM114-
CacheID')};
}
if ($do_tag2 $is_local) {
# SA reports may contain any octet, i.e. 8-bit data from a
mail
@@ -12975,9 +12991,9 @@
if ($daemonize) { # log warnings and uncaught errors
$SIG{'__DIE__' } =
-sub { if (!$^S) { my($m) = $@; chomp($m); do_log(-1,_DIE: %s,
$m) } };
+sub { if (!$^S) { my($m) = @_; chomp($m); do_log(-1,_DIE: %s,
$m) } };
$SIG{'__WARN__'} =
-sub { my($m) = $@; chomp($m); do_log( 2,_WARN: %s,$m) };
+sub { my($m) = @_; chomp($m); do_log( 2,_WARN: %s,$m) };
}
# set up Net::Server configuration
@@ -20359,6 +20375,7 @@
$sa_tests = $per_msg_status-get_tag('TESTSSCORES',',');
for my $t (qw(TESTS AUTOLEARN AUTOLEARNSCORE SC SCRULE SCTYPE
LANGUAGES RELAYCOUNTRY ASN ASNCIDR DCCB DCCR
DCCREP
+
Re: [AMaViS-user] CRM114 spamassassin plugin
Peter Sørensen schrieb: Is it nessecary to patch amavisd-new to make this work - meaning make the X-CRM114-CacheID header generated by CRM114 available in the mail? The scoring itself works without. But to write the CacheIDs into the mail header (to make use of the crm114 cache) the patch is necessary. It basically does three things: - collect the additional tags from SpamAssassin, - adds them to the cache, and - adds them to the mail header. It would be a nice task to write a more general solution, so one could configure a header field and a SA tag that should be written into the header. But so far I have not even seen another program/plugin that would need this modification. -- Martin - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ AMaViS-user mailing list AMaViS-user@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/amavis-user AMaViS-FAQ:http://www.amavis.org/amavis-faq.php3 AMaViS-HowTos:http://www.amavis.org/howto/
Re: [AMaViS-user] CRM114 spamassassin plugin
Jules M schrieb: If you want to try, my actual diff against v2.6.1 looks like this: If you do not mind I would like to publish that on the website. I did not find the time to update my own amavisd yet; that's why I still have no own patch for v2.6... -- Martin - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ AMaViS-user mailing list AMaViS-user@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/amavis-user AMaViS-FAQ:http://www.amavis.org/amavis-faq.php3 AMaViS-HowTos:http://www.amavis.org/howto/
