--- sa-exim-4.2.1.orig/README +++ sa-exim-4.2.1/README @@ -194,6 +194,9 @@ {1}{0} \ } +PLEASE NOTE: This conditional statement must be on one line. SA-Exim's +configfile parser does not support \-lineconitunation!! + You may also want to look at my exim4.conf config if you haven't done so yet: http://marc.merlins.org/linux/exim/#conf --- sa-exim-4.2.1.orig/Greylisting.pm +++ sa-exim-4.2.1/Greylisting.pm @@ -160,6 +160,8 @@ # 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 ""); @@ -170,16 +172,19 @@ # connectip is supposed to be untainted now, but I was still getting # some insecure dependecy error messages sometimes (perl 5.8 problem apparently) - $connectip =~ /(\d+)\.(\d+)\.(\d+)\.(\d+)/; - my ($ipbyte1, $ipbyte2, $ipbyte3, $ipbyte4) = ($1, $2, $3, $4); - my $ipdir1 = "$option{'dir'}/$ipbyte1"; - my $ipdir2 = "$ipdir1/$ipbyte2"; - my $ipdir3 = "$ipdir2/$ipbyte3"; + 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 .= "/$ipbyte4" if ($option{'greylistfourthbyte'}); + $ipdir4 .= "/$4" if ($option{'greylistfourthbyte'}); $tupletdir = "$ipdir4/$envfrom"; $tuplet = "$tupletdir/$rcptto"; --- sa-exim-4.2.1.orig/sa-exim.conf +++ sa-exim-4.2.1/sa-exim.conf @@ -54,14 +54,30 @@ 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 {$h_X-SA-Do-Not-Run:}{Yes}} } {1}{0}} +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, @@ -70,10 +86,12 @@ # Use this to tag messages that you shouldn't reject (messages sent to # abuse or postmaster for instance). # -# X-SA-Do-Not-Rej should be set as a warn header if mail is sent to -# postmaster and abuse (in the RCPT ACL), this way you're not bouncing -# spam abuse reports sent to you. This is a RFC guideline. -SAEximRejCond: ${if !eq {$h_X-SA-Do-Not-Rej:}{Yes} {1}{0}} +# 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) @@ -280,7 +298,7 @@ # 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 +#SAtempreject: 9.0 # You can optionally save or not save messages that matched the above rule SAtemprejectSavCond: 1 --- sa-exim-4.2.1.orig/sa-exim.c +++ sa-exim-4.2.1/sa-exim.c @@ -29,10 +29,8 @@ #include "sa-exim.h" /* Exim includes */ -#include "local_scan.h" -extern FILE *smtp_out; /* Exim's incoming SMTP output file */ -extern int body_linecount; /* Line count in body */ -extern uschar *primary_hostname; +#include +//extern int body_linecount; /* Line count in body */ #ifdef DLOPEN_LOCAL_SCAN @@ -515,6 +513,7 @@ 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 */ @@ -552,6 +551,7 @@ 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; @@ -602,6 +602,15 @@ /* 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; @@ -712,6 +721,7 @@ M_CHECKFORSTR(SAspamcSockPath); M_CHECKFORSTR(SAspamcPort); M_CHECKFORSTR(SAspamcHost); + M_CHECKFORSTR(SAspamcUser); M_CHECKFORSTR(SAEximRunCond); M_CHECKFORSTR(SAEximRejCond); M_CHECKFORVAR(SAmaxbody, "%d"); @@ -914,6 +924,22 @@ 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 @@ -924,17 +950,26 @@ /* 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) { - ret=execl(SAspamcpath, "spamc", "-s", string_sprintf("%d", SAmaxbody+16384), "-U", SAspamcSockPath, NULL); - CHECKERR(ret,string_sprintf("exec %s", SAspamcpath),__LINE__); + spamc_argv[i++] = "-U"; + spamc_argv[i++] = SAspamcSockPath; } else { - ret=execl(SAspamcpath, "spamc", "-s", string_sprintf("%d", SAmaxbody+16384), "-d", SAspamcHost, "-p", SAspamcPort, NULL); - CHECKERR(ret,string_sprintf("exec %s", SAspamcpath),__LINE__); + 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) @@ -1229,18 +1264,19 @@ } } - if (SAEximDebug > 1) +/* 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); +/* body_linecount = (line - 1); if (SAEximDebug > 1) { log_write(0, LOG_MAIN, "SA: Debug2: body_linecount after SA: %d", body_linecount); } +*/ } fclose((FILE *)readfh); @@ -1331,6 +1367,9 @@ 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 @@ -1353,20 +1392,8 @@ for (i=0;i Thu, 26 Apr 2007 16:22:49 +0200 + --- sa-exim-4.2.1.orig/debian/dirs +++ sa-exim-4.2.1/debian/dirs @@ -1,6 +1,5 @@ usr/lib/exim4/local_scan -usr/share/doc/sa-exim/patches etc/exim4/conf.d/main usr/share/perl5/Mail/SpamAssassin/Plugin +usr/share/sa-exim etc/cron.d -usr/sbin --- sa-exim-4.2.1.orig/debian/control +++ sa-exim-4.2.1/debian/control @@ -1,18 +1,28 @@ Source: sa-exim Section: mail Priority: optional -Maintainer: Sander Smeenk -Build-Depends: lynx, debhelper (>= 4.1.16) -Standards-Version: 3.5.10 +Maintainer: Magnus Holmgren +Build-Depends: debhelper (>= 4.1.16), links, exim4-dev +Standards-Version: 3.8.0 +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: exim4-daemon-light (>>4.30-1) | exim4-daemon-heavy (>>4.30-1) | exim4-daemon-custom (>>4.30-1), spamc, ${shlibs:Depends}, debconf (>= 1.2.0) | debconf-2.0 -Suggests: spamassassin (<< 2.30-2) +Depends: ${exim:Depends}, spamc, ${shlibs:Depends}, debconf (>= 1.2.0) | debconf-2.0 +Recommends: ${perl:Depends} +Suggests: spamassassin Description: Use spamAssassin at SMTP time with the Exim v4 MTA SA-Exim lets you use spamAssassin at SMTP time with the Exim v4 MTA, which enables you to do many things with incoming Emails, including refusing them before they come in, or even teergrubing the sender (i.e. slowing him down, by tying his resources) . - Homepage: http://marc.merlins.org/linux/exim/sa.html + Note: 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. You should use this package if: + . + * you want to use SpamAssassin's report_safe feature, or + * you want easier control over the header fields added, without using + the report template to add multiple fields. --- sa-exim-4.2.1.orig/debian/rules +++ sa-exim-4.2.1/debian/rules @@ -24,14 +24,14 @@ build: build-stamp build-stamp: configure-stamp dh_testdir - $(MAKE) LDFLAGS="-shared -fPIC" + $(MAKE) BUILDCFLAGS='-I/usr/include/exim4 -fPIC $$(CFLAGS)' touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp - -$(MAKE) clean + $(MAKE) clean dh_clean install: build @@ -48,16 +48,12 @@ 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 SA-greylisting-2.4x.diff \ - $(CURDIR)/debian/sa-exim/usr/share/doc/sa-exim/sa2.xpatches - install -m644 SA-greylisting-2.6.diff \ - $(CURDIR)/debian/sa-exim/usr/share/doc/sa-exim/sa2.xpatches 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/sbin/greylistclean + $(CURDIR)/debian/sa-exim/usr/share/sa-exim/greylistclean # Build architecture-independent files here. binary-indep: build install @@ -70,26 +66,17 @@ dh_installchangelogs Changelog.html dh_installdocs dh_installexamples -# dh_install -# dh_installmenu dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron -# dh_installinfo dh_installman dh_link dh_strip dh_compress dh_fixperms -Xvar/spool/sa-exim -# dh_perl -# dh_python -# dh_makeshlibs + 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 --- sa-exim-4.2.1.orig/debian/watch +++ sa-exim-4.2.1/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://marc.merlins.org/linux/exim/sa.html files/sa-exim-(\d+(?:\.\d+)*)\.tar\.gz --- sa-exim-4.2.1.orig/debian/changelog +++ sa-exim-4.2.1/debian/changelog @@ -1,10 +1,140 @@ +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 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 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 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 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 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 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 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 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 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 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 + greylisting tuplets Closes: #345071 + * Fixed sa-exim.conf typo Closes: #305890 * Disable former insecure /etc/cron.daily/greylistclean - -- Marc MERLIN Mon, 09 Jan 2006 09:01:25 -0800 + -- Sander Smeenk Mon, 09 Jan 2006 09:01:25 -0800 sa-exim (4.2-1) unstable; urgency=high --- sa-exim-4.2.1.orig/debian/postinst +++ sa-exim-4.2.1/debian/postinst @@ -20,13 +20,21 @@ configure) if [ ! -e /var/spool/sa-exim ] ; then # Debian-exim should exist as we depend on exim4-base - install -d -m770 -oDebian-exim -gDebian-exim \ + 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" ] && \ --- sa-exim-4.2.1.orig/debian/README.Debian +++ sa-exim-4.2.1/debian/README.Debian @@ -1,3 +1,44 @@ +******************************** +* 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 * ***************** @@ -7,7 +48,7 @@ DebConf questions while configuring Exim4, the module will be loaded automatically, or human intervention is required. -To find out what configurationfile Exim4 is using, issue: +To find out what configuration file Exim4 is using, issue: $ exim4 -bV | tail -1 Configuration file is /path/to/configfile @@ -15,16 +56,17 @@ If /path/to/configfile shows: - /etc/exim4/exim4.conf - You are using the 'monolithic' configuration file. - See the 'MONOLITHIC' section below. + You are using the hand-crafted configuration file. + See the 'HAND-CRAFTED' section below. - /var/lib/exim4/config.autogenerated - You are using the 'split' configuration file. - See the 'SPLIT' section below. + You are using the debianized configuration scheme - with either + 'split' or 'unsplit' configuration file. + See the 'DEBIANIZED' section below. -MONOLITHIC ----------- +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 @@ -34,28 +76,32 @@ 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 restart' or '/etc/init.d/exim4 restart' as root. +'invoke-rc.d exim4 reload' or '/etc/init.d/exim4 reload' as root. -SPLIT ------ +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: +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', but the check -earlier showed that you *are* in fact using the split configuration, -then you have to edit /etc/exim4/update-exim4.conf.conf by hand and -change the 'false' to 'true' and issue 'update-exim4.conf' as root. -Next, 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 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: @@ -68,40 +114,56 @@ 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) +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. -If you use a version of SA older than 3.0, you will need to patch -spamassassin's sources to support greylisting. +2 a) In addition, you can add -There are two versions of the patches: - - /usr/share/doc/sa-exim/patches/SA-greylisting-2.4x.diff - This patch can be applied to versions 2.4x of SpamAssassin. Note - that this patch is not fully functional anymore, it is just left as - a template should you want to backport the current 2.6x patch. - That said, you really ought to upgrade SA to 2.6x or 3.x + bayes_auto_expire 0 - - /usr/share/doc/sa-exim/patches/SA-greylisting-2.6.diff - This patch can be applied to versions 2.6x of SpamAssassin. + 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. -Please read README.Greylisting for more information on how to enable -this feature, and what further changes are needed. -Note that this configuration won't be supported in the future, and you -are encouraged to upgrade to SA 3.0 or better. +2 b) If you get a lot of mail, consider adding -************* -* BE WARNED * -************* + bayes_learn_to_journal 1 -By applying these patches, you change the sourcecode of SpamAssassin -(again, this is if you use a version of SpamAssassin earlier than 3.0) -This also means that when the SpamAssassin package gets upgraded, the -changes made by the patch are LOST. -This *MIGHT* cause your mail setup to break. It might be best to put -SpamAssassin on hold: + to local.cf. See the Mail::SpamAssassin::Conf(3) manual page for + more information. - $ echo "spamassassin hold" | dpkg --set-selections +********************************** +* NOTICE ABOUT SPAMC CONFIG FILE * +********************************** -You can later set it to install again with: +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. - $ echo "spamassassin install" | dpkg --set-selections + -- Magnus Holmgren , Tue, 24 Jun 2008 14:27:59 +0200 --- sa-exim-4.2.1.orig/debian/postrm +++ sa-exim-4.2.1/debian/postrm @@ -1,7 +1,9 @@ #!/bin/sh set -e -. /usr/share/debconf/confmodule +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' @@ -35,7 +37,11 @@ /etc/init.d/exim4 reload || true fi fi - if [ -e /var/spool/sa-exim ] && ! rmdir /var/spool/sa-exim 2>/dev/null ; then + # 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 --- sa-exim-4.2.1.orig/debian/copyright +++ sa-exim-4.2.1/debian/copyright @@ -1,15 +1,19 @@ -This package was adopted by Sander Smeenk -Tue, 24 Feb 2004 19:47:11 +0100 -This package was originally debianized by Andreas Metzler on -Thu, 13 Mar 2003 17:16:46 +0100. +This package was adopted by the current Debian maintainer, +Magnus Holmgren , on Fri, 1 Dec 2006 19:05:58 +0100. + +Before that, it was maintained by Sander Smeenk , who +adopted it on Tue, 24 Feb 2004 19:47:11 +0100. + +The package was originally debianized by Andreas Metzler + on Thu, 13 Mar 2003 17:16:46 +0100. -Current Debian maintainer: Marc MERLIN Upstream Author: Marc MERLIN It was downloaded from http://marc.merlins.org/linux/exim/sa.html +Copyright © 2004-2006 Marc Merlin -Copyright: +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 @@ -22,8 +26,8 @@ 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., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. + 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'. --- sa-exim-4.2.1.orig/debian/templates +++ sa-exim-4.2.1/debian/templates @@ -9,5 +9,3 @@ . You can keep them for further analysis and later remove them manually or decide to delete them now. - . - Should they be removed? --- sa-exim-4.2.1.orig/debian/po/templates.pot +++ sa-exim-4.2.1/debian/po/templates.pot @@ -1,22 +1,14 @@ -# -# 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. +# 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 , YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-15 14:44+0200\n" +"Report-Msgid-Bugs-To: holmgren@debian.org\n" +"POT-Creation-Date: 2006-12-02 20:15+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,13 +18,13 @@ #. Type: boolean #. Description -#: ../templates:4 +#: ../templates:1001 msgid "Remove saved mails in spool directory?" msgstr "" #. Type: boolean #. Description -#: ../templates:4 +#: ../templates:1001 msgid "" "There are some saved mails in subdirectories of /var/spool/sa-exim. " "Depending on the configuration sa-exim will save mails matching specific " @@ -42,14 +34,8 @@ #. Type: boolean #. Description -#: ../templates:4 +#: ../templates:1001 msgid "" "You can keep them for further analysis and later remove them manually or " "decide to delete them now." msgstr "" - -#. Type: boolean -#. Description -#: ../templates:4 -msgid "Should they be removed?" -msgstr "" --- sa-exim-4.2.1.orig/debian/po/da.po +++ sa-exim-4.2.1/debian/po/da.po @@ -15,27 +15,26 @@ msgid "" msgstr "" "Project-Id-Version: sa-exim_3.1-4-da\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-15 14:44+0200\n" -"PO-Revision-Date: 2004-03-17 15:55+0100\n" +"Report-Msgid-Bugs-To: holmgren@debian.org\n" +"POT-Creation-Date: 2006-12-02 20:15+0100\n" +"PO-Revision-Date: 2004-11-19 17:21+0100\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.3.1\n" +"X-Generator: KBabel 1.9.1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Type: boolean #. Description -#: ../templates:4 +#: ../templates:1001 msgid "Remove saved mails in spool directory?" msgstr "Fjern gemte breve fra spool-mappen?" #. Type: boolean #. Description -#: ../templates:4 -#, fuzzy +#: ../templates:1001 msgid "" "There are some saved mails in subdirectories of /var/spool/sa-exim. " "Depending on the configuration sa-exim will save mails matching specific " @@ -43,13 +42,13 @@ "recognized as spam, ...) in subdirectories of /var/spool/sa-exim." msgstr "" "Der er nogle gemte breve i mapperne under /var/spool/sa-exim. Afhngig af " -"opstningen vil sa-exim under bestemte omstndigheder (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." +"opstningen 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:4 +#: ../templates:1001 msgid "" "You can keep them for further analysis and later remove them manually or " "decide to delete them now." @@ -57,8 +56,5 @@ "Du kan beholde dem til yderligere efterforskning og selv fjerne dem senere " "eller vlge at f dem slettet nu." -#. Type: boolean -#. Description -#: ../templates:4 -msgid "Should they be removed?" -msgstr "Skal de slettes?" +#~ msgid "Should they be removed?" +#~ msgstr "Skal de slettes?" --- sa-exim-4.2.1.orig/debian/po/de.po +++ sa-exim-4.2.1/debian/po/de.po @@ -0,0 +1,59 @@ +# translation of po-debconf template to German +# +# 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. +# +# Matthias Julius , 2006. +msgid "" +msgstr "" +"Project-Id-Version: sa-exim 4.2.1-2\n" +"Report-Msgid-Bugs-To: holmgren@debian.org\n" +"POT-Creation-Date: 2006-12-02 20:15+0100\n" +"PO-Revision-Date: 2006-11-23 00:53-0500\n" +"Last-Translator: Matthias Julius \n" +"Language-Team: German \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:1001 +msgid "Remove saved mails in spool directory?" +msgstr "Gespeicherte E-Mails in Spool-Verzeichnis löschen?" + +#. Type: boolean +#. Description +#: ../templates:1001 +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." +msgstr "" +"Es befinden sich einige gespeicherte E-Mails in Unterverzeichnissen von /var/" +"spool/sa-exim. Abhängig von der Konfiguration wird sa-exim E-Mails, die " +"bestimmte Kriterien erfüllen (ein Fehler ereignete sich, als Spam " +"abgewiesen, durchgelassen obwohl als Spam erkannt, ...), in " +"Unterverzeichnissen von /var/spool/sa-exim speichern." + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"You can keep them for further analysis and later remove them manually or " +"decide to delete them now." +msgstr "" +"Sie können diese zur späteren Analyse aufbewahren und später löschen, oder " +"Sie entscheiden, sie jetzt zu löschen." + +#~ msgid "Should they be removed?" +#~ msgstr "Sollen die E-Mails gelöscht werden?" --- sa-exim-4.2.1.orig/debian/po/cs.po +++ sa-exim-4.2.1/debian/po/cs.po @@ -0,0 +1,57 @@ +# +# 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: holmgren@debian.org\n" +"POT-Creation-Date: 2006-12-02 20:15+0100\n" +"PO-Revision-Date: 2005-06-27 20:12+0200\n" +"Last-Translator: Miroslav Kure \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Remove saved mails in spool directory?" +msgstr "Odstranit emaily v adresáři spool?" + +#. Type: boolean +#. Description +#: ../templates:1001 +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." +msgstr "" +"V podadresářích adresáře /var/spool/sa-exim se nachází nějaké uložené " +"emaily. Podle nastavení může sa-exim ukládat do těchto adresářů emaily, " +"které se shodují s danými kritérii (výskyt chyby, odmítnuto jako spam, " +"předáno dále, přestože vypadá jako spam, ...)." + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"You can keep them for further analysis and later remove them manually or " +"decide to delete them now." +msgstr "" +"Emaily 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?" --- sa-exim-4.2.1.orig/debian/po/es.po +++ sa-exim-4.2.1/debian/po/es.po @@ -0,0 +1,63 @@ +# sa-exim po-debconf translation to spanish +# Copyright (C) 2004 Software in the Public Interest +# This file is distributed under the same license as the sa-exim package. +# +# Changes: +# - Initial translation +# Rudy Godoy , 2006 +# +# +# Traductores, si no conoce 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\n" +"Report-Msgid-Bugs-To: holmgren@debian.org\n" +"POT-Creation-Date: 2006-12-02 20:15+0100\n" +"PO-Revision-Date: 2006-12-25 11:42-0500\n" +"Last-Translator: Rudy Godoy \n" +"Language-Team: Debian l10n Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Remove saved mails in spool directory?" +msgstr "¿Desea eliminar los correos guardados en el directorio «spool»?" + +#. Type: boolean +#. Description +#: ../templates:1001 +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." +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 (si ha ocurrido un fallo, rechazado como spam, aceptado aunque se ha reconocido como spam, ...) en los subdirectorios de «/var/spool/sa-exim»." + +#. Type: boolean +#. Description +#: ../templates:1001 +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." --- sa-exim-4.2.1.orig/debian/po/fi.po +++ sa-exim-4.2.1/debian/po/fi.po @@ -0,0 +1,32 @@ +msgid "" +msgstr "" +"Project-Id-Version: sa-exim\n" +"Report-Msgid-Bugs-To: holmgren@debian.org\n" +"POT-Creation-Date: 2006-12-02 20:15+0100\n" +"PO-Revision-Date: 2008-06-03 20:52+0200\n" +"Last-Translator: Esko Arajärvi \n" +"Language-Team: Finnish \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:1001 +msgid "Remove saved mails in spool directory?" +msgstr "Poistetaanko tallennetut sähköpostit spool-hakemistosta?" + +#. Type: boolean +#. Description +#: ../templates:1001 +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." +msgstr "Hakemiston /var/spool/sa-exim alihakemistoissa on joitain tallennettuja sähköposteja. Riippuen sa-eximin asetuksista, joitain tietyt ehdot täyttäviä sähköposteja (virheen aiheuttaneet, roskapostina hylätyt, roskapostiksi tunnistetut, mutta edelleen lähetetyt,...) tallennetaan hakemiston /var/spool/sa-exim alihakemistoihin." + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "You can keep them for further analysis and later remove them manually or decide to delete them now." +msgstr "Nämä voidaan poistaa nyt tai säilyttää jatkotutkimuksia varten ja poistaa myöhemmin käsin." + --- sa-exim-4.2.1.orig/debian/po/fr.po +++ sa-exim-4.2.1/debian/po/fr.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: sa-exim\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-15 14:44+0200\n" -"PO-Revision-Date: 2004-03-12 22:00+0100\n" +"Report-Msgid-Bugs-To: holmgren@debian.org\n" +"POT-Creation-Date: 2006-12-02 20:15+0100\n" +"PO-Revision-Date: 2004-08-17 11:00+0200\n" "Last-Translator: Eric Madesclair \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -25,14 +25,13 @@ #. Type: boolean #. Description -#: ../templates:4 +#: ../templates:1001 msgid "Remove saved mails in spool directory?" msgstr "Faut-il supprimer les courriers du rpertoire de dpt? " #. Type: boolean #. Description -#: ../templates:4 -#, fuzzy +#: ../templates:1001 msgid "" "There are some saved mails in subdirectories of /var/spool/sa-exim. " "Depending on the configuration sa-exim will save mails matching specific " @@ -40,14 +39,14 @@ "recognized as spam, ...) in subdirectories of /var/spool/sa-exim." msgstr "" "Il y a plusieurs courriers sauvegards dans les sous-rpertoires de /var/" -"spool/sa-exim. Selon la configuration, sa-exim sauvegarde les courriers " -"quicorrespondent des critres spcifiques (p. ex. une erreur est survenue, " +"spool/sa-exim. Selon la configuration, sa-exim sauvegarde les courriers qui " +"correspondent des critres spcifiques (p. ex. une erreur est survenue, " "rejet comme spam, pass travers, reconnu comme spam ...) dans des sous-" "rpertoires de /var/spool/sa-exim." #. Type: boolean #. Description -#: ../templates:4 +#: ../templates:1001 msgid "" "You can keep them for further analysis and later remove them manually or " "decide to delete them now." @@ -55,8 +54,5 @@ "Vous pouvez les garder pour des analyses approfondies et les supprimer par " "la suite ou vous pouvez dcider de les effacer maintenant." -#. Type: boolean -#. Description -#: ../templates:4 -msgid "Should they be removed?" -msgstr "Vous pouvez les supprimer maintenant." +#~ msgid "Should they be removed?" +#~ msgstr "Vous pouvez les supprimer maintenant." --- sa-exim-4.2.1.orig/debian/po/gl.po +++ sa-exim-4.2.1/debian/po/gl.po @@ -0,0 +1,45 @@ +# Galician translation of sa-exim's debconf templates +# This file is distributed under the same license as the sa-exim package. +# Jacobo Tarrio , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: sa-exim\n" +"Report-Msgid-Bugs-To: holmgren@debian.org\n" +"POT-Creation-Date: 2006-12-02 20:15+0100\n" +"PO-Revision-Date: 2007-02-28 10:34+0100\n" +"Last-Translator: Jacobo Tarrio \n" +"Language-Team: Galician \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Remove saved mails in spool directory?" +msgstr "¿Borrar as mensaxes gravadas do directorio de traballo?" + +#. Type: boolean +#. Description +#: ../templates:1001 +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." +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:1001 +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." --- sa-exim-4.2.1.orig/debian/po/ja.po +++ sa-exim-4.2.1/debian/po/ja.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: sa-exim 4.0-2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-15 14:44+0200\n" -"PO-Revision-Date: 2004-06-03 00:02+0900\n" +"Report-Msgid-Bugs-To: holmgren@debian.org\n" +"POT-Creation-Date: 2006-12-02 20:15+0100\n" +"PO-Revision-Date: 2004-08-19 15:21+0900\n" "Last-Translator: Hideki Yamane \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -26,14 +26,13 @@ #. Type: boolean #. Description -#: ../templates:4 +#: ../templates:1001 msgid "Remove saved mails in spool directory?" msgstr "סǥ쥯ȥ¸᡼ޤ?" #. Type: boolean #. Description -#: ../templates:4 -#, fuzzy +#: ../templates:1001 msgid "" "There are some saved mails in subdirectories of /var/spool/sa-exim. " "Depending on the configuration sa-exim will save mails matching specific " @@ -47,15 +46,12 @@ #. Type: boolean #. Description -#: ../templates:4 +#: ../templates:1001 msgid "" "You can keep them for further analysis and later remove them manually or " "decide to delete them now." msgstr "" "ʬϤΤ˻ĤƸ˼ưǺ뤫뤫ޤ" -#. Type: boolean -#. Description -#: ../templates:4 -msgid "Should they be removed?" -msgstr "ޤ?" +#~ msgid "Should they be removed?" +#~ msgstr "ޤ?" --- sa-exim-4.2.1.orig/debian/po/it.po +++ sa-exim-4.2.1/debian/po/it.po @@ -0,0 +1,47 @@ +# 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 , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: sa-exim 4.2.1 italian debconf templates\n" +"Report-Msgid-Bugs-To: holmgren@debian.org\n" +"POT-Creation-Date: 2006-12-02 20:15+0100\n" +"PO-Revision-Date: 2007-02-18 16:41+0100\n" +"Last-Translator: Luca Monducci \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Remove saved mails in spool directory?" +msgstr "Eliminare le mail salvate nella directory di spool?" + +#. Type: boolean +#. Description +#: ../templates:1001 +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." +msgstr "" +"Nelle sottodirectory di /var/spool/sa.exim sono state salvate delle mail. A " +"seconda della configurazione di sa-exim le mail vengono salvate se verificano " +"determinati criteri (si verificato un errore, rifiutata per spam, passata " +"nonostante identificata come spam, ecc.) nelle sottodirectory di /var/spool/" +"sa-exim." + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"You can keep them for further analysis and later remove them manually or " +"decide to delete them now." +msgstr "" +"Si possono tenere per una successiva analisi e poi eliminarle manualmente " +"oppure cancellarle adesso." --- sa-exim-4.2.1.orig/debian/po/nl.po +++ sa-exim-4.2.1/debian/po/nl.po @@ -0,0 +1,35 @@ +# 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 , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: sa-exim\n" +"Report-Msgid-Bugs-To: holmgren@debian.org\n" +"POT-Creation-Date: 2006-12-02 20:15+0100\n" +"PO-Revision-Date: 2007-02-28 19:43+0100\n" +"Last-Translator: Bart Cornelis \n" +"Language-Team: debian-l10n-dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Remove saved mails in spool directory?" +msgstr "Wilt u dat opgeslagen e-mails verwijderd worden uit de spool-map?" + +#. Type: boolean +#. Description +#: ../templates:1001 +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." +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:1001 +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." + --- sa-exim-4.2.1.orig/debian/po/pt.po +++ sa-exim-4.2.1/debian/po/pt.po @@ -0,0 +1,46 @@ +# Portuguese translation for sa-exim debconf messages. +# Copyright (C) 2007 Pedro Ribeiro +# This file is distributed under the same license as the sa-exim package. +# Pedro Ribeiro , 2007 +# +msgid "" +msgstr "" +"Project-Id-Version: sa-exim 4.2.1-5\n" +"Report-Msgid-Bugs-To: holmgren@debian.org\n" +"POT-Creation-Date: 2006-12-02 20:15+0100\n" +"PO-Revision-Date: 2007-03-19 22:08+0100\n" +"Last-Translator: Pedro Ribeiro \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Remove saved mails in spool directory?" +msgstr "Remover os mails guardados no directório de spool?" + +#. Type: boolean +#. Description +#: ../templates:1001 +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." +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 (ocorreu um erro, rejeitada como spam, aceite mas marcada como " +"spam, ...) em sub-directórios de /var/spool/sa-exim." + +#. Type: boolean +#. Description +#: ../templates:1001 +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." --- sa-exim-4.2.1.orig/debian/po/sv.po +++ sa-exim-4.2.1/debian/po/sv.po @@ -0,0 +1,56 @@ +# 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: holmgren@debian.org\n" +"POT-Creation-Date: 2006-12-02 20:15+0100\n" +"PO-Revision-Date: 2006-12-02 02:07+0100\n" +"Last-Translator: Magnus Holmgren \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Remove saved mails in spool directory?" +msgstr "Ta bort sparad e-post i spool-mappen?" + +#. Type: boolean +#. Description +#: ../templates:1001 +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." +msgstr "" +"Det finns ngra sparade e-postmeddelanden i undermappar till /var/spool/sa-" +"exim. Beroende p konfigurationen kan sa-exim spara e-post som matchar " +"specifika kriterier (ett fel intrffade, avvisat som spam, genomslppt trots " +"spamklassat, ...) i undermappar till /var/spool/sa-exim." + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"You can keep them for further analysis and later remove them manually or " +"decide to delete them now." +msgstr "" +"Du kan spara dom fr vidare analys och senare ta bort dom manuellt eller " +"vlja att ta bort dom nu." + +#~ msgid "Should they be removed?" +#~ msgstr "Ska de tas bort?" --- sa-exim-4.2.1.orig/debian/po/vi.po +++ sa-exim-4.2.1/debian/po/vi.po @@ -0,0 +1,50 @@ +# Vietnamese translation for sa-exim. +# Copyright © 2005 Free Software Foundation, Inc. +# Clytie Siddall , 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: sa-exim 4.2-2\n" +"Report-Msgid-Bugs-To: holmgren@debian.org\n" +"POT-Creation-Date: 2006-12-02 20:15+0100\n" +"PO-Revision-Date: 2005-07-12 15:07+0930\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \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.2.2\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Remove saved mails in spool directory?" +msgstr "Loại bỏ các thư đã lưu trong thư mục ống chỉ không?" + +#. Type: boolean +#. Description +#: ../templates:1001 +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." +msgstr "" +"Có một số thư đã lưu trong thư mục con của «/var/spool/sa-exim». Phụ thuộc " +"vào cấu hình, trình sa-exim sẽ lưu thư khớp với tiêu chuẩn dứt khoát (gặp " +"lỗi, thư bị từ chối vì rác, thư qua được dù phân loại là rác v.v.) vào thư " +"mục con của «/var/spool/sa-exim»." + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"You can keep them for further analysis and later remove them manually or " +"decide to delete them now." +msgstr "" +"Bạn có thể giữ các thư ấy để phân tích thêm nữa rồi sau đó tự loại bỏ chúng, " +"hoặc quyết định xóa bỏ chúng ngay bây giờ." + +#~ msgid "Should they be removed?" +#~ msgstr "Bạn có muốn loại bỏ các lưu ấy không?" --- sa-exim-4.2.1.orig/debian/po/pt_BR.po +++ sa-exim-4.2.1/debian/po/pt_BR.po @@ -0,0 +1,46 @@ +# 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 , 2008. +# +msgid "" +msgstr "pt_BR utf-8\n" +"Project-Id-Version: sa-exim 4.2.1-9\n" +"Report-Msgid-Bugs-To: magnus@kibibyte.se\n" +"POT-Creation-Date: 2006-12-02 20:15+0100\n" +"PO-Revision-Date: 2008-06-07 19:35-0300\n" +"Last-Translator: Adriano Rafael Gomes \n" +"Language-Team: l10n Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Remove saved mails in spool directory?" +msgstr "Remover os e-mails salvos no diretório spool?" + +#. Type: boolean +#. Description +#: ../templates:1001 +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." +msgstr "" +"Há alguns e-mails salvos em subdiretórios de /var/spool/sa-exim. Dependendo " +"da configuração, o sa-exim salvará e-mails que atendam a critérios " +"específicos (ocorreu um erro, rejeitado como spam, aceito apesar de " +"reconhecido como spam, ...) em subdiretórios de /var/spool/sa-exim." + +#. Type: boolean +#. Description +#: ../templates:1001 +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."