| /trunk/debian/control |
|---|
| 2,12 → 2,12 |
| Section: mail |
| Priority: optional |
| Maintainer: Magnus Holmgren <magnus@kibibyte.se> |
| Build-Depends: links, debhelper (>= 4.1.16) |
| Build-Depends: debhelper (>= 4.1.16), links, exim4-dev |
| Standards-Version: 3.7.2 |
| 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 |
| Depends: exim4-daemon-light (>>4.30-1) | exim4-daemon-heavy (>>4.30-1) | exim4-daemon-custom (>>4.30-1), spamc, ${shlibs:Depends}, ${misc:Depends} |
| Recommends: ${perl:Depends} |
| Suggests: spamassassin |
| Description: Use spamAssassin at SMTP time with the Exim v4 MTA |
| /trunk/debian/compat |
|---|
| 1,0 → 0,0 |
| 4 |
| 5 |
| /trunk/debian/changelog |
|---|
| 1,3 → 1,13 |
| 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 |
| /trunk/debian/rules |
|---|
| 24,7 → 24,7 |
| build: build-stamp |
| build-stamp: configure-stamp |
| dh_testdir |
| $(MAKE) LDFLAGS="-shared -fPIC" |
| $(MAKE) EXIM_SRC="/usr/include/exim4" LDFLAGS="-shared -fPIC" |
| touch build-stamp |
| clean: |
| /trunk/debian/po/pt.po |
|---|
| 0,0 → 1,46 |
| # 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 |
| # |
| msgid "" |
| msgstr "" |
| "Project-Id-Version: sa-exim 4.2.1-5\n" |
| "Report-Msgid-Bugs-To: magnus@kibibyte.se\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 <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: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." |
| /trunk/sa-exim.c |
|---|
| 515,6 → 515,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 → 553,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; |
| 712,6 → 714,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 → 917,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 |
| { |
| 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 → 943,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) |
| /trunk/sa-exim.conf |
|---|
| 54,6 → 54,12 |
| 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 |