Subversion Repositories sa-exim

Compare Revisions

Ignore whitespace Rev 88 → Rev 86

/tags/4.2.1-16/.cvsignore
File deleted
/tags/4.2.1-16/debian/docs
File deleted
/tags/4.2.1-16/debian/rules
File deleted
Property changes:
Deleted: svn:executable
Index: 4.2.1-16/debian/templates
===================================================================
--- 4.2.1-16/debian/templates (revision 88)
+++ 4.2.1-16/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: 4.2.1-16/debian/source/format
===================================================================
--- 4.2.1-16/debian/source/format (revision 88)
+++ 4.2.1-16/debian/source/format (nonexistent)
@@ -1 +0,0 @@
-3.0 (quilt)
Index: 4.2.1-16/debian/sa-exim.lintian-overrides
===================================================================
--- 4.2.1-16/debian/sa-exim.lintian-overrides (revision 88)
+++ 4.2.1-16/debian/sa-exim.lintian-overrides (nonexistent)
@@ -1 +0,0 @@
-sa-exim: virtual-package-depends-without-real-package-depends depends: exim4-localscanapi-*
Index: 4.2.1-16/debian/15_sa-exim_plugin_path
===================================================================
--- 4.2.1-16/debian/15_sa-exim_plugin_path (revision 88)
+++ 4.2.1-16/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: 4.2.1-16/debian/config
===================================================================
--- 4.2.1-16/debian/config (revision 88)
+++ 4.2.1-16/debian/config (nonexistent)
@@ -1,5 +0,0 @@
-#!/bin/sh -e
-
-. /usr/share/debconf/confmodule
-
-exit 0
Index: 4.2.1-16/debian/watch
===================================================================
--- 4.2.1-16/debian/watch (revision 88)
+++ 4.2.1-16/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: 4.2.1-16/debian/install
===================================================================
--- 4.2.1-16/debian/install (revision 88)
+++ 4.2.1-16/debian/install (nonexistent)
@@ -1,6 +0,0 @@
-sa-exim.so usr/lib/exim4/local_scan
-accept.so usr/lib/exim4/local_scan
-sa-exim.conf etc/exim4/
-debian/15_sa-exim_plugin_path etc/exim4/conf.d/main
-Greylisting.pm usr/share/perl5/Mail/SpamAssassin/Plugin/
-greylistclean usr/share/sa-exim
Index: 4.2.1-16/debian/copyright
===================================================================
--- 4.2.1-16/debian/copyright (revision 88)
+++ 4.2.1-16/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: 4.2.1-16/debian/NEWS
===================================================================
--- 4.2.1-16/debian/NEWS (revision 88)
+++ 4.2.1-16/debian/NEWS (nonexistent)
@@ -1,32 +0,0 @@
-sa-exim (4.2.1-14) unstable; urgency=low
-
- If you are using sa-exim's greylisting plugin for SpamAssassin you may
- want to review your setup. Previously the documentation recommended
- running spamd as the "nobody" user. This is not a very good
- recommendation as nobody/nogroup should be completely unprivileged and
- thus not own anything. This version won't change the ownership of any
- directories or files and won't try to fix your SpamAssassin
- configuration, but if you haven't modified /etc/cron.d/greylistclean
- it will be changed to run greylistclean as "Debian-exim", which won't
- work if the greylisting data is owned by nobody:nogroup.
-
- -- Magnus Holmgren <holmgren@debian.org> Sun, 18 Sep 2011 23:19:53 +0200
-
-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: 4.2.1-16/debian/README.Debian
===================================================================
--- 4.2.1-16/debian/README.Debian (revision 88)
+++ 4.2.1-16/debian/README.Debian (nonexistent)
@@ -1,223 +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.
-
-
-***************
-* GREYLISTING *
-***************
-
-Greylisting is implemented as a SpamAssassin module. To enable it you
-need to add the following five lines to your SpamAssassin
-configuration:
-
-loadplugin Greylisting /usr/share/perl5/Mail/SpamAssassin/Plugin/Greylisting.pm
-
-header GREYLIST_ISWHITE eval:greylisting("( 'dir' => '/var/spool/sa-exim/tuplets'; 'method' => 'dir'; 'greylistsecs' => '1800'; 'dontgreylistthreshold' => 11; 'connectiphdr' => 'X-SA-Exim-Connect-IP'; 'envfromhdr' => 'X-SA-Exim-Mail-From'; 'rcpttohdr' => 'X-SA-Exim-Rcpt-To'; 'greylistnullfrom' => 1; 'greylistfourthbyte' => 0 )")
-describe GREYLIST_ISWHITE The incoming server has been whitelisted for this recipient and sender
-score GREYLIST_ISWHITE -1.5
-priority GREYLIST_ISWHITE 99999
-
-(It is a long-standing bug that the module is installed in the wrong
-directory, which is why the full path has to be specified on the
-loadplugin line, but fixing it is probably not worth the disruption of
-existing installations.)
-
-If two messages from the same /24 IPv4 network or /64 IPv6 network (or
-individual IP address, depending on greylistfourthbyte), with the same
-sender, with the same list of recipient, and with a score below
-dontgreylistthreshold are seen at least greylistsecs apart, the
-triplet will be whitelisted and the GREYLIST_ISWHITE rule will be
-considered to match thenceforth. That will signal to the local_scan
-library to raise SAtempreject to let the message through, in addition
-to the negative spam score it carries.
-
-Notice that messages can be permanently rejected (score above
-SApermreject) and still get a triplet whitelisted if the score is
-below dontgreylistthreshold. If dontgreylistthreshold or SAtempreject
-+ SAgreylistraisetempreject are less than SApermreject, some mail may
-be temporarily rejected indefinitely.
-
-See README.Greylisting for more details.
-
-***********************
-* SPAMD CONFIGURATION *
-***********************
-
-By default, spamd runs as root and assumes the identity of the user it
-is told it is scanning mail on behalf of by whoever connects to it
-(see README.spamd.gz in the spamassassin package for a discussion on
-security). When SA-Exim runs spamc, this user will normally be
-Debian-exim. You can set the SAspamcUser option in sa-exim.conf to
-override this, but since a mail can have multiple recipients and is
-only scanned once, per-user setups are problematic. Also, the
-greylisting module won't work unless all users can write to the
-tuplets directory.
-
-Thus, when using SpamAssassin together with SA-Exim you may want to
-run spamd under a specific system account by modifying the OPTIONS
-variable in /etc/default/spamassassin to include a --username option.
-However, if you ONLY use SpamAssassin with SA-Exim this is in practice
-not strictly necessary.
-
-You should NOT run spamd as the "nobody" user and/or the "nogroup"
-group if you configure SpamAssassin to use sa-exim's greylisting
-module, the bayesian classifier, or any helper module that needs to
-write files, because nobody/nogroup should be completely unprivileged
-and thus not own any files. Instead you should create a dedicated
-account to run spamd under. You can then adjust the ownership of
-/var/spool/sa-exim/tuplets and the username in
-/etc/cron.d/greylistclean accordingly.
-
-***********************************
-* 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>, Fri, 22 Jul 2016 09:58:32 +0200
Index: 4.2.1-16/debian/po/ja.po
===================================================================
--- 4.2.1-16/debian/po/ja.po (revision 88)
+++ 4.2.1-16/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: 4.2.1-16/debian/po/fi.po
===================================================================
--- 4.2.1-16/debian/po/fi.po (revision 88)
+++ 4.2.1-16/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: 4.2.1-16/debian/po/gl.po
===================================================================
--- 4.2.1-16/debian/po/gl.po (revision 88)
+++ 4.2.1-16/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: 4.2.1-16/debian/po/cs.po
===================================================================
--- 4.2.1-16/debian/po/cs.po (revision 88)
+++ 4.2.1-16/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: 4.2.1-16/debian/po/pt_BR.po
===================================================================
--- 4.2.1-16/debian/po/pt_BR.po (revision 88)
+++ 4.2.1-16/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: 4.2.1-16/debian/po/fr.po
===================================================================
--- 4.2.1-16/debian/po/fr.po (revision 88)
+++ 4.2.1-16/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: 4.2.1-16/debian/po/es.po
===================================================================
--- 4.2.1-16/debian/po/es.po (revision 88)
+++ 4.2.1-16/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: 4.2.1-16/debian/po/nl.po
===================================================================
--- 4.2.1-16/debian/po/nl.po (revision 88)
+++ 4.2.1-16/debian/po/nl.po (nonexistent)
@@ -1,50 +0,0 @@
-# Dutch translation of sa-exim debconf templates.
-# Copyright (C) 2007-2011 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the sa-exim package.
-# Bart Cornelis <cobaco@skolelinux.no>, 2007.
-# Jeroen Schot <schot@a-eskwadraat.nl>, 2011.
-#
-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-04-04 15:40+0200\n"
-"PO-Revision-Date: 2011-07-18 17:35+0200\n"
-"Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
-"Language-Team: Debian 10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
-"Language: nl\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 ""
-"Wilt u dat opgeslagen e-mails verwijderd worden uit sa-exim's spool-map?"
-
-#. 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 ""
-"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 ""
-"Geef aan of u deze e-mails wilt bewaren voor verdere analyse of nu wilt "
-"verwijderen."
Index: 4.2.1-16/debian/po/it.po
===================================================================
--- 4.2.1-16/debian/po/it.po (revision 88)
+++ 4.2.1-16/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: 4.2.1-16/debian/po/POTFILES.in
===================================================================
--- 4.2.1-16/debian/po/POTFILES.in (revision 88)
+++ 4.2.1-16/debian/po/POTFILES.in (nonexistent)
@@ -1 +0,0 @@
-[type: gettext/rfc822deb] templates
Index: 4.2.1-16/debian/po/vi.po
===================================================================
--- 4.2.1-16/debian/po/vi.po (revision 88)
+++ 4.2.1-16/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: 4.2.1-16/debian/po/templates.pot
===================================================================
--- 4.2.1-16/debian/po/templates.pot (revision 88)
+++ 4.2.1-16/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: 4.2.1-16/debian/po/pt.po
===================================================================
--- 4.2.1-16/debian/po/pt.po (revision 88)
+++ 4.2.1-16/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: 4.2.1-16/debian/po/da.po
===================================================================
--- 4.2.1-16/debian/po/da.po (revision 88)
+++ 4.2.1-16/debian/po/da.po (nonexistent)
@@ -1,50 +0,0 @@
-# Danish translation for sa-exim.
-# Copyright (C) 2010 sa-exim og nedenstående oversættere.
-# This file is distributed under the same license as the sa-exim package.
-# Claus Hindsgaul <claus_h@image.dk>, 2004.
-# Joe Hansen (joedalton2@yahoo.dk), 2010.
-#
-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: 2010-12-30 19:25+0200\n"
-"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
-"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. Type: boolean
-#. Description
-#: ../templates:2001
-msgid "Remove saved mails in sa-exim's spool directory?"
-msgstr "Fjern gemt e-post fra sa-exims kømappe?"
-
-#. 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 ""
-"Der er gemt e-post i mapperne under /var/spool/sa-exim. Afhængig af "
-"opsætningen vil sa-exim gemme e-post, der opfylder bestemte kriterier (der "
-"opstod en fejl, afvist som spam, lod brevet passere på trods af at det blev "
-"genkendt som spam,...) i disse mapper."
-
-#. Type: boolean
-#. Description
-#: ../templates:2001
-msgid ""
-"Please choose whether you want to keep these mails for further analysis or "
-"delete them now."
-msgstr ""
-"Vælg venligst om du ønsker at beholde denne e-post for yderligere analyse, "
-"eller om du ønsker at slette dem nu."
-
-
Index: 4.2.1-16/debian/po/ru.po
===================================================================
--- 4.2.1-16/debian/po/ru.po (revision 88)
+++ 4.2.1-16/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: 4.2.1-16/debian/po/sv.po
===================================================================
--- 4.2.1-16/debian/po/sv.po (revision 88)
+++ 4.2.1-16/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: 4.2.1-16/debian/po/de.po
===================================================================
--- 4.2.1-16/debian/po/de.po (revision 88)
+++ 4.2.1-16/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: 4.2.1-16/debian/control
===================================================================
--- 4.2.1-16/debian/control (revision 88)
+++ 4.2.1-16/debian/control (nonexistent)
@@ -1,28 +0,0 @@
-Source: sa-exim
-Section: mail
-Priority: optional
-Maintainer: Magnus Holmgren <holmgren@debian.org>
-Build-Depends: debhelper (>= 7), links, exim4-dev
-Standards-Version: 3.9.8
-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, libnetaddr-ip-perl
-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: 4.2.1-16/debian/compat
===================================================================
--- 4.2.1-16/debian/compat (revision 88)
+++ 4.2.1-16/debian/compat (nonexistent)
@@ -1 +0,0 @@
-7
Index: 4.2.1-16/debian/postinst
===================================================================
--- 4.2.1-16/debian/postinst (revision 88)
+++ 4.2.1-16/debian/postinst (nonexistent)
@@ -1,52 +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 -m770 -oDebian-exim -gDebian-exim \
- /var/spool/sa-exim
- fi
- # Support for greylisting tuplets (written by default as Debian-exim by spamd)
- if [ ! -e /var/spool/sa-exim/tuplets ] ; then
- install -d -m770 -oDebian-exim -gDebian-exim \
- /var/spool/sa-exim/tuplets
- elif [ `stat -c "%U:%G" /var/spool/sa-exim/tuplets` = "nobody:Debian-exim" ] &&
- dpkg --compare-versions "$2" lt-nl "4.2.1-14"; then
- # If ownership is as before 4.2.1-14, give the Debian-exim
- # group write permissions. Bug 563492.
- chmod g+w /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 "`which invoke-rc.d 2>/dev/null`" ]; then
- invoke-rc.d exim4 reload || true
- else
- /etc/init.d/exim4 reload || true
- fi
- fi
- ;;
-
-esac
-
-#DEBHELPER#
Index: 4.2.1-16/debian/postrm
===================================================================
--- 4.2.1-16/debian/postrm (revision 88)
+++ 4.2.1-16/debian/postrm (nonexistent)
@@ -1,59 +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 "`which invoke-rc.d 2>/dev/null`" ]; 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 "`which invoke-rc.d 2>/dev/null`" ]; then
- invoke-rc.d exim4 reload || true
- else
- /etc/init.d/exim4 reload || true
- fi
- fi
-
- rm -rf /var/spool/sa-exim/tuplets
- # 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: 4.2.1-16/debian/greylistclean.cron.d
===================================================================
--- 4.2.1-16/debian/greylistclean.cron.d (revision 88)
+++ 4.2.1-16/debian/greylistclean.cron.d (nonexistent)
@@ -1,3 +0,0 @@
-# If you have configured spamd to run as a fixed user, change "Debian-exim" below.
-# Be smart and don't run this as root, it doesn't need those perms
-33 * * * * Debian-exim [ -x /usr/share/sa-exim/greylistclean ] && /usr/share/sa-exim/greylistclean
Index: 4.2.1-16/debian/changelog
===================================================================
--- 4.2.1-16/debian/changelog (revision 88)
+++ 4.2.1-16/debian/changelog (nonexistent)
@@ -1,410 +0,0 @@
-sa-exim (4.2.1-16) unstable; urgency=low
-
- * reproducible-build.patch: Make ACKNOWLEDGEMENTS always UTF-8 encoded
- rather than depending on the environment.
-
- -- Magnus Holmgren <holmgren@debian.org> Tue, 02 Aug 2016 23:08:31 +0200
-
-sa-exim (4.2.1-15) unstable; urgency=low
-
- * reproducible-build.patch (new): Make build reproducible by replacing
- the build date with the source date via ${SOURCE_DATE_EPOCH} when
- available (Closes: #831649). Thanks to Chris Lamb.
- * greylisting-ipv6.patch (new): Finally add IPv6 support to the
- greylisting plugin (Closes: #508161). Replaces grey-only-ipv4.patch.
- Based on Robert Tasarz's patch, though I decided to do things a little
- differently by keeping the greylistfourthbyte option for backwards
- compatibility and not adding separate options for IPv4 and IPv6 at
- this time. Also, with that option enabled, there will only be one
- directory level for all the last 64 bits of an IPv6 address.
- * delete-ext-html-references.patch (new): sa.html, which is shipped in
- the doc directory, is a copy of the author's webpage on sa-exim from
- his website, but without the images or linked pages, which means that
- most of the images and links don't work, except the SourceForge logo,
- which was fetched from sourceforge.net, causing a privacy concern. We
- drop the images and make the non-absolute links relative to
- http://marc.merlins.org/linux/exim/.
- * postinst, postrm: Remove hard-coded path to invoke-rc.d.
- * postrm: On purge, always delete the greylisting tuplets directory
- first. Normally, /var/spool/sa-exim is then empty and can be removed
- without asking the user, avoiding leaving unowned files (Closes:
- #657140).
- * greylist-lint.patch: disable greylisting plugin during spamassassin
- --lint to avoid warnings about missing headers (Closes: #760860).
- Thanks to Chaskiel Grundman.
- * Use dpkg-buildflags.
- * Bump Standards-Version to 3.9.8.
- * Override Lintian warning about virtual exim4-localscanapi dependency
- regardless of API version.
-
- -- Magnus Holmgren <holmgren@debian.org> Fri, 22 Jul 2016 11:26:45 +0200
-
-sa-exim (4.2.1-14) unstable; urgency=low
-
- * Updated Danish and Dutch Debconf template translations (Closes:
- #608447, #634314).
- * Drop the defaults for SAspamcHost and SAspamcPort, deferring to spamc
- as to what the defaults will be if those options are not set in
- sa-exim.conf (Closes: #506571).
- * The "nobody" user and "nogroup" group should not own files. Therefore,
- create /var/spool/sa-exim/tuplets with Debian-exim as owner on new
- installations and run greylistclean as Debian-exim by default. Don't
- change ownership of already existing /var/spool/sa-exim or
- /var/spool/sa-exim/tuplets, since the local admin may have different
- preferences, but give the Debian-exim group the write permission it
- needs if /var/spool/sa-exim/tuplets is owned by "nobody" and spamd
- runs as the calling user (Closes: #563492). Add documentation to
- README.Debian and remove recommendation to run spamd as "nobody" from
- README and README.greylisting.
- * Some tidying of debian/rules and the packaging in general:
- * Add build-arch and build-indep targets.
- * Remove configure target; it's not a mandatory target.
- * Remove install target and use dh_install (and dh_lintian) to put the
- files in the staging directory.
- * Replace /var/spool/exim with /var/spool/sa-exim in the Debian patch
- instead of using sed.
- * Pass SUFF='' to the makefile instead of renaming sa-exim-4.2.1.so
- afterwards.
- * Put our version of the crontab file in debian/greylistclean.cron.d
- and install it using dh_installcron.
- * Upgrade to Debhelper compat level 7. Replace dh_clean -k with
- dh_prep.
- * Switch to source package format 3.0 (quilt), splitting the Debian
- patch as follows:
- * api-limitations.patch: Changes needed because Exim exports only the
- symbols that are part of the official API.
- * spamc-args.patch: Changes related to the arguments sent to spamc.
- * grey-clean-sender.patch: Simplify the sender address so that senders
- using VERP, SRS, etc. hopefully won't be greylisted each and every
- time.
- * grey-only-ipv4.patch: Bail out if a non-IPv4 address is encountered.
- * improved-default-conf.patch: General improvements (in my opinion) of
- the default sa-exim.conf.
- * spamd-not-nobody.patch: Strike the recommendation that spamd run as
- nobody.
- * save-path.patch: Put saved mail in /var/spool/sa-exim instead of
- /var/spool/exim.
- * readme.patch: Other additions to the README file(s).
- * Update Standards-Version to 3.9.2.
-
- -- Magnus Holmgren <holmgren@debian.org> Sun, 25 Dec 2011 12:13:22 +0100
-
-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: 4.2.1-16/debian/patches/spamd-not-nobody.patch
===================================================================
--- 4.2.1-16/debian/patches/spamd-not-nobody.patch (revision 88)
+++ 4.2.1-16/debian/patches/spamd-not-nobody.patch (nonexistent)
@@ -1,52 +0,0 @@
-Description: Don't recommend that spamd runs as nobody
-Author: Magnus Holmgren <holmgren@debian.org>
-
---- sa-exim-4.2.1.orig/README
-+++ sa-exim-4.2.1/README
-@@ -147,8 +147,11 @@ anything, you may not want to use SARewr
-
-
- Important:
--You want to run spamd as such:
--/usr/sbin/spamd -d -u nobody -H /var/spool/spamassassin/
-+
-+You want to run spamd as such (you have to create the spamd user
-+yourself):
-+
-+/usr/sbin/spamd -d -u spamd -H /var/spool/spamassassin/
-
- It may not work if you run spamd with -c (debian default),
- (you shouldn't run spamassassin as root for this purpose anyway (there
-@@ -158,7 +161,7 @@ You can edit this in /etc/default/spamas
- /etc/sysconfig/spamassassin (redhat)
-
- With SA 3.x is better, the updated syntax would look like this:
--/usr/sbin/spamd --max-children 50 --daemonize --username=nobody --nouser-config --helper-home-dir=/var/spool/spamassassin/
-+/usr/sbin/spamd --max-children 50 --daemonize --username=spamd --nouser-config --helper-home-dir=/var/spool/spamassassin/
-
-
-
---- sa-exim-4.2.1.orig/README.greylisting
-+++ sa-exim-4.2.1/README.greylisting
-@@ -139,8 +139,8 @@ let in" range.
-
- FILE SETUP
- ----------
--Make very sure that uid nobody can traverse /var/spool/sa-exim and
--create tuplets writeable by nobody (or whoever you run SA as)
-+Make very sure that the user that spamd runs as can traverse and write
-+to /var/spool/sa-exim.
-
- Then, setup a cron job to delete tuplets that are older than 14 days for
- whitelisted entries, and 2 days for greylisted entries (or whatever
-@@ -159,8 +159,8 @@ You should install greylistclean.cron in
- call greylistclean and clean up greylisted entries and whitelisted entries
- that haven't been used in a while.
- You can optionally modify it to tweak the cleanup times.
--Note that you need to tweak greylistclean.cron to match the user spamd runs
--as if you aren't using the recommended --username=nobody
-+Note that you may need to tweak greylistclean.cron to match the user
-+spamd runs as.
-
-
- SA PATCH (SA 2.x)
Index: 4.2.1-16/debian/patches/improved-default-conf.patch
===================================================================
--- 4.2.1-16/debian/patches/improved-default-conf.patch (revision 88)
+++ 4.2.1-16/debian/patches/improved-default-conf.patch (nonexistent)
@@ -1,52 +0,0 @@
-Description: Improvements (in my opinion) of the default sa-exim.conf
-Author: Magnus Holmgren <holmgren@debian.org>
-
---- sa-exim-4.2.1.orig/sa-exim.conf
-+++ sa-exim-4.2.1/sa-exim.conf
-@@ -49,9 +49,19 @@ SAspamcpath: /usr/bin/spamc
- # 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 @@ SAEximRunCond: 0
- # 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 @@ SApermrejectsave: /var/spool/exim/SAperm
- # 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
Index: 4.2.1-16/debian/patches/series
===================================================================
--- 4.2.1-16/debian/patches/series (revision 88)
+++ 4.2.1-16/debian/patches/series (nonexistent)
@@ -1,11 +0,0 @@
-api-limitations.patch
-spamc-args.patch
-grey-clean-sender.patch
-save-path.patch
-improved-default-conf.patch
-spamd-not-nobody.patch
-readme.patch
-reproducible-build.patch
-greylisting-ipv6.patch
-greylist-lint.patch
-delete-ext-html-references.patch
Index: 4.2.1-16/debian/patches/reproducible-build.patch
===================================================================
--- 4.2.1-16/debian/patches/reproducible-build.patch (revision 88)
+++ 4.2.1-16/debian/patches/reproducible-build.patch (nonexistent)
@@ -1,26 +0,0 @@
-Author: Chris Lamb <lamby@debian.org>
-Last-Update: 2016-07-18
-
---- a/Makefile
-+++ b/Makefile
-@@ -48,7 +48,7 @@ accept.so: accept.c
-
- ACKNOWLEDGEMENTS: Acknowledgements.html
- @echo "Generating $@"
-- @links -dump $< > $@
-+ @links -dump -codepage UTF-8 $< > $@
-
- CHANGELOG: Changelog.html
- @echo "Generating $@"
-@@ -63,7 +63,11 @@ sa-exim_short.conf: sa-exim.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
-+ifdef SOURCE_DATE_EPOCH
-+ echo "char *version=\"`cat version` (built `LC_ALL=C date --utc -R --date=@$${SOURCE_DATE_EPOCH}`)\";" > sa-exim.h
-+else
- echo "char *version=\"`cat version` (built `date -R 2>/dev/null || date`)\";" > sa-exim.h
-+endif
-
- 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
Index: 4.2.1-16/debian/patches/spamc-args.patch
===================================================================
--- 4.2.1-16/debian/patches/spamc-args.patch (revision 88)
+++ 4.2.1-16/debian/patches/spamc-args.patch (nonexistent)
@@ -1,120 +0,0 @@
-Description: Changes related to the arguments sent to spamc, namely thst
- we don't pass -d (SAspamcHost), -p (SAspamcPort), or -U (SAspamcSockPath)
- if those options aren't set, as well as the new parameter -u (SAspamcUser).
-Author: Magnus Holmgren <holmgren@debian.org>
-Bug-Debian: http://bugs.debian.org/506571
-
---- sa-exim-4.2.1.orig/sa-exim.c
-+++ sa-exim-4.2.1/sa-exim.c
-@@ -515,6 +513,7 @@ int local_scan(volatile int fd, uschar *
- 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 */
-@@ -550,8 +549,9 @@ int local_scan(volatile int fd, uschar *
- 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 *SAspamcPort=NULL;
-+ static char *SAspamcHost=NULL;
-+ static char *SAspamcUser=NULL;
- static char *SAEximRunCond="0";
- static char *SAEximRejCond="1";
- static int SAmaxbody=250*1024;
-@@ -712,6 +721,7 @@ int local_scan(volatile int fd, uschar *
- 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 @@ int local_scan(volatile int fd, uschar *
- 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,30 @@ int local_scan(volatile int fd, uschar *
- /* 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__);
-+ if (SAspamcHost) {
-+ spamc_argv[i++] = "-d";
-+ spamc_argv[i++] = SAspamcHost;
-+ }
-+ if (SAspamcPort) {
-+ 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)
---- sa-exim-4.2.1.orig/sa-exim.conf
-+++ sa-exim-4.2.1/sa-exim.conf
-@@ -49,11 +49,17 @@ SAspamcpath: /usr/bin/spamc
- # 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
--
-+# SAspamcHost / SAspamcPort: TCP socket where your spamd is listening.
-+# Default is to let spamc use any settings in spamc.conf.
-+#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
Index: 4.2.1-16/debian/patches/readme.patch
===================================================================
--- 4.2.1-16/debian/patches/readme.patch (revision 88)
+++ 4.2.1-16/debian/patches/readme.patch (nonexistent)
@@ -1,16 +0,0 @@
-Description: Other additions to README file(s)
-Author: Sander Smeenk <ssmeenk@debian.org>
-Bug-Debian: http://bugs.debian.org/276080
-
---- sa-exim-4.2.1.orig/README
-+++ sa-exim-4.2.1/README
-@@ -194,6 +197,9 @@ SAEximRunCond: ${if and{ \
- {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
-
Index: 4.2.1-16/debian/patches/delete-ext-html-references.patch
===================================================================
--- 4.2.1-16/debian/patches/delete-ext-html-references.patch (revision 88)
+++ 4.2.1-16/debian/patches/delete-ext-html-references.patch (nonexistent)
@@ -1,41 +0,0 @@
-Description: Delete references to images not distributed, and add base URL to make links work.
- In particular get rid of the external SourceForce logo, which caused a privacy breach.
-
---- a/sa.html.template
-+++ b/sa.html.template
-@@ -1,6 +1,7 @@
- <html>
- <head>
--<title>Exim SpamAssassin at SMTP time</title>
-+ <title>Exim SpamAssassin at SMTP time</title>
-+ <base href="http://marc.merlins.org/linux/exim/">
- </head>
-
- <body>
-@@ -113,7 +114,7 @@ threshold (7 for instance). After that,
- 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
-+You can also (and probably should :-)) use the new greylisting support for even
- better spam control
-
-
-@@ -205,17 +206,5 @@ prefer the use of the
- <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&amp;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: 4.2.1-16/debian/patches/greylisting-ipv6.patch
===================================================================
--- 4.2.1-16/debian/patches/greylisting-ipv6.patch (revision 88)
+++ 4.2.1-16/debian/patches/greylisting-ipv6.patch (nonexistent)
@@ -1,76 +0,0 @@
-Description: Add IPv6 support to the Greylisting SpamAssassin plugin.
- The greylistfourthbyte option, for IPv6 addresses, means that all
- addresses in the same /64 get whitelisted as a group.
-Bug: https://bugs.debian.org/508161
-
---- a/Greylisting.pm
-+++ b/Greylisting.pm
-@@ -21,6 +21,8 @@ package Greylisting;
-
- use strict;
- use Mail::SpamAssassin::Plugin;
-+use NetAddr::IP;
-+use File::Path qw(mkpath);
- our @ISA = qw(Mail::SpamAssassin::Plugin);
-
- sub new
-@@ -104,8 +106,12 @@ sub greylisting
- }
- chomp($connectip);
- # Clean up input (for security, if you use files/dirs)
-- $connectip =~ /([\d.:]+)/;
-- $connectip = ($1 or "");
-+
-+ $connectip = NetAddr::IP->new($connectip);
-+ if (not defined $connectip) {
-+ warn "Can only handle IPv4 and IPv6 addresses; skipping greylisting call for message $mesgid\n";
-+ return 0;
-+ }
-
- # Account for a null envelope from
- if (not defined ($envfrom = $permsgstatus->get($option{'envfromhdr'})))
-@@ -172,26 +178,27 @@ sub greylisting
-
- # 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";
-- my $ipdir4;
-- my $tupletdir;
--
-- $ipdir4 = "$ipdir3";
-- $ipdir4 .= "/$ipbyte4" if ($option{'greylistfourthbyte'});
-- $tupletdir = "$ipdir4/$envfrom";
--
-+ my $ipdir;
-+ if ($connectip->version == 6) {
-+ my @components = split ':', $connectip->full, 5;
-+ if ($option{'greylistfourthbyte'}) {
-+ $ipdir = join '/', @components;
-+ } else {
-+ $ipdir = join '/', @components[0..3];
-+ }
-+ } else {
-+ my @components = split '\.', $connectip->addr;
-+ if ($option{'greylistfourthbyte'}) {
-+ $ipdir = join '/', @components;
-+ } else {
-+ $ipdir = join '/', @components[0..2];
-+ }
-+ }
-+ my $tupletdir = "$option{'dir'}/$ipdir/$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;
-+ mkpath $tupletdir;
-
- if (not -e $tuplet)
- {
Index: 4.2.1-16/debian/patches/api-limitations.patch
===================================================================
--- 4.2.1-16/debian/patches/api-limitations.patch (revision 88)
+++ 4.2.1-16/debian/patches/api-limitations.patch (nonexistent)
@@ -1,94 +0,0 @@
-Description: Changes needed because Exim now exports only the symbols
- that are part of the official API.
-Author: Magnus Holmgren <holmgren@debian.org>
-Bug-Debian: http://bugs.debian.org/420443
-Bug-Debian: http://bugs.debian.org/420555
-Bug-Debian: http://bugs.debian.org/420736
-
---- sa-exim-4.2.1.orig/sa-exim.c
-+++ sa-exim-4.2.1/sa-exim.c
-@@ -29,10 +29,8 @@ http://lists.merlins.org/lists/listinfo/
- #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 <local_scan.h>
-+//extern int body_linecount; /* Line count in body */
-
- #ifdef DLOPEN_LOCAL_SCAN
-
-@@ -602,6 +602,15 @@ int local_scan(volatile int fd, uschar *
- /* 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;
-@@ -1229,18 +1268,19 @@ restart:
- }
- }
-
-- 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 +1371,9 @@ restart:
-
- 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 +1396,8 @@ restart:
-
- for (i=0;i<SAteergrubetime/10;i++)
- {
-- char *str;
--
-- /* Unfortunately, we can't use exim's smtp_printf because it
-- * doesn't return an error code if the write gets an EPIPE.
-- * So, we write ourselves, but this won't work if you have a
-- * TLS connection opened (that said, if you are teergrubing
-- * a TLS connection, it's probably a relay host, not a
-- * spammer, and in this case you should not teergrube a
-- * friendly relay, so basically we should be ok).
-- * If you do teergrube an SSL connection with the current
-- * code, you will break it, but that's acceptable */
-- str=string_sprintf(string_sprintf("451- %s\r\n",SAmsgteergrubewait), spamstatus);
-- fprintf(smtp_out, str);
-- ret=fflush(smtp_out);
-+ 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);
Index: 4.2.1-16/debian/patches/grey-clean-sender.patch
===================================================================
--- 4.2.1-16/debian/patches/grey-clean-sender.patch (revision 88)
+++ 4.2.1-16/debian/patches/grey-clean-sender.patch (nonexistent)
@@ -1,16 +0,0 @@
-Description: Simplify the sender address so that senders using VERP,
- SRS, etc. hopefully won't be greylisted each and every time
-Author: Magnus Holmgren <holmgren@debian.org>
-Bug-Debian: http://bugs.debian.org/347590
-
---- sa-exim-4.2.1.orig/Greylisting.pm
-+++ sa-exim-4.2.1/Greylisting.pm
-@@ -160,6 +160,8 @@ sub greylisting
- # 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 "");
Index: 4.2.1-16/debian/patches/greylist-lint.patch
===================================================================
--- 4.2.1-16/debian/patches/greylist-lint.patch (revision 88)
+++ 4.2.1-16/debian/patches/greylist-lint.patch (nonexistent)
@@ -1,17 +0,0 @@
-From: Chaskiel Grundman <cg2v@andrew.cmu.edu>
-Subject: Prevent warnings during spamassassin --lint
-Bug: https://bugs.debian.org/760860
-
---- a/Greylisting.pm
-+++ b/Greylisting.pm
-@@ -65,6 +65,10 @@ sub greylisting
- my $dontcheckscore;
- my %option;
-
-+ if ($self->{main}->{lint_rules}) {
-+ Mail::SpamAssassin::Plugin::dbg("GREYLISTING: disabled while linting");
-+ return 0;
-+ }
- Mail::SpamAssassin::Plugin::dbg("GREYLISTING: called function");
-
- $optionhash =~ s/;/,/g;
Index: 4.2.1-16/debian/patches/save-path.patch
===================================================================
--- 4.2.1-16/debian/patches/save-path.patch (revision 88)
+++ 4.2.1-16/debian/patches/save-path.patch (nonexistent)
@@ -1,76 +0,0 @@
-Description: Put saved mail in /var/spool/sa-exim instead of /var/spool/exim.
-
---- sa-exim-4.2.1.orig/sa-exim.conf
-+++ sa-exim-4.2.1/sa-exim.conf
-@@ -148,7 +166,7 @@ SAaddSAEheaderBeforeSA: 1
- # 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
-+SAtimeoutsave: /var/spool/sa-exim/SAtimeoutsave
-
- # You can optionally save or not save messages that matched the above rule
- SAtimeoutSavCond: 1
-@@ -160,7 +178,7 @@ SAtimeoutSavCond: 1
- # 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
-+SAerrorsave: /var/spool/sa-exim/SAerrorsave
-
- # You can optionally save or not save messages that matched the above rule
- # You should not put double quotes around the expression
-@@ -219,7 +237,7 @@ SAteergrubeSavCond: 1
- # 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
-+SAteergrubesave: /var/spool/sa-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
-@@ -249,7 +267,7 @@ SAdevnullSavCond: 1
- # 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
-+SAdevnullsave: /var/spool/sa-exim/SAdevnull
-
-
-
-@@ -269,7 +287,7 @@ SApermrejectSavCond: 1
- # 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
-+SApermrejectsave: /var/spool/sa-exim/SApermreject
-
-
-
-@@ -292,7 +310,7 @@ SAtemprejectSavCond: 1
- # 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
-+SAtemprejectsave: /var/spool/sa-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
-@@ -330,7 +348,7 @@ SAgreylistraisetempreject: 3.0
- # 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
-+SAspamacceptsave: /var/spool/sa-exim/SAspamaccept
-
- # You can control which messages you want saved if you only want a subset
- SAspamacceptSavCond: 0
-@@ -343,7 +361,7 @@ SAspamacceptSavCond: 0
- # 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
-+SAnotspamsave: /var/spool/sa-exim/SAnotspam
-
- # You can control which messages you want saved if you only want a subset
- SAnotspamSavCond: 0
Index: 4.2.1-16/debian
===================================================================
--- 4.2.1-16/debian (revision 88)
+++ 4.2.1-16/debian (nonexistent)
/4.2.1-16/debian
Property changes:
Deleted: mergeWithUpstream
## -1 +0,0 ##
-1
\ No newline at end of property