| /tags/4.2.1-13/greylistclean |
|---|
| File deleted |
|---|
|
|
|---|
| Property changes: |
|---|
| Deleted: svn:executable |
|---|
| Index: tags/4.2.1-13/INSTALL |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/INSTALL (revision 63) |
|---|
| +++ tags/4.2.1-13/INSTALL (nonexistent) |
|---|
| @@ -1,100 +0,0 @@ |
|---|
| -READ THIS FIRST |
|---|
| ---------------- |
|---|
| -If you try to build with 'make' without editing the makefile for sa-exim to |
|---|
| -see the exim source, and if you haven't patched your exim source with |
|---|
| -localscan_dlopen.patch, sa-exim will not build. |
|---|
| -This is normal, see the BUILDING section below |
|---|
| - |
|---|
| -This version of sa-exim now requires at least exim 4.11 |
|---|
| - |
|---|
| - |
|---|
| - |
|---|
| - |
|---|
| -BUILDING |
|---|
| --------- |
|---|
| -The code can be compiled in two ways: |
|---|
| - |
|---|
| -0) Do not set LOCAL_SCAN_HAS_OPTIONS=yes in exim's Makefile. Leave the |
|---|
| - default which is disabled. |
|---|
| - |
|---|
| -1) Unpack exim 4.11 or better, and overwrite src/local_scan.c with |
|---|
| - sa-exim.c. |
|---|
| - In the sa-exim distribution directory, type make sa-exim.h, and copy |
|---|
| - it in the same place than sa-exim.c. |
|---|
| - Rebuild exim, and you're done. |
|---|
| - Note that if you do this, you are responsible for modifying variables |
|---|
| - in sa-exim.c that would normally have been modified by the Makefile. |
|---|
| - |
|---|
| - This method might seem simpler, but it requires that you rebuild exim every |
|---|
| - time you upgrade sa-exim. |
|---|
| - |
|---|
| -2) The better solution is to patch exim with localscan_dlopen.patch originally |
|---|
| - from David Woodhouse (provided in this archive), and rebuild exim. |
|---|
| - Here are details on how to patch exim if yours needs it (at least debian's |
|---|
| - exim4 is prepatched, yours may be too). |
|---|
| - Choose the patch for your exim version (Philip included the portion that |
|---|
| - sets LOCAL_SCAN_ABI_VERSION_MAJOR and LOCAL_SCAN_ABI_VERSION_MINOR in exim |
|---|
| - 4.20) |
|---|
| - - localscan_dlopen_exim_4.20_or_better.patch |
|---|
| - - localscan_dlopen_up_to_4.14.patch |
|---|
| - |
|---|
| - |
|---|
| - What you gain from doing this is that sa-exim, or another local_scan module |
|---|
| - can be plugged into exim without rebuilding exim itself (here too you need |
|---|
| - exim 4.11 or better) |
|---|
| - |
|---|
| - To build, you can edit EXIM_SRC in the Makefile and build sa-exim-x.y.so, |
|---|
| - or I have also recently modified the build environment so that you can |
|---|
| - now build sa-exim without having the exim sources. |
|---|
| - You can look in eximinc/version to see which source I included. While this |
|---|
| - should work for the forseable future, the exim local_scan API might change |
|---|
| - one day and not building against the current exim sources could cause issues |
|---|
| - (hopefully, at worst it will prevent sa-exim from using better functions in |
|---|
| - newer versions of the local_scan API). |
|---|
| - To be really safe, I modified the localscan_dlopen patch to include a |
|---|
| - minor and major version number for the API. Philip has agreed to including |
|---|
| - the piece of the patch that says which version of the API exim is using, |
|---|
| - so it will be obvious in the future whether exim becomes potentially |
|---|
| - incompatible with an older version of sa-exim. Note that when Philip adds |
|---|
| - this small portion of the patch, you will have a resulting conflict if |
|---|
| - you try to apply it again. This is obviously normal, just remove it :-) |
|---|
| - |
|---|
| - Once you're done building, you can copy sa-exim-x.y.so and optionally the |
|---|
| - dummy/test accept.so in /usr/lib/exim4/local_scan/, and add this to your |
|---|
| - exim4.conf (at the beginning of the file) |
|---|
| - #local_scan_path = /usr/lib/exim4/local_scan/accept.so |
|---|
| - local_scan_path = /usr/lib/exim4/local_scan/sa-exim.so |
|---|
| - |
|---|
| - If you are a package builder, note that you don't actually have |
|---|
| - to edit the values in the Makefile, you can override them as such: |
|---|
| - make SACONF=/etc/mail/sa-exim.conf LDFLAGS="-shared -fPIC" |
|---|
| - |
|---|
| - |
|---|
| -The following is mostly obsolete, but left here for info purposes |
|---|
| ------------------------------------------------------------------ |
|---|
| -I would also recommend to edit exim/src/config.h.defaults as such: |
|---|
| -#define STRING_SPRINTF_BUFFER_SIZE 32768 |
|---|
| -The default value is a bit too small for some of the strings that we need to |
|---|
| -expand from SA. |
|---|
| -That said, I found out that exim then complaints that the headers |
|---|
| -it tries to add are too big even after I set "uschar buffer[32768];" in |
|---|
| -src/header.c. |
|---|
| -As a result, I haven't quite found out how to deal with more than 8KB worth |
|---|
| -of SpamAssassin headers, but it may not be a huge deal, 8KB headers are too |
|---|
| -long anyway. |
|---|
| -I asked the SA guys not to output such huge headers and I wrote a patch |
|---|
| -to disable one of the "features" that outputs such huge headers. |
|---|
| -See: http://bugzilla.spamassassin.org/showattachment.cgi?attach_id=195 |
|---|
| -This is included and turned on by default in Spamassassin 2.40 and later. |
|---|
| - |
|---|
| - |
|---|
| -INSTALL |
|---|
| -------- |
|---|
| -Copy sa-exim.conf to /etc/exim4 (or whatever you set SACONF to), |
|---|
| -and make sure to read it and edit the values to suit your environment. |
|---|
| -So that you don't make any mistakes, SAEximRunCond is turned off by default. |
|---|
| -This should force you to scan the docs before potentially shooting yourself |
|---|
| -in the foot :) |
|---|
| - |
|---|
| -See README for options |
|---|
| - |
|---|
| Index: tags/4.2.1-13/Greylisting.pm |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/Greylisting.pm (revision 63) |
|---|
| +++ tags/4.2.1-13/Greylisting.pm (nonexistent) |
|---|
| @@ -1,301 +0,0 @@ |
|---|
| -package Greylisting; |
|---|
| -# |
|---|
| -# $Id: Greylisting.pm,v 1.4 2006/01/11 17:17:28 marcmerlin Exp $ |
|---|
| -# |
|---|
| - |
|---|
| -# General Greylisting Plugin, written by Marc MERLIN <marc_soft@merlins.org> |
|---|
| -# (Kristopher Austin gets the credit for the original port to an SA 3.0 plugin) |
|---|
| -# |
|---|
| -# This was originally written to implement greylisting in SA-Exim, although |
|---|
| -# I have tried to make it more general and allow for reuse in other MTAs |
|---|
| -# (although they will need to |
|---|
| -# 1) be running SA at SMTP time |
|---|
| -# 2) Provide the list of rcpt to and env from in some headers for SA to read |
|---|
| -# 3) Provide the IP of the connecting host ) |
|---|
| -# |
|---|
| -# This rule should get a negative score so that if we've already seen the |
|---|
| -# greylisting tuplet before, we lower the score, which hopefully brings us from |
|---|
| -# a tempreject to an accept (at least that's how sa-exim does it) |
|---|
| -# |
|---|
| -# -- Marc 2004/01/19 |
|---|
| - |
|---|
| -use strict; |
|---|
| -use Mail::SpamAssassin::Plugin; |
|---|
| -our @ISA = qw(Mail::SpamAssassin::Plugin); |
|---|
| - |
|---|
| -sub new |
|---|
| -{ |
|---|
| - my ($class, $mailsa) = @_; |
|---|
| - $class = ref($class) || $class; |
|---|
| - my $self = $class->SUPER::new($mailsa); |
|---|
| - bless ($self, $class); |
|---|
| - $self->register_eval_rule ("greylisting"); |
|---|
| - return $self; |
|---|
| -} |
|---|
| - |
|---|
| - |
|---|
| -sub check_end |
|---|
| -{ |
|---|
| - my ($self, $permsgstatus) = @_; |
|---|
| - |
|---|
| - if (not $self->{'rangreylisting'}) |
|---|
| - { |
|---|
| - Mail::SpamAssassin::Plugin::dbg("GREYLISTING: greylisting didn't run since the configuration wasn't setup to call us"); |
|---|
| - } |
|---|
| -} |
|---|
| - |
|---|
| -# Greylisting happens depending on the SA score, so we want to run it last, |
|---|
| -# which is why we give it a high priority |
|---|
| -sub greylisting |
|---|
| -{ |
|---|
| - my ($self, $permsgstatus, $optionhash) = @_; |
|---|
| - |
|---|
| - my $connectip; |
|---|
| - my $envfrom; |
|---|
| - my $rcptto; |
|---|
| - my @rcptto; |
|---|
| - my $iswhitelisted=0; |
|---|
| - my $err; |
|---|
| - my $mesgid = $permsgstatus->get('Message-Id')."\n"; |
|---|
| - my $mesgidfn; |
|---|
| - my $tuplet; |
|---|
| - my $sascore = $permsgstatus->get_score(); |
|---|
| - my $dontcheckscore; |
|---|
| - my %option; |
|---|
| - |
|---|
| - Mail::SpamAssassin::Plugin::dbg("GREYLISTING: called function"); |
|---|
| - |
|---|
| - $optionhash =~ s/;/,/g; |
|---|
| - # This is safe, right? (users shouldn't be able to set it in their config) |
|---|
| - %option=eval $optionhash; |
|---|
| - $self->{'rangreylisting'}=1; |
|---|
| - |
|---|
| - foreach my $reqoption (qw ( method greylistsecs dontgreylistthreshold |
|---|
| - connectiphdr envfromhdr rcpttohdr greylistnullfrom greylistfourthbyte )) |
|---|
| - { |
|---|
| - die "Greylist option $reqoption missing from SA config" unless (defined $option{$reqoption}); |
|---|
| - } |
|---|
| - |
|---|
| - $dontcheckscore = $option{'dontgreylistthreshold'}; |
|---|
| - |
|---|
| - |
|---|
| - # No newlines, thank you (yes, you need this twice apparently) |
|---|
| - chomp ($mesgid); |
|---|
| - chomp ($mesgid); |
|---|
| - # Newline in the middle mesgids, are you serious? Get rid of them here |
|---|
| - $mesgid =~ s/\012/|/g; |
|---|
| - |
|---|
| - # For stuff that we know is spam, don't greylist the host |
|---|
| - # (that might help later spam with a lower score to come in) |
|---|
| - if ($sascore >= $dontcheckscore) |
|---|
| - { |
|---|
| - Mail::SpamAssassin::Plugin::dbg("GREYLISTING: skipping greylisting on $mesgid, since score is already $sascore and you configured greylisting not to bother with anything above $dontcheckscore"); |
|---|
| - return 0; |
|---|
| - } |
|---|
| - else |
|---|
| - { |
|---|
| - Mail::SpamAssassin::Plugin::dbg("GREYLISTING: running greylisting on $mesgid, since score is too low ($sascore) and you configured greylisting to greylist anything under $dontcheckscore"); |
|---|
| - } |
|---|
| - |
|---|
| - if (not $connectip = $permsgstatus->get($option{'connectiphdr'})) |
|---|
| - { |
|---|
| - warn "Couldn't get Connecting IP header $option{'connectiphdr'} for message $mesgid, skipping greylisting call\n"; |
|---|
| - return 0; |
|---|
| - } |
|---|
| - chomp($connectip); |
|---|
| - # Clean up input (for security, if you use files/dirs) |
|---|
| - $connectip =~ /([\d.:]+)/; |
|---|
| - $connectip = ($1 or ""); |
|---|
| - |
|---|
| - # Account for a null envelope from |
|---|
| - if (not defined ($envfrom = $permsgstatus->get($option{'envfromhdr'}))) |
|---|
| - { |
|---|
| - warn "Couldn't get Envelope From header $option{'envfromhdr'} for message $mesgid, skipping greylisting call\n"; |
|---|
| - return 0; |
|---|
| - } |
|---|
| - chomp($envfrom); |
|---|
| - # Clean up input (for security, if you use files/dirs) |
|---|
| - $envfrom =~ s#/#-#g; |
|---|
| - if (not $envfrom) |
|---|
| - { |
|---|
| - $envfrom="<>"; |
|---|
| - return 0 if (not $option{'greylistnullfrom'}); |
|---|
| - } |
|---|
| - |
|---|
| - if (not $rcptto = $permsgstatus->get($option{'rcpttohdr'})) |
|---|
| - { |
|---|
| - warn "Couldn't get Rcpt To header $option{'rcpttohdr'} for message $mesgid, skipping greylisting call\n"; |
|---|
| - return 0; |
|---|
| - } |
|---|
| - chomp($rcptto); |
|---|
| - # Clean up input (for security, if you use files/dirs) |
|---|
| - $rcptto =~ s#/#-#g; |
|---|
| - @rcptto = split(/, /, $rcptto); |
|---|
| - |
|---|
| - |
|---|
| - umask 0007; |
|---|
| - |
|---|
| - foreach $rcptto (@rcptto) |
|---|
| - { |
|---|
| - # The dir method is easy to fiddle with and expire records in (with |
|---|
| - # a find | rm) but it's probably more I/O extensive than a real DB |
|---|
| - # and suffers from directory size problems if a specific IP is sending |
|---|
| - # generating tens of thousands of tuplets. -- Marc |
|---|
| - # That said, I prefer formats I can easily tinker with, and not having |
|---|
| - # to worry about buggy locking and so forth |
|---|
| - |
|---|
| - if ($option{'method'} eq "dir") |
|---|
| - { |
|---|
| - my $tmpvar; |
|---|
| - |
|---|
| - # The clean strings are hardcoded because it's hard to do a variable |
|---|
| - # substitution within a tr (and using the eval solution is too |
|---|
| - # resource expensive) |
|---|
| - # envfrom could be cleaned outside of the loop, but the other method |
|---|
| - # options might now want that |
|---|
| - $envfrom =~ tr/!#%()*+,-.0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_abcdefghijklmnopqrstuvwxyz{|}~/_/c; |
|---|
| - # clean variables to run properly under -T |
|---|
| - $envfrom =~ /(.+)/; |
|---|
| - $tmpvar = ($1 or ""); |
|---|
| - # work around bug in perl untaint in perl 5.8 |
|---|
| - $envfrom=undef; |
|---|
| - $envfrom=$tmpvar; |
|---|
| - $envfrom =~ s/^([a-z0-9._]*)[^@]*/$1/i; |
|---|
| - |
|---|
| - $rcptto =~ tr/!#%()*+,-.0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_abcdefghijklmnopqrstuvwxyz{|}~/_/c; |
|---|
| - $rcptto =~ /(.+)/; |
|---|
| - $tmpvar = ($1 or ""); |
|---|
| - $rcptto=undef; |
|---|
| - $rcptto=$tmpvar; |
|---|
| - |
|---|
| - die "greylist option dir not passed, even though method was set to dir" unless ($option{'dir'}); |
|---|
| - |
|---|
| - # connectip is supposed to be untainted now, but I was still getting |
|---|
| - # some insecure dependecy error messages sometimes (perl 5.8 problem apparently) |
|---|
| - unless ($connectip =~ /(\d+)\.(\d+)\.(\d+)\.(\d+)/) { |
|---|
| - warn "Can only handle IPv4 addresses; skipping greylisting call for message $mesgid\n"; |
|---|
| - return 0; |
|---|
| - } |
|---|
| - |
|---|
| - my $ipdir1 = "$option{'dir'}/$1"; |
|---|
| - my $ipdir2 = "$ipdir1/$2"; |
|---|
| - my $ipdir3 = "$ipdir2/$3"; |
|---|
| - my $ipdir4; |
|---|
| - my $tupletdir; |
|---|
| - |
|---|
| - $ipdir4 = "$ipdir3"; |
|---|
| - $ipdir4 .= "/$4" if ($option{'greylistfourthbyte'}); |
|---|
| - $tupletdir = "$ipdir4/$envfrom"; |
|---|
| - |
|---|
| - $tuplet = "$tupletdir/$rcptto"; |
|---|
| - |
|---|
| - # make directory whether it's there or not (faster than test and set) |
|---|
| - mkdir $ipdir1; |
|---|
| - mkdir $ipdir2; |
|---|
| - mkdir $ipdir3; |
|---|
| - mkdir $ipdir4; |
|---|
| - mkdir $tupletdir; |
|---|
| - |
|---|
| - if (not -e $tuplet) |
|---|
| - { |
|---|
| - # If the tuplets aren't there, we create them and continue in |
|---|
| - # case there are other ones (one of them might be whitelisted |
|---|
| - # already) |
|---|
| - $err="creating $tuplet"; |
|---|
| - open (TUPLET, ">$tuplet") or goto greylisterror; |
|---|
| - print TUPLET time."\n"; |
|---|
| - print TUPLET "Status: Greylisted\n"; |
|---|
| - print TUPLET "Last Message-Id: $mesgid\n"; |
|---|
| - print TUPLET "Whitelisted Count: 0\n"; |
|---|
| - print TUPLET "Query Count: 1\n"; |
|---|
| - print TUPLET "SA Score: $sascore\n"; |
|---|
| - $err="closing first-written $tuplet"; |
|---|
| - close TUPLET or goto greylisterror; |
|---|
| - } |
|---|
| - else |
|---|
| - { |
|---|
| - my $time; |
|---|
| - my $status; |
|---|
| - my $whitelistcount; |
|---|
| - my $querycount; |
|---|
| - |
|---|
| - # Take into account race condition of expiring deletes and us |
|---|
| - # running |
|---|
| - $err="reading $tuplet"; |
|---|
| - open (TUPLET, "<$tuplet") or goto greylisterror; |
|---|
| - $err="Couldn't read time"; |
|---|
| - defined ($time=<TUPLET>) or goto greylisterror; |
|---|
| - chomp ($time); |
|---|
| - |
|---|
| - $err="Couldn't read status"; |
|---|
| - defined ($status=<TUPLET>) or goto greylisterror; |
|---|
| - chomp ($status); |
|---|
| - $err="Couldn't extract Status from $status"; |
|---|
| - $status =~ s/^Status: // or goto greylisterror; |
|---|
| - |
|---|
| - # Skip Mesg-Id |
|---|
| - $err="Couldn't skip Mesg-Id"; |
|---|
| - defined ($_=<TUPLET>) or goto greylisterror; |
|---|
| - |
|---|
| - $err="Couldn't read whitelistcount"; |
|---|
| - defined ($whitelistcount=<TUPLET>) or goto greylisterror; |
|---|
| - chomp ($whitelistcount); |
|---|
| - $err="Couldn't extract Whitelisted Count from $whitelistcount"; |
|---|
| - $whitelistcount =~ s/^Whitelisted Count: // or goto greylisterror; |
|---|
| - |
|---|
| - $err="Couldn't read querycount"; |
|---|
| - defined ($querycount=<TUPLET>) or goto greylisterror; |
|---|
| - chomp ($querycount); |
|---|
| - $err="Couldn't extract Query Count from $querycount"; |
|---|
| - $querycount =~ s/^Query Count: // or goto greylisterror; |
|---|
| - close (TUPLET); |
|---|
| - |
|---|
| - $querycount++; |
|---|
| - if ((time - $time) > $option{'greylistsecs'}) |
|---|
| - { |
|---|
| - $status="Whitelisted"; |
|---|
| - $whitelistcount++; |
|---|
| - } |
|---|
| - |
|---|
| - $err="re-writing $tuplet"; |
|---|
| - open (TUPLET, ">$tuplet") or goto greylisterror; |
|---|
| - print TUPLET "$time\n"; |
|---|
| - print TUPLET "Status: $status\n"; |
|---|
| - print TUPLET "Last Message-Id: $mesgid\n"; |
|---|
| - print TUPLET "Whitelisted Count: $whitelistcount\n"; |
|---|
| - print TUPLET "Query Count: $querycount\n"; |
|---|
| - print TUPLET "SA Score: $sascore\n"; |
|---|
| - $err="closing re-written $tuplet"; |
|---|
| - close TUPLET or goto greylisterror; |
|---|
| - |
|---|
| - # We continue processing the other recipients, to setup or |
|---|
| - # update their counters |
|---|
| - if ($status eq "Whitelisted") |
|---|
| - { |
|---|
| - $iswhitelisted=1; |
|---|
| - } |
|---|
| - } |
|---|
| - } |
|---|
| - elsif ($option{'method'} eq "file") |
|---|
| - { |
|---|
| - warn "codeme (file greylisting)\n"; |
|---|
| - } |
|---|
| - elsif ($option{'method'} eq "db") |
|---|
| - { |
|---|
| - warn "codeme (db greylisting)\n"; |
|---|
| - } |
|---|
| - } |
|---|
| - |
|---|
| - Mail::SpamAssassin::Plugin::dbg("GREYLISTING: computed greylisting on tuplet, saved info in $tuplet and whitelist status is $iswhitelisted"); |
|---|
| - return $iswhitelisted; |
|---|
| - |
|---|
| - greylisterror: |
|---|
| - warn "Reached greylisterror: $err / $!"; |
|---|
| - # delete tuplet since it apparently had issues but don't check for errors |
|---|
| - # in case it was a permission denied on write |
|---|
| - unlink ($tuplet); |
|---|
| - return $iswhitelisted; |
|---|
| -} |
|---|
| - |
|---|
| - |
|---|
| -1; |
|---|
| Index: tags/4.2.1-13/SA-greylisting-2.6.diff |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/SA-greylisting-2.6.diff (revision 63) |
|---|
| +++ tags/4.2.1-13/SA-greylisting-2.6.diff (nonexistent) |
|---|
| @@ -1,304 +0,0 @@ |
|---|
| -diff -urN SpamAssassin.orig/Conf.pm SpamAssassin/Conf.pm |
|---|
| ---- SpamAssassin.orig/Conf.pm Mon Dec 15 22:41:57 2003 |
|---|
| -+++ SpamAssassin/Conf.pm Sun Feb 29 17:42:58 2004 |
|---|
| -@@ -107,6 +107,10 @@ |
|---|
| - use constant TYPE_URI_EVALS => 0x0011; |
|---|
| - use constant TYPE_META_TESTS => 0x0012; |
|---|
| - use constant TYPE_RBL_EVALS => 0x0013; |
|---|
| -+# Need to reserve a number with the SA folks (needs to be odd as it is an |
|---|
| -+# eval test) |
|---|
| -+use constant TYPE_RES_EVALS => 0x0021; |
|---|
| -+ |
|---|
| - |
|---|
| - $VERSION = 'bogus'; # avoid CPAN.pm picking up version strings later |
|---|
| - |
|---|
| -@@ -2000,12 +2004,15 @@ |
|---|
| - |
|---|
| - =cut |
|---|
| - |
|---|
| -- if (/^header\s+(\S+)\s+(?:rbl)?eval:(.*)$/) { |
|---|
| -+ if (/^header\s+(\S+)\s+(?:rbl|res)?eval:(.*)$/) { |
|---|
| - my ($name, $fn) = ($1, $2); |
|---|
| - |
|---|
| - if ($fn =~ /^check_rbl/) { |
|---|
| - $self->add_test ($name, $fn, TYPE_RBL_EVALS); |
|---|
| - } |
|---|
| -+ elsif (/^header\s+(\S+)\s+reseval:(.*)$/) { |
|---|
| -+ $self->add_test ($name, $fn, TYPE_RES_EVALS); |
|---|
| -+ } |
|---|
| - else { |
|---|
| - $self->add_test ($name, $fn, TYPE_HEAD_EVALS); |
|---|
| - } |
|---|
| -@@ -2603,6 +2610,9 @@ |
|---|
| - } |
|---|
| - elsif ($type == TYPE_RBL_EVALS) { |
|---|
| - $self->{rbl_evals}->{$name} = \@args; |
|---|
| -+ } |
|---|
| -+ elsif ($type == TYPE_RES_EVALS) { |
|---|
| -+ $self->{res_evals}->{$name} = \@args; |
|---|
| - } |
|---|
| - elsif ($type == TYPE_RAWBODY_EVALS) { |
|---|
| - $self->{rawbody_evals}->{$name} = \@args; |
|---|
| -diff -urN SpamAssassin.orig/EvalTests.pm SpamAssassin/EvalTests.pm |
|---|
| ---- SpamAssassin.orig/EvalTests.pm Sat Jan 17 15:56:08 2004 |
|---|
| -+++ SpamAssassin/EvalTests.pm Sun Aug 15 15:47:22 2004 |
|---|
| -@@ -1941,6 +1941,234 @@ |
|---|
| - return $self->{habeas_swe}; |
|---|
| - } |
|---|
| - |
|---|
| -+ |
|---|
| -+# This was originally written to implement greylisting in SA-Exim, although |
|---|
| -+# I have tried to make it more general and allow for reuse in other MTAs |
|---|
| -+# (although they will need to |
|---|
| -+# 1) be running SA at SMTP time |
|---|
| -+# 2) Provide the list of rcpt to and env from in some headers for SA to read |
|---|
| -+# 3) Provide the IP of the connecting host ) |
|---|
| -+# |
|---|
| -+# This rule should get a negative score so that if we've already seen the |
|---|
| -+# greylisting tuplet before, we lower the score, which hopefully brings us from |
|---|
| -+# a tempreject to an accept (at least that's how sa-exim does it) |
|---|
| -+# -- Marc <marc_soft@merlins.org> 2004/01/19 |
|---|
| -+ |
|---|
| -+sub greylisting { |
|---|
| -+ my ($self, $optionhash) = @_; |
|---|
| -+ |
|---|
| -+ $optionhash =~ s/;/,/g; |
|---|
| -+ # This is safe, right? (users shouldn't be able to set it in their config) |
|---|
| -+ my %option=eval $optionhash; |
|---|
| -+ my $connectip; |
|---|
| -+ my $envfrom; |
|---|
| -+ my $rcptto; |
|---|
| -+ my @rcptto; |
|---|
| -+ my $iswhitelisted=0; |
|---|
| -+ my $err; |
|---|
| -+ my $mesgid = $self->get ('Message-Id')."\n"; |
|---|
| -+ my $mesgidfn; |
|---|
| -+ my $tuplet; |
|---|
| -+ |
|---|
| -+ foreach my $reqoption (qw ( method greylistsecs dontgreylistthreshold |
|---|
| -+ connectiphdr envfromhdr rcpttohdr greylistnullfrom greylistfourthbyte )) |
|---|
| -+ { |
|---|
| -+ die "Greylist option $reqoption missing from SA config" unless (defined $option{$reqoption}); |
|---|
| -+ #warn "found $reqoption -> $option{$reqoption}\n"; |
|---|
| -+ } |
|---|
| -+ |
|---|
| -+ # No newlines, thank you (yes, you need this twice apparently) |
|---|
| -+ chomp ($mesgid); |
|---|
| -+ chomp ($mesgid); |
|---|
| -+ # Newline in the middle mesgids, are you serious? Get rid of them here |
|---|
| -+ $mesgid =~ s/\012/|/g; |
|---|
| -+ |
|---|
| -+ # For stuff that we know is spam, don't greylist the host |
|---|
| -+ # (that might help later spam with a lower score to come in) |
|---|
| -+ if ($self->{hits} >= $option{'dontgreylistthreshold'}) |
|---|
| -+ { |
|---|
| -+ #warn "debug: skipping greylisting on $mesgid, since score is already ".$self->{hits}." and you configured greylisting to not bother with anything above $dontcheckscore\n"; |
|---|
| -+ return 0; |
|---|
| -+ } |
|---|
| -+ |
|---|
| -+ |
|---|
| -+ if (not $connectip = $self->get($option{'connectiphdr'})) |
|---|
| -+ { |
|---|
| -+ warn "Couldn't get Connecting IP header $option{'connectiphdr'} for message $mesgid, skipping greylisting call\n"; |
|---|
| -+ return 0; |
|---|
| -+ } |
|---|
| -+ chomp($connectip); |
|---|
| -+ # Clean up input (for security, if you use files/dirs) |
|---|
| -+ $connectip =~ s#/#-#g; |
|---|
| -+ |
|---|
| -+ # Account for a null envelope from |
|---|
| -+ if (not defined ($envfrom = $self->get($option{'envfromhdr'}))) |
|---|
| -+ { |
|---|
| -+ warn "Couldn't get Envelope From header $option{'envfromhdr'} for message $mesgid, skipping greylisting call\n"; |
|---|
| -+ return 0; |
|---|
| -+ } |
|---|
| -+ chomp($envfrom); |
|---|
| -+ # Clean up input (for security, if you use files/dirs) |
|---|
| -+ $envfrom =~ s#/#-#g; |
|---|
| -+ if (not $envfrom) |
|---|
| -+ { |
|---|
| -+ $envfrom="<>"; |
|---|
| -+ return 0 if (not $option{'greylistnullfrom'}); |
|---|
| -+ } |
|---|
| -+ |
|---|
| -+ if (not $rcptto = $self->get($option{'rcpttohdr'})) |
|---|
| -+ { |
|---|
| -+ warn "Couldn't get Rcpt To header $option{'rcpttohdr'} for message $mesgid, skipping greylisting call\n"; |
|---|
| -+ return 0; |
|---|
| -+ } |
|---|
| -+ chomp($rcptto); |
|---|
| -+ # Clean up input (for security, if you use files/dirs) |
|---|
| -+ $rcptto =~ s#/#-#g; |
|---|
| -+ @rcptto = split(/, /, $rcptto); |
|---|
| -+ |
|---|
| -+ |
|---|
| -+ umask 0007; |
|---|
| -+ |
|---|
| -+ foreach $rcptto (@rcptto) |
|---|
| -+ { |
|---|
| -+ # The dir method is easy to fiddle with and expire records in (with |
|---|
| -+ # a find | rm) but it's probably more I/O extensive than a real DB |
|---|
| -+ # and suffers from directory size problems if a specific IP is sending |
|---|
| -+ # generating tens of thousands of tuplets. -- Marc |
|---|
| -+ # That said, I prefer formats I can easily tinker with, and not having to |
|---|
| -+ # worry about buggy locking and so forth |
|---|
| -+ |
|---|
| -+ if ($option{'method'} eq "dir") |
|---|
| -+ { |
|---|
| -+ # The clean strings are hardcoded because it's hard to do a variable |
|---|
| -+ # substitution within a tr (and using the eval solution is too resource |
|---|
| -+ # expensive) |
|---|
| -+ $envfrom =~ tr/!#%( )*+,-.0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_abcdefghijklmnopqrstuvwxyz{|}~/_/c; |
|---|
| -+ # clean variables to run properly under -T |
|---|
| -+ $envfrom =~ /(.+)/; |
|---|
| -+ $envfrom = $1; |
|---|
| -+ $rcptto =~ tr/!#%( )*+,-.0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_abcdefghijklmnopqrstuvwxyz{|}~/_/c; |
|---|
| -+ $rcptto =~ /(.+)/; |
|---|
| -+ $rcptto = $1; |
|---|
| -+ |
|---|
| -+ die "greylist option dir not passed, even though method was set to dir" unless ($option{'dir'}); |
|---|
| -+ my ($ipbyte1, $ipbyte2, $ipbyte3, $ipbyte4) = split(/\./, $connectip); |
|---|
| -+ my $ipdir1 = "$option{'dir'}/$ipbyte1"; |
|---|
| -+ my $ipdir2 = "$ipdir1/$ipbyte2"; |
|---|
| -+ my $ipdir3 = "$ipdir2/$ipbyte3"; |
|---|
| -+ my $ipdir4; |
|---|
| -+ my $tupletdir; |
|---|
| -+ |
|---|
| -+ $ipdir4 = "$ipdir3"; |
|---|
| -+ $ipdir4 .= "/$ipbyte4" if ($option{'greylistfourthbyte'}); |
|---|
| -+ $tupletdir = "$ipdir4/$envfrom"; |
|---|
| -+ |
|---|
| -+ $tuplet = "$tupletdir/$rcptto"; |
|---|
| -+ |
|---|
| -+ # make directory whether it's there or not (faster than test and set) |
|---|
| -+ mkdir $ipdir1; |
|---|
| -+ mkdir $ipdir2; |
|---|
| -+ mkdir $ipdir3; |
|---|
| -+ mkdir $ipdir4; |
|---|
| -+ mkdir $tupletdir; |
|---|
| -+ |
|---|
| -+ if (not -e $tuplet) |
|---|
| -+ { |
|---|
| -+ # If the tuplets aren't there, we create them and continue in |
|---|
| -+ # case there are other ones (one of them might be whitelisted already) |
|---|
| -+ $err="creating $tuplet"; |
|---|
| -+ open (TUPLET, ">$tuplet") or goto greylisterror; |
|---|
| -+ print TUPLET time."\n"; |
|---|
| -+ print TUPLET "Status: Greylisted\n"; |
|---|
| -+ print TUPLET "Last Message-Id: $mesgid\n"; |
|---|
| -+ print TUPLET "Whitelisted Count: 0\n"; |
|---|
| -+ print TUPLET "Query Count: 1\n"; |
|---|
| -+ $err="closing first-written $tuplet"; |
|---|
| -+ close TUPLET or goto greylisterror; |
|---|
| -+ } |
|---|
| -+ else |
|---|
| -+ { |
|---|
| -+ my $time; |
|---|
| -+ my $status; |
|---|
| -+ my $whitelistcount; |
|---|
| -+ my $querycount; |
|---|
| -+ |
|---|
| -+ # Take into account race condition of expiring deletes and us running |
|---|
| -+ $err="reading $tuplet"; |
|---|
| -+ open (TUPLET, "<$tuplet") or goto greylisterror; |
|---|
| -+ $err="Couldn't read time"; |
|---|
| -+ defined ($time=<TUPLET>) or goto greylisterror; |
|---|
| -+ chomp ($time); |
|---|
| -+ |
|---|
| -+ $err="Couldn't read status"; |
|---|
| -+ defined ($status=<TUPLET>) or goto greylisterror; |
|---|
| -+ chomp ($status); |
|---|
| -+ $err="Couldn't extract Status from $status"; |
|---|
| -+ $status =~ s/^Status: // or goto greylisterror; |
|---|
| -+ |
|---|
| -+ # Skip Mesg-Id |
|---|
| -+ $err="Couldn't skip Mesg-Id"; |
|---|
| -+ defined ($_=<TUPLET>) or goto greylisterror; |
|---|
| -+ |
|---|
| -+ $err="Couldn't read whitelistcount"; |
|---|
| -+ defined ($whitelistcount=<TUPLET>) or goto greylisterror; |
|---|
| -+ chomp ($whitelistcount); |
|---|
| -+ $err="Couldn't extract Whitelisted Count from $whitelistcount"; |
|---|
| -+ $whitelistcount =~ s/^Whitelisted Count: // or goto greylisterror; |
|---|
| -+ |
|---|
| -+ $err="Couldn't read querycount"; |
|---|
| -+ defined ($querycount=<TUPLET>) or goto greylisterror; |
|---|
| -+ chomp ($querycount); |
|---|
| -+ $err="Couldn't extract Query Count from $querycount"; |
|---|
| -+ $querycount =~ s/^Query Count: // or goto greylisterror; |
|---|
| -+ close (TUPLET); |
|---|
| -+ |
|---|
| -+ $querycount++; |
|---|
| -+ if ((time - $time) > $option{'greylistsecs'}) |
|---|
| -+ { |
|---|
| -+ $status="Whitelisted"; |
|---|
| -+ $whitelistcount++; |
|---|
| -+ } |
|---|
| -+ |
|---|
| -+ $err="re-writing $tuplet"; |
|---|
| -+ open (TUPLET, ">$tuplet") or goto greylisterror; |
|---|
| -+ print TUPLET "$time\n"; |
|---|
| -+ print TUPLET "Status: $status\n"; |
|---|
| -+ print TUPLET "Last Message-Id: $mesgid\n"; |
|---|
| -+ print TUPLET "Whitelisted Count: $whitelistcount\n"; |
|---|
| -+ print TUPLET "Query Count: $querycount\n"; |
|---|
| -+ $err="closing re-written $tuplet"; |
|---|
| -+ close TUPLET or goto greylisterror; |
|---|
| -+ |
|---|
| -+ # We continue processing the other recipients, to setup or |
|---|
| -+ # update their counters |
|---|
| -+ if ($status eq "Whitelisted") |
|---|
| -+ { |
|---|
| -+ $iswhitelisted=1; |
|---|
| -+ } |
|---|
| -+ } |
|---|
| -+ } |
|---|
| -+ elsif ($option{'method'} eq "file") |
|---|
| -+ { |
|---|
| -+ warn "codeme\n"; |
|---|
| -+ } |
|---|
| -+ elsif ($option{'method'} eq "db") |
|---|
| -+ { |
|---|
| -+ warn "codeme\n"; |
|---|
| -+ } |
|---|
| -+ } |
|---|
| -+ |
|---|
| -+ return $iswhitelisted; |
|---|
| -+ |
|---|
| -+ greylisterror: |
|---|
| -+ warn "Reached greylisterror: $err / $!"; |
|---|
| -+ # delete tuplet since it apparently had issues but don't check for errors |
|---|
| -+ # in case it was a permission denied on write |
|---|
| -+ unlink ($tuplet); |
|---|
| -+ return $iswhitelisted; |
|---|
| -+} |
|---|
| -+ |
|---|
| -+ |
|---|
| - ########################################################################### |
|---|
| - # BODY TESTS: |
|---|
| - ########################################################################### |
|---|
| -diff -urN SpamAssassin.orig/PerMsgStatus.pm SpamAssassin/PerMsgStatus.pm |
|---|
| ---- SpamAssassin.orig/PerMsgStatus.pm Tue Jan 20 13:40:04 2004 |
|---|
| -+++ SpamAssassin/PerMsgStatus.pm Sun Feb 29 19:01:19 2004 |
|---|
| -@@ -184,6 +184,9 @@ |
|---|
| - |
|---|
| - # add points from Bayes, before adjusting the AWL |
|---|
| - $self->{hits} += $self->{learned_hits}; |
|---|
| -+ |
|---|
| -+ # Now, we can run rules that have to run last |
|---|
| -+ $self->do_res_eval_tests(); |
|---|
| - |
|---|
| - # Do AWL tests last, since these need the score to have already been |
|---|
| - # calculated |
|---|
| -@@ -2010,6 +2013,11 @@ |
|---|
| - } |
|---|
| - |
|---|
| - ########################################################################### |
|---|
| -+ |
|---|
| -+sub do_res_eval_tests { |
|---|
| -+ my ($self) = @_; |
|---|
| -+ $self->run_eval_tests ($self->{conf}->{res_evals}, ''); |
|---|
| -+} |
|---|
| - |
|---|
| - sub do_head_eval_tests { |
|---|
| - my ($self) = @_; |
|---|
| Index: tags/4.2.1-13/.cvsignore |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/.cvsignore (revision 63) |
|---|
| +++ tags/4.2.1-13/.cvsignore (nonexistent) |
|---|
| @@ -1,7 +0,0 @@ |
|---|
| -.* |
|---|
| -ACKNOWLEDGEMENTS |
|---|
| -CHANGELOG |
|---|
| -sa.html |
|---|
| -sa-exim.h |
|---|
| -sa-exim_short.conf |
|---|
| - |
|---|
| Index: tags/4.2.1-13/Makefile |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/Makefile (revision 63) |
|---|
| +++ tags/4.2.1-13/Makefile (nonexistent) |
|---|
| @@ -1,107 +0,0 @@ |
|---|
| -# SA-Exim can be built standalone as a loadable module with this Makefile |
|---|
| -# or you can copy sa-exim.c over exim's local_scan.c file if you want to |
|---|
| -# statically build it into exim |
|---|
| -# |
|---|
| - |
|---|
| -VERSION=$(shell cat version) |
|---|
| - |
|---|
| -# The idea is that you don't have to edit these values, you can override |
|---|
| -# them on the command line: |
|---|
| -# make SACONF=/etc/exim/sa-exim.conf LDFLAGS="-shared -fPIC" CC=cc |
|---|
| -CC=gcc |
|---|
| -CFLAGS=-O2 -Wall |
|---|
| -LDFLAGS=-shared |
|---|
| -SACONF=/etc/exim4/sa-exim.conf |
|---|
| -SPAMC=/usr/bin/spamc |
|---|
| - |
|---|
| - |
|---|
| -# I place the directory in exim/debian/local_scan. Adjust the path as needed |
|---|
| -# Actually, we will also look for the versions supplied with this source |
|---|
| -# if we can't find the exim source |
|---|
| -EXIM_SRC= ../../src |
|---|
| -EXIM_SRC_LOCAL = ./eximinc |
|---|
| -SUFF=-$(VERSION) |
|---|
| - |
|---|
| -SAFLAGS=-DSPAMASSASSIN_CONF=\"$(SACONF)\" -DSPAMC_LOCATION=\"$(SPAMC)\" |
|---|
| -BUILDCFLAGS=-I$(EXIM_SRC) -I$(EXIM_SRC_LOCAL) -DDLOPEN_LOCAL_SCAN $(SAFLAGS) $(CFLAGS) |
|---|
| - |
|---|
| -SONAME=$(subst .so,$(SUFF).so,sa-exim.so) |
|---|
| - |
|---|
| -DOCS=sa.html CHANGELOG ACKNOWLEDGEMENTS |
|---|
| -OBJECTS=$(SONAME) accept.so sa-exim_short.conf $(DOCS) |
|---|
| -OTHERTARGETS=sa-exim.h |
|---|
| - |
|---|
| -all: $(OBJECTS) |
|---|
| - |
|---|
| -docs: $(DOCS) |
|---|
| - |
|---|
| - |
|---|
| -$(SONAME) : sa-exim.c sa-exim.h |
|---|
| - @echo "Building $@" |
|---|
| - $(CC) $(BUILDCFLAGS) $(LDFLAGS) -o $@ $< |
|---|
| - chmod a+rx $(SONAME) |
|---|
| - |
|---|
| -accept.so: accept.c |
|---|
| - @echo "Building $@" |
|---|
| - $(CC) $(BUILDCFLAGS) $(LDFLAGS) -o $@ $< |
|---|
| - chmod a+rx $@ |
|---|
| - |
|---|
| -ACKNOWLEDGEMENTS: Acknowledgements.html |
|---|
| - @echo "Generating $@" |
|---|
| - @links -dump $< > $@ |
|---|
| - |
|---|
| -CHANGELOG: Changelog.html |
|---|
| - @echo "Generating $@" |
|---|
| - @links -dump $< > $@ |
|---|
| - |
|---|
| -sa.html: Changelog.html Acknowledgements.html sa.html.template |
|---|
| - @echo "Generating $@" |
|---|
| - @bash -c 'sed "/<Changelog>/,$$ d" < sa.html.template; cat Changelog.html; sed "1,/<\/Changelog>/ d; /<Acknowledgements>/,$$ d" < sa.html.template; cat Acknowledgements.html; sed "1,/<\/Acknowledgements>/ d" < sa.html.template' > sa.html |
|---|
| - |
|---|
| -sa-exim_short.conf: sa-exim.conf |
|---|
| - @cat sa-exim.conf | sed "/# --- snip ---/,$$ d" > sa-exim_short.conf |
|---|
| - @cat sa-exim.conf | grep -v "^#" | tr '\012' 'ÿ' | sed "s/ÿÿÿ*/ÿÿ/g" | tr 'ÿ' '\012' >> sa-exim_short.conf |
|---|
| - |
|---|
| -sa-exim.h: sa-exim.c version |
|---|
| - echo "char *version=\"`cat version` (built `date -R 2>/dev/null || date`)\";" > sa-exim.h |
|---|
| - |
|---|
| -clean: |
|---|
| - @-rm -rf $(OBJECTS) $(DOCS) $(OTHERTARGETS) build-stamp configure-stamp debian/sa-exim debian/sa-exim.postrm.debhelper debian/sa-exim.substvars debian/files 2>/dev/null |
|---|
| - |
|---|
| -deb: ../sa-exim_$(VERSION).orig.tar.gz debian/* |
|---|
| - @make clean |
|---|
| - @dpkg-buildpackage -uc -us -sd -rfakeroot |
|---|
| - @make clean |
|---|
| - |
|---|
| -../sa-exim_$(VERSION).orig.tar.gz: * */* |
|---|
| - @make clean |
|---|
| - @( cd ..; tar chvzf sa-exim_$(VERSION).orig.tar.gz sa-exim-$(VERSION) ) |
|---|
| - |
|---|
| -# This didn't work too well, I'll just ship the source with the debian tree |
|---|
| -#deb: ../sa-exim_$(VERSION).orig.tar.gz debian/rules |
|---|
| -# @make clean |
|---|
| -# @dpkg-buildpackage -uc -us -sd -rfakeroot |
|---|
| -# |
|---|
| -# |
|---|
| -#../sa-exim_$(VERSION).tar.gz: * */* |
|---|
| -# @make clean |
|---|
| -# @if [ -d debian ]; then echo "Can't rebuild $@ with debian tree unpacked, please remove it"; exit 1; fi |
|---|
| -# @( cd ..; tar chvzf sa-exim_$(VERSION).tar.gz sa-exim-$(VERSION) ) |
|---|
| -# |
|---|
| -# |
|---|
| -#../sa-exim_$(VERSION).orig.tar.gz: ../sa-exim_$(VERSION).tar.gz |
|---|
| -# if [ -e ../sa-exim-$(VERSION).tar.gz ] ; then \ |
|---|
| -# cp -a ../sa-exim-$(VERSION).tar.gz ../sa-exim_$(VERSION).orig.tar.gz ; \ |
|---|
| -# else \ |
|---|
| -# wget http://marc.merlins.org/linux/sa-exim-$(VERSION).tar.gz; \ |
|---|
| -# mv sa-exim-$(VERSION).tar.gz ../sa-exim_$(VERSION).orig.tar.gz; \ |
|---|
| -# fi |
|---|
| -# |
|---|
| -# |
|---|
| -#debian/rules: |
|---|
| -# @wget http://marc.merlins.org/linux/exim/files/debian/sa-exim_diff.gz |
|---|
| -# @zcat sa-exim_diff.gz | patch -s -p1 |
|---|
| -# @/bin/rm sa-exim_diff.gz |
|---|
| -# @chmod 755 debian/rules |
|---|
| -# |
|---|
| - |
|---|
| Index: tags/4.2.1-13/sa.html.template |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/sa.html.template (revision 63) |
|---|
| +++ tags/4.2.1-13/sa.html.template (nonexistent) |
|---|
| @@ -1,221 +0,0 @@ |
|---|
| -<html> |
|---|
| -<head> |
|---|
| -<title>Exim SpamAssassin at SMTP time</title> |
|---|
| -</head> |
|---|
| - |
|---|
| -<body> |
|---|
| - |
|---|
| -<h1 ALIGN="CENTER">Exim SpamAssassin at SMTP time</h1> |
|---|
| - |
|---|
| -<h3>What's that?</h3> |
|---|
| -<pre> |
|---|
| -mail from: merlin@gandalf |
|---|
| -250 OK |
|---|
| -rcpt to: merlin@gandalf |
|---|
| -250 Accepted |
|---|
| -data |
|---|
| -354 Enter message, ending with "." on a line by itself |
|---|
| -From: merlin@gandalf |
|---|
| -To: merlin@gandalf |
|---|
| -Subject: $$$ Make Money Fast $$$ !!! |
|---|
| - |
|---|
| -viagra 100% GARANTEE AMAZING FULL REFUND |
|---|
| -This is not spam |
|---|
| -. |
|---|
| -550 Rejected |
|---|
| -</pre> |
|---|
| -(logs would show something like this: |
|---|
| -<tt>2004-03-10 08:27:18 1B16Y8-0001UP-4R SA: Action: permanently rejected message: hits=14.8 required=7.0 trigger=11.0 ( scanned in 2/2 secs | Message-Id: CCQPVENACPQBFLTRLICXWQVEK@gandalf). From <merlin@gandalf> (host=gandalf [127.0.0.1]) for merlin@gandalf</tt>) |
|---|
| - |
|---|
| - |
|---|
| -<P> |
|---|
| -An example of teergrube would return this instead |
|---|
| -<pre> |
|---|
| -data |
|---|
| -354 Enter message, ending with "." on a line by itself |
|---|
| -(...) |
|---|
| -body SEE_FOR_YOURSELF /See (?:for|it) yourself\b/i |
|---|
| -describe SEE_FOR_YOURSELF See for yourself |
|---|
| - |
|---|
| -body ORDER_NOW /\border (?:now|soon|fast|quickly|while)\b/i |
|---|
| -describe ORDER_NOW Encourages you to waste no time in ordering |
|---|
| - |
|---|
| -. |
|---|
| -451- wait for more output |
|---|
| -451- wait for more output |
|---|
| -451- wait for more output |
|---|
| -(... one line every 10 secs, 15 minutes elapse ...) |
|---|
| -450 Please try again later |
|---|
| -</pre> |
|---|
| - |
|---|
| -The idea here is to stall and waste the resources of the remote sender (BTW |
|---|
| -teergrube comes from german, and means tar-pitting, or stopping someone in his |
|---|
| -tracks) |
|---|
| - |
|---|
| -<BR><BR> |
|---|
| -<h3>Why?</h3> |
|---|
| -SpamAssassin can be run inside exim after the mail has been accepted, as shown |
|---|
| -<a href="http://bogmog.sourceforge.net/document_show.php3?doc_id=28">here</a>, |
|---|
| -but if you're not going to use my patch and you just want to run SA as an exim |
|---|
| -transport, |
|---|
| -<a href="http://dman13.dyndns.org/~dman/config_docs/exim-spamassassin/">this</a> |
|---|
| -version is recommended |
|---|
| -<P> |
|---|
| -Now, while this will work, we can do better, hence the reason for my code |
|---|
| -(just to make things clear, you do not want to run both my code, and dman's |
|---|
| -transports. It'd work, but you'd be scanning the message twice) |
|---|
| -<P> |
|---|
| -The reason why I wanted SpamAssassin in local scan is that I don't want to |
|---|
| -accept the damn spam in the first place. |
|---|
| - |
|---|
| -<ul> |
|---|
| -<li>While my code lets you do that, I don't like to send mails to the bit |
|---|
| - bucket, so you need to bounce them. |
|---|
| -<li>Once you accept the spam, you can't bounce it half the time, or you |
|---|
| - bounce it to an innocent whose Email was forged as an envelope sender |
|---|
| - (some spam even forges the bounce address to <em>you</em>) |
|---|
| -<li>If I refuse spam at SMTP time, it will remove the spam addresses from at |
|---|
| - least a few lists (they gotta clean their lists eventually otherwise they'd |
|---|
| - spend more time Emailing dead addresses than good ones) |
|---|
| -<li>I have the option of toying with spammers and stall their connections and |
|---|
| - waste their resources (see the following page for details on |
|---|
| - <A HREF="http://www.iks-jena.de/mitarb/lutz/usenet/teergrube.en.html"> |
|---|
| - teergrubing</A> |
|---|
| -</ul> |
|---|
| - |
|---|
| -Note that you can also use this code to simply run SA on all your mails (or |
|---|
| -portion thereof as configured with SAEximRunCond) without having to configure SA |
|---|
| -in your exim.conf. In other words, this code can be configured to not reject |
|---|
| -any mails. |
|---|
| - |
|---|
| -<BR><BR> |
|---|
| -<h3>SpamAssassin? What's that?</h3> |
|---|
| -Ah, you need to visit <a href="http://spamassassin.org/">this page</a> first |
|---|
| -then |
|---|
| - |
|---|
| - |
|---|
| -<BR><BR> |
|---|
| -<h3>How does it work, what knobs are there?</h3> |
|---|
| -You need to configure spamassassin to flags mails as spam after a certain |
|---|
| -threshold (7 for instance). After that, this code can be configured to |
|---|
| - |
|---|
| -<ul> |
|---|
| -<li>Pretend to be processing the Email and send continuation lines to the |
|---|
| - remote server until it gives up (aka |
|---|
| - <A HREF="http://www.iks-jena.de/mitarb/lutz/usenet/teergrube.en.html"> |
|---|
| - teergrubing</A>) |
|---|
| -<li>Accept but not deliver mail with a high threshold (i.e. devnull the mail) |
|---|
| -<li>Reject mail with a lower threshold |
|---|
| -<li>Temporarily reject mail with a still lower threshold (you can then inspect |
|---|
| - your logs to decide if you want to tweak SA so that next time the mail |
|---|
| - is sent, you can receive it) |
|---|
| -<li>In all 5 cases, mail can be optionally saved to disk so that you can |
|---|
| - inspect all the mails you've rejected or /dev/nulled |
|---|
| -</ul> |
|---|
| - |
|---|
| -You can also (and probably should <img src="/gifs/people/smile.happy.gif" alt=":-)" align=TOP WIDTH=16 HEIGHT=16>) use the new greylisting support for even |
|---|
| -better spam control |
|---|
| - |
|---|
| - |
|---|
| -<P> |
|---|
| -For more details, you should look at the self-documented |
|---|
| -<a href="files/sa-exim.conf">config file</a> and you can see |
|---|
| -<a href="sa-exim.demo.txt">some sample rejects and what you get in the logs</a> |
|---|
| - |
|---|
| - |
|---|
| -<BR><BR> |
|---|
| -<h3><A NAME="greylisting">Greylisting you say?</A></h3> |
|---|
| -While when sa-exim first came out, its strongest point was being one of the |
|---|
| -first programs (if not the first) that let you reject Spam at SMTP time, its |
|---|
| -coolest feature now is adaptive greylisting support<BR> |
|---|
| -In a nutshell, you get the advantages of greylisting without the disadvantages: |
|---|
| -<ul> |
|---|
| -<li>mails with a low spam score are accepted without delay |
|---|
| -<li>mails with an average spam score are greylisted, |
|---|
| - <b>and only those are delayed</b> |
|---|
| -<li>mails with high spam scores are rejected regardless (no greylisting) |
|---|
| -</ul> |
|---|
| - |
|---|
| -This method is the best combination I've seen out there so far, and |
|---|
| -while I've been talking about it for a while, I don't yet know of other |
|---|
| -programs that implement this method (if you do, please let me know so that |
|---|
| -I can acknowledge them) |
|---|
| -<BR> |
|---|
| -For more details on how this works, check out the <a href="files/sa-exim-cvs/README.greylisting">greylisting README</a> |
|---|
| - |
|---|
| - |
|---|
| -<BR><BR> |
|---|
| -<h3>Ok, where's the code? / Downloads</h3> |
|---|
| -<ul> |
|---|
| -<li>The latest version is here (<a href="files/sa-exim-current/">browsable tree</a> or <a href="files/sa-exim-current.tar.gz">tar.gz</a>). You can also |
|---|
| -get it from <A href="http://sourceforge.net/projects/sa-exim/">sf.net</a><BR> |
|---|
| -<li>The CVS version is here (<a href="files/sa-exim-cvs/">browsable tree</a>) |
|---|
| -and you can also get the CVS tree from |
|---|
| -<A HREF="http://sourceforge.net/cvs/?group_id=56124">sf.net</A> |
|---|
| -<li>The latest config file with documentation is |
|---|
| -<a href="files/sa-exim.conf">here</a> |
|---|
| -<li>Debian packages (source and binary) are <a href="files/debian/">here</a> |
|---|
| -</ul> |
|---|
| -<P> |
|---|
| - |
|---|
| -As explained in the archive, you can either copy <tt>sa-exim.c</tt> over exim's |
|---|
| -<tt>src/local_scan.c</tt> You need to copy local_scan in src in the exim source |
|---|
| -tree and rebuild it, or you can build sa-exim as a loadable module (you need |
|---|
| -to patch exim to support loadable modules though) |
|---|
| -<P> |
|---|
| -You can also browse all my exim files <A HREF="files/">here</A> |
|---|
| - |
|---|
| -<BR><BR> |
|---|
| -<h3>Mailing list</h3> |
|---|
| -You should probably subscribe to this low traffic |
|---|
| -<a href="http://lists.merlins.org/lists/listinfo/sa-exim">mailing list</a> if |
|---|
| -you download the code to keep apprised of bug fixes and enhancements |
|---|
| - |
|---|
| -<BR><BR> |
|---|
| -<h3>Integration with Exim 4</h3> |
|---|
| -This code works without anything in the exim conf, but you probably want to use |
|---|
| -some knobs to disable scanning for some users (like setting |
|---|
| -<tt>X-SA-Do-Not-Rej</tt> or <tt>X-SA-Do-Not-Run</tt> in the rcpt ACL and |
|---|
| -removing those headers in the right places).<BR> |
|---|
| -See <A HREF="http://marc.merlins.org/linux/exim/#conf">my exim4 conf tree</a> |
|---|
| -and more specifically the |
|---|
| -<A HREF="http://marc.merlins.org/linux/exim/exim4-conf/exim4.conf">exim4.conf</A> |
|---|
| -file |
|---|
| -<P> |
|---|
| -You can look at the <A HREF="files/sa-exim-cvs/README">README</A> for more |
|---|
| -integration details. |
|---|
| - |
|---|
| - |
|---|
| -<BR><BR> |
|---|
| -<h3>Changelog/Download</h3> |
|---|
| - |
|---|
| -<Changelog> |
|---|
| -</Changelog> |
|---|
| - |
|---|
| -<P> |
|---|
| -More generally, all the files can also be found <A HREF="files/">here</A> |
|---|
| -<P> |
|---|
| -<A HREF="/perso/contact.html">Feedback is appreciated</A> (but please |
|---|
| -prefer the use of the |
|---|
| -<a href="http://lists.merlins.org/lists/listinfo/sa-exim">sa-exim list</a>) |
|---|
| - |
|---|
| -<BR><BR> |
|---|
| -<h3>Acknowledgements</h3> |
|---|
| - |
|---|
| -<Acknowledgements> |
|---|
| -</Acknowledgements> |
|---|
| - |
|---|
| - |
|---|
| -<P ALIGN="center"> |
|---|
| -<img src="/gifs/lines/misc/lampline.gif" alt="" WIDTH=720 HEIGHT=14> |
|---|
| -</P> |
|---|
| -<br> |
|---|
| -<img src="/gifs/misc/wizard.gif" alt="" align="middle" WIDTH=72 HEIGHT=61> |
|---|
| -<img src="/gifs/linux/damn-powered.gif" alt="" align="right" WIDTH=170 HEIGHT=29> |
|---|
| -<IMG SRC="/gifs/icons/msfree.gif" ALT="[ms free site]" ALIGN="right" WIDTH=95 HEIGHT=31> |
|---|
| -<a href="http://sourceforge.net"><img src="http://sourceforge.net/sflogo.php?group_id=56124&type=1" width="88" height="31" border="0" align="right" alt="SourceForge.net Logo"></a> |
|---|
| -<A HREF="/perso/contact.html">Email</A><BR> |
|---|
| -<A HREF="/">Link to Home Page</A> |
|---|
| -<P> |
|---|
| -</body> |
|---|
| -</html> |
|---|
| Index: tags/4.2.1-13/accept.c |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/accept.c (revision 63) |
|---|
| +++ tags/4.2.1-13/accept.c (nonexistent) |
|---|
| @@ -1,45 +0,0 @@ |
|---|
| -/************************************************* |
|---|
| -* Exim - an Internet mail transport agent * |
|---|
| -*************************************************/ |
|---|
| - |
|---|
| -/* Copyright (c) University of Cambridge 1995 - 2002 */ |
|---|
| -/* See the file NOTICE for conditions of use and distribution. */ |
|---|
| - |
|---|
| - |
|---|
| -#include "local_scan.h" |
|---|
| - |
|---|
| -/* |
|---|
| - * This is a basic version of local_scan that always accepts the messge. |
|---|
| - * It is like the template provided by Philip Hazel, except it is |
|---|
| - * intended to be compiled as a .so and loaded dynamically by the "real" |
|---|
| - * local_scan. |
|---|
| - */ |
|---|
| - |
|---|
| -int local_scan_version_major(void) |
|---|
| -{ |
|---|
| - return LOCAL_SCAN_ABI_VERSION_MAJOR; |
|---|
| -} |
|---|
| - |
|---|
| -int local_scan_version_minor(void) |
|---|
| -{ |
|---|
| - return LOCAL_SCAN_ABI_VERSION_MINOR; |
|---|
| -} |
|---|
| - |
|---|
| -int local_scan_version( void ) |
|---|
| -{ |
|---|
| - return 1; |
|---|
| -} |
|---|
| - |
|---|
| - |
|---|
| -int local_scan(int fd, uschar **return_text) |
|---|
| -{ |
|---|
| - /* Keep pedantic compilers happy */ |
|---|
| - fd = fd; |
|---|
| - return_text = return_text; |
|---|
| - |
|---|
| - log_write(0, LOG_MAIN, "Message accepted by dynamically loaded dummy local_scan"); |
|---|
| - return LOCAL_SCAN_ACCEPT; |
|---|
| -} |
|---|
| - |
|---|
| - |
|---|
| -/* End of local_scan.c */ |
|---|
| Index: tags/4.2.1-13/LICENSE |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/LICENSE (revision 63) |
|---|
| +++ tags/4.2.1-13/LICENSE (nonexistent) |
|---|
| @@ -1 +0,0 @@ |
|---|
| -GPL version 2.0 ('nuff said :-D) |
|---|
| Index: tags/4.2.1-13/debian/changelog |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/changelog (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/changelog (nonexistent) |
|---|
| @@ -1,319 +0,0 @@ |
|---|
| -sa-exim (4.2.1-13) unstable; urgency=low |
|---|
| - |
|---|
| - * Updated Spanish Debconf template translation (Closes: #543310). |
|---|
| - Submitted by Francisco Javier Cuadrado. |
|---|
| - |
|---|
| - -- Magnus Holmgren <holmgren@debian.org> Sun, 14 Mar 2010 18:33:42 +0100 |
|---|
| - |
|---|
| -sa-exim (4.2.1-12) unstable; urgency=low |
|---|
| - |
|---|
| - * Debconf templates and debian/control reviewed by the debian-l10n- |
|---|
| - english team as part of the Smith review project (Closes: #517169). |
|---|
| - * Corresponding Debconf translation updates: |
|---|
| - * Brazilian Portuguese from Adriano Rafael Gomes. (Closes: #519422). |
|---|
| - * Czech from Miroslav Kure (Closes: #518989). |
|---|
| - * Finnish from Esko Arajärvi (Closes: #518200). |
|---|
| - * German from Matthias Julius (Closes: #518332). |
|---|
| - * Galician from Marce Villarino. (Closes: #519487). |
|---|
| - * Italian from Luca Monducci (Closes: #519177). |
|---|
| - * Japanese from Hideki Yamane (Closes: #518502). |
|---|
| - * Portuguese from Miguel Figueiredo. (Closes: #519002). |
|---|
| - * Swedish from Martin Bagge (Closes: #518325). |
|---|
| - * Vietnamese from Clytie Siddall (Closes: #517813). |
|---|
| - * French from Christian Perrier (Closes: #532560). |
|---|
| - The following translations have not been updated yet: da, es, fr, nl. |
|---|
| - * Add Russian Debconf translation (Closes: #529808). Thanks to Yuri Kozlov. |
|---|
| - * debian/postinst: Don't call mv with a prepended path. |
|---|
| - * debian/control: Put back ${misc:Depends} in Depends. |
|---|
| - * debian/copyright: Point to the GPL 2.0 license text since this package |
|---|
| - is licensed under that version only. |
|---|
| - * Bump Standards-Version to 3.8.1. |
|---|
| - * Increase Debhelper compat level to 5. |
|---|
| - * Override Lintian warning about depending on exim4-localscanapi-1.1 |
|---|
| - without a real package as a primary alternative, since adding that |
|---|
| - would defeat the purpose of not having to keep track of which version |
|---|
| - of Exim provides which API/ABI version. |
|---|
| - |
|---|
| - -- Magnus Holmgren <holmgren@debian.org> Sat, 01 Aug 2009 13:55:21 +0200 |
|---|
| - |
|---|
| -sa-exim (4.2.1-11) unstable; urgency=low |
|---|
| - |
|---|
| - * Add Brazilian Portuguese Debconf template translation (Closes: |
|---|
| - #484986). Thanks to Adriano Rafael Gomes and Felipe Augusto van de |
|---|
| - Wiel. |
|---|
| - * Don't ignore make clean errors. |
|---|
| - * README.Debian: Remove outdated information about patching pre-3.0 |
|---|
| - SpamAssassin. Add information regarding auto-expire problems |
|---|
| - (Closes: #461219). |
|---|
| - * Stop including the SA 2.x greylisting patches altogether (due to a |
|---|
| - typo only of them was included anyway). |
|---|
| - * This package seems to comply with policy 3.8.0 already. |
|---|
| - |
|---|
| - -- Magnus Holmgren <holmgren@debian.org> Wed, 25 Jun 2008 19:11:02 +0200 |
|---|
| - |
|---|
| -sa-exim (4.2.1-10) unstable; urgency=low |
|---|
| - |
|---|
| - * Add Finnish Debconf template translation (Closes: #472788). Thanks to |
|---|
| - Esko Arajärvi. |
|---|
| - * New maintainer email address. |
|---|
| - * Use modern fields in debian/control (Homepage; Vcs-* fields without |
|---|
| - XS-). |
|---|
| - * Greylisting.pm: Bail out if a non-IPv4 address is encountered |
|---|
| - (Closes: #300103, #479955). |
|---|
| - * Greylisting.pm: Simplify the sender address so that senders using |
|---|
| - VERP, SRS, etc. hopefully won't be greylisted each and every time |
|---|
| - (Closes: #347590). |
|---|
| - * Increase Standards-Version to 3.7.3; no changes. |
|---|
| - |
|---|
| - -- Magnus Holmgren <holmgren@debian.org> Tue, 03 Jun 2008 23:01:19 +0200 |
|---|
| - |
|---|
| -sa-exim (4.2.1-9) unstable; urgency=high |
|---|
| - |
|---|
| - * Fix ugly bug caused by expanding $primary_hostname to the |
|---|
| - non-permanent memory pool, where it will be overwritten when |
|---|
| - receiveing multiple messages over the same connection (strangely |
|---|
| - enough, nobody noticed). |
|---|
| - * Depend on the local_scan ABI version returned by |
|---|
| - exim4-localscan-plugin-config instead of all exim4-daemon-* variants |
|---|
| - (Closes: #426425). |
|---|
| - * debian/control: Indent Homepage: line and add XS-Vcs-* fields. |
|---|
| - |
|---|
| - -- Magnus Holmgren <magnus@kibibyte.se> Tue, 21 Aug 2007 22:28:01 +0200 |
|---|
| - |
|---|
| -sa-exim (4.2.1-8) unstable; urgency=medium |
|---|
| - |
|---|
| - * Urgency medium to reach testing before exim4. |
|---|
| - * Since version 4.67-1, exim4 only exports those symbols that are part |
|---|
| - of the official local_scan API. Unfortunately, sa-exim cheated and |
|---|
| - declared three extern variables by itself: |
|---|
| - · primary_hostname: Now retrieved by expanding "$primary_hostname". |
|---|
| - · smtp_out: Use smtp_fflush() to get error indication. |
|---|
| - · body_linecount: No workaround; $body_linecount simply won't be |
|---|
| - updated. I'm working to get Exim to update it along with other |
|---|
| - variables such as $message_size. |
|---|
| - (Closes: #420443, #420555, #420736) |
|---|
| - |
|---|
| - -- Magnus Holmgren <magnus@kibibyte.se> Thu, 26 Apr 2007 16:05:26 +0200 |
|---|
| - |
|---|
| -sa-exim (4.2.1-7) unstable; urgency=low |
|---|
| - |
|---|
| - * Don't depend on debconf in postrm; if we can't prompt the user, |
|---|
| - leave the spool directory alone (Closes: #417027). |
|---|
| - * Do not pass a '-u' parameter to spamc if SAspamcUser expands to the |
|---|
| - empty string. |
|---|
| - |
|---|
| - -- Magnus Holmgren <magnus@kibibyte.se> Tue, 3 Apr 2007 13:02:48 +0200 |
|---|
| - |
|---|
| -sa-exim (4.2.1-6) unstable; urgency=low |
|---|
| - |
|---|
| - * Added Portuguese Debconf template translation (Closes: #415537). |
|---|
| - Thanks to Pedro Ribeiro. |
|---|
| - * It is now possible to pass a username to spamc. See the SAspamcUser |
|---|
| - option in sa-exim.conf. |
|---|
| - * Build-depend on exim4-dev. |
|---|
| - |
|---|
| - -- Magnus Holmgren <magnus@kibibyte.se> Tue, 20 Mar 2007 14:25:31 +0100 |
|---|
| - |
|---|
| -sa-exim (4.2.1-5) unstable; urgency=low |
|---|
| - |
|---|
| - * Added Italian debconf template translation (Closes: #411396). Thanks |
|---|
| - to Luca Monducci. |
|---|
| - * Added Galician Debconf template translation (Closes: #412804). |
|---|
| - Thanks to Jacobo Tarrio. |
|---|
| - * Added Dutch debconf template translation (Closes: #413702). Thanks |
|---|
| - to Bart Cornelis. |
|---|
| - * Added debian/watch. |
|---|
| - |
|---|
| - -- Magnus Holmgren <magnus@kibibyte.se> Wed, 7 Mar 2007 15:46:16 +0100 |
|---|
| - |
|---|
| -sa-exim (4.2.1-4) unstable; urgency=low |
|---|
| - |
|---|
| - * Added Spanish debconf template translation (Closes: #404490). |
|---|
| - Thanks to Rudy Godoy. |
|---|
| - |
|---|
| - -- Magnus Holmgren <magnus@kibibyte.se> Tue, 9 Jan 2007 16:39:43 +0100 |
|---|
| - |
|---|
| -sa-exim (4.2.1-3) unstable; urgency=low |
|---|
| - |
|---|
| - * New maintainer (Closes: #352533). |
|---|
| - * Updated package description to explain what SA-Exim can do that |
|---|
| - exim-daemon-heavy can't, and vice versa (Closes: #378732). |
|---|
| - * Added German debconf template translation (Closes: #399963). |
|---|
| - Thanks to Matthias Julius. |
|---|
| - * Updated Swedish debconf templates. |
|---|
| - * Encourage use of ACL variables in sa-exim.conf. Also exclude ::1 |
|---|
| - from SA scanning. |
|---|
| - * Removed unnecessary question in long description of debconf |
|---|
| - template. |
|---|
| - * Upgraded to Standards-Version 3.7.2. No changes needed. |
|---|
| - * Moved greylistclean to /usr/share/sa-exim. If you have modified |
|---|
| - the crontab file, you have to update it manually. |
|---|
| - * Added Recommends: perl (needed by greylistclean, but greylistclean |
|---|
| - isn't completely necessary. |
|---|
| - |
|---|
| - -- Magnus Holmgren <magnus@kibibyte.se> Sun, 3 Dec 2006 00:41:01 +0100 |
|---|
| - |
|---|
| -sa-exim (4.2.1-2) unstable; urgency=medium |
|---|
| - |
|---|
| - * Fixed rights on /var/spool/sa-exim. Closes: #297623 |
|---|
| - + Content-type bug closed by 4.2.1-1: Closes: #286069 |
|---|
| - * Fixed README.greylisting Closes: #325335 |
|---|
| - + Added cs, sv, vi translations Closes: #315995, #332363, #317869 |
|---|
| - + Added note about unsupported linecontinuation to README |
|---|
| - sa-exim.conf already has note Closes: #276080 |
|---|
| - + Removed SAtempreject from default sa-exim.conf Closes: #281567 |
|---|
| - |
|---|
| - -- Sander Smeenk <ssmeenk@debian.org> Mon, 27 Mar 2006 13:42:06 +0200 |
|---|
| - |
|---|
| -sa-exim (4.2.1-1) unstable; urgency=high |
|---|
| - |
|---|
| - * SECURITY: new upstream does a better job at being safe when deleting |
|---|
| - greylisting tuplets Closes: #345071 |
|---|
| - * Fixed sa-exim.conf typo Closes: #305890 |
|---|
| - * Disable former insecure /etc/cron.daily/greylistclean |
|---|
| - |
|---|
| - -- Sander Smeenk <ssmeenk@debian.org> Mon, 09 Jan 2006 09:01:25 -0800 |
|---|
| - |
|---|
| -sa-exim (4.2-1) unstable; urgency=high |
|---|
| - |
|---|
| - * New upstream version |
|---|
| - * Ship new SA-Exim Greylisting plugin for SA 3.0 or better |
|---|
| - * Ship new /etc/cron.daily/greylistclean |
|---|
| - * Updated README.Debian |
|---|
| - |
|---|
| - -- Marc MERLIN <marc_soft@merlins.org> Mon, 17 Dec 2005 00:14:03 -0800 |
|---|
| - |
|---|
| -sa-exim (4.1-1) unstable; urgency=high |
|---|
| - |
|---|
| - * New upstream version |
|---|
| - * SECURITY: new upstream provides SA greylisting patch with shell safe |
|---|
| - filenames and directories (only affected users who use the SA greylisting |
|---|
| - patch _and_ an unsafe shell cron job to delete old files and directories) |
|---|
| - * Updated README.debian to warn that the SA 2.4 greylisting patch is out |
|---|
| - of date and unmaintained. |
|---|
| - |
|---|
| - -- Marc MERLIN <marc_soft@merlins.org> Mon, 16 Aug 2004 08:32:36 -0700 |
|---|
| - |
|---|
| -sa-exim (4.0-3) unstable; urgency=low |
|---|
| - |
|---|
| - + Changed hard depend on spamc, since that's all sa-exim needs. |
|---|
| - You have to choose to install spamassassin, or run spamc to |
|---|
| - another host. This entry closes: #253393 |
|---|
| - + Documentation was assed to explain about sa-exim defaulting |
|---|
| - to exim4 configured to use exim4/use_split_config. Devine |
|---|
| - intervention is needed when using monolithic configs. One day |
|---|
| - sa-exim might detect this and act on it? |
|---|
| - This entry closes: #251755, #265820 |
|---|
| - + Incorrect scoring of messages due to incorrect last-Received: |
|---|
| - header is now fixed by newer versions of the exim4 package. |
|---|
| - Dependencies have been changed. This entry closes: #250726, #246715 |
|---|
| - + Updated Japanese translations of debconf templates. A typo in the |
|---|
| - english templates has been fixed too. This entry closes: #252341 |
|---|
| - |
|---|
| - -- Sander Smeenk <ssmeenk@debian.org> Wed, 15 Aug 2004 19:40:05 +0200 |
|---|
| - |
|---|
| -sa-exim (4.0-2) unstable; urgency=low |
|---|
| - |
|---|
| - * Clarified SA-greylisting patches in README.Debian |
|---|
| - Closes: #245573 |
|---|
| - + Added Danish translations |
|---|
| - + Added French translations |
|---|
| - Closes: #238537, #239258 |
|---|
| - |
|---|
| - -- Sander Smeenk <ssmeenk@debian.org> Sat, 24 Apr 2004 11:34:35 +0200 |
|---|
| - |
|---|
| -sa-exim (4.0-1) unstable; urgency=low |
|---|
| - |
|---|
| - * New upstream version |
|---|
| - * Added new docs (README.greylisting / SA patches) |
|---|
| - * Create /var/spool/sa-exim/tuplets for the new greylisting support |
|---|
| - |
|---|
| - -- Marc MERLIN <marc_soft@merlins.org> Tue, 03 Mar 2004 08:52:49 -0800 |
|---|
| - |
|---|
| -sa-exim (3.1-4) unstable; urgency=low |
|---|
| - |
|---|
| - * Fixed minor packaging bugs. |
|---|
| - * Debconf gettextized for translators (Closes: #237105) |
|---|
| - |
|---|
| - -- Sander Smeenk <ssmeenk@debian.org> Sun, 07 Mar 2004 15:38:47 +0100 |
|---|
| - |
|---|
| -sa-exim (3.1-3) unstable; urgency=low |
|---|
| - |
|---|
| - * Clean up properly on purge, asking per debconf about removing saved mails |
|---|
| - in spool-directory if necessary. |
|---|
| - * Update to work with exim4 running as Debian-exim (don't include |
|---|
| - /var/spool/sa-exim in deb, generate it in postinst; stricter |
|---|
| - dependencies). |
|---|
| - * sa-exim uses spamc - Correct depends accordingly. |
|---|
| - |
|---|
| - -- Sander Smeenk <ssmeenk@debian.org> Sun, 22 Feb 2004 10:32:03 +0100 |
|---|
| - |
|---|
| -sa-exim (3.1-2) unstable; urgency=low |
|---|
| - |
|---|
| - * Minor updates to control suggested by Andreas Metzler |
|---|
| - * Minor updates on upstream source (INSTALL / sa-exim.conf) |
|---|
| - * Uploaded to Debian (Closes: #196100) |
|---|
| - |
|---|
| - -- Marc MERLIN <marc_soft@merlins.org> Wed, 20 Aug 2003 09:18:42 -0700 |
|---|
| - |
|---|
| -sa-exim (3.1-1) unstable; urgency=low |
|---|
| - |
|---|
| - * Upstream update |
|---|
| - |
|---|
| - -- Marc MERLIN <marc_soft@merlins.org> Tue, 19 Aug 2003 09:48:13 -0700 |
|---|
| - |
|---|
| -sa-exim (3.0+cvs-20030802) unstable; urgency=low |
|---|
| - |
|---|
| - * Updated sa-exim to cvs version |
|---|
| - * Restored plugin location to /usr/lib/exim4/local_scan/ |
|---|
| - * Added contrib contents to docs |
|---|
| - |
|---|
| - -- Marc MERLIN <marc_soft@merlins.org> Sat, 02 Aug 2003 20:57:50 -0700 |
|---|
| - |
|---|
| -sa-exim (3.0+cvs-20030728) unstable; urgency=low |
|---|
| - |
|---|
| - * Updated sa-exim to cvs version |
|---|
| - |
|---|
| - -- Marc MERLIN <marc_soft@merlins.org> Mon, 28 Jul 2003 21:08:24 -0500 |
|---|
| - |
|---|
| -sa-exim (3.0+cvs-1) unstable; urgency=low |
|---|
| - |
|---|
| - * Updated sa-exim to cvs version (and new sa-exim.conf config file) |
|---|
| - |
|---|
| - -- Marc MERLIN <marc_soft@merlins.org> Mon, 08 Jun 2003 23:19:11 -0700 |
|---|
| - |
|---|
| -sa-exim (3.0-3) unstable; urgency=low |
|---|
| - |
|---|
| - * Taken over from Andreas, thanks for the template |
|---|
| - * Rewrote description in control |
|---|
| - * Updated docs to contain all the documentation files |
|---|
| - * /var/spool/sa-exim will contain the saved mails and is 770/mail.mail |
|---|
| - * Do not patch sample sa-exim.conf, run sed during the install |
|---|
| - * Removed ${misc:Depends} from control, my dpkg-gencontrol says it's unknown |
|---|
| - * Fixes to debian/control, debian/rules and debian/copyright for policy |
|---|
| - compliance and to make lintian more happy. Increased Standards-Version to |
|---|
| - 3.5.10. (Andreas Metzler) |
|---|
| - * Add some magic to maintainerscripts, disabling the sa-exim part of exim's |
|---|
| - main configuration file when sa-exim is uninstalled. (Andreas Metzler) |
|---|
| - |
|---|
| - -- Marc MERLIN <marc_soft@merlins.org> Mon, 26 May 2003 23:22:56 -0700 |
|---|
| - |
|---|
| -sa-exim (3.0-2) unstable; urgency=low |
|---|
| - |
|---|
| - * Small fixes |
|---|
| - |
|---|
| - -- Andreas Metzler <ametzler@debian.org> Fri, 2 May 2003 20:20:11 +0200 |
|---|
| - |
|---|
| -sa-exim (3.0-1) unstable; urgency=low |
|---|
| - |
|---|
| - * renamed package to sa-exim |
|---|
| - * upgrade to 3.0 |
|---|
| - |
|---|
| - -- Andreas Metzler <ametzler@debian.org> Fri, 2 May 2003 17:36:28 +0200 |
|---|
| - |
|---|
| -exim4-sa-plugin (2.2-1) unstable; urgency=low |
|---|
| - |
|---|
| - * Initial Release. |
|---|
| - |
|---|
| - -- Andreas Metzler <ametzler@debian.org> Thu, 13 Mar 2003 17:16:46 +0100 |
|---|
| - |
|---|
| Index: tags/4.2.1-13/debian/docs |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/docs (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/docs (nonexistent) |
|---|
| @@ -1,8 +0,0 @@ |
|---|
| -ACKNOWLEDGEMENTS |
|---|
| -Acknowledgements.html |
|---|
| -README |
|---|
| -README.greylisting |
|---|
| -sa.html |
|---|
| -TODO |
|---|
| -contrib/sa-exim-stats.txt |
|---|
| -contrib/spam_resend.txt |
|---|
| Index: tags/4.2.1-13/debian/rules |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/rules (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/rules (nonexistent) |
|---|
| @@ -1,88 +0,0 @@ |
|---|
| -#!/usr/bin/make -f |
|---|
| -# Sample debian/rules that uses debhelper. |
|---|
| -# GNU copyright 1997 to 1999 by Joey Hess. |
|---|
| - |
|---|
| -# Uncomment this to turn on verbose mode. |
|---|
| -#export DH_VERBOSE=1 |
|---|
| - |
|---|
| -CFLAGS = -Wall -g |
|---|
| - |
|---|
| -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) |
|---|
| - CFLAGS += -O0 |
|---|
| -else |
|---|
| - CFLAGS += -O2 |
|---|
| -endif |
|---|
| -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) |
|---|
| - INSTALL_PROGRAM += -s |
|---|
| -endif |
|---|
| - |
|---|
| -configure: configure-stamp |
|---|
| -configure-stamp: |
|---|
| - dh_testdir |
|---|
| - touch configure-stamp |
|---|
| - |
|---|
| -build: build-stamp |
|---|
| -build-stamp: configure-stamp |
|---|
| - dh_testdir |
|---|
| - $(MAKE) BUILDCFLAGS='-I/usr/include/exim4 -fPIC $$(CFLAGS)' |
|---|
| - touch build-stamp |
|---|
| - |
|---|
| -clean: |
|---|
| - dh_testdir |
|---|
| - dh_testroot |
|---|
| - rm -f build-stamp configure-stamp |
|---|
| - $(MAKE) clean |
|---|
| - dh_clean |
|---|
| - |
|---|
| -install: build |
|---|
| - dh_testdir |
|---|
| - dh_testroot |
|---|
| - dh_clean -k |
|---|
| - dh_installdirs |
|---|
| - install -m755 sa-exim-*so \ |
|---|
| - $(CURDIR)/debian/sa-exim/usr/lib/exim4/local_scan/sa-exim.so |
|---|
| - install -m755 accept*so \ |
|---|
| - $(CURDIR)/debian/sa-exim/usr/lib/exim4/local_scan/accept.so |
|---|
| - sed "s/\/var\/spool\/exim/\/var\/spool\/sa-exim/" < sa-exim.conf > \ |
|---|
| - $(CURDIR)/debian/sa-exim/etc/exim4/sa-exim.conf |
|---|
| - chmod 644 $(CURDIR)/debian/sa-exim/etc/exim4/sa-exim.conf |
|---|
| - install -m644 debian/15_sa-exim_plugin_path \ |
|---|
| - $(CURDIR)/debian/sa-exim/etc/exim4/conf.d/main |
|---|
| - install -m644 Greylisting.pm \ |
|---|
| - $(CURDIR)/debian/sa-exim/usr/share/perl5/Mail/SpamAssassin/Plugin/Greylisting.pm |
|---|
| - install -m644 greylistclean.cron \ |
|---|
| - $(CURDIR)/debian/sa-exim/etc/cron.d/greylistclean |
|---|
| - install -m755 greylistclean \ |
|---|
| - $(CURDIR)/debian/sa-exim/usr/share/sa-exim/greylistclean |
|---|
| - |
|---|
| -# Build architecture-independent files here. |
|---|
| -binary-indep: build install |
|---|
| -# We have nothing to do by default. |
|---|
| - |
|---|
| -# Build architecture-dependent files here. |
|---|
| -binary-arch: build install |
|---|
| - dh_testdir |
|---|
| - dh_testroot |
|---|
| - dh_installchangelogs Changelog.html |
|---|
| - dh_installdocs |
|---|
| - dh_installexamples |
|---|
| - dh_installdebconf |
|---|
| - dh_installman |
|---|
| - install -d debian/sa-exim/usr/share/lintian/overrides |
|---|
| - install -m 644 debian/sa-exim.lintian-overrides \ |
|---|
| - debian/sa-exim/usr/share/lintian/overrides/sa-exim |
|---|
| - dh_link |
|---|
| - dh_strip |
|---|
| - dh_compress |
|---|
| - dh_fixperms -Xvar/spool/sa-exim |
|---|
| - dh_perl |
|---|
| - dh_installdeb |
|---|
| - dh_shlibdeps |
|---|
| - echo "exim:Depends=exim4-localscanapi-`exim4-localscan-plugin-config --localscan-apiversion`" \ |
|---|
| - >> debian/sa-exim.substvars |
|---|
| - dh_gencontrol |
|---|
| - dh_md5sums |
|---|
| - dh_builddeb |
|---|
| - |
|---|
| -binary: binary-indep binary-arch |
|---|
| -.PHONY: build clean binary-indep binary-arch binary install configure |
|---|
| /tags/4.2.1-13/debian/rules |
|---|
| Property changes: |
|---|
| Deleted: svn:executable |
|---|
| Index: tags/4.2.1-13/debian/templates |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/templates (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/templates (nonexistent) |
|---|
| @@ -1,20 +0,0 @@ |
|---|
| -# These templates have been reviewed by the debian-l10n-english |
|---|
| -# team |
|---|
| -# |
|---|
| -# If modifications/additions/rewording are needed, please ask |
|---|
| -# debian-l10n-english@lists.debian.org for advice. |
|---|
| -# |
|---|
| -# Even minor modifications require translation updates and such |
|---|
| -# changes should be coordinated with translators and reviewers. |
|---|
| - |
|---|
| -Template: sa-exim/purge_spool |
|---|
| -Type: boolean |
|---|
| -Default: false |
|---|
| -_Description: Remove saved mails in sa-exim's spool directory? |
|---|
| - There are some saved mails in subdirectories of /var/spool/sa-exim. |
|---|
| - Depending on the configuration, sa-exim may save mails matching specific |
|---|
| - criteria (such as "an error occurred", "rejected as spam", or "passed |
|---|
| - through although recognized as spam") in these directories. |
|---|
| - . |
|---|
| - Please choose whether you want to keep these mails for further analysis |
|---|
| - or delete them now. |
|---|
| Index: tags/4.2.1-13/debian/sa-exim.lintian-overrides |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/sa-exim.lintian-overrides (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/sa-exim.lintian-overrides (nonexistent) |
|---|
| @@ -1 +0,0 @@ |
|---|
| -sa-exim: virtual-package-depends-without-real-package-depends depends: exim4-localscanapi-1.1 |
|---|
| Index: tags/4.2.1-13/debian/dirs |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/dirs (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/dirs (nonexistent) |
|---|
| @@ -1,5 +0,0 @@ |
|---|
| -usr/lib/exim4/local_scan |
|---|
| -etc/exim4/conf.d/main |
|---|
| -usr/share/perl5/Mail/SpamAssassin/Plugin |
|---|
| -usr/share/sa-exim |
|---|
| -etc/cron.d |
|---|
| Index: tags/4.2.1-13/debian/15_sa-exim_plugin_path |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/15_sa-exim_plugin_path (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/15_sa-exim_plugin_path (nonexistent) |
|---|
| @@ -1,9 +0,0 @@ |
|---|
| -# This will enable sa-exim, but it won't actually scan and possibly reject |
|---|
| -# messsages before you enable this in sa-exim.conf (see SAEximRunCond) |
|---|
| -# |
|---|
| -# For a starter, you'd probably want to read the documentation at: |
|---|
| -# /usr/share/doc/sa-exim/README.Debian |
|---|
| -# and |
|---|
| -# /usr/share/doc/sa-exim/README.gz |
|---|
| -# |
|---|
| -local_scan_path = /usr/lib/exim4/local_scan/sa-exim.so |
|---|
| Index: tags/4.2.1-13/debian/config |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/config (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/config (nonexistent) |
|---|
| @@ -1,5 +0,0 @@ |
|---|
| -#!/bin/sh -e |
|---|
| - |
|---|
| -. /usr/share/debconf/confmodule |
|---|
| - |
|---|
| -exit 0 |
|---|
| Index: tags/4.2.1-13/debian/watch |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/watch (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/watch (nonexistent) |
|---|
| @@ -1,3 +0,0 @@ |
|---|
| -version=3 |
|---|
| - |
|---|
| -http://marc.merlins.org/linux/exim/sa.html files/sa-exim-(\d+(?:\.\d+)*)\.tar\.gz |
|---|
| Index: tags/4.2.1-13/debian/copyright |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/copyright (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/copyright (nonexistent) |
|---|
| @@ -1,34 +0,0 @@ |
|---|
| -This package was adopted by the current Debian maintainer, |
|---|
| -Magnus Holmgren <magnus@debian.org>, on Fri, 1 Dec 2006 19:05:58 +0100. |
|---|
| - |
|---|
| -Before that, it was maintained by Sander Smeenk <ssmeenk@debian.org>, who |
|---|
| -adopted it on Tue, 24 Feb 2004 19:47:11 +0100. |
|---|
| - |
|---|
| -The package was originally debianized by Andreas Metzler |
|---|
| -<ametzler@debian.org> on Thu, 13 Mar 2003 17:16:46 +0100. |
|---|
| - |
|---|
| -Upstream Author: Marc MERLIN <marc_soft@merlins.org> |
|---|
| - |
|---|
| -It was downloaded from http://marc.merlins.org/linux/exim/sa.html |
|---|
| - |
|---|
| -Copyright © 2004-2006 Marc Merlin |
|---|
| - |
|---|
| -License: |
|---|
| - |
|---|
| - This package is free software; you can redistribute it and/or modify |
|---|
| - it under the terms of the GNU General Public License as published by |
|---|
| - the Free Software Foundation; version 2 dated June, 1991. |
|---|
| - |
|---|
| - This package is distributed in the hope that it will be useful, |
|---|
| - but WITHOUT ANY WARRANTY; without even the implied warranty of |
|---|
| - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|---|
| - GNU General Public License for more details. |
|---|
| - |
|---|
| - You should have received a copy of the GNU General Public License |
|---|
| - along with this package; if not, write to the Free Software |
|---|
| - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA |
|---|
| - 02110-1301, USA |
|---|
| - |
|---|
| -On Debian systems, the complete text of the GNU General |
|---|
| -Public License can be found in `/usr/share/common-licenses/GPL-2'. |
|---|
| - |
|---|
| Index: tags/4.2.1-13/debian/NEWS |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/NEWS (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/NEWS (nonexistent) |
|---|
| @@ -1,18 +0,0 @@ |
|---|
| -sa-exim (4.2.1-8) unstable; urgency=medium |
|---|
| - |
|---|
| - * Since version 4.67-1, exim4 only exports those symbols that are part |
|---|
| - of the official local_scan API. Unfortunately, sa-exim has all along |
|---|
| - cheated and declared some "extern" variables by itself, something that |
|---|
| - no longer works. For one of these, body_linecount, no workaround is |
|---|
| - currently possible, meaning that it will not be updated if the message |
|---|
| - body is rewritten (by way of SpamAssassin's report_safe together with |
|---|
| - SARewriteBody: 1 in sa-exim.conf. This means that if you use |
|---|
| - $body_linecount or $message_linecount in string expansions in your |
|---|
| - Exim configuration, they will refer to the line count before rewriting |
|---|
| - the message body. |
|---|
| - |
|---|
| - This change will hopefully be restored soon, either by extending the |
|---|
| - local_scan API or by making Exim count the lines. |
|---|
| - |
|---|
| - -- Magnus Holmgren <magnus@kibibyte.se> Thu, 26 Apr 2007 16:22:49 +0200 |
|---|
| - |
|---|
| Index: tags/4.2.1-13/debian/README.Debian |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/README.Debian (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/README.Debian (nonexistent) |
|---|
| @@ -1,169 +0,0 @@ |
|---|
| -******************************** |
|---|
| -* SHOULD YOU USE THIS PACKAGE? * |
|---|
| -******************************** |
|---|
| - |
|---|
| -Since version 4.50, Exim has the content-scanning extension formerly |
|---|
| -known as "exiscan" built-in. It has a number of advantages and |
|---|
| -disadvantages compared to SA-Exim. |
|---|
| - |
|---|
| -Advantages of built-in content-scanning interface: |
|---|
| - |
|---|
| - * One less configuration file to edit. |
|---|
| - * Spam control policy integrates better with Exim's ACL system. |
|---|
| - * It's possible to tell SA which user to scan for (the -u parameter of |
|---|
| - spamc). SA-Exim can't do that (yet). |
|---|
| - * Finer control over the mail header is possible, but not in a clean |
|---|
| - way (it involves putting all header fields you might possibly want |
|---|
| - to add in the report template, and using rather complicated |
|---|
| - expansion expressions to extract the wanted ones from |
|---|
| - $spam_report). At any rate, you can choose a prefix different from |
|---|
| - "X-Spam-". |
|---|
| - |
|---|
| -Advantages of SA-Exim: |
|---|
| - |
|---|
| - * It is possible to use the report_safe feature, which turns mail |
|---|
| - deemed to be spam into a message/rfc822 attachment of a report |
|---|
| - message. (Note however that if you do, then any X-SA-* fields added |
|---|
| - to help the greylisting module can't be removed.) |
|---|
| - * All the add_header and rewrite_header options in |
|---|
| - /etc/spamassassin/local.cf will be obeyed. In other words, |
|---|
| - everything will be *almost* as if you filtered the mail through |
|---|
| - spamassassin on the command line. |
|---|
| - * So-called teergrubing ("tarpitting") is possible in a way that |
|---|
| - isn't possible with exiscan (I'm not in any way saying that it |
|---|
| - works as a counterattack against spammers). |
|---|
| - * You can simply add the sa-exim package to a standard exim4 |
|---|
| - installation and it should, in principle, instantly work (except |
|---|
| - you have to uncomment one line in sa-exim.conf). |
|---|
| - |
|---|
| -Both alternatives enable you to defer, greylist, reject, and blackhole |
|---|
| -mail, optionally saving copies, at configurable score levels. |
|---|
| - |
|---|
| -***************** |
|---|
| -* CONFIGURATION * |
|---|
| -***************** |
|---|
| - |
|---|
| -This version of the sa-exim package defaults to placing a configuration |
|---|
| -sniplet in /etc/exim4/conf.d/. Depending on what you have answered to the |
|---|
| -DebConf questions while configuring Exim4, the module will be loaded |
|---|
| -automatically, or human intervention is required. |
|---|
| - |
|---|
| -To find out what configuration file Exim4 is using, issue: |
|---|
| - |
|---|
| - $ exim4 -bV | tail -1 |
|---|
| - Configuration file is /path/to/configfile |
|---|
| - |
|---|
| -If /path/to/configfile shows: |
|---|
| - |
|---|
| - - /etc/exim4/exim4.conf |
|---|
| - You are using the hand-crafted configuration file. |
|---|
| - See the 'HAND-CRAFTED' section below. |
|---|
| - |
|---|
| - - /var/lib/exim4/config.autogenerated |
|---|
| - You are using the debianized configuration scheme - with either |
|---|
| - 'split' or 'unsplit' configuration file. |
|---|
| - See the 'DEBIANIZED' section below. |
|---|
| - |
|---|
| - |
|---|
| -HAND-CRAFTED |
|---|
| ------------- |
|---|
| - |
|---|
| -Use 'grep "local_scan_path" /etc/exim4/exim4.conf" to see if the sa-exim |
|---|
| -line is included in the configuration. If grep returns something, check |
|---|
| -if it matches the following line. If grep returns nothing, you have to |
|---|
| -manually add the following line to the exim4.conf file and restart exim4. |
|---|
| - |
|---|
| - local_scan_path = /usr/lib/exim4/local_scan/sa-exim.so |
|---|
| - |
|---|
| -Change or add the line above and manually restart exim4 by issuing |
|---|
| -'invoke-rc.d exim4 reload' or '/etc/init.d/exim4 reload' as root. |
|---|
| - |
|---|
| - |
|---|
| -DEBIANIZED |
|---|
| ----------- |
|---|
| - |
|---|
| -Use 'grep "local_scan_path" /var/lib/exim4/config.autogenerated' to |
|---|
| -see if the sa-exim line is included in the configuration. If grep |
|---|
| -returns something, you're set and already using the sa-exim module. If |
|---|
| -grep returns nothing, we need to figure out a few things: |
|---|
| - |
|---|
| -Issue: |
|---|
| - $ grep "use_split_config" /etc/exim4/update-exim4.conf.conf |
|---|
| - dc_use_split_config='true' |
|---|
| - |
|---|
| -If your result shows 'false' where mine shows 'true', then you're |
|---|
| -using the unsplit configuration, generated from |
|---|
| -/etc/exim4/exim4.conf.template. If you haven't customized that file |
|---|
| -you could edit /etc/exim4/update-exim4.conf.conf by hand, change the |
|---|
| -'false' to 'true' and issue 'update-exim4.conf' as root. Then, check |
|---|
| -again if the sa-exim module line is included. It should. If it still |
|---|
| -isn't: mail me. If it is, restart exim4 by issuing 'invoke-rc.d exim4 |
|---|
| -restart' or '/etc/init.d/exim4 restart' as root. If you *have* |
|---|
| -customized /etc/exim4/exim4.conf.template, then you'd better stick |
|---|
| -with the unsplit configuration scheme and add the local_scan_path |
|---|
| -setting by hand, like with the hand-crafted configuration file. |
|---|
| - |
|---|
| -Next, read all about greylisting and sa-exim: |
|---|
| - |
|---|
| -*************** |
|---|
| -* GREYLISTING * |
|---|
| -*************** |
|---|
| -Notes on greylisting with sa-exim. |
|---|
| - |
|---|
| -If you use SpamAssassin 3.0 or better, you do not need to patch it, you |
|---|
| -can just use the Greylisting module shipped with sa-exim. |
|---|
| -The only thing you need to do to enable it, is to copy the 4 lines below |
|---|
| -loadplugin in the greylisting README, and adjust the score if you wish (see |
|---|
| -README.Greylisting for details). |
|---|
| - |
|---|
| -*********************************** |
|---|
| -* PROBLEMS WITH BAYES AUTO-EXPIRY * |
|---|
| -*********************************** |
|---|
| - |
|---|
| -When scanning mail during the SMTP dialogue there is somewhat limited |
|---|
| -time before the remote host gives up, even if they should wait for at |
|---|
| -least ten minutes. To avoid Exim returning a temporary error status, |
|---|
| -or the remote host giving up prematurely and in some cases for good, |
|---|
| -SA-Exim overrides Exim's timeout handler and accepts the message if |
|---|
| -SpamAssassin takes too long, by default 240 seconds. |
|---|
| - |
|---|
| -Using SpamAssassin's Bayesian learning module means that it will |
|---|
| -automatically expire old tokens when its database has grown too large. |
|---|
| -That can take several minutes. If it takes too long, SA-Exim will |
|---|
| -abort it, meaning that SpamAssassin will run auto-expiry again next |
|---|
| -time, and be aborted, and so on... |
|---|
| - |
|---|
| -If this happens, you have a few remedies: |
|---|
| - |
|---|
| -1) Set SAtimeout to a higher value in /etc/exim4/sa-exim.conf. |
|---|
| - |
|---|
| -2) Run sa-learn --force-expire periodically. How you run it depends on |
|---|
| - how you've configured SpamAssassin. Running it as Debian-exim may |
|---|
| - be sufficient. |
|---|
| - |
|---|
| -2 a) In addition, you can add |
|---|
| - |
|---|
| - bayes_auto_expire 0 |
|---|
| - |
|---|
| - to /etc/spamassassin/local.cf. This may not be a good idea if |
|---|
| - SpamAssassin, for whatever reason, is also used as a more |
|---|
| - traditional filter from e.g. .procmailrc, as all users will need to |
|---|
| - run sa-learn --force-expire then. |
|---|
| - |
|---|
| -2 b) If you get a lot of mail, consider adding |
|---|
| - |
|---|
| - bayes_learn_to_journal 1 |
|---|
| - |
|---|
| - to local.cf. See the Mail::SpamAssassin::Conf(3) manual page for |
|---|
| - more information. |
|---|
| - |
|---|
| -********************************** |
|---|
| -* NOTICE ABOUT SPAMC CONFIG FILE * |
|---|
| -********************************** |
|---|
| - |
|---|
| -Recent versions of spamc can read command-line parameters and switches |
|---|
| -from a configuration file called /etc/spamassassin/spamc.conf. If that |
|---|
| -file specifies conflicting options, it will prevent SA-Exim from |
|---|
| -working. For now, you'll have to make sure that it doesn't. |
|---|
| - |
|---|
| - -- Magnus Holmgren <holmgren@debian.org>, Tue, 24 Jun 2008 14:27:59 +0200 |
|---|
| Index: tags/4.2.1-13/debian/po/vi.po |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/po/vi.po (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/po/vi.po (nonexistent) |
|---|
| @@ -1,47 +0,0 @@ |
|---|
| -# Vietnamese translation for sa-exim. |
|---|
| -# Copyright © 2009 Free Software Foundation, Inc. |
|---|
| -# Clytie Siddall <clytie@riverland.net.au>, 2005-2009. |
|---|
| -# |
|---|
| -msgid "" |
|---|
| -msgstr "" |
|---|
| -"Project-Id-Version: sa-exim 4.2.1-12\n" |
|---|
| -"Report-Msgid-Bugs-To: sa-exim@packages.debian.org\n" |
|---|
| -"POT-Creation-Date: 2009-04-04 15:40+0200\n" |
|---|
| -"PO-Revision-Date: 2009-03-02 19:08+1030\n" |
|---|
| -"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" |
|---|
| -"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" |
|---|
| -"MIME-Version: 1.0\n" |
|---|
| -"Content-Type: text/plain; charset=UTF-8\n" |
|---|
| -"Content-Transfer-Encoding: 8bit\n" |
|---|
| -"Plural-Forms: nplurals=1; plural=0;\n" |
|---|
| -"X-Generator: LocFactoryEditor 1.8\n" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "Remove saved mails in sa-exim's spool directory?" |
|---|
| -msgstr "Gỡ bỏ các thư đã lưu khỏi thư mục ống chỉ của sa-exim ?" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"There are some saved mails in subdirectories of /var/spool/sa-exim. " |
|---|
| -"Depending on the configuration, sa-exim may save mails matching specific " |
|---|
| -"criteria (such as \"an error occurred\", \"rejected as spam\", or \"passed " |
|---|
| -"through although recognized as spam\") in these directories." |
|---|
| -msgstr "" |
|---|
| -"Có một số thư đã lưu nằm trong thư mục con của « /var/spool/sa-exim ». Phụ " |
|---|
| -"thuộc vào cấu hình, sa-exim có thể lưu mỗi thư tương ứng với tiêu chuẩn " |
|---|
| -"riêng (v.d. gặp lỗi, bị từ chối do thư rác, tán thành dù nhận ra là thư rác) " |
|---|
| -"vào các thư mục này." |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"Please choose whether you want to keep these mails for further analysis or " |
|---|
| -"delete them now." |
|---|
| -msgstr "" |
|---|
| -"Hãy chọn nếu bạn muốn giữ lại các thư này để phân tích về sau, hoặc xoá " |
|---|
| -"chúng ngay bây giờ." |
|---|
| Index: tags/4.2.1-13/debian/po/templates.pot |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/po/templates.pot (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/po/templates.pot (nonexistent) |
|---|
| @@ -1,40 +0,0 @@ |
|---|
| -# SOME DESCRIPTIVE TITLE. |
|---|
| -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER |
|---|
| -# This file is distributed under the same license as the PACKAGE package. |
|---|
| -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. |
|---|
| -# |
|---|
| -msgid "" |
|---|
| -msgstr "" |
|---|
| -"Project-Id-Version: PACKAGE VERSION\n" |
|---|
| -"Report-Msgid-Bugs-To: sa-exim@packages.debian.org\n" |
|---|
| -"POT-Creation-Date: 2009-04-04 15:40+0200\n" |
|---|
| -"PO-Revision-Date: 2009-04-04 15:41+0200\n" |
|---|
| -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
|---|
| -"Language-Team: LANGUAGE <LL@li.org>\n" |
|---|
| -"MIME-Version: 1.0\n" |
|---|
| -"Content-Type: text/plain; charset=CHARSET\n" |
|---|
| -"Content-Transfer-Encoding: 8bit\n" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "Remove saved mails in sa-exim's spool directory?" |
|---|
| -msgstr "" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"There are some saved mails in subdirectories of /var/spool/sa-exim. " |
|---|
| -"Depending on the configuration, sa-exim may save mails matching specific " |
|---|
| -"criteria (such as \"an error occurred\", \"rejected as spam\", or \"passed " |
|---|
| -"through although recognized as spam\") in these directories." |
|---|
| -msgstr "" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"Please choose whether you want to keep these mails for further analysis or " |
|---|
| -"delete them now." |
|---|
| -msgstr "" |
|---|
| Index: tags/4.2.1-13/debian/po/pt.po |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/po/pt.po (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/po/pt.po (nonexistent) |
|---|
| @@ -1,53 +0,0 @@ |
|---|
| -# Portuguese translation for sa-exim debconf messages. |
|---|
| -# Copyright (C) 2007 Pedro Ribeiro <p.m42.ribeiro@gmail.com> |
|---|
| -# This file is distributed under the same license as the sa-exim package. |
|---|
| -# Pedro Ribeiro <p.m42.ribeiro@gmail.com>, 2007-2009 |
|---|
| -# |
|---|
| -msgid "" |
|---|
| -msgstr "" |
|---|
| -"Project-Id-Version: sa-exim 4.2.1-12\n" |
|---|
| -"Report-Msgid-Bugs-To: sa-exim@packages.debian.org\n" |
|---|
| -"POT-Creation-Date: 2009-04-04 15:40+0200\n" |
|---|
| -"PO-Revision-Date: 2009-03-09 19:58+0000\n" |
|---|
| -"Last-Translator: Pedro Ribeiro <p.m42.ribeiro@gmail.com>\n" |
|---|
| -"Language-Team: Portuguese <traduz@debianpt.org>\n" |
|---|
| -"MIME-Version: 1.0\n" |
|---|
| -"Content-Type: text/plain; charset=utf-8\n" |
|---|
| -"Content-Transfer-Encoding: 8bit\n" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "Remove saved mails in sa-exim's spool directory?" |
|---|
| -msgstr "Remover os mails guardados no directório de spool do sa-exim ?" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"There are some saved mails in subdirectories of /var/spool/sa-exim. " |
|---|
| -"Depending on the configuration, sa-exim may save mails matching specific " |
|---|
| -"criteria (such as \"an error occurred\", \"rejected as spam\", or \"passed " |
|---|
| -"through although recognized as spam\") in these directories." |
|---|
| -msgstr "" |
|---|
| -"Existem alguns mails guardados em sub-directórios de /var/spool/sa-exim. " |
|---|
| -"Dependendo da configuração, o sa-exim guarda os mails que obedecem a certos " |
|---|
| -"critérios (tais como \"ocorreu um erro\", \"rejeitado como spam\", \"aceite " |
|---|
| -"mas marcada como spam\", ...) nesses directórios." |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"Please choose whether you want to keep these mails for further analysis or " |
|---|
| -"delete them now." |
|---|
| -msgstr "" |
|---|
| -"Escolha, por favor, se quer manter estes mails para análise futura ou apagá-" |
|---|
| -"los agora." |
|---|
| - |
|---|
| -#~ msgid "" |
|---|
| -#~ "You can keep them for further analysis and later remove them manually or " |
|---|
| -#~ "decide to delete them now." |
|---|
| -#~ msgstr "" |
|---|
| -#~ "Pode mantê-las para análise posterior e removê-las mais tarde manualmente " |
|---|
| -#~ "ou apagá-las agora." |
|---|
| Index: tags/4.2.1-13/debian/po/da.po |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/po/da.po (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/po/da.po (nonexistent) |
|---|
| @@ -1,73 +0,0 @@ |
|---|
| -# translation of sa-exim_3.1-4-da.po to Danish |
|---|
| -# translation of sa-exim_3.1-4_templates.po to Danish |
|---|
| -# |
|---|
| -# Translators, if you are not familiar with the PO format, gettext |
|---|
| -# documentation is worth reading, especially sections dedicated to |
|---|
| -# this format, e.g. by running: |
|---|
| -# info -n '(gettext)PO Files' |
|---|
| -# info -n '(gettext)Header Entry' |
|---|
| -# Some information specific to po-debconf are available at |
|---|
| -# /usr/share/doc/po-debconf/README-trans |
|---|
| -# or http://www.debian.org/intl/l10n/po-debconf/README-trans# |
|---|
| -# Developers do not need to manually edit POT or PO files. |
|---|
| -# Claus Hindsgaul <claus_h@image.dk>, 2004. |
|---|
| -# |
|---|
| -msgid "" |
|---|
| -msgstr "" |
|---|
| -"Project-Id-Version: sa-exim_3.1-4-da\n" |
|---|
| -"Report-Msgid-Bugs-To: sa-exim@packages.debian.org\n" |
|---|
| -"POT-Creation-Date: 2009-04-04 15:40+0200\n" |
|---|
| -"PO-Revision-Date: 2004-11-19 17:21+0100\n" |
|---|
| -"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n" |
|---|
| -"Language-Team: Danish <dansk@klid.dk>\n" |
|---|
| -"MIME-Version: 1.0\n" |
|---|
| -"Content-Type: text/plain; charset=ISO-8859-1\n" |
|---|
| -"Content-Transfer-Encoding: 8bit\n" |
|---|
| -"X-Generator: KBabel 1.9.1\n" |
|---|
| -"Plural-Forms: nplurals=2; plural=(n != 1);\n" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -#, fuzzy |
|---|
| -#| msgid "Remove saved mails in spool directory?" |
|---|
| -msgid "Remove saved mails in sa-exim's spool directory?" |
|---|
| -msgstr "Fjern gemte breve fra spool-mappen?" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -#, fuzzy |
|---|
| -#| msgid "" |
|---|
| -#| "There are some saved mails in subdirectories of /var/spool/sa-exim. " |
|---|
| -#| "Depending on the configuration sa-exim will save mails matching specific " |
|---|
| -#| "criterias (an error occured, rejected as spam, passed through although " |
|---|
| -#| "recognized as spam, ...) in subdirectories of /var/spool/sa-exim." |
|---|
| -msgid "" |
|---|
| -"There are some saved mails in subdirectories of /var/spool/sa-exim. " |
|---|
| -"Depending on the configuration, sa-exim may save mails matching specific " |
|---|
| -"criteria (such as \"an error occurred\", \"rejected as spam\", or \"passed " |
|---|
| -"through although recognized as spam\") in these directories." |
|---|
| -msgstr "" |
|---|
| -"Der er nogle gemte breve i mapperne under /var/spool/sa-exim. Afhængig af " |
|---|
| -"opsætningen vil sa-exim gemme breve, der opfylder bestemte kriterier (der " |
|---|
| -"opstod en fejl, afvist som spam, lod brevet passere på trods af at det blev " |
|---|
| -"genkendt som spam,...) gemme breve i mapperne under /var/spool/sa-exim." |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"Please choose whether you want to keep these mails for further analysis or " |
|---|
| -"delete them now." |
|---|
| -msgstr "" |
|---|
| - |
|---|
| -#~ msgid "" |
|---|
| -#~ "You can keep them for further analysis and later remove them manually or " |
|---|
| -#~ "decide to delete them now." |
|---|
| -#~ msgstr "" |
|---|
| -#~ "Du kan beholde dem til yderligere efterforskning og selv fjerne dem " |
|---|
| -#~ "senere eller vælge at få dem slettet nu." |
|---|
| - |
|---|
| -#~ msgid "Should they be removed?" |
|---|
| -#~ msgstr "Skal de slettes?" |
|---|
| Index: tags/4.2.1-13/debian/po/ru.po |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/po/ru.po (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/po/ru.po (nonexistent) |
|---|
| @@ -1,49 +0,0 @@ |
|---|
| -# translation of ru.po to Russian |
|---|
| -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER |
|---|
| -# This file is distributed under the same license as the PACKAGE package. |
|---|
| -# |
|---|
| -# Yuri Kozlov <yuray@komyakino.ru>, 2009. |
|---|
| -msgid "" |
|---|
| -msgstr "" |
|---|
| -"Project-Id-Version: sa-exim 4.2.1-12\n" |
|---|
| -"Report-Msgid-Bugs-To: sa-exim@packages.debian.org\n" |
|---|
| -"POT-Creation-Date: 2009-03-02 07:25+0100\n" |
|---|
| -"PO-Revision-Date: 2009-05-10 10:31+0400\n" |
|---|
| -"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" |
|---|
| -"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" |
|---|
| -"MIME-Version: 1.0\n" |
|---|
| -"Content-Type: text/plain; charset=UTF-8\n" |
|---|
| -"Content-Transfer-Encoding: 8bit\n" |
|---|
| -"X-Generator: KBabel 1.11.4\n" |
|---|
| -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "Remove saved mails in sa-exim's spool directory?" |
|---|
| -msgstr "Удалить сохранённую почту в буферном каталоге sa-exim?" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"There are some saved mails in subdirectories of /var/spool/sa-exim. " |
|---|
| -"Depending on the configuration, sa-exim may save mails matching specific " |
|---|
| -"criteria (such as \"an error occurred\", \"rejected as spam\", or \"passed " |
|---|
| -"through although recognized as spam\") in these directories." |
|---|
| -msgstr "" |
|---|
| -"В подкаталогах /var/spool/sa-exim обнаружены почтовые сообщения. " |
|---|
| -"В зависимости от настройки, sa-exim может сохранить эту почту в " |
|---|
| -"подкаталогах, если она удовлетворяет критериям (например, \"возникла " |
|---|
| -"ошибка\", \"отвергнуто как спам\", или \"передано, хотя считается спамом\")." |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"Please choose whether you want to keep these mails for further analysis or " |
|---|
| -"delete them now." |
|---|
| -msgstr "" |
|---|
| -"Укажите, нужно ли сохранить эту почту для дальнейшего анализа или " |
|---|
| -"удалить её прямо сейчас." |
|---|
| - |
|---|
| Index: tags/4.2.1-13/debian/po/sv.po |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/po/sv.po (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/po/sv.po (nonexistent) |
|---|
| @@ -1,65 +0,0 @@ |
|---|
| -# Translators, if you are not familiar with the PO format, gettext |
|---|
| -# documentation is worth reading, especially sections dedicated to |
|---|
| -# this format, e.g. by running: |
|---|
| -# info -n '(gettext)PO Files' |
|---|
| -# info -n '(gettext)Header Entry' |
|---|
| -# Some information specific to po-debconf are available at |
|---|
| -# /usr/share/doc/po-debconf/README-trans |
|---|
| -# or http://www.debian.org/intl/l10n/po-debconf/README-trans |
|---|
| -# Developers do not need to manually edit POT or PO files. |
|---|
| -# , fuzzy |
|---|
| -# |
|---|
| -# |
|---|
| -msgid "" |
|---|
| -msgstr "" |
|---|
| -"Project-Id-Version: sa-exim 4.2-2\n" |
|---|
| -"Report-Msgid-Bugs-To: sa-exim@packages.debian.org\n" |
|---|
| -"POT-Creation-Date: 2009-04-04 15:40+0200\n" |
|---|
| -"PO-Revision-Date: 2009-04-04 15:47+0200\n" |
|---|
| -"Last-Translator: Martin Bagge <brother@bsnet.se>\n" |
|---|
| -"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n" |
|---|
| -"MIME-Version: 1.0\n" |
|---|
| -"Content-Type: text/plain; charset=utf-8\n" |
|---|
| -"Content-Transfer-Encoding: 8bit\n" |
|---|
| -"X-Poedit-Language: Swedish\n" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "Remove saved mails in sa-exim's spool directory?" |
|---|
| -msgstr "Ta bort sparad e-post i sa-exims spool-mapp?" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"There are some saved mails in subdirectories of /var/spool/sa-exim. " |
|---|
| -"Depending on the configuration, sa-exim may save mails matching specific " |
|---|
| -"criteria (such as \"an error occurred\", \"rejected as spam\", or \"passed " |
|---|
| -"through although recognized as spam\") in these directories." |
|---|
| -msgstr "" |
|---|
| -"Det finns sparade e-postmeddelanden i undermappar till /var/spool/sa-" |
|---|
| -"exim. Beroende på konfigurationen kan sa-exim spara e-postmeddelanden som " |
|---|
| -"matchar specifika kriterier (exempelvis \"ett fel inträffade\", \"avvisat " |
|---|
| -"som spam\", \"genomsläppt trots att det blev spam-klassat\") i dessa " |
|---|
| -"kataloger." |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"Please choose whether you want to keep these mails for further analysis or " |
|---|
| -"delete them now." |
|---|
| -msgstr "" |
|---|
| -"Ange om du vill spara eller radera dessa meddelanden. Vill du kunna göra " |
|---|
| -"analyser av meddelandena senare ska de sparas nu." |
|---|
| - |
|---|
| -#~ msgid "" |
|---|
| -#~ "You can keep them for further analysis and later remove them manually or " |
|---|
| -#~ "decide to delete them now." |
|---|
| -#~ msgstr "" |
|---|
| -#~ "Du kan spara dom för vidare analys och senare ta bort dom manuellt eller " |
|---|
| -#~ "välja att ta bort dom nu." |
|---|
| - |
|---|
| -#~ msgid "Should they be removed?" |
|---|
| -#~ msgstr "Ska de tas bort?" |
|---|
| Index: tags/4.2.1-13/debian/po/de.po |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/po/de.po (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/po/de.po (nonexistent) |
|---|
| @@ -1,48 +0,0 @@ |
|---|
| -# translation of po-debconf template to German |
|---|
| -# This file is distributed under the same license as the sa-exim package. |
|---|
| -# Copyright (C): |
|---|
| -# |
|---|
| -# Matthias Julius <mdeb@julius-net.net>, 2006, 2009. |
|---|
| -msgid "" |
|---|
| -msgstr "" |
|---|
| -"Project-Id-Version: sa-exim 4.2.1-13\n" |
|---|
| -"Report-Msgid-Bugs-To: sa-exim@packages.debian.org\n" |
|---|
| -"POT-Creation-Date: 2009-03-02 07:25+0100\n" |
|---|
| -"PO-Revision-Date: 2009-03-02 21:29-0500\n" |
|---|
| -"Last-Translator: Matthias Julius <mdeb@julius-net.net>\n" |
|---|
| -"Language-Team: German <debian-l10n-german@lists.debian.org>\n" |
|---|
| -"MIME-Version: 1.0\n" |
|---|
| -"Content-Type: text/plain; charset=UTF-8\n" |
|---|
| -"Content-Transfer-Encoding: 8bit\n" |
|---|
| -"X-Generator: KBabel 1.11.4\n" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "Remove saved mails in sa-exim's spool directory?" |
|---|
| -msgstr "Gespeicherte E-Mails im Spool-Verzeichnis von Sa-Exim löschen?" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"There are some saved mails in subdirectories of /var/spool/sa-exim. Depending " |
|---|
| -"on the configuration, sa-exim may save mails matching specific criteria (such " |
|---|
| -"as \"an error occurred\", \"rejected as spam\", or \"passed through although " |
|---|
| -"recognized as spam\") in these directories." |
|---|
| -msgstr "" |
|---|
| -"Es befinden sich einige gespeicherte E-Mails in Unterverzeichnissen von /var/" |
|---|
| -"spool/sa-exim. Abhängig von der Konfiguration kann Sa-Exim E-Mails, die " |
|---|
| -"bestimmte Kriterien erfüllen (wie »ein Fehler trat auf«, »als Spam abgewiesen« " |
|---|
| -"oder »durchgelassen, obwohl als Spam erkannt«), in diesen Unterverzeichnissen " |
|---|
| -"speichern." |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"Please choose whether you want to keep these mails for further analysis or " |
|---|
| -"delete them now." |
|---|
| -msgstr "" |
|---|
| -"Bitte wählen Sie, ob Sie diese E-Mails zur späteren Analyse behalten oder " |
|---|
| -"jetzt löschen möchten." |
|---|
| Index: tags/4.2.1-13/debian/po/ja.po |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/po/ja.po (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/po/ja.po (nonexistent) |
|---|
| @@ -1,55 +0,0 @@ |
|---|
| -# |
|---|
| -# Translators, if you are not familiar with the PO format, gettext |
|---|
| -# documentation is worth reading, especially sections dedicated to |
|---|
| -# this format, e.g. by running: |
|---|
| -# info -n '(gettext)PO Files' |
|---|
| -# info -n '(gettext)Header Entry' |
|---|
| -# |
|---|
| -# Some information specific to po-debconf are available at |
|---|
| -# /usr/share/doc/po-debconf/README-trans |
|---|
| -# or http://www.debian.org/intl/l10n/po-debconf/README-trans |
|---|
| -# |
|---|
| -# Developers do not need to manually edit POT or PO files. |
|---|
| -# |
|---|
| -# |
|---|
| -msgid "" |
|---|
| -msgstr "" |
|---|
| -"Project-Id-Version: sa-exim 4.2.1-12\n" |
|---|
| -"Report-Msgid-Bugs-To: sa-exim@packages.debian.org\n" |
|---|
| -"POT-Creation-Date: 2009-04-04 15:40+0200\n" |
|---|
| -"PO-Revision-Date: 2009-03-07 15:21+0900\n" |
|---|
| -"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n" |
|---|
| -"Language-Team: Japanese <debian-japanese@lists.debian.org>\n" |
|---|
| -"MIME-Version: 1.0\n" |
|---|
| -"Content-Type: text/plain; charset=UTF-8\n" |
|---|
| -"Content-Transfer-Encoding: 8bit\n" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "Remove saved mails in sa-exim's spool directory?" |
|---|
| -msgstr "sa-exim のスプールディレクトリに保存したメールを削除しますか?" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"There are some saved mails in subdirectories of /var/spool/sa-exim. " |
|---|
| -"Depending on the configuration, sa-exim may save mails matching specific " |
|---|
| -"criteria (such as \"an error occurred\", \"rejected as spam\", or \"passed " |
|---|
| -"through although recognized as spam\") in these directories." |
|---|
| -msgstr "" |
|---|
| -"/var/spool/sa-exim のサブディレクトリ以下に保存されたメールがあります。sa-" |
|---|
| -"exim の設定によって、sa-exim は特定の項目 (「エラーが起きた」、「spamとして拒" |
|---|
| -"否された」、「spam と認識されたにも関わらず通り抜けた」など) にマッチしたメー" |
|---|
| -"ルを各ディレクトリに保存します。" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"Please choose whether you want to keep these mails for further analysis or " |
|---|
| -"delete them now." |
|---|
| -msgstr "" |
|---|
| -"後ほど分析するためにこのメールを保存しておくか、それともここで削除するかを選" |
|---|
| -"んでください。" |
|---|
| Index: tags/4.2.1-13/debian/po/fi.po |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/po/fi.po (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/po/fi.po (nonexistent) |
|---|
| @@ -1,44 +0,0 @@ |
|---|
| -msgid "" |
|---|
| -msgstr "" |
|---|
| -"Project-Id-Version: sa-exim\n" |
|---|
| -"Report-Msgid-Bugs-To: sa-exim@packages.debian.org\n" |
|---|
| -"POT-Creation-Date: 2009-04-04 15:40+0200\n" |
|---|
| -"PO-Revision-Date: 2009-03-04 20:56+0200\n" |
|---|
| -"Last-Translator: Esko Arajärvi <edu@iki.fi>\n" |
|---|
| -"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n" |
|---|
| -"MIME-Version: 1.0\n" |
|---|
| -"Content-Type: text/plain; charset=UTF-8\n" |
|---|
| -"Content-Transfer-Encoding: 8bit\n" |
|---|
| -"X-Poedit-Language: Finnish\n" |
|---|
| -"X-Poedit-Country: FINLAND\n" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "Remove saved mails in sa-exim's spool directory?" |
|---|
| -msgstr "Poistetaanko tallennetut sähköpostit sa-eximin spool-hakemistosta?" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"There are some saved mails in subdirectories of /var/spool/sa-exim. " |
|---|
| -"Depending on the configuration, sa-exim may save mails matching specific " |
|---|
| -"criteria (such as \"an error occurred\", \"rejected as spam\", or \"passed " |
|---|
| -"through although recognized as spam\") in these directories." |
|---|
| -msgstr "" |
|---|
| -"Hakemiston /var/spool/sa-exim alihakemistoissa on joitain tallennettuja " |
|---|
| -"sähköposteja. Riippuen sa-eximin asetuksista, tietyt ehdot täyttäviä " |
|---|
| -"sähköposteja saatetaan tallentaa hakemiston /var/spool/sa-exim " |
|---|
| -"alihakemistoihin (kuten virheen aiheuttaneet, roskapostina hylätyt tai " |
|---|
| -"roskapostiksi tunnistetut, mutta edelleen lähetetyt)." |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"Please choose whether you want to keep these mails for further analysis or " |
|---|
| -"delete them now." |
|---|
| -msgstr "" |
|---|
| -"Valitse haluatko säilyttää nämä viestit jatkotutkimuksia varten vai poistaa " |
|---|
| -"ne nyt." |
|---|
| Index: tags/4.2.1-13/debian/po/gl.po |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/po/gl.po (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/po/gl.po (nonexistent) |
|---|
| @@ -1,58 +0,0 @@ |
|---|
| -# Galician translation of sa-exim's debconf templates |
|---|
| -# This file is distributed under the same license as the sa-exim package. |
|---|
| -# Jacobo Tarrio <jtarrio@debian.org>, 2007. |
|---|
| -# |
|---|
| -msgid "" |
|---|
| -msgstr "" |
|---|
| -"Project-Id-Version: sa-exim\n" |
|---|
| -"Report-Msgid-Bugs-To: sa-exim@packages.debian.org\n" |
|---|
| -"POT-Creation-Date: 2009-04-04 15:40+0200\n" |
|---|
| -"PO-Revision-Date: 2007-02-28 10:34+0100\n" |
|---|
| -"Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n" |
|---|
| -"Language-Team: Galician <proxecto@trasno.net>\n" |
|---|
| -"MIME-Version: 1.0\n" |
|---|
| -"Content-Type: text/plain; charset=UTF-8\n" |
|---|
| -"Content-Transfer-Encoding: 8bit\n" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -#, fuzzy |
|---|
| -#| msgid "Remove saved mails in spool directory?" |
|---|
| -msgid "Remove saved mails in sa-exim's spool directory?" |
|---|
| -msgstr "¿Borrar as mensaxes gravadas do directorio de traballo?" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -#, fuzzy |
|---|
| -#| msgid "" |
|---|
| -#| "There are some saved mails in subdirectories of /var/spool/sa-exim. " |
|---|
| -#| "Depending on the configuration sa-exim will save mails matching specific " |
|---|
| -#| "criterias (an error occured, rejected as spam, passed through although " |
|---|
| -#| "recognized as spam, ...) in subdirectories of /var/spool/sa-exim." |
|---|
| -msgid "" |
|---|
| -"There are some saved mails in subdirectories of /var/spool/sa-exim. " |
|---|
| -"Depending on the configuration, sa-exim may save mails matching specific " |
|---|
| -"criteria (such as \"an error occurred\", \"rejected as spam\", or \"passed " |
|---|
| -"through although recognized as spam\") in these directories." |
|---|
| -msgstr "" |
|---|
| -"Hai algunhas mensaxes gravadas nos subdirectorios de /var/spool/sa-exim. " |
|---|
| -"Dependendo da configuración, sa-exim ha gravar as mensaxes que encaixen en " |
|---|
| -"determinados criterios (houbo un erro, rexeitada coma spam, pasada aínda que " |
|---|
| -"se recoñeceu coma spam, ...) en subdirectorios de /var/spool/sa-exim." |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"Please choose whether you want to keep these mails for further analysis or " |
|---|
| -"delete them now." |
|---|
| -msgstr "" |
|---|
| - |
|---|
| -#~ msgid "" |
|---|
| -#~ "You can keep them for further analysis and later remove them manually or " |
|---|
| -#~ "decide to delete them now." |
|---|
| -#~ msgstr "" |
|---|
| -#~ "Pode conservalas para seguir analizándoas e eliminalas despois " |
|---|
| -#~ "manualmente ou decidir eliminalas agora." |
|---|
| Index: tags/4.2.1-13/debian/po/cs.po |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/po/cs.po (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/po/cs.po (nonexistent) |
|---|
| @@ -1,64 +0,0 @@ |
|---|
| -# |
|---|
| -# Translators, if you are not familiar with the PO format, gettext |
|---|
| -# documentation is worth reading, especially sections dedicated to |
|---|
| -# this format, e.g. by running: |
|---|
| -# info -n '(gettext)PO Files' |
|---|
| -# info -n '(gettext)Header Entry' |
|---|
| -# |
|---|
| -# Some information specific to po-debconf are available at |
|---|
| -# /usr/share/doc/po-debconf/README-trans |
|---|
| -# or http://www.debian.org/intl/l10n/po-debconf/README-trans |
|---|
| -# |
|---|
| -# Developers do not need to manually edit POT or PO files. |
|---|
| -# |
|---|
| -msgid "" |
|---|
| -msgstr "" |
|---|
| -"Project-Id-Version: sa-exim\n" |
|---|
| -"Report-Msgid-Bugs-To: sa-exim@packages.debian.org\n" |
|---|
| -"POT-Creation-Date: 2009-04-04 15:40+0200\n" |
|---|
| -"PO-Revision-Date: 2009-03-07 20:53+0100\n" |
|---|
| -"Last-Translator: Miroslav Kure <kurem@debian.cz>\n" |
|---|
| -"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" |
|---|
| -"MIME-Version: 1.0\n" |
|---|
| -"Content-Type: text/plain; charset=UTF-8\n" |
|---|
| -"Content-Transfer-Encoding: 8bit\n" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "Remove saved mails in sa-exim's spool directory?" |
|---|
| -msgstr "Odstranit maily v adresáři /var/spool/sa-exim?" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"There are some saved mails in subdirectories of /var/spool/sa-exim. " |
|---|
| -"Depending on the configuration, sa-exim may save mails matching specific " |
|---|
| -"criteria (such as \"an error occurred\", \"rejected as spam\", or \"passed " |
|---|
| -"through although recognized as spam\") in these directories." |
|---|
| -msgstr "" |
|---|
| -"V podadresářích adresáře /var/spool/sa-exim se nachází nějaké uložené maily. " |
|---|
| -"Podle nastavení může sa-exim ukládat do těchto adresářů maily, které se " |
|---|
| -"shodují s danými kritérii (jako např. „výskyt chyby“, „odmítnuto jako spam“, " |
|---|
| -"„předáno dále, přestože vypadá jako spam“)." |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"Please choose whether you want to keep these mails for further analysis or " |
|---|
| -"delete them now." |
|---|
| -msgstr "" |
|---|
| -"Zvolte si, zda chcete maily ponechat pro další analýzu, nebo je rovnou " |
|---|
| -"smazat." |
|---|
| - |
|---|
| -#~ msgid "" |
|---|
| -#~ "You can keep them for further analysis and later remove them manually or " |
|---|
| -#~ "decide to delete them now." |
|---|
| -#~ msgstr "" |
|---|
| -#~ "Maily si můžete ponechat pro budoucí analýzu a poté je smazat ručně, nebo " |
|---|
| -#~ "je můžete smazat přímo teď." |
|---|
| - |
|---|
| -#~ msgid "Should they be removed?" |
|---|
| -#~ msgstr "Mají se odstranit?" |
|---|
| Index: tags/4.2.1-13/debian/po/pt_BR.po |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/po/pt_BR.po (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/po/pt_BR.po (nonexistent) |
|---|
| @@ -1,55 +0,0 @@ |
|---|
| -# sa-exim Brazilian Portuguese translation. |
|---|
| -# Copyright (C) 2008 THE sa-exim'S COPYRIGHT HOLDER |
|---|
| -# This file is distributed under the same license as the sa-exim package. |
|---|
| -# Adriano Rafael Gomes <adrianorg@gmail.com>, 2008-2009. |
|---|
| -# |
|---|
| -msgid "" |
|---|
| -msgstr "" |
|---|
| -"Project-Id-Version: sa-exim 4.2.1-12\n" |
|---|
| -"Report-Msgid-Bugs-To: sa-exim@packages.debian.org\n" |
|---|
| -"POT-Creation-Date: 2009-04-04 15:40+0200\n" |
|---|
| -"PO-Revision-Date: 2009-03-09 08:33-0300\n" |
|---|
| -"Last-Translator: Adriano Rafael Gomes <adrianorg@gmail.com>\n" |
|---|
| -"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian." |
|---|
| -"org>\n" |
|---|
| -"MIME-Version: 1.0\n" |
|---|
| -"Content-Type: text/plain; charset=UTF-8\n" |
|---|
| -"Content-Transfer-Encoding: 8bit\n" |
|---|
| -"pt_BR utf-8\n" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "Remove saved mails in sa-exim's spool directory?" |
|---|
| -msgstr "Remover os e-mails salvos no diretório spool do sa-exim?" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"There are some saved mails in subdirectories of /var/spool/sa-exim. " |
|---|
| -"Depending on the configuration, sa-exim may save mails matching specific " |
|---|
| -"criteria (such as \"an error occurred\", \"rejected as spam\", or \"passed " |
|---|
| -"through although recognized as spam\") in these directories." |
|---|
| -msgstr "" |
|---|
| -"Há alguns e-mails salvos em subdiretórios de /var/spool/sa-exim. Dependendo " |
|---|
| -"da configuração, o sa-exim pode salvar e-mails que atendam a critérios " |
|---|
| -"específicos (como \"ocorreu um erro\", \"rejeitado como spam\", ou \"aceito " |
|---|
| -"apesar de reconhecido como spam\") nestes diretórios." |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"Please choose whether you want to keep these mails for further analysis or " |
|---|
| -"delete them now." |
|---|
| -msgstr "" |
|---|
| -"Por favor, escolha se você quer manter estes e-mails para uma análise mais " |
|---|
| -"aprofundada ou se quer excluí-los agora." |
|---|
| - |
|---|
| -#~ msgid "" |
|---|
| -#~ "You can keep them for further analysis and later remove them manually or " |
|---|
| -#~ "decide to delete them now." |
|---|
| -#~ msgstr "" |
|---|
| -#~ "Você pode mantê-los para uma análise mais aprofundada e mais tarde removê-" |
|---|
| -#~ "los manualmente ou decidir excluí-los agora." |
|---|
| Index: tags/4.2.1-13/debian/po/fr.po |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/po/fr.po (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/po/fr.po (nonexistent) |
|---|
| @@ -1,69 +0,0 @@ |
|---|
| -# Translation of sa-exim debconf screen to French |
|---|
| -# Copyright (C) 2004-2009 Debian French l10n team <debian-l10n-french@lists.debian.org> |
|---|
| -# This file is distributed under the same license as the sa-exim package. |
|---|
| -# |
|---|
| -# Translators: |
|---|
| -# Eric Madesclair <eric-m@wanadoo.fr>, 2004 |
|---|
| -# Christian Perrier <bubulle@debian.org>, 2009. |
|---|
| -msgid "" |
|---|
| -msgstr "" |
|---|
| -"Project-Id-Version: fr\n" |
|---|
| -"Report-Msgid-Bugs-To: sa-exim@packages.debian.org\n" |
|---|
| -"POT-Creation-Date: 2009-03-02 07:25+0100\n" |
|---|
| -"PO-Revision-Date: 2009-06-10 00:08+0200\n" |
|---|
| -"Last-Translator: Christian Perrier <bubulle@debian.org>\n" |
|---|
| -"Language-Team: French <debian-l10n-french@lists.debian.org>\n" |
|---|
| -"MIME-Version: 1.0\n" |
|---|
| -"Content-Type: text/plain; charset=UTF-8\n" |
|---|
| -"Content-Transfer-Encoding: 8bit\n" |
|---|
| -"X-Generator: KBabel 1.11.4\n" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -#| msgid "Remove saved mails in spool directory?" |
|---|
| -msgid "Remove saved mails in sa-exim's spool directory?" |
|---|
| -msgstr "" |
|---|
| -"Supprimer les courriers sauvegardés du répertoire d'attente (« spool ») de sa-" |
|---|
| -"exim ?" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -#| msgid "" |
|---|
| -#| "There are some saved mails in subdirectories of /var/spool/sa-exim. " |
|---|
| -#| "Depending on the configuration sa-exim will save mails matching specific " |
|---|
| -#| "criterias (an error occured, rejected as spam, passed through although " |
|---|
| -#| "recognized as spam, ...) in subdirectories of /var/spool/sa-exim." |
|---|
| -msgid "" |
|---|
| -"There are some saved mails in subdirectories of /var/spool/sa-exim. " |
|---|
| -"Depending on the configuration, sa-exim may save mails matching specific " |
|---|
| -"criteria (such as \"an error occurred\", \"rejected as spam\", or \"passed " |
|---|
| -"through although recognized as spam\") in these directories." |
|---|
| -msgstr "" |
|---|
| -"Plusieurs courriers sauvegardés existent dans les sous-répertoires de /var/" |
|---|
| -"spool/sa-exim. Selon la configuration, sa-exim sauvegarde les courriers qui " |
|---|
| -"correspondent à des critères spécifiques (p. ex. « an error occurred » -une " |
|---|
| -"erreur est survenue-, « rejected as spam » - rejeté comme spam -, « passed " |
|---|
| -"through although recognized as spam » - passé à travers, reconnu comme spam -) " |
|---|
| -"dans ces répertoires." |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"Please choose whether you want to keep these mails for further analysis or " |
|---|
| -"delete them now." |
|---|
| -msgstr "" |
|---|
| -"Veuillez choisir si vous souhaitez conserver ces courriers pour analyse " |
|---|
| -"ultérieure ou si vous préférez les supprimer maintenant." |
|---|
| - |
|---|
| -#~ msgid "" |
|---|
| -#~ "You can keep them for further analysis and later remove them manually or " |
|---|
| -#~ "decide to delete them now." |
|---|
| -#~ msgstr "" |
|---|
| -#~ "Vous pouvez les garder pour des analyses approfondies et les supprimer " |
|---|
| -#~ "par la suite ou vous pouvez décider de les effacer maintenant." |
|---|
| - |
|---|
| -#~ msgid "Should they be removed?" |
|---|
| -#~ msgstr "Vous pouvez les supprimer maintenant." |
|---|
| Index: tags/4.2.1-13/debian/po/es.po |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/po/es.po (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/po/es.po (nonexistent) |
|---|
| @@ -1,72 +0,0 @@ |
|---|
| -# sa-exim po-debconf translation to Spanish |
|---|
| -# Copyright (C) 2004, 2006, 2009 Software in the Public Interest |
|---|
| -# This file is distributed under the same license as the sa-exim package. |
|---|
| -# |
|---|
| -# Changes: |
|---|
| -# - Initial translation |
|---|
| -# Rudy Godoy <rudy@kernel-panik.org>, 2006 |
|---|
| -# |
|---|
| -# - Updates |
|---|
| -# Francisco Javier Cuadrado <fcocuadrado@gmail.com>, 2009 |
|---|
| -# |
|---|
| -# Traductores, si no conocen el formato PO, merece la pena leer la |
|---|
| -# documentación de gettext, especialmente las secciones dedicadas a este |
|---|
| -# formato, por ejemplo ejecutando: |
|---|
| -# info -n '(gettext)PO Files' |
|---|
| -# info -n '(gettext)Header Entry' |
|---|
| -# |
|---|
| -# Equipo de traducción al español, por favor lean antes de traducir |
|---|
| -# los siguientes documentos: |
|---|
| -# |
|---|
| -# - El proyecto de traducción de Debian al español |
|---|
| -# http://www.debian.org/intl/spanish/coordinacion |
|---|
| -# especialmente las notas de traducción en |
|---|
| -# http://www.debian.org/intl/spanish/notas |
|---|
| -# |
|---|
| -# - La guía de traducción de po's de debconf: |
|---|
| -# /usr/share/doc/po-debconf/README-trans |
|---|
| -# o http://www.debian.org/intl/l10n/po-debconf/README-trans |
|---|
| -# |
|---|
| -msgid "" |
|---|
| -msgstr "" |
|---|
| -"Project-Id-Version: sa-exim 4.2.1-12\n" |
|---|
| -"Report-Msgid-Bugs-To: sa-exim@packages.debian.org\n" |
|---|
| -"POT-Creation-Date: 2009-04-04 15:40+0200\n" |
|---|
| -"PO-Revision-Date: 2009-08-13 08:54+0100\n" |
|---|
| -"Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n" |
|---|
| -"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n" |
|---|
| -"MIME-Version: 1.0\n" |
|---|
| -"Content-Type: text/plain; charset=utf-8\n" |
|---|
| -"Content-Transfer-Encoding: 8bit\n" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -#| msgid "Remove saved mails in spool directory?" |
|---|
| -msgid "Remove saved mails in sa-exim's spool directory?" |
|---|
| -msgstr "¿Desea eliminar los correos guardados en el directorio «spool»?" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -#| msgid "" |
|---|
| -#| "There are some saved mails in subdirectories of /var/spool/sa-exim. " |
|---|
| -#| "Depending on the configuration sa-exim will save mails matching specific " |
|---|
| -#| "criterias (an error occured, rejected as spam, passed through although " |
|---|
| -#| "recognized as spam, ...) in subdirectories of /var/spool/sa-exim." |
|---|
| -msgid "There are some saved mails in subdirectories of /var/spool/sa-exim. Depending on the configuration, sa-exim may save mails matching specific criteria (such as \"an error occurred\", \"rejected as spam\", or \"passed through although recognized as spam\") in these directories." |
|---|
| -msgstr "Existen algunos correos guardados en subdirectorios de «/var/spool/sa-exim». Dependiendo de la configuración, sa-exim guardará los correos que cumplan con un criterio específico (como «ha ocurrido un fallo», «rechazado como spam» o «aceptado aunque se ha reconocido como spam») en estos directorios." |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "Please choose whether you want to keep these mails for further analysis or delete them now." |
|---|
| -msgstr "Escoja si quiere guardar estos correos para un análisis posterior o si quiere borrarlos ahora." |
|---|
| - |
|---|
| -#~ msgid "" |
|---|
| -#~ "You can keep them for further analysis and later remove them manually or " |
|---|
| -#~ "decide to delete them now." |
|---|
| -#~ msgstr "" |
|---|
| -#~ "Puede conservarlos para un análisis posterior, y eliminarlos de forma " |
|---|
| -#~ "manual más tarde, o decidir eliminarlos ahora." |
|---|
| - |
|---|
| Index: tags/4.2.1-13/debian/po/nl.po |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/po/nl.po (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/po/nl.po (nonexistent) |
|---|
| @@ -1,60 +0,0 @@ |
|---|
| -# SOME DESCRIPTIVE TITLE. |
|---|
| -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER |
|---|
| -# This file is distributed under the same license as the PACKAGE package. |
|---|
| -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. |
|---|
| -# |
|---|
| -msgid "" |
|---|
| -msgstr "" |
|---|
| -"Project-Id-Version: sa-exim\n" |
|---|
| -"Report-Msgid-Bugs-To: sa-exim@packages.debian.org\n" |
|---|
| -"POT-Creation-Date: 2009-04-04 15:40+0200\n" |
|---|
| -"PO-Revision-Date: 2007-02-28 19:43+0100\n" |
|---|
| -"Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n" |
|---|
| -"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n" |
|---|
| -"MIME-Version: 1.0\n" |
|---|
| -"Content-Type: text/plain; charset=utf-8\n" |
|---|
| -"Content-Transfer-Encoding: 8bit\n" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -#, fuzzy |
|---|
| -#| msgid "Remove saved mails in spool directory?" |
|---|
| -msgid "Remove saved mails in sa-exim's spool directory?" |
|---|
| -msgstr "Wilt u dat opgeslagen e-mails verwijderd worden uit de spool-map?" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -#, fuzzy |
|---|
| -#| msgid "" |
|---|
| -#| "There are some saved mails in subdirectories of /var/spool/sa-exim. " |
|---|
| -#| "Depending on the configuration sa-exim will save mails matching specific " |
|---|
| -#| "criterias (an error occured, rejected as spam, passed through although " |
|---|
| -#| "recognized as spam, ...) in subdirectories of /var/spool/sa-exim." |
|---|
| -msgid "" |
|---|
| -"There are some saved mails in subdirectories of /var/spool/sa-exim. " |
|---|
| -"Depending on the configuration, sa-exim may save mails matching specific " |
|---|
| -"criteria (such as \"an error occurred\", \"rejected as spam\", or \"passed " |
|---|
| -"through although recognized as spam\") in these directories." |
|---|
| -msgstr "" |
|---|
| -"Er zijn een aantal opgeslagen e-mails in de submappen van /var/spool/sa-" |
|---|
| -"exim. Afhankelijk van de configuratie slaat sa-exim e-mails die aan " |
|---|
| -"specifieke criteria voldoen (bv. fout opgetreden, geweigerd als spam, " |
|---|
| -"doorgelaten maar gemarkeerd als spam, ...) op in submappen van /var/spool/sa-" |
|---|
| -"exim ." |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"Please choose whether you want to keep these mails for further analysis or " |
|---|
| -"delete them now." |
|---|
| -msgstr "" |
|---|
| - |
|---|
| -#~ msgid "" |
|---|
| -#~ "You can keep them for further analysis and later remove them manually or " |
|---|
| -#~ "decide to delete them now." |
|---|
| -#~ msgstr "" |
|---|
| -#~ "U kunt deze behouden voor verdere analyse, en ze dan later handmatig " |
|---|
| -#~ "verwijderen, of u kunt ze nu laten verwijderen." |
|---|
| Index: tags/4.2.1-13/debian/po/it.po |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/po/it.po (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/po/it.po (nonexistent) |
|---|
| @@ -1,46 +0,0 @@ |
|---|
| -# Italian (it) translation of debconf templates for sa-exim |
|---|
| -# Copyright (C) 2007 Free Software Foundation, Inc. |
|---|
| -# This file is distributed under the same license as the sa-exim package. |
|---|
| -# Luca Monducci <luca.mo@tiscali.it>, 2007-2009. |
|---|
| -# |
|---|
| -msgid "" |
|---|
| -msgstr "" |
|---|
| -"Project-Id-Version: sa-exim 4.2.1 italian debconf templates\n" |
|---|
| -"Report-Msgid-Bugs-To: sa-exim@packages.debian.org\n" |
|---|
| -"POT-Creation-Date: 2009-03-02 07:25+0100\n" |
|---|
| -"PO-Revision-Date: 2009-03-10 21:41+0100\n" |
|---|
| -"Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n" |
|---|
| -"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" |
|---|
| -"MIME-Version: 1.0\n" |
|---|
| -"Content-Type: text/plain; charset=UTF-8\n" |
|---|
| -"Content-Transfer-Encoding: 8bit\n" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "Remove saved mails in sa-exim's spool directory?" |
|---|
| -msgstr "Eliminare le mail salvate nella directory di spool di sa-exim?" |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"There are some saved mails in subdirectories of /var/spool/sa-exim. " |
|---|
| -"Depending on the configuration, sa-exim may save mails matching specific " |
|---|
| -"criteria (such as \"an error occurred\", \"rejected as spam\", or \"passed " |
|---|
| -"through although recognized as spam\") in these directories." |
|---|
| -msgstr "" |
|---|
| -"Nelle sottodirectory di /var/spool/sa-exim sono state salvate delle mail. A " |
|---|
| -"seconda della configurazione di sa-exim le mail vengono salvate in queste " |
|---|
| -"sottodirectory quando verificano determinati criteri (si è verificato un " |
|---|
| -"errore, rifiutata per spam, passata nonostante identificata come spam, ecc.)." |
|---|
| - |
|---|
| -#. Type: boolean |
|---|
| -#. Description |
|---|
| -#: ../templates:2001 |
|---|
| -msgid "" |
|---|
| -"Please choose whether you want to keep these mails for further analysis or " |
|---|
| -"delete them now." |
|---|
| -msgstr "" |
|---|
| -"Scegliere se tenere queste mail per una successiva analisi oppure eliminarle " |
|---|
| -"adesso." |
|---|
| Index: tags/4.2.1-13/debian/po/POTFILES.in |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/po/POTFILES.in (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/po/POTFILES.in (nonexistent) |
|---|
| @@ -1 +0,0 @@ |
|---|
| -[type: gettext/rfc822deb] templates |
|---|
| Index: tags/4.2.1-13/debian/control |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/control (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/control (nonexistent) |
|---|
| @@ -1,28 +0,0 @@ |
|---|
| -Source: sa-exim |
|---|
| -Section: mail |
|---|
| -Priority: optional |
|---|
| -Maintainer: Magnus Holmgren <holmgren@debian.org> |
|---|
| -Build-Depends: debhelper (>= 5), links, exim4-dev |
|---|
| -Standards-Version: 3.8.1 |
|---|
| -Vcs-Svn: svn://svn.kibibyte.se/sa-exim/trunk |
|---|
| -Vcs-Browser: http://svn.kibibyte.se/sa-exim |
|---|
| -Homepage: http://marc.merlins.org/linux/exim/sa.html |
|---|
| - |
|---|
| -Package: sa-exim |
|---|
| -Architecture: any |
|---|
| -Depends: ${exim:Depends}, spamc, ${shlibs:Depends}, ${misc:Depends}, |
|---|
| - debconf (>= 1.2.0) | debconf-2.0 |
|---|
| -Recommends: ${perl:Depends} |
|---|
| -Suggests: spamassassin |
|---|
| -Description: SpamAssassin filter for Exim |
|---|
| - SA-Exim integrates SpamAssassin filtering at SMTP time with the Exim |
|---|
| - v4 MTA. It may be used to reject incoming mails before they arrive, or |
|---|
| - even to tie up the sender's resources by slowing down the connection |
|---|
| - ("teergrubing"). |
|---|
| - . |
|---|
| - Most of the functionality of this package can also be achieved |
|---|
| - using the exiscan ACL conditions built into the "heavy" Exim daemon, |
|---|
| - exim-daemon-heavy. Use this package if you need SpamAssassin's |
|---|
| - report_safe feature, or if you want to have easier control over the |
|---|
| - header fields added, without using the report template to add multiple |
|---|
| - fields. |
|---|
| Index: tags/4.2.1-13/debian/compat |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/compat (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/compat (nonexistent) |
|---|
| @@ -1 +0,0 @@ |
|---|
| -5 |
|---|
| Index: tags/4.2.1-13/debian/postinst |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/postinst (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/postinst (nonexistent) |
|---|
| @@ -1,55 +0,0 @@ |
|---|
| -#!/bin/sh |
|---|
| -set -e |
|---|
| - |
|---|
| -. /usr/share/debconf/confmodule |
|---|
| - |
|---|
| -LOCALSCANCONF=/etc/exim4/conf.d/main/15_sa-exim_plugin_path |
|---|
| -DISABLELOCALSCANTEXT='# sa-exim plugin is disabled, because it was uninstalled' |
|---|
| -DISABLELOCALSCANMD5=`echo "${DISABLELOCALSCANTEXT}" | md5sum | cut -d\ -f1` |
|---|
| - |
|---|
| -OLDCRONJOB=/etc/cron.hourly/greylistclean |
|---|
| -OLDCRONJOBREN=/etc/cron.hourly/.greylistclean.insecure.deleteme |
|---|
| -if test -f $OLDCRONJOB; then |
|---|
| - echo "disabling old insecure $OLDCRONJOB" |
|---|
| - echo "(renamed to $OLDCRONJOBREN)" |
|---|
| - echo "See new cronjob in /etc/cron.d/greylistclean" |
|---|
| - mv $OLDCRONJOB $OLDCRONJOBREN |
|---|
| -fi |
|---|
| - |
|---|
| -case "$1" in |
|---|
| - configure) |
|---|
| - if [ ! -e /var/spool/sa-exim ] ; then |
|---|
| - # Debian-exim should exist as we depend on exim4-base |
|---|
| - install -d -m771 -oDebian-exim -gDebian-exim \ |
|---|
| - /var/spool/sa-exim |
|---|
| - elif [ -d /var/spool/sa-exim ]; then |
|---|
| - # Fix permissions |
|---|
| - chmod 771 /var/spool/sa-exim |
|---|
| - chown Debian-exim:Debian-exim /var/spool/sa-exim |
|---|
| - fi |
|---|
| - # Support for greylisting tuplets (written as nobody by spamd) |
|---|
| - if [ ! -e /var/spool/sa-exim/tuplets ] ; then |
|---|
| - install -d -m750 -onobody -gDebian-exim \ |
|---|
| - /var/spool/sa-exim/tuplets |
|---|
| - elif [ -d /var/spool/sa-exim/tuplets ]; then |
|---|
| - # Fix permissions |
|---|
| - chmod 771 /var/spool/sa-exim/tuplets |
|---|
| - chown nobody:Debian-exim /var/spool/sa-exim/tuplets |
|---|
| - fi |
|---|
| - # clean up temporary file generated by postrm uninstall |
|---|
| - if [ -e "${LOCALSCANCONF}.rul" ] && \ |
|---|
| - [ "`md5sum ${LOCALSCANCONF}.rul | cut -d\ -f1`" = "${DISABLELOCALSCANMD5}" ]; then |
|---|
| - rm ${LOCALSCANCONF}.rul |
|---|
| - fi |
|---|
| - if [ -x /etc/init.d/exim4 ]; then |
|---|
| - if [ -x /usr/sbin/invoke-rc.d ]; then |
|---|
| - invoke-rc.d exim4 reload || true |
|---|
| - else |
|---|
| - /etc/init.d/exim4 reload || true |
|---|
| - fi |
|---|
| - fi |
|---|
| - ;; |
|---|
| - |
|---|
| -esac |
|---|
| - |
|---|
| -#DEBHELPER# |
|---|
| Index: tags/4.2.1-13/debian/postrm |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/debian/postrm (revision 63) |
|---|
| +++ tags/4.2.1-13/debian/postrm (nonexistent) |
|---|
| @@ -1,57 +0,0 @@ |
|---|
| -#!/bin/sh |
|---|
| -set -e |
|---|
| - |
|---|
| -if [ -f /usr/share/debconf/confmodule ]; then |
|---|
| - . /usr/share/debconf/confmodule |
|---|
| -fi |
|---|
| - |
|---|
| -LOCALSCANCONF=/etc/exim4/conf.d/main/15_sa-exim_plugin_path |
|---|
| -DISABLELOCALSCANTEXT='# sa-exim plugin is disabled, because it was uninstalled' |
|---|
| -DISABLELOCALSCANMD5=`echo "${DISABLELOCALSCANTEXT}" | md5sum | cut -d\ -f1` |
|---|
| - |
|---|
| -case "$1" in |
|---|
| - remove) |
|---|
| - # disable local_scan_path directive to exim working |
|---|
| - if [ -e "$LOCALSCANCONF" ] && [ ! -e "${LOCALSCANCONF}.rul" ]; then |
|---|
| - echo "${DISABLELOCALSCANTEXT}" > ${LOCALSCANCONF}.rul |
|---|
| - fi |
|---|
| - if [ -x /etc/init.d/exim4 ]; then |
|---|
| - if [ -x /usr/sbin/invoke-rc.d ]; then |
|---|
| - invoke-rc.d exim4 reload || true |
|---|
| - else |
|---|
| - /etc/init.d/exim4 reload || true |
|---|
| - fi |
|---|
| - fi |
|---|
| - ;; |
|---|
| - |
|---|
| - purge) |
|---|
| - # clean up temporary file generated by postrm uninstall |
|---|
| - if [ -e "${LOCALSCANCONF}.rul" ] && \ |
|---|
| - [ "`md5sum ${LOCALSCANCONF}.rul | cut -d\ -f1`" = "${DISABLELOCALSCANMD5}" ]; then |
|---|
| - rm ${LOCALSCANCONF}.rul |
|---|
| - fi |
|---|
| - if [ -x /etc/init.d/exim4 ]; then |
|---|
| - if [ -x /usr/sbin/invoke-rc.d ]; then |
|---|
| - invoke-rc.d exim4 reload || true |
|---|
| - else |
|---|
| - /etc/init.d/exim4 reload || true |
|---|
| - fi |
|---|
| - fi |
|---|
| - # In the rather uncommon event that debconf has been removed before |
|---|
| - # us, we have no choice but leaving the spool directory alone. |
|---|
| - if [ -e /var/spool/sa-exim ] && |
|---|
| - ! rmdir /var/spool/sa-exim 2>/dev/null && |
|---|
| - [ -f /usr/share/debconf/confmodule ]; then |
|---|
| - db_version 2.0 |
|---|
| - db_input medium sa-exim/purge_spool || true |
|---|
| - db_go || true |
|---|
| - db_get sa-exim/purge_spool |
|---|
| - purge_spool="$RET" |
|---|
| - if [ "x${purge_spool}" = "xtrue" ] ; then |
|---|
| - rm -rf /var/spool/sa-exim |
|---|
| - fi |
|---|
| - fi |
|---|
| - ;; |
|---|
| -esac |
|---|
| - |
|---|
| -#DEBHELPER# |
|---|
| Index: tags/4.2.1-13/sa-exim.c |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/sa-exim.c (revision 63) |
|---|
| +++ tags/4.2.1-13/sa-exim.c (nonexistent) |
|---|
| @@ -1,1541 +0,0 @@ |
|---|
| -/* Spamassassin in local_scan by Marc MERLIN <marc_soft@merlins.org> */ |
|---|
| -/* $Id: sa-exim.c,v 1.71 2005/03/08 20:39:51 marcmerlin Exp $ */ |
|---|
| -/* |
|---|
| - |
|---|
| -The inline comments and minidocs were moved to the distribution tarball |
|---|
| - |
|---|
| -You can get the up to date version of this file and full tarball here: |
|---|
| -http://sa-exim.sourceforge.net/ |
|---|
| -http://marc.merlins.org/linux/exim/sa.html |
|---|
| -The discussion list is here: |
|---|
| -http://lists.merlins.org/lists/listinfo/sa-exim |
|---|
| -*/ |
|---|
| - |
|---|
| - |
|---|
| - |
|---|
| -#include <stdio.h> |
|---|
| -#include <unistd.h> |
|---|
| -#include <fcntl.h> |
|---|
| -#include <errno.h> |
|---|
| -#include <string.h> |
|---|
| -#include <stdlib.h> |
|---|
| -#include <time.h> |
|---|
| -#include <ctype.h> |
|---|
| -#include <signal.h> |
|---|
| -#include <setjmp.h> |
|---|
| -#include <sys/wait.h> |
|---|
| -#include <sys/types.h> |
|---|
| -#include <sys/stat.h> |
|---|
| -#include "sa-exim.h" |
|---|
| - |
|---|
| -/* Exim includes */ |
|---|
| -#include <local_scan.h> |
|---|
| -//extern int body_linecount; /* Line count in body */ |
|---|
| - |
|---|
| -#ifdef DLOPEN_LOCAL_SCAN |
|---|
| - |
|---|
| -/* Karsten Engelke <me@kaeng.org> says this is missing on openbsd */ |
|---|
| -#ifndef RTLD_NOW |
|---|
| -#define RTLD_NOW 0x002 |
|---|
| -#endif |
|---|
| - |
|---|
| -/* Return the verion of the local_scan ABI, if being compiled as a .so */ |
|---|
| -int local_scan_version_major(void) |
|---|
| -{ |
|---|
| - return LOCAL_SCAN_ABI_VERSION_MAJOR; |
|---|
| -} |
|---|
| - |
|---|
| -int local_scan_version_minor(void) |
|---|
| -{ |
|---|
| - return LOCAL_SCAN_ABI_VERSION_MINOR; |
|---|
| -} |
|---|
| - |
|---|
| -/* Left over for compatilibility with old patched exims that didn't have |
|---|
| - a version number with minor an major. Keep in mind that it will not work |
|---|
| - with older exim4s (I think 4.11 is required) */ |
|---|
| -#ifdef DLOPEN_LOCAL_SCAN_OLD_API |
|---|
| -int local_scan_version(void) |
|---|
| -{ |
|---|
| - return 1; |
|---|
| -} |
|---|
| -#endif |
|---|
| -#endif |
|---|
| - |
|---|
| -#ifndef SAFEMESGIDCHARS |
|---|
| -#define SAFEMESGIDCHARS "!#%( )*+,-.0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_abcdefghijklmnopqrstuvwxyz{|}~"; |
|---|
| -#endif |
|---|
| - |
|---|
| - |
|---|
| -/******************************/ |
|---|
| -/* Compile time config values */ |
|---|
| -/******************************/ |
|---|
| -#ifndef SPAMC_LOCATION |
|---|
| -#define SPAMC_LOCATION "/usr/bin/spamc" |
|---|
| -#endif |
|---|
| - |
|---|
| -#ifndef SPAMASSASSIN_CONF |
|---|
| -#define SPAMASSASSIN_CONF "/etc/exim4/sa-exim.conf" |
|---|
| -#endif |
|---|
| -static const char conffile[]=SPAMASSASSIN_CONF; |
|---|
| - |
|---|
| - |
|---|
| -/********************/ |
|---|
| -/* Code starts here */ |
|---|
| -/********************/ |
|---|
| -static const char nospamstatus[]="<error finding status>"; |
|---|
| - |
|---|
| -static char *buffera[4096]; |
|---|
| -static char *buffer=(char *)buffera; |
|---|
| -static int SAEximDebug=0; |
|---|
| -static int SAPrependArchiveWithFrom=1; |
|---|
| -static jmp_buf jmp_env; |
|---|
| - |
|---|
| -static char *where="Error handler called without error string"; |
|---|
| -static int line=-1; |
|---|
| -static char *panicerror; |
|---|
| - |
|---|
| -#define MIN(a,b) (a<b?a:b) |
|---|
| - |
|---|
| -#define CHECKERR(mret, mwhere, mline) \ |
|---|
| - if (mret < 0) \ |
|---|
| - { \ |
|---|
| - where=mwhere; \ |
|---|
| - line=mline; \ |
|---|
| - goto errexit; \ |
|---|
| - } |
|---|
| - |
|---|
| -#define PANIC(merror) \ |
|---|
| - panicerror=merror; \ |
|---|
| - goto panicexit; |
|---|
| - |
|---|
| - |
|---|
| -static void alarm_handler(int sig) |
|---|
| -{ |
|---|
| - sig = sig; /* Keep picky compilers happy */ |
|---|
| - longjmp(jmp_env, 1); |
|---|
| -} |
|---|
| - |
|---|
| - |
|---|
| -/* Comparing header lines isn't fun, especially since the comparison has to |
|---|
| - be caseless, so we offload this to this function |
|---|
| - You can scan on partial headers, just give the root to scan for |
|---|
| - Return 1 if the header was found, 0 otherwise */ |
|---|
| -static int compare_header(char *buffertocompare, char *referenceheader) |
|---|
| -{ |
|---|
| - int idx; |
|---|
| - int same=1; |
|---|
| - |
|---|
| - for (idx=0; idx<strlen(referenceheader); idx++) |
|---|
| - { |
|---|
| - if ( tolower(referenceheader[idx]) != tolower(buffertocompare[idx]) ) |
|---|
| - { |
|---|
| - same=0; |
|---|
| - break; |
|---|
| - } |
|---|
| - } |
|---|
| - |
|---|
| - if (SAEximDebug > 7) |
|---|
| - { |
|---|
| - if (same) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug8: Found %s in %s", referenceheader, buffertocompare); |
|---|
| - } |
|---|
| - else if (SAEximDebug > 8) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug9: Did not find %s in %s", referenceheader, buffertocompare); |
|---|
| - } |
|---|
| - } |
|---|
| - |
|---|
| - return same; |
|---|
| -} |
|---|
| - |
|---|
| - |
|---|
| -/* returns a header from a buffer line */ |
|---|
| -static char *get_header(char *buffer) |
|---|
| -{ |
|---|
| - char *start; |
|---|
| - char *end; |
|---|
| - char *header; |
|---|
| - |
|---|
| - start=buffer; |
|---|
| - end=strstr(buffer, ":"); |
|---|
| - |
|---|
| - header=string_copyn(start, end-start); |
|---|
| - |
|---|
| - if (SAEximDebug>5) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug6: Extracted header %s in buffer %s", header, buffer); |
|---|
| - } |
|---|
| - |
|---|
| - return header; |
|---|
| -} |
|---|
| - |
|---|
| - |
|---|
| -/* Rejected mails can be archived in a spool directory */ |
|---|
| -/* filename will contain a double / before the filename, I prefer two to none */ |
|---|
| -static int savemail(int readfd, off_t fdstart, char *dir, char *dirvarname, |
|---|
| - char *filename, int SAmaxarchivebody, char *condition) |
|---|
| -{ |
|---|
| - header_line *hl; |
|---|
| - int writefd=0; |
|---|
| - int ret; |
|---|
| - ssize_t stret; |
|---|
| - off_t otret; |
|---|
| - char *expand; |
|---|
| - char *fake_env_from; |
|---|
| - int towrite; |
|---|
| - int chunk; |
|---|
| - struct stat bufst; |
|---|
| - |
|---|
| - if (dir == NULL) |
|---|
| - { |
|---|
| - if (SAEximDebug>4) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug5: Not saving message because %s in undefined", dirvarname); |
|---|
| - } |
|---|
| - return 0; |
|---|
| - } |
|---|
| - |
|---|
| - if (condition[0] != '1' || condition[1] != 0) |
|---|
| - { |
|---|
| - expand=expand_string(condition); |
|---|
| - if (expand == NULL) |
|---|
| - { |
|---|
| - /* Can't use PANIC within this function :( */ |
|---|
| - CHECKERR(-1, string_sprintf("savemail condition expansion failure on %s", condition), __LINE__ - 1); |
|---|
| - } |
|---|
| - |
|---|
| - if (SAEximDebug > 2) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug3: savemail condition expand returned: '%s'", expand); |
|---|
| - } |
|---|
| - |
|---|
| - if (expand[0] == 0 || (expand[0] == '0' && expand[1] == 0)) |
|---|
| - { |
|---|
| - if (SAEximDebug > 1) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug2: savemail condition expanded to false, not saving message to disk"); |
|---|
| - } |
|---|
| - return 0; |
|---|
| - } |
|---|
| - } |
|---|
| - |
|---|
| - if (SAEximDebug) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug: Writing message to %s/new/%s", dir, filename); |
|---|
| - |
|---|
| - } |
|---|
| - |
|---|
| - if (stat(string_sprintf("%s/new/", dir), &bufst) == -1) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Notice: creating maildir tree in %s", dir); |
|---|
| - if (stat(dir, &bufst) == -1) |
|---|
| - { |
|---|
| - ret=mkdir (dir, 0770); |
|---|
| - CHECKERR(ret,string_sprintf("mkdir %s", dir),__LINE__); |
|---|
| - } |
|---|
| - ret=mkdir (string_sprintf("%s/new", dir), 0770); |
|---|
| - CHECKERR(ret,string_sprintf("mkdir %s/new/", dir),__LINE__); |
|---|
| - ret=mkdir (string_sprintf("%s/cur", dir), 0770); |
|---|
| - CHECKERR(ret,string_sprintf("mkdir %s/cur/", dir),__LINE__); |
|---|
| - ret=mkdir (string_sprintf("%s/tmp", dir), 0770); |
|---|
| - CHECKERR(ret,string_sprintf("mkdir %s/tmp/", dir),__LINE__); |
|---|
| - } |
|---|
| - |
|---|
| - /* Let's not worry about you receiving two spams at the same second |
|---|
| - * with the same message ID. If you do, the second one will overwrite |
|---|
| - * the first one */ |
|---|
| - writefd=creat(string_sprintf("%s/new/%s", dir, filename), S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH); |
|---|
| - CHECKERR(writefd, string_sprintf("creat %s/new/%s", dir, filename),__LINE__); |
|---|
| - |
|---|
| - /* make the file look like a valid mbox -- idea from dman */ |
|---|
| - /* Although now that we use maildir format, this isn't really necessary */ |
|---|
| - /* Richard Lithvall made this an option */ |
|---|
| - if(SAPrependArchiveWithFrom == 1) |
|---|
| - { |
|---|
| - fake_env_from=string_sprintf("From %s Thu Jan 1 00:00:01 1970\n",sender_address); |
|---|
| - stret=write(writefd, fake_env_from, strlen(fake_env_from)); |
|---|
| - CHECKERR(stret,string_sprintf("'From ' line write in %s", filename),__LINE__); |
|---|
| - } |
|---|
| - |
|---|
| - /* First we need to get the header lines from exim, and then we can read |
|---|
| - the body from writefd */ |
|---|
| - hl=header_list; |
|---|
| - while (hl != NULL) |
|---|
| - { |
|---|
| - /* type '*' means the header is internal, don't print it */ |
|---|
| - if (hl->type == '*') |
|---|
| - { |
|---|
| - hl=hl->next; |
|---|
| - continue; |
|---|
| - } |
|---|
| - stret=write(writefd,hl->text,strlen(hl->text)); |
|---|
| - CHECKERR(stret,string_sprintf("header line write in %s", filename),__LINE__); |
|---|
| - hl=hl->next; |
|---|
| - } |
|---|
| - stret=write(writefd,"\n",1); |
|---|
| - CHECKERR(stret,string_sprintf("header separation write in %s", filename),__LINE__); |
|---|
| - |
|---|
| - /* Now copy the body to the save file */ |
|---|
| - /* we already read from readfd, so we need to reset it */ |
|---|
| - otret=lseek(readfd, fdstart, SEEK_SET); |
|---|
| - CHECKERR(otret, "lseek reset on spooled message", __LINE__); |
|---|
| - |
|---|
| - if (SAEximDebug > 8) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug9: Archive body write starts: writing up to %d bytes in %d byte blocks", SAmaxarchivebody, sizeof(buffera)); |
|---|
| - } |
|---|
| - |
|---|
| - towrite=SAmaxarchivebody; |
|---|
| - chunk=0; |
|---|
| - while (towrite>0 && (stret=read(readfd, buffer, MIN(sizeof(buffera), towrite))) > 0) |
|---|
| - { |
|---|
| - chunk++; |
|---|
| - if (SAEximDebug > 8) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug9: Processing archive body chunk %d (read %.0f, and %.0f can still be written)", chunk, (double)stret, (double)towrite); |
|---|
| - } |
|---|
| - towrite-=stret; |
|---|
| - stret=write(writefd, buffer, stret); |
|---|
| - CHECKERR(stret,string_sprintf("body write in %s", filename),__LINE__); |
|---|
| - } |
|---|
| - CHECKERR(stret, "read body for archival", __LINE__ - 8); |
|---|
| - ret=close(writefd); |
|---|
| - CHECKERR(ret, "Closing spooled message",__LINE__); |
|---|
| - return 0; |
|---|
| - |
|---|
| - /* catch the global errexit, clean up, and return the error up */ |
|---|
| - errexit: |
|---|
| - close(writefd); |
|---|
| - return -1; |
|---|
| -} |
|---|
| - |
|---|
| -/* |
|---|
| - * let's add the X-SA-Exim-Connect-IP, X-SA-Exim-Rcpt-To, and |
|---|
| - * X-SA-Exim-Mail-From headers. |
|---|
| - * Those are all required by the greylisting with SA implementation |
|---|
| - * And From/Rcpt-To can also be used for personalized SA rules |
|---|
| - */ |
|---|
| -void AddSAEheaders(char *rcptlist, int SAmaxrcptlistlength) |
|---|
| -{ |
|---|
| - if (sender_host_address) |
|---|
| - { |
|---|
| - header_add(' ', "X-SA-Exim-Connect-IP: %s\n", sender_host_address); |
|---|
| - } |
|---|
| - else |
|---|
| - { |
|---|
| - header_add(' ', "X-SA-Exim-Connect-IP: <locally generated>\n"); |
|---|
| - } |
|---|
| - |
|---|
| - /* Create a mega envelope-to header with all the recipients */ |
|---|
| - /* Note, if you consider this a privacy violation, you can remove the header |
|---|
| - * in exim's system filter. |
|---|
| - * This is very useful to see who a message was really sent to, and can |
|---|
| - * be used by Spamassassin to do additional scoring */ |
|---|
| - if (strlen(rcptlist) <= SAmaxrcptlistlength) |
|---|
| - { |
|---|
| - header_add(' ', "X-SA-Exim-Rcpt-To: %s\n", rcptlist); |
|---|
| - } |
|---|
| - /* Therefore SAmaxrcptlistlength set to 0 disables the header completely */ |
|---|
| - else if (SAmaxrcptlistlength) |
|---|
| - { |
|---|
| - header_add(' ', "X-SA-Exim-Rcpt-To: too long (recipient list exceeded maximum allowed size of %d bytes)\n", SAmaxrcptlistlength); |
|---|
| - } |
|---|
| - |
|---|
| - header_add(' ', "X-SA-Exim-Mail-From: %s\n", sender_address); |
|---|
| -} |
|---|
| - |
|---|
| -void RemoveHeaders(char *headername) |
|---|
| -{ |
|---|
| - header_line *hl; |
|---|
| - |
|---|
| - /* Remove headers that SA can set */ |
|---|
| - hl=header_list; |
|---|
| - while (hl != NULL) |
|---|
| - { |
|---|
| - |
|---|
| - /* type '*' means the header is internal or deleted */ |
|---|
| - if (hl->type == '*') |
|---|
| - { |
|---|
| - hl=hl->next; |
|---|
| - continue; |
|---|
| - } |
|---|
| - |
|---|
| - /* Strip all SA and SA-Exim headers on incoming mail */ |
|---|
| - if ( compare_header((char *)hl->text, headername) ) |
|---|
| - { |
|---|
| - if (SAEximDebug > 2) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug3: removing header %s on incoming mail '%s'", headername, (char *)hl->text); |
|---|
| - } |
|---|
| - hl->type = '*'; |
|---|
| - } |
|---|
| - hl=hl->next; |
|---|
| - } |
|---|
| -} |
|---|
| - |
|---|
| - |
|---|
| -/* |
|---|
| - * Headers can be multi-line (in theory all of them can I think). Parsing them |
|---|
| - * is a little more work than a simple line scan, so we're off-loading this to |
|---|
| - * a function |
|---|
| - */ |
|---|
| -int parsemlheader(char *buffer, FILE *readfh, char *headername, char **header) |
|---|
| -{ |
|---|
| - header_line *hl; |
|---|
| - char *dummy; |
|---|
| - char *foundheadername; |
|---|
| - |
|---|
| - if (SAEximDebug > 4) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug5: looking for header %s", headername); |
|---|
| - } |
|---|
| - |
|---|
| - if (header == NULL) |
|---|
| - { |
|---|
| - header=&dummy; |
|---|
| - } |
|---|
| - |
|---|
| - if (compare_header(buffer, string_sprintf("%s", headername))) |
|---|
| - { |
|---|
| - *header=string_copy(buffer); |
|---|
| - |
|---|
| - /* Read the next line(s) in case this is a multi-line header */ |
|---|
| - while ((fgets((char *)buffer,sizeof(buffera),readfh)) != NULL) |
|---|
| - { |
|---|
| - /* Remove trailing newline */ |
|---|
| - if (buffer[strlen(buffer)-1] == '\n') |
|---|
| - { |
|---|
| - buffer[strlen(buffer)-1]=0; |
|---|
| - } |
|---|
| - if (SAEximDebug > 5) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug6: while parsing header %s, read %s", headername, buffer); |
|---|
| - } |
|---|
| - /* concatenated lines only start with space or tab. right? */ |
|---|
| - if (buffer[0] != ' ' && buffer[0] != '\t') |
|---|
| - { |
|---|
| - break; |
|---|
| - } |
|---|
| - |
|---|
| - /* Guard against humongous header lines */ |
|---|
| - if (strlen(*header) < 8000) |
|---|
| - { |
|---|
| - /* Slight waste of memory here, oh well... */ |
|---|
| - *header=string_sprintf("%s\n%s", *header, buffer); |
|---|
| - } |
|---|
| - else |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Warning: while parsing header %s, ignoring the following trailing line due to header size overflow: %s", headername, buffer); |
|---|
| - |
|---|
| - } |
|---|
| - } |
|---|
| - if (SAEximDebug > 5) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug6: header pieced up %s as: '%s'", headername, *header); |
|---|
| - } |
|---|
| - |
|---|
| - /* Headers need a newline at the end before being handed out to exim */ |
|---|
| - /* Slight waste of memory here, oh well... */ |
|---|
| - *header=string_sprintf("%s\n", *header); |
|---|
| - |
|---|
| - foundheadername=get_header(*header); |
|---|
| - |
|---|
| - /* Mark the former header as deleted if it's already present */ |
|---|
| - /* Note that for X-Spam, it won't since we already deleted it earlier */ |
|---|
| - hl=header_list; |
|---|
| - while (hl != NULL) |
|---|
| - { |
|---|
| - /* type '*' means the header is internal or deleted */ |
|---|
| - if (hl->type == '*') |
|---|
| - { |
|---|
| - hl=hl->next; |
|---|
| - continue; |
|---|
| - } |
|---|
| - |
|---|
| - if ( compare_header((char *)hl->text, foundheadername) ) |
|---|
| - { |
|---|
| - if (SAEximDebug > 5) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug6: removing old copy of header '%s' and replacing with new one: '%s'", (char *)hl->text, *header); |
|---|
| - } |
|---|
| - hl->type = '*'; |
|---|
| - break; |
|---|
| - } |
|---|
| - hl=hl->next; |
|---|
| - } |
|---|
| - |
|---|
| - header_add(' ', "%s", *header); |
|---|
| - return 1; |
|---|
| - } |
|---|
| - return 0; |
|---|
| -} |
|---|
| - |
|---|
| - |
|---|
| -char *cleanmsgid(char *msgid, char *SAsafemesgidchars) |
|---|
| -{ |
|---|
| - char *safemesgid; |
|---|
| - char *ptr; |
|---|
| - |
|---|
| - /* In case the message-Id is too long, let's truncate it */ |
|---|
| - safemesgid=string_copyn(msgid, 220); |
|---|
| - ptr=safemesgid; |
|---|
| - |
|---|
| - /* Clean Message-ID to make sure people can't write on our FS */ |
|---|
| - while (*ptr) |
|---|
| - { |
|---|
| - /* This might be more aggressive than you want, but since you |
|---|
| - * potentially have shell programs dealing with the resulting filenames |
|---|
| - * let's make it a bit safer */ |
|---|
| - if (strchr(SAsafemesgidchars, *ptr) == NULL) |
|---|
| - { |
|---|
| - *ptr='_'; |
|---|
| - } |
|---|
| - ptr++; |
|---|
| - } |
|---|
| - |
|---|
| - if (SAEximDebug > 1) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug2: Message-Id taken from Exim and cleaned from: %s to: %s", msgid, safemesgid); |
|---|
| - } |
|---|
| - |
|---|
| - return safemesgid; |
|---|
| -} |
|---|
| - |
|---|
| - |
|---|
| -/* Exim calls us here, feeds us a fd on the message body, and expects a return |
|---|
| - message in *return_text */ |
|---|
| -int local_scan(volatile int fd, uschar **return_text) |
|---|
| -{ |
|---|
| -#warning you should not worry about the "might be clobbered by longjmp", see source |
|---|
| - int ret; |
|---|
| - ssize_t stret; |
|---|
| - int pid; |
|---|
| - int writefd[2]; |
|---|
| - int readfd[2]; |
|---|
| - char *spamc_argv[10]; |
|---|
| - int i; |
|---|
| - /* These are the only values that we want working after the longjmp |
|---|
| - * The automatic ones can be clobbered, but we don't really care */ |
|---|
| - volatile FILE *readfh; |
|---|
| - volatile char *mesgfn=NULL; |
|---|
| - volatile off_t fdsize; |
|---|
| - volatile off_t scansize; |
|---|
| - volatile off_t fdstart; |
|---|
| - volatile char *rcptlist; |
|---|
| - volatile void *old_sigchld; |
|---|
| - char *safemesgid=NULL; |
|---|
| - int isspam=0; |
|---|
| - int gotsa=0; |
|---|
| - int chunk; |
|---|
| - off_t towrite; |
|---|
| - char *mailinfo; |
|---|
| - float spamvalue=0.0; |
|---|
| - char *spamstatus=NULL; |
|---|
| - time_t beforescan; |
|---|
| - time_t afterscan; |
|---|
| - time_t afterwait; |
|---|
| - time_t scantime=0; |
|---|
| - time_t fulltime=0; |
|---|
| - struct stat stbuf; |
|---|
| - |
|---|
| - uschar *expand; |
|---|
| - header_line *hl; |
|---|
| - |
|---|
| - static int readconffile=0; |
|---|
| - static int wrotedebugenabled=0; |
|---|
| - |
|---|
| - /* Options we read from /etc/exim4/sa-exim.conf */ |
|---|
| - static char *SAspamcpath=SPAMC_LOCATION; |
|---|
| - static char *SAsafemesgidchars=SAFEMESGIDCHARS |
|---|
| - static char *SAspamcSockPath=NULL; |
|---|
| - static char *SAspamcPort="783"; |
|---|
| - static char *SAspamcHost="127.0.0.1"; |
|---|
| - static char *SAspamcUser=NULL; |
|---|
| - static char *SAEximRunCond="0"; |
|---|
| - static char *SAEximRejCond="1"; |
|---|
| - static int SAmaxbody=250*1024; |
|---|
| - static char *SATruncBodyCond="0"; |
|---|
| - static int SARewriteBody=0; |
|---|
| - static int SAmaxarchivebody=20*1048576; |
|---|
| - static int SAerrmaxarchivebody=1024*1048576; |
|---|
| - static int SAmaxrcptlistlength=0; |
|---|
| - static int SAaddSAEheaderBeforeSA=1; |
|---|
| - static int SAtimeout=240; |
|---|
| - static char *SAtimeoutsave=NULL; |
|---|
| - static char *SAtimeoutSavCond="1"; |
|---|
| - static char *SAerrorsave=NULL; |
|---|
| - static char *SAerrorSavCond="1"; |
|---|
| - static int SAtemprejectonerror=0; |
|---|
| - static char *SAteergrube="1048576"; |
|---|
| - static float SAteergrubethreshold; |
|---|
| - /* This is obsolete, since SAteergrube (now a condition) can do the same */ |
|---|
| - static char *SAteergrubecond="1"; |
|---|
| - static int SAteergrubetime=900; |
|---|
| - static char *SAteergrubeSavCond="1"; |
|---|
| - static char *SAteergrubesave=NULL; |
|---|
| - static int SAteergrubeoverwrite=1; |
|---|
| - static char *SAdevnull="1048576"; |
|---|
| - static float SAdevnullthreshold; |
|---|
| - static char *SAdevnullSavCond="1"; |
|---|
| - static char *SAdevnullsave=NULL; |
|---|
| - static char *SApermreject="1048576"; |
|---|
| - static float SApermrejectthreshold; |
|---|
| - static char *SApermrejectSavCond="1"; |
|---|
| - static char *SApermrejectsave=NULL; |
|---|
| - static char *SAtempreject="1048576"; |
|---|
| - static float SAtemprejectthreshold; |
|---|
| - static char *SAtemprejectSavCond="1"; |
|---|
| - static char *SAtemprejectsave=NULL; |
|---|
| - static int SAtemprejectoverwrite=1; |
|---|
| - static char *SAgreylistiswhitestr="GREYLIST_ISWHITE"; |
|---|
| - static float SAgreylistraisetempreject=3.0; |
|---|
| - static char *SAspamacceptsave=NULL; |
|---|
| - static char *SAspamacceptSavCond="0"; |
|---|
| - static char *SAnotspamsave=NULL; |
|---|
| - static char *SAnotspamSavCond="0"; |
|---|
| - /* Those variables can take a %s to show the spam info */ |
|---|
| - static char *SAmsgteergrubewait="wait for more output"; |
|---|
| - static char *SAmsgteergruberej="Please try again later"; |
|---|
| - static char *SAmsgpermrej="Rejected"; |
|---|
| - static char *SAmsgtemprej="Please try again later"; |
|---|
| - /* Do not put a %s in there, or you'll segfault */ |
|---|
| - static char *SAmsgerror="Temporary local error while processing message, please contact postmaster"; |
|---|
| - |
|---|
| - /* This needs to be retrieved through expand_string in order |
|---|
| - not to violate the API. */ |
|---|
| - static uschar *primary_hostname; |
|---|
| - if (!primary_hostname) { |
|---|
| - store_pool = POOL_PERM; |
|---|
| - primary_hostname = expand_string("$primary_hostname"); |
|---|
| - store_pool = POOL_MAIN; |
|---|
| - } |
|---|
| - |
|---|
| - /* New values we read from spamassassin */ |
|---|
| - char *xspamstatus=NULL; |
|---|
| - char *xspamflag=NULL; |
|---|
| - |
|---|
| - |
|---|
| - /* Any error can write the faulty message to mesgfn, so we need to |
|---|
| - give it a value right now. We'll set the real value later */ |
|---|
| - /* message_id here comes from Exim, it's an internal disk Mesg-Id format |
|---|
| - which doesn't correlate to the actual message's Mesg-Id. We shouldn't |
|---|
| - need to clean it, and besides, SAsafemesgidchars hasn't been read from |
|---|
| - the config file yet, but eh, safety is always a good thing, right? */ |
|---|
| - safemesgid=cleanmsgid(message_id, SAsafemesgidchars); |
|---|
| - mesgfn=string_sprintf("%d_%s", time(NULL), safemesgid); |
|---|
| - |
|---|
| - /* We won't scan local messages. I think exim bypasses local_scan for a |
|---|
| - * bounce generated after a locally submitted message, but better be safe */ |
|---|
| - /* This is commented out now, because you can control it with SAEximRunCond |
|---|
| - if (!sender_host_address) |
|---|
| - { |
|---|
| - return LOCAL_SCAN_ACCEPT; |
|---|
| - } |
|---|
| - */ |
|---|
| - |
|---|
| - /* If you discard a mail with exim ACLs, we get 0 recipients, so let's just |
|---|
| - * accept the mail, which won't matter either way since it'll get dropped |
|---|
| - * (thanks to John Horne for reporting this corner case) */ |
|---|
| - if (recipients_count == 0) |
|---|
| - { |
|---|
| - return LOCAL_SCAN_ACCEPT; |
|---|
| - } |
|---|
| - |
|---|
| - /* |
|---|
| - * We keep track of whether we've alrady read the config file, but since |
|---|
| - * exim spawns itself, it will get read by exim children even though you |
|---|
| - * didn't restart exim. That said, after you change the config file, you |
|---|
| - * should restart exim to make sure all the instances pick up the new |
|---|
| - * config file |
|---|
| - */ |
|---|
| - if (!readconffile) |
|---|
| - { |
|---|
| - ret=open(conffile, 0); |
|---|
| - CHECKERR(ret,string_sprintf("conf file open for %s", conffile),__LINE__); |
|---|
| - readfh=fdopen(ret, "r"); |
|---|
| - CHECKERR(readfh,"fdopen",__LINE__); |
|---|
| - |
|---|
| - while ((fgets((char *)buffer, sizeof(buffera), (FILE *)readfh)) != NULL) |
|---|
| - { |
|---|
| - if (*buffer == '#' || *buffer == '\n' ) |
|---|
| - { |
|---|
| - continue; |
|---|
| - } |
|---|
| - |
|---|
| - if (*buffer != 'S' || *(buffer+1) != 'A') |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Warning: error while reading configuration file %s. Line does not begin with a SA directive: '%s', ignoring", conffile, buffer); |
|---|
| - continue; |
|---|
| - } |
|---|
| - |
|---|
| -#define M_CHECKFORVAR(VAR, TYPE) \ |
|---|
| - if (strstr(buffer, #VAR ": ") == buffer) \ |
|---|
| - { \ |
|---|
| - if (sscanf(buffer, #VAR ": " TYPE, &VAR)) \ |
|---|
| - { \ |
|---|
| - if (SAEximDebug > 3) \ |
|---|
| - { \ |
|---|
| - if (SAEximDebug && ! wrotedebugenabled) \ |
|---|
| - { \ |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug4: Debug enabled, reading config from file %s", conffile); \ |
|---|
| - wrotedebugenabled=1; \ |
|---|
| - } \ |
|---|
| - else \ |
|---|
| - { \ |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug4: config read " #VAR " = " TYPE, VAR); \ |
|---|
| - }\ |
|---|
| - }\ |
|---|
| - } \ |
|---|
| - else \ |
|---|
| - { \ |
|---|
| - log_write(0, LOG_MAIN, "SA: Warning: error while reading configuration file %s. Can't parse value in: '%s', ignoring", conffile, buffer); \ |
|---|
| - } \ |
|---|
| - continue; \ |
|---|
| - } |
|---|
| - |
|---|
| -#define M_CHECKFORSTR(VAR) \ |
|---|
| - if (strstr(buffer, #VAR ": ") == buffer) \ |
|---|
| - { \ |
|---|
| - VAR = strdup(buffer+strlen( #VAR )+2); \ |
|---|
| - if (VAR == NULL) \ |
|---|
| - { \ |
|---|
| - log_write(0, LOG_MAIN, "SA: PANIC: malloc failed, quitting..."); \ |
|---|
| - exit(-1); \ |
|---|
| - } \ |
|---|
| - \ |
|---|
| - if (VAR[strlen(VAR)-1] == '\n') \ |
|---|
| - { \ |
|---|
| - VAR[strlen(VAR)-1]=0; \ |
|---|
| - } \ |
|---|
| - if (SAEximDebug > 3) \ |
|---|
| - { \ |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug4: config read " #VAR " = %s", VAR); \ |
|---|
| - } \ |
|---|
| - continue; \ |
|---|
| - } |
|---|
| - |
|---|
| - M_CHECKFORVAR(SAEximDebug, "%d"); |
|---|
| - M_CHECKFORSTR(SAspamcpath); |
|---|
| - M_CHECKFORSTR(SAsafemesgidchars); |
|---|
| - M_CHECKFORSTR(SAspamcSockPath); |
|---|
| - M_CHECKFORSTR(SAspamcPort); |
|---|
| - M_CHECKFORSTR(SAspamcHost); |
|---|
| - M_CHECKFORSTR(SAspamcUser); |
|---|
| - M_CHECKFORSTR(SAEximRunCond); |
|---|
| - M_CHECKFORSTR(SAEximRejCond); |
|---|
| - M_CHECKFORVAR(SAmaxbody, "%d"); |
|---|
| - M_CHECKFORSTR(SATruncBodyCond); |
|---|
| - M_CHECKFORVAR(SARewriteBody, "%d"); |
|---|
| - M_CHECKFORVAR(SAPrependArchiveWithFrom, "%d"); |
|---|
| - M_CHECKFORVAR(SAmaxarchivebody, "%d"); |
|---|
| - M_CHECKFORVAR(SAerrmaxarchivebody, "%d"); |
|---|
| - M_CHECKFORVAR(SAmaxrcptlistlength, "%d"); |
|---|
| - M_CHECKFORVAR(SAaddSAEheaderBeforeSA, "%d"); |
|---|
| - M_CHECKFORVAR(SAtimeout, "%d"); |
|---|
| - M_CHECKFORSTR(SAtimeoutsave); |
|---|
| - M_CHECKFORSTR(SAtimeoutSavCond); |
|---|
| - M_CHECKFORSTR(SAerrorsave); |
|---|
| - M_CHECKFORSTR(SAerrorSavCond); |
|---|
| - M_CHECKFORVAR(SAtemprejectonerror, "%d"); |
|---|
| - M_CHECKFORSTR(SAteergrube); |
|---|
| - M_CHECKFORSTR(SAteergrubecond); |
|---|
| - M_CHECKFORVAR(SAteergrubetime, "%d"); |
|---|
| - M_CHECKFORSTR(SAteergrubeSavCond); |
|---|
| - M_CHECKFORSTR(SAteergrubesave); |
|---|
| - M_CHECKFORVAR(SAteergrubeoverwrite, "%d"); |
|---|
| - M_CHECKFORSTR(SAdevnull); |
|---|
| - M_CHECKFORSTR(SAdevnullSavCond); |
|---|
| - M_CHECKFORSTR(SAdevnullsave); |
|---|
| - M_CHECKFORSTR(SApermreject); |
|---|
| - M_CHECKFORSTR(SApermrejectsave); |
|---|
| - M_CHECKFORSTR(SApermrejectSavCond); |
|---|
| - M_CHECKFORSTR(SAtempreject); |
|---|
| - M_CHECKFORSTR(SAtemprejectSavCond); |
|---|
| - M_CHECKFORSTR(SAtemprejectsave); |
|---|
| - M_CHECKFORVAR(SAtemprejectoverwrite, "%d"); |
|---|
| - M_CHECKFORSTR(SAgreylistiswhitestr); |
|---|
| - M_CHECKFORVAR(SAgreylistraisetempreject, "%f"); |
|---|
| - M_CHECKFORSTR(SAspamacceptsave); |
|---|
| - M_CHECKFORSTR(SAspamacceptSavCond); |
|---|
| - M_CHECKFORSTR(SAnotspamsave); |
|---|
| - M_CHECKFORSTR(SAnotspamSavCond); |
|---|
| - M_CHECKFORSTR(SAmsgteergrubewait); |
|---|
| - M_CHECKFORSTR(SAmsgteergruberej); |
|---|
| - M_CHECKFORSTR(SAmsgpermrej); |
|---|
| - M_CHECKFORSTR(SAmsgtemprej); |
|---|
| - M_CHECKFORSTR(SAmsgerror); |
|---|
| - |
|---|
| - |
|---|
| - } |
|---|
| - |
|---|
| - readconffile=1; |
|---|
| - } |
|---|
| - |
|---|
| -#define M_CONDTOFLOAT(VAR) \ |
|---|
| - if ((expand=expand_string( VAR )) == NULL) \ |
|---|
| - { \ |
|---|
| - PANIC(string_sprintf(#VAR " config expansion failure on %s", #VAR ));\ |
|---|
| - } \ |
|---|
| - sscanf(expand, "%f", &VAR ## threshold); \ |
|---|
| - if (SAEximDebug > 2) \ |
|---|
| - { \ |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug3: expanded " #VAR " = %.2f", VAR ## threshold); \ |
|---|
| - }\ |
|---|
| - |
|---|
| - M_CONDTOFLOAT(SAteergrube); |
|---|
| - M_CONDTOFLOAT(SAdevnull); |
|---|
| - M_CONDTOFLOAT(SApermreject); |
|---|
| - M_CONDTOFLOAT(SAtempreject); |
|---|
| - |
|---|
| - /* Initialize the list of recipients here */ |
|---|
| - rcptlist=string_copy(recipients_list[0].address); |
|---|
| - for (i=1; i < recipients_count && strlen((char *)rcptlist) < 7998 - strlen(recipients_list[i].address); i++) |
|---|
| - { |
|---|
| - rcptlist=string_sprintf("%s, %s", rcptlist, recipients_list[i].address); |
|---|
| - } |
|---|
| - |
|---|
| - if (sender_host_address != NULL) |
|---|
| - { |
|---|
| - mailinfo=string_sprintf("From <%s> (host=%s [%s]) for", |
|---|
| - sender_address, sender_host_name, sender_host_address); |
|---|
| - } |
|---|
| - else |
|---|
| - { |
|---|
| - mailinfo=string_sprintf("From <%s> (local) for", sender_address); |
|---|
| - } |
|---|
| - mailinfo=string_sprintf("%s %s", mailinfo, rcptlist); |
|---|
| - |
|---|
| - |
|---|
| - /* Remove SA-Exim headers that could have been set before we add ours*/ |
|---|
| - RemoveHeaders("X-SA-Exim-"); |
|---|
| - |
|---|
| - if(SAaddSAEheaderBeforeSA) |
|---|
| - { |
|---|
| - AddSAEheaders((char *)rcptlist, SAmaxrcptlistlength); |
|---|
| - } |
|---|
| - |
|---|
| - /* This is used later if we need to rewind and save the body elsewhere */ |
|---|
| - fdstart=lseek(fd, 0, SEEK_CUR); |
|---|
| - CHECKERR(fdstart,"lseek SEEK_CUR",__LINE__); |
|---|
| - |
|---|
| - ret=fstat(fd, &stbuf); |
|---|
| - CHECKERR(ret,"fstat fd",__LINE__); |
|---|
| - /* this is the body size plus a few bytes (exim msg ID) */ |
|---|
| - /* it should be 18 bytes, but I'll assume it could be more or less */ |
|---|
| - fdsize=stbuf.st_size; |
|---|
| - |
|---|
| - if (SAEximDebug > 3) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug4: Message body is about %.0f bytes and the initial offset is %.0f", (double)(fdsize-18), (double)fdstart); |
|---|
| - } |
|---|
| - |
|---|
| - if (fdsize > SAmaxbody) |
|---|
| - { |
|---|
| - if (SATruncBodyCond[0] != '1' || SATruncBodyCond[1] != 0) |
|---|
| - { |
|---|
| - expand=expand_string(SATruncBodyCond); |
|---|
| - if (expand == NULL) |
|---|
| - { |
|---|
| - PANIC(string_sprintf("SATruncBodyCond expansion failure on %s", SATruncBodyCond)); |
|---|
| - } |
|---|
| - |
|---|
| - if (SAEximDebug) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug: SATruncBodyCond expand returned: '%s'", expand); |
|---|
| - } |
|---|
| - |
|---|
| - if (expand[0] == 0 || (expand[0] == '0' && expand[1] == 0)) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Action: check skipped due to message size (%.0f bytes) and SATruncBodyCond expanded to false (Message-Id: %s). %s", (double)(fdsize-18), safemesgid, mailinfo); |
|---|
| - header_add(' ', "X-SA-Exim-Scanned: No (on %s); Message bigger than SAmaxbody (%d)\n", primary_hostname, SAmaxbody); |
|---|
| - return LOCAL_SCAN_ACCEPT; |
|---|
| - } |
|---|
| - } |
|---|
| - |
|---|
| - if (SAEximDebug > 1) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug2: Message body is about %.0f bytes and SATruncBodyCond expanded to true, will feed a truncated body to SA", (double)(fdsize-18)); |
|---|
| - } |
|---|
| - |
|---|
| - /* Let's feed exactly spamc will accept */ |
|---|
| - scansize=SAmaxbody; |
|---|
| - header_add(' ', "X-SA-Exim-Scan-Truncated: Fed %.0f bytes of the body to SA instead of %.0f\n", (double)scansize, (double)fdsize); |
|---|
| - } |
|---|
| - else |
|---|
| - { |
|---|
| - scansize=fdsize; |
|---|
| - } |
|---|
| - |
|---|
| - expand=expand_string(SAEximRunCond); |
|---|
| - if (expand == NULL) |
|---|
| - { |
|---|
| - PANIC(string_sprintf("SAEximRunCond expansion failure on %s", SAEximRunCond)); |
|---|
| - } |
|---|
| - |
|---|
| - if (SAEximDebug) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug: SAEximRunCond expand returned: '%s'", expand); |
|---|
| - } |
|---|
| - |
|---|
| - |
|---|
| - /* Bail from SA if the expansion string says so */ |
|---|
| - if (expand[0] == 0 || (expand[0] == '0' && expand[1] == 0)) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Action: Not running SA because SAEximRunCond expanded to false (Message-Id: %s). %s", safemesgid, mailinfo); |
|---|
| - header_add(' ', "X-SA-Exim-Scanned: No (on %s); SAEximRunCond expanded to false\n", primary_hostname); |
|---|
| - return LOCAL_SCAN_ACCEPT; |
|---|
| - } |
|---|
| - |
|---|
| - if (SAEximDebug) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug: check succeeded, running spamc"); |
|---|
| - } |
|---|
| - |
|---|
| - /* Ok, so now that we know we're running SA, we remove the X-Spam headers */ |
|---|
| - /* that might have been there */ |
|---|
| - RemoveHeaders("X-Spam-"); |
|---|
| - |
|---|
| - |
|---|
| - beforescan=time(NULL); |
|---|
| - /* Fork off spamc, and get ready to talk to it */ |
|---|
| - ret=pipe(writefd); |
|---|
| - CHECKERR(ret,"write pipe",__LINE__); |
|---|
| - ret=pipe(readfd); |
|---|
| - CHECKERR(ret,"read pipe",__LINE__); |
|---|
| - |
|---|
| - /* Ensure that SIGCHLD isn't being ignored. */ |
|---|
| - old_sigchld = signal(SIGCHLD, SIG_DFL); |
|---|
| - |
|---|
| - if ((pid=fork()) < 0) |
|---|
| - { |
|---|
| - CHECKERR(pid, "fork", __LINE__ - 1); |
|---|
| - } |
|---|
| - |
|---|
| - if (pid == 0) |
|---|
| - { |
|---|
| - close(readfd[0]); |
|---|
| - close(writefd[1]); |
|---|
| - |
|---|
| - ret=dup2(writefd[0],0); |
|---|
| - CHECKERR(ret,"dup2 stdin",__LINE__); |
|---|
| - ret=dup2(readfd[1],1); |
|---|
| - CHECKERR(ret,"dup2 stdout",__LINE__); |
|---|
| - ret=dup2(readfd[1],2); |
|---|
| - CHECKERR(ret,"dup2 stderr",__LINE__); |
|---|
| - |
|---|
| - i = 0; |
|---|
| - spamc_argv[i++] = "spamc"; |
|---|
| - if (SAspamcUser && SAspamcUser[0]) |
|---|
| - { |
|---|
| - expand=expand_string(SAspamcUser); |
|---|
| - if (expand == NULL) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN | LOG_PANIC, "SA: SAspamcUser expansion failure on %s, will run as Exim user instead.", SAspamcUser); |
|---|
| - } |
|---|
| - else if (expand[0] != '\0') |
|---|
| - { |
|---|
| - spamc_argv[i++] = "-u"; |
|---|
| - spamc_argv[i++] = expand; |
|---|
| - } |
|---|
| - } |
|---|
| - |
|---|
| - /* |
|---|
| - * I could implement the spamc protocol and talk to spamd directly |
|---|
| - * instead of forking spamc, but considering the overhead spent |
|---|
| - * in spamd, forking off spamc seemed acceptable rather than |
|---|
| - * re-implementing and tracking the spamc/spamd protocol or linking |
|---|
| - * with a possibly changing library |
|---|
| - */ |
|---|
| - /* Ok, we cheat, spamc cares about how big the whole message is and |
|---|
| - * we only know about the body size, so I'll give an extra 16K |
|---|
| - * to account for any headers that can accompany the message */ |
|---|
| - |
|---|
| - spamc_argv[i++] = "-s"; |
|---|
| - spamc_argv[i++] = string_sprintf("%d", SAmaxbody+16384); |
|---|
| - |
|---|
| - if(SAspamcSockPath) |
|---|
| - { |
|---|
| - spamc_argv[i++] = "-U"; |
|---|
| - spamc_argv[i++] = SAspamcSockPath; |
|---|
| - } |
|---|
| - else |
|---|
| - { |
|---|
| - spamc_argv[i++] = "-d"; |
|---|
| - spamc_argv[i++] = SAspamcHost; |
|---|
| - spamc_argv[i++] = "-p"; |
|---|
| - spamc_argv[i++] = SAspamcPort; |
|---|
| - } |
|---|
| - spamc_argv[i++] = NULL; |
|---|
| - |
|---|
| - ret=execv(SAspamcpath, spamc_argv); |
|---|
| - CHECKERR(ret,string_sprintf("exec %s", SAspamcpath),__LINE__); |
|---|
| - } |
|---|
| - |
|---|
| - if (SAEximDebug > 8) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug9: forked spamc"); |
|---|
| - } |
|---|
| - |
|---|
| - ret=close(readfd[1]); |
|---|
| - CHECKERR(ret,"close r",__LINE__); |
|---|
| - ret=close(writefd[0]); |
|---|
| - CHECKERR(ret,"close w",__LINE__); |
|---|
| - readfh=fdopen(readfd[0], "r"); |
|---|
| - |
|---|
| - if (SAEximDebug > 8) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug9: closed filehandles"); |
|---|
| - } |
|---|
| - |
|---|
| - /* Ok, we're ready for spewing the mail at spamc */ |
|---|
| - /* First we need to get the header lines from exim, and then we can read |
|---|
| - the body from fd */ |
|---|
| - hl=header_list; |
|---|
| - while (hl != NULL) |
|---|
| - { |
|---|
| - /* type '*' means the header is internal, don't print it */ |
|---|
| - if (hl->type == '*') |
|---|
| - { |
|---|
| - hl=hl->next; |
|---|
| - continue; |
|---|
| - } |
|---|
| - |
|---|
| - stret=write(writefd[1],hl->text,strlen(hl->text)); |
|---|
| - CHECKERR(stret,"header line write",__LINE__); |
|---|
| - |
|---|
| - hl=hl->next; |
|---|
| - } |
|---|
| - stret=write(writefd[1],"\n",1); |
|---|
| - CHECKERR(stret,"header separation write",__LINE__); |
|---|
| - |
|---|
| - if (SAEximDebug > 6) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug7: sent headers to spamc pipe. Sending body..."); |
|---|
| - } |
|---|
| - |
|---|
| - towrite=scansize; |
|---|
| - chunk=0; |
|---|
| - while (towrite>0 && (stret=read(fd, buffer, MIN(sizeof(buffera), towrite))) > 0) |
|---|
| - { |
|---|
| - chunk++; |
|---|
| - if (SAEximDebug > 8) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug9: spamc body going to write chunk %d (read %.0f, %.0f left to write)", chunk, (double)stret, (double)towrite); |
|---|
| - } |
|---|
| - towrite-=stret; |
|---|
| - stret=write(writefd[1], buffer, stret); |
|---|
| - CHECKERR(stret,"body write in",__LINE__); |
|---|
| - if (SAEximDebug > 8) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug9: Spamc body wrote chunk %d (wrote %.0f, %.0f left to write)", chunk, (double)stret, (double)towrite); |
|---|
| - } |
|---|
| - } |
|---|
| - CHECKERR(stret, "read body", __LINE__ - 14); |
|---|
| - close(writefd[1]); |
|---|
| - |
|---|
| - if (SAEximDebug > 5) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug6: fed spam to spamc, reading result"); |
|---|
| - } |
|---|
| - |
|---|
| - if (SAtimeout) |
|---|
| - { |
|---|
| - if (SAEximDebug > 2) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug3: Setting timeout of %d secs before reading from spamc", SAtimeout); |
|---|
| - } |
|---|
| - /* SA can take very long to run for various reasons, let's not wait |
|---|
| - * forever, that's just bad at SMTP time */ |
|---|
| - if (setjmp(jmp_env) == 0) |
|---|
| - { |
|---|
| - signal(SIGALRM, alarm_handler); |
|---|
| - alarm (SAtimeout); |
|---|
| - } |
|---|
| - else |
|---|
| - { |
|---|
| - /* Make sure that all your variables here are volatile or static */ |
|---|
| - signal(SIGCHLD, old_sigchld); |
|---|
| - fclose((FILE *)readfh); |
|---|
| - |
|---|
| - header_add(' ', "X-SA-Exim-Scanned: No (on %s); SA Timed out after %d secs\n", primary_hostname, SAtimeout); |
|---|
| - |
|---|
| - /* We sent it to LOG_REJECT too so that we get a header dump */ |
|---|
| - log_write(0, LOG_MAIN | LOG_REJECT, "SA: Action: spamd took more than %d secs to run, accepting message (scanned in %d/%d secs | Message-Id: %s). %s", SAtimeout, scantime, fulltime, safemesgid, mailinfo); |
|---|
| - |
|---|
| - ret=savemail(fd, fdstart, SAtimeoutsave, "SAtimeoutsave", (char *)mesgfn, SAerrmaxarchivebody, SAtimeoutSavCond); |
|---|
| - CHECKERR(ret,where,line); |
|---|
| - |
|---|
| - /* Make sure we kill spamc in case SIGPIPE from fclose didn't */ |
|---|
| - kill(pid, SIGTERM); |
|---|
| - return LOCAL_SCAN_ACCEPT; |
|---|
| - |
|---|
| - } |
|---|
| - } |
|---|
| - |
|---|
| - /* Let's see what SA has to tell us about this mail and store the headers */ |
|---|
| - while ((fgets((char *)buffer,sizeof(buffera),(FILE *) readfh)) != NULL) |
|---|
| - { |
|---|
| - /* Remove trailing newline */ |
|---|
| - if (buffer[strlen(buffer)-1] == '\n') |
|---|
| - { |
|---|
| - buffer[strlen(buffer)-1]=0; |
|---|
| - } |
|---|
| -restart: |
|---|
| - if (SAEximDebug > 5) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug6: spamc read: %s", buffer); |
|---|
| - } |
|---|
| - |
|---|
| - /* Let's handle special multi-line headers first, what a pain... */ |
|---|
| - /* We feed the one line we read and the filehandle because we'll need |
|---|
| - to check whether more lines need to be concatenated */ |
|---|
| - /* This is ugly, there is an order dependency so we return to the |
|---|
| - beginning of the loop without reading a new line since we already |
|---|
| - did that */ |
|---|
| - if (parsemlheader(buffer, (FILE *)readfh, "Subject", NULL)) goto restart; |
|---|
| - if ((SARewriteBody == 1) && parsemlheader(buffer, (FILE *)readfh, "Content-Type", NULL)) goto restart; |
|---|
| - if ((SARewriteBody == 1) && parsemlheader(buffer, (FILE *)readfh, "Content-Transfer-Encoding", NULL)) goto restart; |
|---|
| - |
|---|
| - if (parsemlheader(buffer, (FILE *)readfh, "X-Spam-Flag", &xspamflag)) |
|---|
| - { |
|---|
| - if (xspamflag[13] == 'Y') |
|---|
| - { |
|---|
| - isspam=1; |
|---|
| - } |
|---|
| - if (SAEximDebug > 2) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug3: isspam read from X-Spam-Flag: %d", isspam); |
|---|
| - } |
|---|
| - goto restart; |
|---|
| - } |
|---|
| - |
|---|
| - if (parsemlheader(buffer, (FILE *)readfh, "X-Spam-Status", &xspamstatus)) |
|---|
| - { |
|---|
| - char *start; |
|---|
| - char *end; |
|---|
| - |
|---|
| - gotsa=1; |
|---|
| - |
|---|
| - /* if we find the preconfigured greylist string (and it is defined |
|---|
| - * in sa-exim.conf), we can raise the threshold for tempreject just |
|---|
| - * for this mail, since it's been whitelisted */ |
|---|
| - if (SAgreylistiswhitestr && strstr(xspamstatus, SAgreylistiswhitestr)) |
|---|
| - { |
|---|
| - SAtemprejectthreshold+=SAgreylistraisetempreject; |
|---|
| - if (SAEximDebug > 2) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug3: read %s string, SAtempreject is now changed to %f", SAgreylistiswhitestr, SAtemprejectthreshold); |
|---|
| - } |
|---|
| - } |
|---|
| - else |
|---|
| - { |
|---|
| - if (SAEximDebug > 2) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug3: did not find read GREYLIST_ISWHITE string in X-Spam-Status"); |
|---|
| - } |
|---|
| - } |
|---|
| - |
|---|
| - start=strstr(xspamstatus, "hits="); |
|---|
| - /* Support SA 3.0 format */ |
|---|
| - if (start == NULL) |
|---|
| - { |
|---|
| - start=strstr(xspamstatus, "score="); |
|---|
| - } |
|---|
| - |
|---|
| - end=strstr(xspamstatus, " tests="); |
|---|
| - if (end == NULL) |
|---|
| - { |
|---|
| - if (SAEximDebug > 5) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug6: Could not find old spamstatus format, trying new one..."); |
|---|
| - } |
|---|
| - end=strstr(xspamstatus, "\n tests="); |
|---|
| - } |
|---|
| - if (start!=NULL && end!=NULL) |
|---|
| - { |
|---|
| - spamstatus=string_copyn(start, end-start); |
|---|
| - if (SAEximDebug > 2) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug3: Read from X-Spam-Status: %s", spamstatus); |
|---|
| - } |
|---|
| - } |
|---|
| - else |
|---|
| - { |
|---|
| - PANIC(string_sprintf("SA: could not parse X-Spam-Status: to extract hits and required. Bad!. Got: '%s'", xspamstatus)); |
|---|
| - } |
|---|
| - |
|---|
| - start=strstr(spamstatus, "="); |
|---|
| - end=strstr(spamstatus, " "); |
|---|
| - if (start!=NULL && end!=NULL) |
|---|
| - { |
|---|
| - start++; |
|---|
| - sscanf(start, "%f", &spamvalue); |
|---|
| - } |
|---|
| - else |
|---|
| - { |
|---|
| - PANIC(string_sprintf("SA: spam value extract failed in '%s'. Bad!", xspamstatus)); |
|---|
| - } |
|---|
| - |
|---|
| - goto restart; |
|---|
| - } |
|---|
| - |
|---|
| - if (parsemlheader(buffer, (FILE *)readfh, "X-Spam-", NULL)) goto restart; |
|---|
| - |
|---|
| - /* Ok, now we can do normal processing */ |
|---|
| - |
|---|
| - /* If no more headers here, we're done */ |
|---|
| - if (buffer[0] == 0) |
|---|
| - { |
|---|
| - if (SAEximDebug > 5) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug6: spamc read got newline, end of headers", buffer); |
|---|
| - } |
|---|
| - goto exit; |
|---|
| - } |
|---|
| - |
|---|
| - if (compare_header(buffer, "Message-Id: ")) |
|---|
| - { |
|---|
| - char *start; |
|---|
| - char *end; |
|---|
| - char *mesgid=NULL; |
|---|
| - |
|---|
| - start=strchr(buffer, '<'); |
|---|
| - end=strchr(buffer, '>'); |
|---|
| - |
|---|
| - if (start == NULL || end == NULL) |
|---|
| - { |
|---|
| - /* we keep the default mesgfn (unix date in seconds) */ |
|---|
| - if (SAEximDebug) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug: Could not get Message-Id from %s", buffer); |
|---|
| - } |
|---|
| - } |
|---|
| - else if ((mesgid=string_copyn(start+1,end-start-1)) && mesgid[0]) |
|---|
| - { |
|---|
| - /* We replace the exim Message-ID with the one read from |
|---|
| - the message * as we use this to detect dupes when we |
|---|
| - send 45x and get the same * message multiple times */ |
|---|
| - safemesgid=cleanmsgid(mesgid, SAsafemesgidchars); |
|---|
| - mesgfn=string_sprintf("%d_%s", time(NULL), safemesgid); |
|---|
| - |
|---|
| - if (SAEximDebug > 5) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug6: Message-Id received and cleaned as: %s", safemesgid); |
|---|
| - } |
|---|
| - } |
|---|
| - continue; |
|---|
| - } |
|---|
| - } |
|---|
| - |
|---|
| - exit: |
|---|
| - |
|---|
| - |
|---|
| - if (isspam && SARewriteBody == 1) |
|---|
| - { |
|---|
| - int line; |
|---|
| - |
|---|
| - if (SAEximDebug) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug: SARewriteBody == 1, rewriting message body"); |
|---|
| - } |
|---|
| - |
|---|
| - /* already read from fd? Better reset it... */ |
|---|
| - ret=lseek(fd, fdstart, SEEK_SET); |
|---|
| - CHECKERR(ret, "lseek reset on spooled message", __LINE__); |
|---|
| - |
|---|
| - line=1; |
|---|
| - while ((fgets((char *)buffer,sizeof(buffera),(FILE *) readfh)) != NULL) |
|---|
| - { |
|---|
| - if (SAEximDebug > 8) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug9: Read body from SA; line %d (read %d)", line, strlen(buffer)); |
|---|
| - } |
|---|
| - |
|---|
| - stret=write(fd, buffer, strlen(buffer)); |
|---|
| - CHECKERR(stret,string_sprintf("SA body write to msg"),__LINE__); |
|---|
| - if (SAEximDebug > 8) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug9: Wrote to msg; line %d (wrote %d)", line, ret); |
|---|
| - } |
|---|
| - if (buffer[strlen(buffer)-1] == '\n') |
|---|
| - { |
|---|
| - line++; |
|---|
| - } |
|---|
| - } |
|---|
| - |
|---|
| -/* if (SAEximDebug > 1) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug2: body_linecount before SA: %d", body_linecount); |
|---|
| - } |
|---|
| -*/ |
|---|
| - /* update global variable $body_linecount to reflect the new body size*/ |
|---|
| -/* body_linecount = (line - 1); |
|---|
| - |
|---|
| - if (SAEximDebug > 1) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug2: body_linecount after SA: %d", body_linecount); |
|---|
| - } |
|---|
| -*/ |
|---|
| - } |
|---|
| - |
|---|
| - fclose((FILE *)readfh); |
|---|
| - |
|---|
| - afterscan=time(NULL); |
|---|
| - scantime=afterscan-beforescan; |
|---|
| - |
|---|
| - wait(&ret); |
|---|
| - signal(SIGCHLD, old_sigchld); |
|---|
| - |
|---|
| - if (ret) |
|---|
| - { |
|---|
| - sprintf(buffer, "%d", ret); |
|---|
| - PANIC(string_sprintf("wait on spamc child yielded, %s", buffer)); |
|---|
| - } |
|---|
| - |
|---|
| - afterwait=time(NULL); |
|---|
| - fulltime=afterwait-beforescan; |
|---|
| - |
|---|
| - if(!SAaddSAEheaderBeforeSA) |
|---|
| - { |
|---|
| - AddSAEheaders((char *)rcptlist, SAmaxrcptlistlength); |
|---|
| - } |
|---|
| - |
|---|
| - header_add(' ', "X-SA-Exim-Version: %s\n",version); |
|---|
| - |
|---|
| - if (gotsa == 0) |
|---|
| - { |
|---|
| - header_add(' ', "X-SA-Exim-Scanned: No (on %s); Unknown failure\n", primary_hostname); |
|---|
| - log_write(0, LOG_MAIN, "SA: Action: SA didn't successfully run against message, accepting (time: %d/%d secs | Message-Id: %s). %s", scantime, fulltime, safemesgid, mailinfo); |
|---|
| - return LOCAL_SCAN_ACCEPT; |
|---|
| - } |
|---|
| - |
|---|
| - header_add(' ', "X-SA-Exim-Scanned: Yes (on %s)\n", primary_hostname); |
|---|
| - |
|---|
| - if (spamstatus == NULL) |
|---|
| - { |
|---|
| - spamstatus = (char *) nospamstatus; |
|---|
| - } |
|---|
| - if (isspam) |
|---|
| - { |
|---|
| - int dorej=1; |
|---|
| - int doteergrube=0; |
|---|
| - |
|---|
| - if (SAEximRejCond[0] != '1' || SAEximRejCond[1] != 0) |
|---|
| - { |
|---|
| - expand=expand_string(SAEximRejCond); |
|---|
| - if (expand == NULL) |
|---|
| - { |
|---|
| - PANIC(string_sprintf("SAEximRejCond expansion failure on %s", SAEximRejCond)); |
|---|
| - } |
|---|
| - |
|---|
| - if (SAEximDebug) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug: SAEximRejCond expand returned: '%s'", expand); |
|---|
| - } |
|---|
| - |
|---|
| - if (expand[0] == 0 || (expand[0] == '0' && expand[1] == 0)) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Notice: SAEximRejCond expanded to false, not applying reject rules"); |
|---|
| - dorej=0; |
|---|
| - } |
|---|
| - } |
|---|
| - |
|---|
| - if (dorej && spamvalue >= SAteergrubethreshold) |
|---|
| - { |
|---|
| - doteergrube=1; |
|---|
| - if (SAteergrubecond[0] != '1' || SAteergrubecond[1] != 0) |
|---|
| - { |
|---|
| - expand=expand_string(SAteergrubecond); |
|---|
| - if (expand == NULL) |
|---|
| - { |
|---|
| - PANIC(string_sprintf("SAteergrubecond expansion failure on %s", SAteergrubecond)); |
|---|
| - } |
|---|
| - |
|---|
| - if (SAEximDebug) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Debug: SAteergrubecond expand returned: '%s'", expand); |
|---|
| - } |
|---|
| - |
|---|
| - if (expand[0] == 0 || (expand[0] == '0' && expand[1] == 0)) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: Notice: SAteergrubecond expanded to false, not teergrubing known peer"); |
|---|
| - doteergrube=0; |
|---|
| - } |
|---|
| - } |
|---|
| - } |
|---|
| - |
|---|
| - if (dorej && doteergrube) |
|---|
| - { |
|---|
| - char *teergrubewaitstr; |
|---|
| - teergrubewaitstr=string_sprintf(SAmsgteergrubewait, spamstatus); |
|---|
| - |
|---|
| - /* By default, we'll only save temp bounces by message ID so |
|---|
| - * that when the same message is submitted several times, we |
|---|
| - * overwrite the same file on disk and not create a brand new |
|---|
| - * one every single time */ |
|---|
| - if (SAteergrubeoverwrite) |
|---|
| - { |
|---|
| - ret=savemail(fd, fdstart, SAteergrubesave, "SAteergrubesave", safemesgid, SAmaxarchivebody, SAteergrubeSavCond); |
|---|
| - CHECKERR(ret,where,line); |
|---|
| - } |
|---|
| - else |
|---|
| - { |
|---|
| - ret=savemail(fd, fdstart, SAteergrubesave, "SAteergrubesave", (char *)mesgfn, SAmaxarchivebody, SAteergrubeSavCond); |
|---|
| - CHECKERR(ret,where,line); |
|---|
| - } |
|---|
| - |
|---|
| - spamstatus=string_sprintf("%s trigger=%.1f", spamstatus, SAteergrubethreshold); |
|---|
| - /* Exim might want to stop us if we run for too long, but that's |
|---|
| - * exactly what we're trying to do, so let's override that */ |
|---|
| - alarm(0); |
|---|
| - |
|---|
| - for (i=0;i<SAteergrubetime/10;i++) |
|---|
| - { |
|---|
| - smtp_printf("451-%s\r\n", teergrubewaitstr); |
|---|
| - ret=smtp_fflush(); |
|---|
| - if (ret != 0) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN | LOG_REJECT, "SA: Action: teergrubed sender for %d secs until it closed the connection: %s (scanned in %d/%d secs | Message-Id: %s). %s", i*10, spamstatus, scantime, fulltime, safemesgid, mailinfo); |
|---|
| - /* The other side closed the connection, nothing to print */ |
|---|
| - *return_text=""; |
|---|
| - return LOCAL_SCAN_TEMPREJECT_NOLOGHDR; |
|---|
| - } |
|---|
| - sleep(10); |
|---|
| - } |
|---|
| - |
|---|
| - log_write(0, LOG_MAIN | LOG_REJECT, "SA: Action: teergrubed sender until full configured duration of %d secs: %s (scanned in %d/%d secs | Message-Id: %s). %s", SAteergrubetime, spamstatus, scantime, fulltime, safemesgid, mailinfo); |
|---|
| - *return_text=string_sprintf(SAmsgteergruberej, spamstatus); |
|---|
| - return LOCAL_SCAN_TEMPREJECT_NOLOGHDR; |
|---|
| - } |
|---|
| - else if (dorej && spamvalue >= SAdevnullthreshold) |
|---|
| - { |
|---|
| - ret=savemail(fd, fdstart, SAdevnullsave, "SAdevnullsave", (char *)mesgfn, SAmaxarchivebody, SAdevnullSavCond); |
|---|
| - CHECKERR(ret,where,line); |
|---|
| - |
|---|
| - recipients_count=0; |
|---|
| - spamstatus=string_sprintf("%s trigger=%.1f", spamstatus, SAdevnullthreshold); |
|---|
| - log_write(0, LOG_REJECT | LOG_MAIN, "SA: Action: silently tossed message: %s (scanned in %d/%d secs | Message-Id: %s). %s", spamstatus, scantime, fulltime, safemesgid, mailinfo); |
|---|
| - return LOCAL_SCAN_ACCEPT; |
|---|
| - } |
|---|
| - else if (dorej && spamvalue >= SApermrejectthreshold) |
|---|
| - { |
|---|
| - ret=savemail(fd, fdstart, SApermrejectsave, "SApermrejectsave", (char *)mesgfn, SAmaxarchivebody, SApermrejectSavCond); |
|---|
| - CHECKERR(ret,where,line); |
|---|
| - |
|---|
| - spamstatus=string_sprintf("%s trigger=%.1f", spamstatus, SApermrejectthreshold); |
|---|
| - log_write(0, LOG_MAIN | LOG_REJECT, "SA: Action: permanently rejected message: %s (scanned in %d/%d secs | Message-Id: %s). %s", spamstatus, scantime, fulltime, safemesgid, mailinfo); |
|---|
| - *return_text=string_sprintf(SAmsgpermrej, spamstatus); |
|---|
| - return LOCAL_SCAN_REJECT_NOLOGHDR; |
|---|
| - } |
|---|
| - else if (dorej && spamvalue >= SAtemprejectthreshold) |
|---|
| - { |
|---|
| - /* Yeah, gotos are harmful, but that'd be a function with a lot |
|---|
| - * of options to send, so, here's a small shortcut */ |
|---|
| - goto dotempreject; |
|---|
| - } |
|---|
| - else |
|---|
| - { |
|---|
| - ret=savemail(fd, fdstart, SAspamacceptsave, "SAspamacceptsave", (char *)mesgfn, SAmaxarchivebody, SAspamacceptSavCond); |
|---|
| - CHECKERR(ret,where,line); |
|---|
| - log_write(0, LOG_MAIN, "SA: Action: flagged as Spam but accepted: %s (scanned in %d/%d secs | Message-Id: %s). %s", spamstatus, scantime, fulltime, safemesgid, mailinfo); |
|---|
| - return LOCAL_SCAN_ACCEPT; |
|---|
| - } |
|---|
| - } |
|---|
| - else |
|---|
| - { |
|---|
| - /* This is an exception to the rule, for grey listing, we allow for |
|---|
| - * sending back a tempreject on SA scores that aren't considered as |
|---|
| - * spam (greylisting is now done directly in spamassassin though */ |
|---|
| - if (spamvalue >= SAtemprejectthreshold) |
|---|
| - { |
|---|
| - dotempreject: |
|---|
| - |
|---|
| - /* By default, we'll only save temp bounces by message ID so |
|---|
| - * that when the same message is submitted several times, we |
|---|
| - * overwrite the same file on disk and not create a brand new |
|---|
| - * one every single time */ |
|---|
| - if (SAtemprejectoverwrite) |
|---|
| - { |
|---|
| - ret=savemail(fd, fdstart, SAtemprejectsave, "SAtemprejectsave", safemesgid, SAmaxarchivebody, SAtemprejectSavCond); |
|---|
| - CHECKERR(ret,where,line); |
|---|
| - } |
|---|
| - else |
|---|
| - { |
|---|
| - ret=savemail(fd, fdstart, SAtemprejectsave, "SAtemprejectsave", (char *)mesgfn, SAmaxarchivebody, SAtemprejectSavCond); |
|---|
| - CHECKERR(ret,where,line); |
|---|
| - } |
|---|
| - |
|---|
| - spamstatus=string_sprintf("%s trigger=%.1f", spamstatus, SAtemprejectthreshold); |
|---|
| - log_write(0, LOG_MAIN | LOG_REJECT, "SA: Action: temporarily rejected message: %s (scanned in %d/%d secs | Message-Id: %s). %s", spamstatus, scantime, fulltime, safemesgid, mailinfo); |
|---|
| - *return_text=string_sprintf(SAmsgtemprej, spamstatus); |
|---|
| - return LOCAL_SCAN_TEMPREJECT_NOLOGHDR; |
|---|
| - } |
|---|
| - else |
|---|
| - { |
|---|
| - ret=savemail(fd, fdstart, SAnotspamsave, "SAnotspamsave", (char *)mesgfn, SAmaxarchivebody, SAnotspamSavCond); |
|---|
| - CHECKERR(ret,where,line); |
|---|
| - log_write(0, LOG_MAIN, "SA: Action: scanned but message isn't spam: %s (scanned in %d/%d secs | Message-Id: %s). %s", spamstatus, scantime, fulltime, safemesgid, mailinfo); |
|---|
| - return LOCAL_SCAN_ACCEPT; |
|---|
| - } |
|---|
| - } |
|---|
| - |
|---|
| - |
|---|
| - |
|---|
| - errexit: |
|---|
| - if (SAtemprejectonerror) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN | LOG_PANIC, "SA: PANIC: Unexpected error on %s, file "__FILE__", line %d: %s", where, line-1, strerror(errno)); |
|---|
| - } |
|---|
| - else |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN, "SA: PANIC: Unexpected error on %s (but message was accepted), file "__FILE__", line %d: %s", where, line-1, strerror(errno)); |
|---|
| - } |
|---|
| - |
|---|
| - header_add(' ', "X-SA-Exim-Scanned: No (on %s); Exit with error (see exim mainlog)\n", primary_hostname); |
|---|
| - |
|---|
| - ret=savemail(fd, fdstart, SAerrorsave, "SAerrorsave", (char *)mesgfn, SAerrmaxarchivebody, SAerrorSavCond); |
|---|
| - if (ret < 0) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN | LOG_PANIC, "SA: PANIC: Error in error handler while trying to save mail to %s, file "__FILE__", line %d: %s", string_sprintf("%s/%s", SAerrorsave, mesgfn), __LINE__ - 3, strerror(errno)); |
|---|
| - } |
|---|
| - |
|---|
| - if (SAtemprejectonerror) |
|---|
| - { |
|---|
| - *return_text=SAmsgerror; |
|---|
| - return LOCAL_SCAN_TEMPREJECT_NOLOGHDR; |
|---|
| - } |
|---|
| - else |
|---|
| - { |
|---|
| - return LOCAL_SCAN_ACCEPT; |
|---|
| - } |
|---|
| - |
|---|
| - |
|---|
| - panicexit: |
|---|
| - if (SAtemprejectonerror) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN | LOG_PANIC, "SA: PANIC: %s", panicerror); |
|---|
| - } |
|---|
| - else |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN | LOG_PANIC, "SA: PANIC: %s (but message was accepted)", panicerror); |
|---|
| - } |
|---|
| - |
|---|
| - header_add(' ', "X-SA-Exim-Scanned: No (on %s); Panic (see exim mainlog)\n", primary_hostname); |
|---|
| - |
|---|
| - ret=savemail(fd, fdstart, SAerrorsave, "SAerrorsave", (char *)mesgfn, SAerrmaxarchivebody, SAerrorSavCond); |
|---|
| - if (ret < 0) |
|---|
| - { |
|---|
| - log_write(0, LOG_MAIN | LOG_PANIC , "SA: PANIC: Error in error handler while trying to save mail to %s, file "__FILE__", line %d: %s", string_sprintf("%s/%s", SAerrorsave, mesgfn), __LINE__ - 3, strerror(errno)); |
|---|
| - } |
|---|
| - |
|---|
| - if (SAtemprejectonerror) |
|---|
| - { |
|---|
| - *return_text=SAmsgerror; |
|---|
| - return LOCAL_SCAN_TEMPREJECT_NOLOGHDR; |
|---|
| - } |
|---|
| - else |
|---|
| - { |
|---|
| - return LOCAL_SCAN_ACCEPT; |
|---|
| - } |
|---|
| -} |
|---|
| Index: tags/4.2.1-13/version |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/version (revision 63) |
|---|
| +++ tags/4.2.1-13/version (nonexistent) |
|---|
| @@ -1 +0,0 @@ |
|---|
| -4.2.1 |
|---|
| Index: tags/4.2.1-13/sa-exim.conf |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/sa-exim.conf (revision 63) |
|---|
| +++ tags/4.2.1-13/sa-exim.conf (nonexistent) |
|---|
| @@ -1,376 +0,0 @@ |
|---|
| -# Options for spamassassin running in exim's local_scan (SA Exim) |
|---|
| -# By Marc MERLIN <marc_soft@merlins.org> - Initial version: April 2002 |
|---|
| -# Sander Smeenk <ssmeenk@freshdot.net> - Improvements: March 2004 |
|---|
| -# |
|---|
| -# Sample file version 1.16 for SA-Exim 4.1 - 2005/01/10 |
|---|
| -# |
|---|
| -# The parse routine is minimalistic. It expects "option: value" (exactly |
|---|
| -# one space after the colon, and none before). You should put long lines |
|---|
| -# on one line. The parser isn't capable of parsing multiline values. |
|---|
| -# |
|---|
| -# SA threshold values are parsed as floats and other numerical options |
|---|
| -# are ints. String options have to be set. To unset them, comment out the |
|---|
| -# variable, don't set it to nothing. |
|---|
| -# |
|---|
| -# READ THIS: |
|---|
| -# --------- |
|---|
| -# Watch your logs, you will get errors and your messages will get |
|---|
| -# temporarily bounced if expansions fail. Watch your logs! |
|---|
| -# |
|---|
| -# If you are afraid that spammers might use a header that is used here |
|---|
| -# as a default, have exim set it to another value than 'Yes' and check |
|---|
| -# here for that other value. |
|---|
| -# |
|---|
| -# For every expansion, anything that doesn't expand to "" or "0" |
|---|
| -# (without quotes) will be considered true. If you set the string to 1, |
|---|
| -# it will be true without going through exim's condition evaluator (and |
|---|
| -# if you leave it unset, it will default to 0) |
|---|
| -# |
|---|
| -# You should not put double quotes around expressions! |
|---|
| -# --- snip --- |
|---|
| - |
|---|
| -# Enable basic verbose output by default. Watch your logs! |
|---|
| -SAEximDebug: 1 |
|---|
| - |
|---|
| - |
|---|
| -# Default path is /usr/bin/spamc, but you can change it here |
|---|
| -SAspamcpath: /usr/bin/spamc |
|---|
| - |
|---|
| -# Which characters are retained from a Message-Id header (for safety, we |
|---|
| -# remove characters that might cause problems with shell parsing) |
|---|
| -# Change the default at your own risk (you also have to change this in |
|---|
| -# the SA greylisting patch if you use that) |
|---|
| -#SAsafemesgidchars: !#%( )*+,-.0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_abcdefghijklmnopqrstuvwxyz{|}~ |
|---|
| - |
|---|
| -# If SAspamcSockPath is set spamc uses socket to connect to spamd, |
|---|
| -# use --socketpath pathname as argument to spamd (new in SA 2.60). |
|---|
| -# Leave it unset if you want spamc to connect(AF_INET) to spamd at |
|---|
| -# 127.0.0.1 (this is the default shown in the options below), but if |
|---|
| -# you set it, it will override the two TCP connect options below |
|---|
| -#SAspamcSockPath: /var/run/spamd.sock |
|---|
| - |
|---|
| -# SAspamcHost / SAspamcPort: TCP socket where your spamd is listening |
|---|
| -# Shown below are the defaults: |
|---|
| -SAspamcHost: 127.0.0.1 |
|---|
| -SAspamcPort: 783 |
|---|
| - |
|---|
| -# SAspamcUser: The username passed to spamc. Some tricks are needed to |
|---|
| -# decide on one user when there are many recipients. This string is of |
|---|
| -# course expanded. If unset or empty, spamc will use the user Exim |
|---|
| -# runs as. We suggest that you decide what username to use in the ACLs |
|---|
| -# and set an ACL variable. |
|---|
| -#SAspamcUser: $acl_m2 |
|---|
| - |
|---|
| -# Exim configuration string to run before running SA against the message |
|---|
| -# This decides whether SA gets run against the message or not. This |
|---|
| -# default will not reject messages if the message had SA headers but |
|---|
| -# they weren't added by us. |
|---|
| -SAEximRunCond: ${if and {{def:sender_host_address} {!eq {$sender_host_address}{127.0.0.1}} {!eq {$sender_host_address}{::1}}}} |
|---|
| -# If you want more detailed control over when to run SA, it's recommended |
|---|
| -# that you set an ACL variable indicating this from the acl section of |
|---|
| -# your Exim configuration file. The current maintainer sets acl_m0 to |
|---|
| -# "noscan" if the sending host is localhost or has authenticated. |
|---|
| -#SAEximRunCond: ${if !eq{$acl_m0}{noscan}} |
|---|
| -# (This means exactly the same as ${if !eq{$acl_m0}{noscan} {true}{}}, |
|---|
| -# where the empty string is considered false.) |
|---|
| - |
|---|
| -#---------------------------------------------------------------------- |
|---|
| -# Remove or comment out the following line to enable sa-exim |
|---|
| -SAEximRunCond: 0 |
|---|
| -#---------------------------------------------------------------------- |
|---|
| - |
|---|
| -# If and only if SAEximRunCond was true, and we did run SA, this |
|---|
| -# expression decides whether we actually consider acting upon SAdevnull, |
|---|
| -# SApermreject, and SAtempreject if you have them set. |
|---|
| -# |
|---|
| -# Use this to tag messages that you shouldn't reject (messages sent to |
|---|
| -# abuse or postmaster for instance). |
|---|
| -# |
|---|
| -# As an example, set acl_m0 to "canreject" if a recipient other than |
|---|
| -# postmaster or abuse is encountered (and the sender isn't local). That |
|---|
| -# way, spammers can't circumvent blocking by sending to postmaster and |
|---|
| -# 99 other recipients. (If acl_m0 is taken, you'll of course have to use |
|---|
| -# a different variable. |
|---|
| -#SAEximRejCond: ${if eq{$acl_m0}{canreject}} |
|---|
| - |
|---|
| - |
|---|
| -# How much of the body we feed to spamassassin (in bytes) |
|---|
| -# Default is 250KB |
|---|
| -SAmaxbody: 256000 |
|---|
| - |
|---|
| -# Do you want to feed SAmaxbody's worth of the message body if it is too big? |
|---|
| -# Either, you skip messages that are too big and not scan them, or you can |
|---|
| -# truncate the body and feed that to SA. |
|---|
| -# Note that SA will sometimes raise the spam score if it can't parse |
|---|
| -# the message correctly (since the end is missing, decoding will fail) |
|---|
| -# Default is 0: do not scan messages that are too big |
|---|
| -# (note that this is parsed as a condition) |
|---|
| -SATruncBodyCond: 0 |
|---|
| - |
|---|
| -# If you want SA to report_safe you need sa-exim to rewrite the body of |
|---|
| -# the message since SA encapsulates the spam as a mime attachment. |
|---|
| -# You probably want SATruncBodyCond to be 0 or else you'll end up with a |
|---|
| -# partial message if it's larger than SAmaxbody and it's spam |
|---|
| -# |
|---|
| -# Also note that if you enable this option, any saved message will be saved |
|---|
| -# after the body has been modified by SA. |
|---|
| -# (this is not a condition as SA's report_safe is not conditional) |
|---|
| -SARewriteBody: 0 |
|---|
| - |
|---|
| -# Prepend saved messages with an fake From-header to make the file look like a |
|---|
| -# valid mbox file |
|---|
| -SAPrependArchiveWithFrom: 1 |
|---|
| - |
|---|
| -# If you are archiving messages that are rejected, how much do you want |
|---|
| -# to archive? Default is 20MB. |
|---|
| -SAmaxarchivebody: 20971520 |
|---|
| - |
|---|
| -# On errors, if you are saving messages, you probably want the entire message |
|---|
| -# Default size saved (if you are saving errors) is 1GB |
|---|
| -SAerrmaxarchivebody: 1073741824 |
|---|
| - |
|---|
| -# You can have SA-Exim add a X-SA-Exim-Rcpt-To header, which will list all |
|---|
| -# the recipients for the Email, unless the list gets bigger than |
|---|
| -# SAmaxrcptlistlength bytes. |
|---|
| -# The default value of 0 disables the header for privacy reasons (the header |
|---|
| -# exposes Bcced recipients) |
|---|
| -# Any value bigger than 8000 will be ignored because there is a limit on the |
|---|
| -# size of headers that you can have and exim's string_sprintf |
|---|
| -# Note that if you are planning to use greylisting, you should set this |
|---|
| -# value to 8000 since SA's greylisting code needs the recipients. |
|---|
| -SAmaxrcptlistlength: 0 |
|---|
| - |
|---|
| -# Add X-SA-Exim-Rcpt-To and X-SA-Exim-Mail-From headers before SA scans |
|---|
| -# the message. |
|---|
| -# If this option is enabled, SARewiteBody is true, and safe_mode is |
|---|
| -# enabled in SA, you end up with the X-SA-Exim-Rcpt-To/X-SA-Exim-Mail-From in |
|---|
| -# the attatched message as well without the ability to remove them later in an |
|---|
| -# exim transport (think privacy). |
|---|
| -# In real life this is usually not a problem because the message is spam anyway, |
|---|
| -# and if you turn this off, you lose the option to use those headers to score |
|---|
| -# the message with SA. |
|---|
| -SAaddSAEheaderBeforeSA: 1 |
|---|
| - |
|---|
| -# How many seconds you want to allow spamc to run. Exim 4.04 and better will |
|---|
| -# kill us after a default of 5 minutes. This however is not great, because the |
|---|
| -# mail gets temporarily rejected |
|---|
| -# You should set this and have SA Exim handle the timeout itself and accept the |
|---|
| -# message if spamc takes too long (instead of timing out) |
|---|
| -# A value of 0 means no timeout, and we run until exim stops us. |
|---|
| -# I know of at least one mail server (nanog's merit.edu) that will not |
|---|
| -# wait a full 5mn (which causes tempreject and resends), so the default is 4mn |
|---|
| -#SAtimeout: 240 |
|---|
| - |
|---|
| -# Do you want to save mails that were accepted because spamc timed out? |
|---|
| -# Specify a directory to enable the feature. |
|---|
| -# SA-Exim will try to create the directory if it has the permissions to do so, |
|---|
| -# check your maillog for failures (or create the directory yourself and make it |
|---|
| -# writeable by exim) |
|---|
| -SAtimeoutsave: /var/spool/exim/SAtimeoutsave |
|---|
| - |
|---|
| -# You can optionally save or not save messages that matched the above rule |
|---|
| -SAtimeoutSavCond: 1 |
|---|
| - |
|---|
| - |
|---|
| -# You should really create this directory for local_scan to save messages that |
|---|
| -# created an error. If you don't want this, comment out this variable |
|---|
| -# Make sure all these directories are owned by the exim user |
|---|
| -# SA-Exim will try to create the directory if it has the permissions to do |
|---|
| -# so, check your maillog for failures (or create the directory yourself and |
|---|
| -# make it writeable by exim) |
|---|
| -SAerrorsave: /var/spool/exim/SAerrorsave |
|---|
| - |
|---|
| -# You can optionally save or not save messages that matched the above rule |
|---|
| -# You should not put double quotes around the expression |
|---|
| -SAerrorSavCond: 1 |
|---|
| - |
|---|
| -# If you set to 1, SA will temporarily reject messages that generated an error |
|---|
| -# while they were processed (they'll still be saved if SAerrorsave is set). |
|---|
| -# Otherwise (0 = false), the messages are just accepted, which seems like a |
|---|
| -# more sensible default |
|---|
| -SAtemprejectonerror: 0 |
|---|
| - |
|---|
| - |
|---|
| -############################################################################### |
|---|
| -# NOTE: Spamd needs to tell sa-exim that the message SA-Exim gave spamd |
|---|
| -# is spam before sa-exim will consider the SA tresholds. |
|---|
| -# In other words, you cannot reject mails on SA scores if you set that |
|---|
| -# threshold to a lower threshold than SA's required_hits value. |
|---|
| -# The one exception to this rule is SAtempreject (in order to let you |
|---|
| -# temporarily reject mail when you are doing greylisting, see |
|---|
| -# README.greylisting in the documentation for details) |
|---|
| -############################################################################### |
|---|
| - |
|---|
| -# SA score when you start stalling the sender by sending many continuation |
|---|
| -# lines for up to SAteergrubetime |
|---|
| -# This is now a string (without quotes) that gets evaluated at runtime by exim |
|---|
| -# but you can still assign a simple float value to it |
|---|
| -# Note that this is an obvious abuse of SMTP, but eh, they started it :-) |
|---|
| -# Of course, this means that each incoming spam with the right score threshold |
|---|
| -# will keep an exim process busy on your machine. Make sure you can afford it. |
|---|
| -# Default value is 2^20, which should disable the behavior |
|---|
| - |
|---|
| -# Please, don't teergrube people who relay for you or your own MXes :-) |
|---|
| -# This option is left behind for backward compatibility, but you can now |
|---|
| -# get the same result by putting a condition string in SAteergrube |
|---|
| -# The trick is to list your score if the condition succeeds, and a really |
|---|
| -# high score otherwise. |
|---|
| -#SAteergrube: ${if and { {!eq {$sender_host_address}{127.0.0.1}} {!eq {$sender_host_address}{127.0.0.2}} } {25}{1048576}} |
|---|
| - |
|---|
| -# SAteergrubecond is deprecated (replaced by SAteergrube) |
|---|
| -# You used to be say whether you would apply the teergrubing score with this |
|---|
| -# condition, but now that scores are conditions, it is obsolete |
|---|
| -#SAteergrubecond: ${if and { {!eq {$sender_host_address}{127.0.0.1}} {!eq {$sender_host_address}{127.0.0.2}} } {1}{0}} |
|---|
| - |
|---|
| -# How long do you want to stall the sender (in seconds) |
|---|
| -# If you set the value too high, you might get too many exim processes running |
|---|
| -# and run out of process slots |
|---|
| -# Remember, don't come crying if playing with this "feature" causes your mail |
|---|
| -# server to catch fire :-) |
|---|
| -SAteergrubetime: 900 |
|---|
| - |
|---|
| -# You can optionally save or not save messages that matched the above rule |
|---|
| -SAteergrubeSavCond: 1 |
|---|
| - |
|---|
| -# Do you want to save mails that you stalled for later analysis? |
|---|
| -# Specify a directory to enable the feature. |
|---|
| -# SA-Exim will try to create the directory if it has the permissions to do so, |
|---|
| -# check your maillog for failures (or create the directory yourself and make it |
|---|
| -# writeable by exim) |
|---|
| -SAteergrubesave: /var/spool/exim/SAteergrube |
|---|
| - |
|---|
| -# When you stall the sender, you will probably get the mail again. |
|---|
| -# By default, we'll only save messages by message ID so that we don't save |
|---|
| -# multiple copies every time the sender tries again. |
|---|
| -# Of course, this means someone could fake someone else's message ID to |
|---|
| -# overwrite the saved copy of another spam. Such is life :-) |
|---|
| -SAteergrubeoverwrite: 1 |
|---|
| - |
|---|
| - |
|---|
| - |
|---|
| -# If you reach this score, the mail is accepted and tossed (/dev/nulled). |
|---|
| -# The default value is 2^20 which should ensure this never happens. |
|---|
| -# This is now a string (without quotes) that gets evaluated at runtime by exim |
|---|
| -# but you can still assign a simple float value to it |
|---|
| -# You should be really sure that the message is spam because the sender will |
|---|
| -# get no notification |
|---|
| -#SAdevnull: 20.0 |
|---|
| - |
|---|
| -# You can optionally save or not save messages that matched the above rule |
|---|
| -SAdevnullSavCond: 1 |
|---|
| - |
|---|
| -# Do you want to save mails that are tossed? |
|---|
| -# Specify a directory to enable the feature. |
|---|
| -# This is just in case you do want to keep a copy of the alledge spams somewhere |
|---|
| -# Messages are saved by unixdate_Message-Id or just unix date if there is no |
|---|
| -# Message-Id. |
|---|
| -# SA-Exim will try to create the directory if it has the permissions to do so, |
|---|
| -# check your maillog for failures (or create the directory yourself and make it |
|---|
| -# writeable by exim) |
|---|
| -SAdevnullsave: /var/spool/exim/SAdevnull |
|---|
| - |
|---|
| - |
|---|
| - |
|---|
| -# SA score when you start rejecting Emails (this is better than the above as |
|---|
| -# it can notify the sender in case you reject non-spam by mistake) |
|---|
| -# This is now a string (without quotes) that gets evaluated at runtime by exim |
|---|
| -# but you can still assign a simple float value to it |
|---|
| -# Default value is 2^20, which should disable the behavior if you comment out |
|---|
| -# the line below |
|---|
| -SApermreject: 12.0 |
|---|
| - |
|---|
| -# You can optionally save or not save messages that matched the above rule |
|---|
| -SApermrejectSavCond: 1 |
|---|
| - |
|---|
| -# Do you want to save mails that are rejected? |
|---|
| -# Specify a directory to enable the feature. |
|---|
| -# SA-Exim will try to create the directory if it has the permissions to do so, |
|---|
| -# check your maillog for failures (or create the directory yourself and make it |
|---|
| -# writeable by exim) |
|---|
| -SApermrejectsave: /var/spool/exim/SApermreject |
|---|
| - |
|---|
| - |
|---|
| - |
|---|
| -# SA score when you start returning a temporary reject. |
|---|
| -# There are few reasons to use this, except if you're reading your tempreject |
|---|
| -# save folder (see below) and ajusting scores on the fly, or if you are using |
|---|
| -# greylisting |
|---|
| -# This is now a string (without quotes) that gets evaluated at runtime by exim |
|---|
| -# but you can still assign a simple float value to it |
|---|
| -# Default value is 2^20, which should disable the behavior |
|---|
| -#SAtempreject: 9.0 |
|---|
| - |
|---|
| -# You can optionally save or not save messages that matched the above rule |
|---|
| -SAtemprejectSavCond: 1 |
|---|
| - |
|---|
| -# Do you want to save mails that are temporarily rejected? |
|---|
| -# Specify a directory to enable the feature. |
|---|
| -# You could use this to analyse what SA is bouncing and adding an allow rule |
|---|
| -# to accept the mail next time it is sent back to you |
|---|
| -# SA-Exim will try to create the directory if it has the permissions to do so, |
|---|
| -# check your maillog for failures (or create the directory yourself and make it |
|---|
| -# writeable by exim) |
|---|
| -SAtemprejectsave: /var/spool/exim/SAtempreject |
|---|
| - |
|---|
| -# When you send back a temp reject code, you will get the mail again. |
|---|
| -# By default, we'll only save messages by message ID so that we don't save |
|---|
| -# multiple copies every time the sender tries again. |
|---|
| -# Of course, this means someone could fake someone else's message ID to |
|---|
| -# overwrite the saved copy of another spam. Such is life :-) |
|---|
| -SAtemprejectoverwrite: 1 |
|---|
| - |
|---|
| -# See README.greylisting in the documentation for the following options |
|---|
| -# This is the string that SpamAssassin adds if the message is whitelisted |
|---|
| -# We use this to optionally increase the score needed for a tempreject |
|---|
| -# (in order to let a message through when it would otherwise have been |
|---|
| -# temprejected) |
|---|
| -# Default value is "GREYLIST_ISWHITE" (as used in the patch provided by SA-Exim) |
|---|
| -SAgreylistiswhitestr: GREYLIST_ISWHITE |
|---|
| - |
|---|
| -# By how much do we temporarly raise tempreject to allow a mail in when it |
|---|
| -# would otherwise have been temp rejected (because SA flagged it was whitelisted |
|---|
| -# by the greylisting code provided as a patch to SA in the SA-Exim distro) |
|---|
| -# Note that greylisting will not work in until you patch SA with the greylist |
|---|
| -# function |
|---|
| -# Note that you most likely want |
|---|
| -# SAtempreject + SAgreylistraisetempreject <= SApermreject |
|---|
| -# Default value is 3.0 but you'd probably to lower the tempreject score and |
|---|
| -# increase this one (see README.greylisting) |
|---|
| -SAgreylistraisetempreject: 3.0 |
|---|
| - |
|---|
| - |
|---|
| -# Do you want to save mails that are flagged as spam by SA, but not rejected by |
|---|
| -# any of the above thresholds? Specify a directory to enable the feature. |
|---|
| -# That's one way to track mails thare are going through even though they were |
|---|
| -# flagged by SA (note that you could also save them in exim's system_filter, |
|---|
| -# although copies saved here happen before exim makes modification to the |
|---|
| -# message like rewriting) |
|---|
| -# SA-Exim will try to create the directory if it has the permissions to do so, |
|---|
| -# check your maillog for failures (or create the directory yourself and make it |
|---|
| -# writeable by exim) |
|---|
| -SAspamacceptsave: /var/spool/exim/SAspamaccept |
|---|
| - |
|---|
| -# You can control which messages you want saved if you only want a subset |
|---|
| -SAspamacceptSavCond: 0 |
|---|
| - |
|---|
| - |
|---|
| -# Do you want to save mails that are not flagged as spam by SA |
|---|
| -# Specify a directory to enable the feature. |
|---|
| -# This is only here for completeness, if you want to save all messages not |
|---|
| -# flagged as spam by SA (you could also do this in system_filter) |
|---|
| -# SA-Exim will try to create the directory if it has the permissions to do so, |
|---|
| -# check your maillog for failures (or create the directory yourself and make it |
|---|
| -# writeable by exim) |
|---|
| -SAnotspamsave: /var/spool/exim/SAnotspam |
|---|
| - |
|---|
| -# You can control which messages you want saved if you only want a subset |
|---|
| -SAnotspamSavCond: 0 |
|---|
| - |
|---|
| -# All the following strings can take one '%s' which will be replaced by |
|---|
| -# spamstatus: "SA score, trigger score" |
|---|
| -SAmsgteergrubewait: Wait for more output |
|---|
| -SAmsgteergruberej: Please try again later |
|---|
| -SAmsgpermrej: Rejected |
|---|
| -SAmsgtemprej: Please try again later |
|---|
| -# This string is a static string, do not include "%s" |
|---|
| -SAmsgerror: Temporary local error while processing message, please contact postmaster. |
|---|
| Index: tags/4.2.1-13/localscan_dlopen_exim_4.20_or_better.patch |
|---|
| =================================================================== |
|---|
| --- tags/4.2.1-13/localscan_dlopen_exim_4.20_or_better.patch (revision 63) |
|---|
| +++ tags/4.2.1-13/localscan_dlopen_exim_4.20_or_better.patch (nonexistent) |
|---|
| @@ -1,268 +0,0 @@ |
|---|
| -The initial version of this patch was originally posted David Woodhouse, and |
|---|
| -dman gets the credit for first integrating it with SA-Exim. |
|---|
| - |
|---|
| -I have since then maintained it by first making a few minor changes, and |
|---|
| -later switching it to a major/minor number scheme to support upgrades in |
|---|
| -the exim API that don't affect backward compatibility (you can rely on |
|---|
| -a feature denoted by the minor number and be compatible with future versions |
|---|
| -of exim until Philip has to break the API and increase the major number) |
|---|
| - |
|---|
| -Marc MERLIN <marc_soft@merlins.org> |
|---|
| - |
|---|
| -diff -urN exim-4.14-0/src/EDITME exim-4.14-1/src/EDITME |
|---|
| ---- exim-4.14-0/src/EDITME Tue Mar 11 04:20:18 2003 |
|---|
| -+++ exim-4.14-1/src/EDITME Sun Mar 23 15:34:15 2003 |
|---|
| -@@ -388,6 +388,20 @@ |
|---|
| - |
|---|
| - |
|---|
| - #------------------------------------------------------------------------------ |
|---|
| -+# On systems which support dynamic loading of shared libraries, Exim can |
|---|
| -+# load a local_scan function specified in its config file instead of having |
|---|
| -+# to be recompiled with the desired local_scan function. For a full |
|---|
| -+# description of the API to this function, see the Exim specification. |
|---|
| -+ |
|---|
| -+DLOPEN_LOCAL_SCAN=yes |
|---|
| -+ |
|---|
| -+# If you set DLOPEN_LOCAL_SCAN, then you need to include -rdynamic in the |
|---|
| -+# linker flags. Without it, the loaded .so won't be able to access any |
|---|
| -+# functions from exim. |
|---|
| -+ |
|---|
| -+LFLAGS=-rdynamic -ldl |
|---|
| -+ |
|---|
| -+#------------------------------------------------------------------------------ |
|---|
| - # The default distribution of Exim contains only the plain text form of the |
|---|
| - # documentation. Other forms are available separately. If you want to install |
|---|
| - # the documentation in "info" format, first fetch the Texinfo documentation |
|---|
| -diff -urNad 50_localscan_dlopen.tmp/src/config.h.defaults 50_localscan_dlopen/src/config.h.defaults |
|---|
| ---- 50_localscan_dlopen.tmp/src/config.h.defaults Sun Dec 29 11:55:42 2002 |
|---|
| -+++ 50_localscan_dlopen/src/config.h.defaults Sun Dec 29 11:56:44 2002 |
|---|
| -@@ -17,6 +17,8 @@ |
|---|
| - #define AUTH_PLAINTEXT |
|---|
| - #define AUTH_SPA |
|---|
| - |
|---|
| -+#define DLOPEN_LOCAL_SCAN |
|---|
| -+ |
|---|
| - #define BIN_DIRECTORY |
|---|
| - |
|---|
| - #define CONFIGURE_FILE |
|---|
| -diff -urN exim-4.14-0/src/globals.c exim-4.14-1/src/globals.c |
|---|
| ---- exim-4.14-0/src/globals.c Tue Mar 11 04:20:20 2003 |
|---|
| -+++ exim-4.14-1/src/globals.c Sun Mar 23 15:34:15 2003 |
|---|
| -@@ -103,6 +103,9 @@ |
|---|
| - uschar *tls_verify_hosts = NULL; |
|---|
| - #endif |
|---|
| - |
|---|
| -+#ifdef DLOPEN_LOCAL_SCAN |
|---|
| -+uschar *local_scan_path = NULL; |
|---|
| -+#endif |
|---|
| - |
|---|
| - /* Input-reading functions for messages, so we can use special ones for |
|---|
| - incoming TCP/IP. The defaults use stdin. We never need these for any |
|---|
| -diff -urN exim-4.14-0/src/globals.h exim-4.14-1/src/globals.h |
|---|
| ---- exim-4.14-0/src/globals.h Tue Mar 11 04:20:20 2003 |
|---|
| -+++ exim-4.14-1/src/globals.h Sun Mar 23 15:34:15 2003 |
|---|
| -@@ -67,6 +67,9 @@ |
|---|
| - extern uschar *tls_verify_hosts; /* Mandatory client verification */ |
|---|
| - #endif |
|---|
| - |
|---|
| -+#ifdef DLOPEN_LOCAL_SCAN |
|---|
| -+extern uschar *local_scan_path; /* Path to local_scan() library */ |
|---|
| -+#endif |
|---|
| - |
|---|
| - /* Input-reading functions for messages, so we can use special ones for |
|---|
| - incoming TCP/IP. */ |
|---|
| -diff -urN exim-4.14-0/src/local_scan.c exim-4.14-1/src/local_scan.c |
|---|
| ---- exim-4.14-0/src/local_scan.c Tue Mar 11 04:20:20 2003 |
|---|
| -+++ exim-4.14-1/src/local_scan.c Sun Mar 23 15:34:15 2003 |
|---|
| -@@ -5,60 +5,131 @@ |
|---|
| - /* Copyright (c) University of Cambridge 1995 - 2003 */ |
|---|
| - /* See the file NOTICE for conditions of use and distribution. */ |
|---|
| - |
|---|
| -+#include "exim.h" |
|---|
| - |
|---|
| --/****************************************************************************** |
|---|
| --This file contains a template local_scan() function that just returns ACCEPT. |
|---|
| --If you want to implement your own version, you should copy this file to, say |
|---|
| --Local/local_scan.c, and edit the copy. To use your version instead of the |
|---|
| --default, you must set |
|---|
| -- |
|---|
| --LOCAL_SCAN_SOURCE=Local/local_scan.c |
|---|
| -- |
|---|
| --in your Local/Makefile. This makes it easy to copy your version for use with |
|---|
| --subsequent Exim releases. |
|---|
| -- |
|---|
| --For a full description of the API to this function, see the Exim specification. |
|---|
| --******************************************************************************/ |
|---|
| -- |
|---|
| -- |
|---|
| --/* This is the only Exim header that you should include. The effect of |
|---|
| --including any other Exim header is not defined, and may change from release to |
|---|
| --release. Use only the documented interface! */ |
|---|
| -- |
|---|
| --#include "local_scan.h" |
|---|
| -- |
|---|
| -- |
|---|
| --/* This is a "do-nothing" version of a local_scan() function. The arguments |
|---|
| --are: |
|---|
| -- |
|---|
| -- fd The file descriptor of the open -D file, which contains the |
|---|
| -- body of the message. The file is open for reading and |
|---|
| -- writing, but modifying it is dangerous and not recommended. |
|---|
| -- |
|---|
| -- return_text A pointer to an unsigned char* variable which you can set in |
|---|
| -- order to return a text string. It is initialized to NULL. |
|---|
| -- |
|---|
| --The return values of this function are: |
|---|
| -- |
|---|
| -- LOCAL_SCAN_ACCEPT |
|---|
| -- The message is to be accepted. The return_text argument is |
|---|
| -- saved in $local_scan_data. |
|---|
| -- |
|---|
| -- LOCAL_SCAN_REJECT |
|---|
| -- The message is to be rejected. The returned text is used |
|---|
| -- in the rejection message. |
|---|
| -- |
|---|
| -- LOCAL_SCAN_TEMPREJECT |
|---|
| -- This specifies a temporary rejection. The returned text |
|---|
| -- is used in the rejection message. |
|---|
| --*/ |
|---|
| -+#ifdef DLOPEN_LOCAL_SCAN |
|---|
| -+#include <dlfcn.h> |
|---|
| -+static int (*local_scan_fn)(int fd, uschar **return_text) = NULL; |
|---|
| -+static int load_local_scan_library(void); |
|---|
| -+#endif |
|---|
| - |
|---|
| - int |
|---|
| - local_scan(int fd, uschar **return_text) |
|---|
| - { |
|---|
| - fd = fd; /* Keep picky compilers happy */ |
|---|
| - return_text = return_text; |
|---|
| --return LOCAL_SCAN_ACCEPT; |
|---|
| -+#ifdef DLOPEN_LOCAL_SCAN |
|---|
| -+/* local_scan_path is defined AND not the empty string */ |
|---|
| -+if (local_scan_path && *local_scan_path) |
|---|
| -+ { |
|---|
| -+ if (!local_scan_fn) |
|---|
| -+ { |
|---|
| -+ if (!load_local_scan_library()) |
|---|
| -+ { |
|---|
| -+ char *base_msg , *error_msg , *final_msg ; |
|---|
| -+ int final_length = -1 ; |
|---|
| -+ |
|---|
| -+ base_msg=US"Local configuration error - local_scan() library failure\n"; |
|---|
| -+ error_msg = dlerror() ; |
|---|
| -+ |
|---|
| -+ final_length = strlen(base_msg) + strlen(error_msg) + 1 ; |
|---|
| -+ final_msg = (char*)malloc( final_length*sizeof(char) ) ; |
|---|
| -+ *final_msg = '\0' ; |
|---|
| -+ |
|---|
| -+ strcat( final_msg , base_msg ) ; |
|---|
| -+ strcat( final_msg , error_msg ) ; |
|---|
| -+ |
|---|
| -+ *return_text = final_msg ; |
|---|
| -+ return LOCAL_SCAN_TEMPREJECT; |
|---|
| -+ } |
|---|
| -+ } |
|---|
| -+ return local_scan_fn(fd, return_text); |
|---|
| -+ } |
|---|
| -+else |
|---|
| -+#endif |
|---|
| -+ return LOCAL_SCAN_ACCEPT; |
|---|
| -+} |
|---|
| -+ |
|---|
| -+#ifdef DLOPEN_LOCAL_SCAN |
|---|
| -+ |
|---|
| -+static int load_local_scan_library(void) |
|---|
| -+{ |
|---|
| -+/* No point in keeping local_scan_lib since we'll never dlclose() anyway */ |
|---|
| -+void *local_scan_lib = NULL; |
|---|
| -+int (*local_scan_version_fn)(void); |
|---|
| -+int vers_maj; |
|---|
| -+int vers_min; |
|---|
| -+ |
|---|
| -+local_scan_lib = dlopen(local_scan_path, RTLD_NOW); |
|---|
| -+if (!local_scan_lib) |
|---|
| -+ { |
|---|
| -+ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library open failed - " |
|---|
| -+ "message temporarily rejected"); |
|---|
| -+ return FALSE; |
|---|
| -+ } |
|---|
| -+ |
|---|
| -+local_scan_version_fn = dlsym(local_scan_lib, "local_scan_version_major"); |
|---|
| -+if (!local_scan_version_fn) |
|---|
| -+ { |
|---|
| -+ dlclose(local_scan_lib); |
|---|
| -+ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain " |
|---|
| -+ "local_scan_version_major() function - message temporarily rejected"); |
|---|
| -+ return FALSE; |
|---|
| -+ } |
|---|
| -+ |
|---|
| -+/* The major number is increased when the ABI is changed in a non |
|---|
| -+ backward compatible way. */ |
|---|
| -+vers_maj = local_scan_version_fn(); |
|---|
| -+ |
|---|
| -+local_scan_version_fn = dlsym(local_scan_lib, "local_scan_version_minor"); |
|---|
| -+if (!local_scan_version_fn) |
|---|
| -+ { |
|---|
| -+ dlclose(local_scan_lib); |
|---|
| -+ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain " |
|---|
| -+ "local_scan_version_minor() function - message temporarily rejected"); |
|---|
| -+ return FALSE; |
|---|
| -+ } |
|---|
| -+ |
|---|
| -+/* The minor number is increased each time a new feature is added (in a |
|---|
| -+ way that doesn't break backward compatibility) -- Marc */ |
|---|
| -+vers_min = local_scan_version_fn(); |
|---|
| -+ |
|---|
| -+ |
|---|
| -+if (vers_maj != LOCAL_SCAN_ABI_VERSION_MAJOR) |
|---|
| -+ { |
|---|
| -+ dlclose(local_scan_lib); |
|---|
| -+ local_scan_lib = NULL; |
|---|
| -+ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() has an incompatible major" |
|---|
| -+ "version number, you need to recompile your module for this version" |
|---|
| -+ "of exim (The module was compiled for version %d.%d and this exim provides" |
|---|
| -+ "ABI version %d.%d)", vers_maj, vers_min, LOCAL_SCAN_ABI_VERSION_MAJOR, |
|---|
| -+ LOCAL_SCAN_ABI_VERSION_MINOR); |
|---|
| -+ return FALSE; |
|---|
| -+ } |
|---|
| -+else if (vers_min > LOCAL_SCAN_ABI_VERSION_MINOR) |
|---|
| -+ { |
|---|
| -+ dlclose(local_scan_lib); |
|---|
| -+ local_scan_lib = NULL; |
|---|
| -+ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() has an incompatible minor" |
|---|
| -+ "version number, you need to recompile your module for this version" |
|---|
| -+ "of exim (The module was compiled for version %d.%d and this exim provides" |
|---|
| -+ "ABI version %d.%d)", vers_maj, vers_min, LOCAL_SCAN_ABI_VERSION_MAJOR, |
|---|
| -+ LOCAL_SCAN_ABI_VERSION_MINOR); |
|---|
| -+ return FALSE; |
|---|
| -+ } |
|---|
| -+ |
|---|
| -+local_scan_fn = dlsym(local_scan_lib, "local_scan"); |
|---|
| -+if (!local_scan_fn) |
|---|
| -+ { |
|---|
| -+ dlclose(local_scan_lib); |
|---|
| -+ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain " |
|---|
| -+ "local_scan() function - message temporarily rejected"); |
|---|
| -+ return FALSE; |
|---|
| -+ } |
|---|
| -+ |
|---|
| -+return TRUE; |
|---|
| - } |
|---|
| -+ |
|---|
| -+#endif /* DLOPEN_LOCAL_SCAN */ |
|---|
| - |
|---|
| - /* End of local_scan.c */ |
|---|
| -diff -urN exim-4.14-0/src/readconf.c exim-4.14-1/src/readconf.c |
|---|
| ---- exim-4.14-0/src/readconf.c Tue Mar 11 04:20:22 2003 |
|---|
| -+++ exim-4.14-1/src/readconf.c Sun Mar 23 15:34:15 2003 |
|---|
| -@@ -182,6 +182,9 @@ |
|---|
| - { "local_from_prefix", opt_stringptr, &local_from_prefix }, |
|---|
| - { "local_from_suffix", opt_stringptr, &local_from_suffix }, |
|---|
| - { "local_interfaces", opt_stringptr, &local_interfaces }, |
|---|
| -+#ifdef DLOPEN_LOCAL_SCAN |
|---|
| -+ { "local_scan_path", opt_stringptr, &local_scan_path }, |
|---|
| -+#endif |
|---|
| - { "local_scan_timeout", opt_time, &local_scan_timeout }, |
|---|
| - { "local_sender_retain", opt_bool, &local_sender_retain }, |
|---|
| - { "localhost_number", opt_stringptr, &host_number_string }, |
|---|