--- amavisd-new-2.6.4.orig/debian/watch
+++ amavisd-new-2.6.4/debian/watch
@@ -0,0 +1,2 @@
+version=2
+opts="dversionmangle=s/\.dfsg//" http://www.ijs.si/software/amavisd/ (?:.*/)?amavisd-new-(\d\.\d\.\d).tar.gz
--- amavisd-new-2.6.4.orig/debian/amavisd-new.lintian
+++ amavisd-new-2.6.4/debian/amavisd-new.lintian
@@ -0,0 +1,2 @@
+amavisd-new: no-debconf-config
+amavisd-new: postinst-uses-db-input
--- amavisd-new-2.6.4.orig/debian/amavisd-new.cron.d
+++ amavisd-new-2.6.4/debian/amavisd-new.cron.d
@@ -0,0 +1,5 @@
+#
+#  SpamAssassin maintenance for amavisd-new
+#
+# m h dom mon dow user  command
+18 */3	* * *	amavis	test -e /usr/sbin/amavisd-new-cronjob && /usr/sbin/amavisd-new-cronjob sa-sync
--- amavisd-new-2.6.4.orig/debian/amavisd-new.templates
+++ amavisd-new-2.6.4/debian/amavisd-new.templates
@@ -0,0 +1,24 @@
+Template: amavisd-new/outdated_config_style_warning
+Type: note
+_Description: Incompatible configuration file layout detected
+ The Debian packages have changed the way they handle configuration files
+ for amavisd-new to a better system, which uses multiple files instead of a
+ single, monolithic file.
+ .
+ The old amavisd-new configuration files that are still present in your
+ system (named either /etc/amavisd.conf or /etc/amavis/amavisd.conf) are
+ incompatible with this new config file layout.
+ .
+ You should read /usr/share/doc/amavisd-new/README.Debian to understand the
+ new configuration layout, and after that you should port your
+ configuration to the new layout.
+ .
+ For your safety, the old configuration files in your system have been
+ disabled, and a ".disabled" postfix was added to their file names.  The
+ amavisd-new service will refuse to start until you remove (or rename)
+ these ".disabled" files.
+ .
+ This safety is in place to avoid starting an unconfigured amavisd-new in
+ place of your previously configured one.  Do not remove the ".disabled"
+ files until you have read the /usr/share/doc/amavisd-new/README.Debian
+ file and ported your old configuration to the new layout.
--- amavisd-new-2.6.4.orig/debian/amavisd-new-milter.init
+++ amavisd-new-2.6.4/debian/amavisd-new-milter.init
@@ -0,0 +1,79 @@
+#! /bin/sh
+#
+# amavisd-new-milter    /etc/init.d/ initscript for amavisd-new milter
+# 		$Id: amavisd-new-milter.init 411 2004-05-15 04:45:59Z hmh $
+#
+#		Copyright (c) 2003 by Brian May <bam@debian.org>
+#			and Henrique M. Holschuh <hmh@debian.org>
+#		Distributed under the GPL version 2
+#
+### BEGIN INIT INFO
+# Provides:          amavisd-new-milter
+# Required-Start:    $syslog 
+# Required-Stop:     $syslog
+# Should-Start:      $local_fs
+# Should-Stop:       $local_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Starts the milter for amavisd-new 
+# Description:       milter for sendmail/postfix and amavisd-new
+### END INIT INFO
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/amavis-milter
+PARENTDAEMON=/usr/sbin/amavisd-new
+NAME=amavis-milter
+DESC="AMaViS Daemons (milter)"
+PARAMS="-D -p /var/lib/amavis/amavisd-new-milter.sock"
+
+test -f ${PARENTDAEMON} || exit 0
+test -f ${DAEMON} || exit 0
+
+set -e
+
+START="--start --quiet --pidfile /var/run/amavis/amavisd-new-milter.pid --chuid amavis --startas ${DAEMON} --name ${NAME} -- ${PARAMS}"
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	if start-stop-daemon ${START} >/dev/null 2>&1; then
+		echo "${NAME}."
+	else
+		if start-stop-daemon --test ${START} >/dev/null 2>&1; then
+			echo "(failed)."
+			exit 1
+		else
+			echo "(already running)."
+			exit 0
+		fi
+	fi
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	if start-stop-daemon --stop --quiet --retry 10 --name ${NAME} \
+	      --pidfile /var/run/amavis/amavisd-new-milter.pid \
+	      --startas $DAEMON >/dev/null 2>&1; then
+		echo "${NAME}."
+	else
+		if start-stop-daemon --test ${START} >/dev/null 2>&1; then
+			echo "(not running)."
+			exit 0
+		else
+			echo "(failed)."
+			exit 1
+		fi
+	fi
+	;;
+  restart|force-reload)
+	$0 stop
+	exec $0 start
+	;;
+  *)
+	N=/etc/init.d/amavisd-new-milter
+	#echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+	echo "Usage: $N {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
--- amavisd-new-2.6.4.orig/debian/amavisd-new-milter.links
+++ amavisd-new-2.6.4/debian/amavisd-new-milter.links
@@ -0,0 +1 @@
+usr/share/doc/amavisd-new usr/share/doc/amavisd-new-milter
--- amavisd-new-2.6.4.orig/debian/amavisd-new.8
+++ amavisd-new-2.6.4/debian/amavisd-new.8
@@ -0,0 +1,107 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" $Id: amavisd-new.8 799 2006-01-30 23:54:32Z hmh $
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH AMAVISD-NEW 8 "2003-01-01"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+amavisd-new \- Interface between MTA and virus scanner/content filters
+.SH SYNOPSIS
+.B amavisd-new
+[
+.B -u
+.I userid
+]
+[
+.B -g
+.I groupid
+]
+[
+.B -c
+.I config-file
+]...
+[
+.B start
+|
+.B stop
+|
+.B reload
+|
+.B debug
+|
+.B debug-sa
+|
+.B foreground
+]
+.br
+.SH DESCRIPTION
+.B amavisd
+is a high-performance interface between message transfer
+agent (MTA) and virus scanners and/or spam scanners.
+.PP
+This is the amavisd-new incarnation of amavisd.  It is a performance-enhanced
+and feature-enriched version of the original amavisd program.
+.PP
+Amavisd-new works as a SMTP proxy.  Email is fed to it through SMTP, processed,
+and fed back to the MTA through a new SMTP connection.  There is no buffering
+to disk by amavis, it will report that the transfer was sucessfull only after
+the forwarding MTA has accepted the message.
+.PP
+It is possible to use the sendmail milter interface instead of the SMTP
+proxy method, as well.
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+.SH OPTIONS
+.TP
+.B \-c configfile
+Use the specified configuration file instead of using run-parts(8) to find
+config files in /usr/share/amavis/conf.d and /etc/amavis/conf.d (this is a
+Debian extension to Amavisd-new).  More than one \-c option can be specified
+and the files will be read in the order given.
+.TP
+.B \-u userid
+Try to switch to that user id.
+.TP
+.B \-g groupid
+Try to switch to that group id.
+.TP
+.B start
+Starts amavisd-new
+.TP
+.B stop
+Stops a running amavisd-new
+.TP
+.B reload
+Reloads configuration from config file (may in fact just restart amavisd-new)
+.TP
+.B debug
+Runs amavisd-new in debug mode
+.TP
+.B debug-sa
+Runs amavisd-new in spamassassin debug mode
+.TP
+.B foreground
+Does not fork to background
+.SH FILES
+.BR /etc/amavis/amavisd.conf,
+.BR /var/lib/amavis,
+.BR /var/run/amavis/amavisd.pid
+.SH SEE ALSO
+.BR /usr/share/doc/amavisd-new/*
+.br
+.SH AUTHOR
+This manual page was written by Henrique de Moraes Holschuh <hmh@debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
--- amavisd-new-2.6.4.orig/debian/amavisd-new.manpages
+++ amavisd-new-2.6.4/debian/amavisd-new.manpages
@@ -0,0 +1,2 @@
+debian/amavisd-new.8
+debian/amavisd-new-cronjob.8
--- amavisd-new-2.6.4.orig/debian/compat
+++ amavisd-new-2.6.4/debian/compat
@@ -0,0 +1 @@
+5
--- amavisd-new-2.6.4.orig/debian/changelog
+++ amavisd-new-2.6.4/debian/changelog
@@ -0,0 +1,1475 @@
+amavisd-new (1:2.6.4-1~bpo50+1) lenny-backports; urgency=low
+
+  * Rebuild for lenny-backports.
+  * Depend on libcompress-zlib-perl 2.015-1~bpo50+1 for proper uncompress
+    support
+
+ -- Alexander Wirt <formorer@debian.org>  Tue, 18 Aug 2009 20:27:33 +0000
+
+amavisd-new (1:2.6.4-1) unstable; urgency=low
+
+  * New upstream release
+    - Fix bitdefender detection (Closes: #510985)
+    - allow customizing SMTP-status response reason 
+      text for blocked messages (Closes: #281752)
+  * Don't enable whitelists per default since sender can be forged
+  * Remove 90_fix_spamscanners (included upstream) 
+  * Bump standards version (no changes)
+  * Add missing ';' to example $myhostname definition
+  * Explicitly disable dkim to prevent a warning
+  * Depend on libmail-dkim-perl
+  * Remove versioned dependency on libcompress-zlib-perl
+    (now included in perl core)
+
+ -- Alexander Wirt <formorer@debian.org>  Fri, 03 Jul 2009 15:50:52 +0200
+
+amavisd-new (1:2.6.3-3) unstable; urgency=low
+
+  * Fix socketpath for clamav in 15-avscanners
+
+ -- Alexander Wirt <formorer@debian.org>  Sat, 23 May 2009 12:14:44 +0200
+
+amavisd-new (1:2.6.3-2) unstable; urgency=low
+
+  * Don't fail if antispamcode is deactived and spamassassin is not installed
+    (Closes: #526529)
+  * Fix spamscanner definitions for secondary spamscanners. 
+  * Bump standards version (no changeŃ• needed)  
+
+ -- Alexander Wirt <formorer@debian.org>  Sat, 23 May 2009 11:34:09 +0200
+
+amavisd-new (1:2.6.3-1) unstable; urgency=low
+
+  * New upstream version (Closes: #525375)
+    - Fixes <> handling in notification mails (Closes: 522250)
+  * Call amavis cronjob with a shell (Closes: #389871)
+  * Add spanish translation (Closes: #518277). Thanks to 
+    Francisco Javier Cuadrado for the translation.
+  * Fix misleading comments in 15-content_filter_mode (Closes: #471796)
+  * Bump standards version (no changes)
+
+ -- Alexander Wirt <formorer@debian.org>  Fri, 24 Apr 2009 09:40:23 +0200
+
+amavisd-new (1:2.6.2-2) unstable; urgency=medium
+
+  * Update antivirusscanner definitions. This is security relevant since
+    some scanners may not work properly anymore without the update. 
+    (Closes: #518524)
+
+ -- Alexander Wirt <formorer@debian.org>  Fri, 06 Mar 2009 22:10:30 +0100
+
+amavisd-new (1:2.6.2-1) unstable; urgency=low
+
+  * Fix DB Home for amavisd-nanny (Closes: #496599)
+  * Remove amavis user and group on purge (Closes: #495629)
+  * Update en_US templates (Closes: #496955) 
+  * New upstream version 
+      - No longer ships rfc4871
+      - Tested which 5.10.0. Notifications should now work as expected 
+        (Closes: #484625)
+      - Fixes bracket handling in macros (Closes: #507571)
+  * Update en_US templates (Closes: #496955)
+  * Make cronjob really, really silent (at least I hope so :)) 
+    	(Closes: #447040, #386366)
+  * Update logcheck rules (Closes: #498659)
+  * Add application/x-zip-compressed to banned examples (Closes: #481935)
+  * Depend on pax (Closes: #517156)
+  * Add p7zip, unrar-free and rpm to suggests (Closes: #511226)
+  * Add unrar-free to 01-debian (Closes: #442010) 
+  * Adjust the clsiŃ• regex to not ban valid files like {clsid}.ext 
+    (Closes: #503047)
+
+ -- Alexander Wirt <formorer@debian.org>  Mon, 02 Mar 2009 22:20:39 +0100
+
+amavisd-new (1:2.6.1.dfsg-2) unstable; urgency=low
+
+  [ Christian Perrier ]
+  * Fix pending l10n bugs. Debconf translations:
+  * Brazilian Portuguese. Closes: #487417
+  * Swedish. Closes: #498814
+  * Basque. Closes: #498873
+
+ -- Alexander Wirt <formorer@debian.org>  Sat, 27 Sep 2008 09:27:55 +0200
+
+amavisd-new (1:2.6.1.dfsg-1) unstable; urgency=low
+
+  * New upstream release 
+  * Add libmail-dkim-perl (>= 0.31) to suggests (Closes: #487111)
+  * Fix socketpath in amavisd-release (Closes: #467189)
+  * Fix TLD check according to rfc2181 (Closes: #463587)
+  * Clarify FQDN errormessage (Closes: #451804) 
+
+ -- Alexander Wirt <formorer@debian.org>  Thu, 24 Jul 2008 20:56:32 +0200
+
+amavisd-new (1:2.6.0.dfsg-2) unstable; urgency=low
+
+  * Remove rfc4871 from upstream tarball (Closes: #484881)
+  * Replace lib-mime-perl with lib-mime-tools-perl 
+  * Bump standards version (No Changes)
+
+ -- Alexander Wirt <formorer@debian.org>  Wed, 02 Jul 2008 22:30:43 +0200
+
+amavisd-new (1:2.6.0-1) unstable; urgency=low
+
+  * New upstream version 
+  * Updated debconf translations:
+    - German. Closes: #448244
+    - Finnish. Closes: #480503
+    - Italian. Closes: #480508
+    - Russian. Closes: #480622
+    - Basque. Closes: #481550
+    Thanks to all translators and Christian Perrier for their work. 
+
+ -- Alexander Wirt <formorer@debian.org>  Tue, 20 May 2008 18:57:16 +0200
+
+amavisd-new (1:2.5.3-1) unstable; urgency=low
+
+  * Enable quarantine hashing (Closes: #447240)
+  * Updated CLEAN logcheck rule (Closes: #450928, #451094). 
+    Thanks to Andrew Gallagher for the patch. 
+  * Bump standards version
+
+ -- Alexander Wirt <formorer@debian.org>  Thu, 20 Dec 2007 13:54:21 +0100
+
+amavisd-new (1:2.5.2-2) unstable; urgency=low
+
+  *  Make milter tempdir group writeable (Closes: #442372)
+  *  Remove amavisd.conf from /etc - thanks to Piotr Szotkowski for reporting 
+  *  Add japanese translation - thanks to Kenshi Muto for providing 
+     (Closes: #446589)
+
+ -- Alexander Wirt <formorer@debian.org>  Mon, 08 Oct 2007 10:27:14 +0200
+
+amavisd-new (1:2.5.2-1) experimental; urgency=low
+
+  * New upstream release (Closes: #427337, #434533)
+  * Don't remove the amavisd user (Closes: #431853)
+  * Fix unix socket path in /etc/amavis/conf.d/25-amavis_helpers
+    (Closes: #406998)
+  * Disable non-free unpackers (Closes: #410588)
+  * Add myself to uploaders 
+  * Instead of interrupting the upgrade process if starting/stopping
+    amavisd-new just warn (Closes: #430028) 
+  * Add suggestion to dspam (Closes: #423737)
+  * Add dutch po files (Closes: #413886)
+  * Add galician po file (Closes: #413459)
+  * Fix typos in debian configs (Closes: #414421)
+  * Fix comment for the X_HEADER_LINE option (Closes: #433268)
+  * Conflict against older versions of logcheck since we track logcheck files
+    now. 
+  * Update logcheck rules (Closes: #406613, #406854, #409053)
+
+ -- Alexander Wirt <formorer@debian.org>  Wed, 05 Sep 2007 10:05:05 +0200
+
+amavisd-new (1:2.4.3-1) unstable; urgency=low
+
+  * New upstream source
+  * ACK NMU: closes: #390391
+  * Switch to debhelper v5
+    + debian/control: build-depend on debhelper >= 5
+    + debian/compat: add, mode v5
+    + debian/rules: drop DH_COMPAT
+  * Switch packaging to use dpatch for all changes
+    + debian/control: build-depend on dpatch >=2, and new-enough patch for
+      "patch -U"
+    + debian/rules: convert to dpatch mechanics
+    + 20_safe_path_at_init (split from amavisd): Set safe PATH before loading
+      and running config scripts
+    + 30_conf.d_support_builtin (split from amavisd): Support out-of-the-box
+      Debian-style conf.d dirs without the need of any hackery on the main
+      config file
+    + 40_fix_paths (split from amavisd-agent, amavisd-nanny, amavisd-release
+      README_FILES/README.chroot, README_FILES/README.old.scanners,
+      README_FILES/README.performance, README_FILES/README.sendmail,
+      README_FILES/README.sendmail-dual): Correct refrences to paths that
+      are different in Debian
+    + 45_misc_doc_chages (split from amavisd.conf-default,
+      README_FILES/README.courier, README_FILES/README.exim_v3,
+      README_FILES/README.milter): miscellaneous doc updates for Debian
+    + 50_amavis-milter_pidfile_support (split from helper-progs/
+      amavis-milter.c): proper pidfile support for amavis-milter
+    + 55_helper-progs_build_fixes (split from helper-progs/Makefile.in,
+      helper-progs/configure.in): misc build fixes for helper-progs/
+  * build-depend on autoconf2.13 because of helper-progs/ (YUCK!)
+  * autotool helper-progs/ at build-time, for now
+  * debian/control: build-depend on dpkg-dev >= 1.13.19, and change to
+    binNMU-friendly dependencies in amavisd-new-milter
+  * debian/control: add po-debconf build-dependency, thanks Lintian!
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Sat,  4 Nov 2006 01:40:27 -0300
+
+amavisd-new (1:2.4.2-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use $(CURDIR) instead of $(PWD) in debian/rules (closes: #390391).
+
+ -- martin f. krafft <madduck@debian.org>  Sat,  7 Oct 2006 17:47:58 +0200
+
+amavisd-new (1:2.4.2-1) unstable; urgency=low
+
+  * New upstream version:
+    + new feature: "pen pals soft-whitelisting" lowers spam score of
+      received replies to a message previously sent by a local user to this
+      address
+    + new features: added command line options to override certain
+      configuration settings from a config file
+    + documentation bug fixes, specially on the use of SQL data type
+      TIMESTAMP
+    + zoo decoder interface routine can now use utility unzoo(1) or
+      zoo(1)
+    + LDAP schema change: amavisSpamSubjectTag renamed to
+      amavisSpamQuarantineCutoffLevel
+    + Many bug fixes, including:
+      + Issue fixed: a message with only a header, without empty
+        separator line and with no body, lost the last line of a header on
+        forwarding or writing to quarantine (closes: #373206)
+      + use stricter suggested regular expression in amavisd.conf for
+        matching CLSID (Class ID extension); previous expression was loose
+        and too easily matched file names with braces in the name
+        (closes: #373159)
+  * NEWS.Debian: make it even more clear to whom the incompatible changes
+    apply, and point user to the upstream documentation about it instead of
+    describing the incompatible changes.  Apply NEWS blurb to 1:2.4.2-1, so
+    that it is shown again to the users (closes: #373136)
+  * conf.d/25-amavis_helpers: (brown paperback bug): fix location of control
+    socket
+  * New amavisd-new-cronjob script (with manpage) to encapsulate cronjobs
+  * amavisd-new.cron.d, amavisd-new.cron.daily: use the new
+    amavisd-new-cronjob script to perform maintenance actions
+    (closes: #381243)
+  * debian/logcheck.ignore: add ignore rule for non-free unpackers
+    (closes: #376465)
+  * etc/conf.d/20-debian_defaults: update black/whitelist from new upstream
+    defaults
+  * Apply patch from upstream to fix backscatter with LMTP
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Thu, 10 Aug 2006 16:26:44 -0300
+
+amavisd-new (1:2.4.1-1) unstable; urgency=low
+
+  * New upstream source
+    + Courier patch requires Net::Server 0.90 or later (not used in Debian
+      by default)
+    + Fixed many bugs
+    + Address extension is back to 2.3.3 semanthics (done at tag2_level)
+    + Fixed error handling during temporary directory cleanups
+    + Added config variables: @spam_subject_tag3_maps, @spam_tag3_level_maps
+      (and $sa_tag3_level_deflt), see upstream documentation for specifics
+    + Added LDAP attributes: amavisSpamSubjectTag, amavisSpamSubjectTag2,
+      amavisSpamDsnCutoffLevel, amavisSpamQuarantineCutoffLevel
+    + Changed notification templates in an incompatible way with 2.4.0
+      (still compatible to 2.3.3 and older): major contents category numbers
+      are renumbered due to a newly inserted category CC_SPAMMY; it affects
+      the use of macro ccat_maj in templates
+    + Storing mail in BSMTP format now saves DSN information, as permitted
+      by RFC 2442
+    + Apply the concept of separate timers $child_timeout and $smtpd_timeout
+      as used in a SMTP session to AM.PDP, AM.CL protocols and Courier patch
+    + New macros: remote_mta, smtp_response, remote_mta_smtp_response
+      and score_boost available to log and notification templates
+    + Enhanced regexp selector macro [~string|regexp|then|else], and
+      iterator macro.  Extended the semantics of the regexp selector macro
+    + Make use of the new macro remote_mta_smtp_response and add it to
+      a default $log_templ, so that a Postfix queue-id of a forwarded
+      message shows up like 'queued_as: DCF2A17B9E4' in the main log entry
+    + sophos_savi_internal (SAVI module): don't include errno ($!) in the
+      error message
+  * Bump standards version to 3.7.2 (no changes required)
+  * Add small debian/extract-upstream-en_US-templates.pl to help manual
+    update of debian/etc/en_US/, add update-templates-from-upstream target
+    to debian/rules
+  * amavisd-new.postinst: abort configuration if the amavis user has an
+    invalid home directory, and tell the local admin to fix the mess
+    as we cannot do it safely by ourselves (closes: #367807)
+  * conf.d/25-amavis_helpers (add): configure an unix socket by default,
+    for the amavis-release helper (closes: #372122)
+  * amavisd-release: modify default socket location to Debian's
+  * amavisd-new.NEWS: note upstream incompatible changes from RELEASE_NOTES
+    for version 2.4.1
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Sun, 11 Jun 2006 16:21:16 -0300
+
+amavisd-new (1:2.4.0-1) unstable; urgency=low
+
+  * New upstream source (closes: #284491)
+    + Support DSNs: RFC 3461, RFC 3462, RFC 3464
+    + Prepend headers always, so we do not break header signatures
+      like DomainKeys
+    + Configuration variables can be chosen based on mail contents
+      category, which is now represented explicitly
+    + Enhanced the built-in macro expander with new macros and call
+    + Compatibility with Net::Server 0.91 and later
+    + Many incompatible changes in the SQL interface, read the docs
+  * Add patch from upstream, sent to amavis-user mailinglist, to perform
+    defanging and spam address extension additions in tag2_level as well
+    as kill_level
+  * Fix helper-progs/Makefile.in now that we do not link
+    amavis-milter.c anymore
+  * Revert to upstream header-folding code for this release
+  * Ship amavis helpers as well (closes: #356953)
+  * Ship p0f-analyzer.pl, but rename it to just p0f-analyzer due to policy
+  * Fix clean target to get rid of cruft in helper-progs/
+  * Do the debconf postrm routine by ourselves, as dh_installdebconf writes
+    unsuitable code for our needs (closes: #362952)
+  * [l10n] Add debconf template for: pt, and fix the package name inside
+    the pt.po file while at it.  Thanks to Miguel Figueiredo
+    <elmig@debianpt.org> (closes: #362802)
+  * Version libnet-ldap-perl suggestion to 0.32 or above and libdbi-perl to
+    1.43 or above, as required by amavisd-new 2.4.0
+  * conf.d/15-av_scanners: update to new upstream
+  * conf.d/20-debian_defaults: update to new syslog facility/priority
+    variables
+  * etc/en_US templates: updated to match new upstream templates
+  * Depend on non-broken libmime-perl (must be >= 5.417, but not 5.419)
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Tue, 18 Apr 2006 17:59:58 -0300
+
+amavisd-new (1:2.3.3-8) unstable; urgency=low
+
+  * Update amavisd-new.cron.daily to be compatible with new su
+    (closes: #360567, #358993)
+  * [l10n] Add Czech (cs) debconf template, thanks to : Miroslav Kure
+    <kurem@upcase.inf.upol.cz> (closes: #358844)
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Tue,  4 Apr 2006 10:39:04 -0300
+
+amavisd-new (1:2.3.3-7) unstable; urgency=low
+
+  * README.Debian: Be more explicit about what needs to be done to correctly
+    interface with a clamav daemon (closes: #353383)
+  * [l10n] Add Debconf template for: fr (closes: #353056)
+  * amavisd: prefix continuated syslog messages with (!!) or (!) depending
+    on level (warning or worse)
+  * logcheck.ignore: filter off all continuated syslog messages as long as
+    they don't have a priority prefix (closes: #341957)
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Sat, 25 Feb 2006 12:58:37 -0300
+
+amavisd-new (1:2.3.3-6) unstable; urgency=low
+
+  * The "I should have waited 12h more to release 2.3.3-5" release
+  * conf.d/20-debian_defaults: use "virusmails" as the quarantine directory,
+    fixing this to use "quarantine" is extremely non-trivial in the
+    packaging (but easy for the local admin) due to packaging issues
+    (closes: #350917)
+  * README.Debian: reword recommendation to disable bayes_auto_expire in
+    spamassassin config files, this closes: #295498 once again; Fix some
+    typos (closes: #350955)
+  * Match file(1) output in case-insensitive mode for most long strings,
+    and update Microsoft Cabinet match string (closes: #350962)
+  * NEWS.Debian: call attention to the left-over quarantine file (caused
+    by the #350917 fix described above)
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Fri,  3 Feb 2006 11:18:25 -0200
+
+amavisd-new (1:2.3.3-5) unstable; urgency=low
+
+  * Enable debconf for postinst:
+    * debian/control: Build-Depends on debhelper >= 4.1.16 (po-debconf)
+    * debian/rules: enable dh_installdebconf; call debconf-updatepo on clean
+      target
+    * amavisd-new.templates: (new) debconf note for incompatible config
+      files in the system, with a much better (and lengthy) explanation of
+      what is happening (closes: #350144)
+    * po/*: (new) debconf l18n support stuff for po-debconf
+    * amavisd-new.postinst: use debconf to warn of outdated config files
+  * Modify amavisd-new to process the Debian conf.d structure by its own
+    when no config files are specified (closes: #350348)
+  * amavisd-new.init: Improve initscript handling of outdated config files:
+    be very terse and tell the user to go read the documentation;  Use the
+    new conf.d support in amavisd-new instead of doing it by hand
+  * amavisd-new.README.Debian: mention the .disabled config stuff
+  * Add lintian overrides for debconf warnings that are not valid for this
+    package
+  * amavisd-new.NEWS: mention new conf.d support in amavisd-new binary
+  * conf.d/01-debian, conf.d/20-debian_defaults: fix pointer to
+    documentation
+  * conf.d/20-debian_defaults: remove comments that lead people to believe
+    we'd ever place all commonly modified settings for amavisd-new in there
+    (see #350142...);  Add note explaining that we set all viruses to "fakes
+    sender mode", except for the EICAR test pattern
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Wed,  1 Feb 2006 12:12:00 -0200
+
+amavisd-new (1:2.3.3-4) unstable; urgency=low
+
+  [ Henrique de Moraes Holschuh ]
+  * Patch from upstream: fix unsecure handling of
+    $spam_quarantine_method = 'bsmtp:spam-%m-%s'
+  * Patch from upstream: add hability to detect WMF (Windows MetaFile)
+    attachments from the output of the file(1) utility
+  * debian/control: bump up versioned dependencies to those required by
+    amavisd-new 2.3.3 (oops!) (closes: #348439)
+    * libarchive-zip-perl >= 1.14
+    * libcompress-zlib-perl >= 1.35
+    * libmime-perl >= 5.417
+  * debian/amavisd-new.8:
+    * remove repeated description of "debug"
+    * mention that "reload" could be in fact a restart
+  * amavisd-new.init:
+    * amavisd-new does not support reloading anymore(!),
+      so remove the reload initscript action (closes: #255376)
+    * improve message when old config files present
+    * minor code cleanups
+    * be silent while cleaning up left-over tmp directories
+  * conf.d/05-node_id: move $mydomain functionality to 05-domain_id
+  * conf.d/05-domain_id (new):
+    * move $mydomain functionality previously in 05-node_id here
+    * amavisd-new must also know the local domains, or a lot of
+      functionality gets disabled.  Add a default to $mydomain
+      through @local_domains_acl (closes: #348990)
+  * conf.d/20-debian_defaults: Add (commented out) entries for WMF
+    matching
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Sat, 21 Jan 2006 15:31:09 -0200
+
+amavisd-new (1:2.3.3-3) unstable; urgency=low
+
+  [ Henrique de Moraes Holschuh ]
+  * Suggest spamassassin 3.1.0a or newer
+  * Do not direct stderr to /dev/null in cron scripts, now that sa 3.1.0a is
+    available in unstable (closes: #283027)
+  * README.Debian: document that using "bayes_auto_expire" for spamassassin
+    config when using amavisd-new is not a very good idea (closes: #295498);
+    Reformat and add section headers while at it
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Sun, 15 Jan 2006 13:58:01 -0200
+
+amavisd-new (1:2.3.3-2) unstable; urgency=low
+
+  * The "A Xmas minor miracle" release
+
+  [ Ondrej Sury ]
+  * Version dependency on libconvert-uulib-perl to >= 1.0.5, for backports
+
+  [ Henrique de Moraes Holschuh ]
+  * Rework of the split config file system:
+    * Move non-etc conf.d files to debian/conf
+    * (ro)00-upstream: deleted: Stop shipping amavisd.conf-defaults as a
+      read-only conf.d file.  Ship it as an example, instead
+    * (ro)10-debian: split split into (ro)10-debian_scripts and
+      (ro)20_package
+    * (ro)10-debian: prunned: Move all changeable settings out of
+      (ro)10-debian and split into (rw)01-debian, (rw)15-av_scanner,
+      (rw)20-debian_default.  Prune out most of them.
+    * (rw)15-content_filter_mode: added: Make it easy for the user to
+      re-enable spam checking and antivirus checking
+    * (rw)05-node_id: add: Autodetect $myhostname (from hostname --fqdn) and
+      $mydomain (from /etc/mailname)
+    * (rw)30-template_localization: add:  Add example for the user on how to
+      read a l10n template set
+  * Ship upstream example configuration as an example
+  * Suggest cabextract too, since amavisd-new can use it
+  * Kill all postinst stuff related to myhostname and mydomain
+  * Add new "debug" and "debug-sa" actions to initscript, and update
+    README.Debian accordingly to suggest their use
+  * Add check in initscript to avoid starting an unconfigured amavisd-new
+    when upgrading from a previous version
+  * Remove old safe_encode kludge, perl now doesn't lock up on tainted utf8
+    string processing, nor does it lose track of encodings anymore
+  * [l10n] Update etc/amavis/en_US messages with the upstream templates for
+    2.3.3
+  * [l10n] Delete other localized templates, as they are much too outdated.
+    New translations are very welcome.
+  * Add postinst code to handle l10n template conffile/confdir removal,
+    since dpkg does not delete conffiles removed by the package: move old
+    templates already installed to <template>.outdated_by_2.3.3-2
+  * Bump standards-version to 3.6.2, no changes
+  * Updated copyright file
+  * Update the template's README.l10n to remove perl 5.6 notes (we only
+    support 5.8 now), and add some more information
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Tue, 27 Dec 2005 13:41:18 -0200
+
+amavisd-new (1:2.3.3-1) experimental; urgency=medium
+
+  * New upstream source
+    * Besides fixing known problems and providing some optimizations, no new
+      features were added.  If using SpamAssassin older than 3.1, an upgrade
+      of either SA to 3.1, or an upgrade of amavisd-new to 2.3.3 is
+      recommended
+  * Henrique de Moraes Holschuh:
+    * Restore README_FILES/README.chroot to upstream, but add a warning
+      about Debian paths being different.  I am tired of always updating
+      this file as it still always ends up subtly wrong for Debian anyway
+    * amavisd-new.NEWS: Update for 2.3.3, trim down stuff refering to
+      packages older than the ones in sarge
+    * Update manpage for 2.3.3
+    * amavisd-new.init: Unbreak initscript restart/stop actions
+    * Fix conffile support for /etc/amavis/conf.d/30-user, remove it
+      from /usr/share/doc/amavisd-new/examples
+    * Do not ship the (empty) /var/lib/amavis tree inside the .deb anymore.
+      Instead, create it in postinst
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Fri, 21 Oct 2005 00:21:09 -0200
+
+amavisd-new (1:2.3.2-2) experimental; urgency=low
+
+  * Fix path to clamav socket in Debian config.
+  * Add french templates. Closes: #316105.
+
+ -- Brian May <bam@debian.org>  Thu,  7 Jul 2005 16:13:51 +1000
+
+amavisd-new (1:2.3.2-1) experimental; urgency=low
+
+  * New upstream source.
+    * Adds %c macro and gives terse log messages (closes: #193364)
+    * [fixed in 2.3.0]: Allows proper handling of 4xx status when LMTP 
+      is used, there is no way to fix this for SMTP (protocol limitations)
+      (closes: #211740)
+    * Never "preserve-evidence" when file or size limits are exceeded
+      (closes: #236482)
+  * Remove support for /etc/amavis/amavisd-all.conf.
+  * Use multiple -c parameters instead, this was the approach preferred by
+    upstream.
+  * Running amavisd by hand won't work unless you pass all the -c parameters
+    by hand too.
+
+ -- Brian May <bam@debian.org>  Wed,  6 Jul 2005 16:25:27 +1000
+
+amavisd-new (1:2.2.1-3) experimental; urgency=low
+
+  * Include JpegTester.pm.
+  * Move constant config files to /usr/share/amavis.
+  * Simplify Debian config file.
+
+ -- Brian May <bam@debian.org>  Fri, 20 May 2005 16:46:01 +1000
+
+amavisd-new (1:2.2.1-2) experimental; urgency=low
+
+  * Add "--quiet" to adduser and addgroup calls. Closes #305603.
+  * Make $mydomain normal variable. Still need long term solution, as this
+    variable is referenced by other variables which will be wrong.
+  * Make amavisd-all.conf default hardcoded configuration, this
+    allows running by amavisd-new by hand (note: this file
+    is automatically generated by init.d script and could still
+    cause confusion).
+  * Replace --rebuild with --sync in cron jobs. Closes: #305711.
+
+ -- Brian May <bam@debian.org>  Mon, 25 Apr 2005 16:12:48 +1000
+
+amavisd-new (1:2.2.1-1) experimental; urgency=low
+
+  * NEW STABLE UPSTREAM BRANCH (amavisd-new 2.2.1);
+    WARNING: you will have to upgrade your configuration manually
+  * Henrique de Moraes Holschuh <hmh@debian.org>:
+    * Merged in new upstream stable branch (amavisd-new 2.2.1)
+      + Closes: #263550.
+      + Require new patched libmime-perl (>> 5.411-2)
+      + Add minimum requirements just in case: libarchive-zip-perl (>=
+        1.09), libmailtools-perl (>= 1.58)
+      + Require known-good libnet-perl (>= 1:1.16)
+      + New dependency: libio-stringy-perl
+      + New dependency: libberkeleydb-perl
+      + Suggests libnet-ldap-perl, libauthen-sasl-perl for better
+        functionality (LDAP lookups and authenticated SMTP/LMTP)
+      + SQL lookups require perl DBI and DBD support, add at least
+        libdbi-perl to suggests as a hint to the user
+    * Added NEWS.Debian material about the new version and the
+      resulting configuration file breakage
+    * Rework package description to stop egging amavis-ng (it is much
+      better now than what it once was).  Bring package description in-line
+      with what the other amavis packages are doing.
+    * Ship amavisd-agent as an example in /usr/share/doc/amavisd-new
+  * Brian May <bam@debian.org>:
+    * New configuration system.
+      + Local changes seperated (closes: #199826).
+
+ -- Brian May <bam@debian.org>  Sat, 16 Apr 2005 12:53:26 +1000
+
+amavisd-new (20030616p10-5) unstable; urgency=high
+
+  Henrique de Moraes Holschuh <hmh@debian.org>:
+    * Fix su invocation on cron.daily script.  Why can't su have a less
+      braindead command line interface? (closes: #281931)
+    * Let message/external-body through.  I just hope that no Micosoftland
+      trash will auto-run, auto-process, auto-overwrite files and otherwise
+      endanger the sanity of a Unix sysadmin out there because of this...
+      (closes: #274940)
+    * Backport a few improvements for spamassassin 3.0 from amavisd-new 2.x
+    * Patch from Mark Martinec <Mark.Martinec@ijs.si> (upstream):
+      patch against amavisd-new-20030616-p10 required to detect some
+      password-protected RAR archives as ***UNCHECKED***
+      (There are viruses using encripted RAR files as a carrier on
+      the wild)
+    * Suggest using only "undef" for false, but I cannot duplicate the
+      problem with sid's perl (closes: #269449)
+    * Add watch file
+    * Let start-stop-daemon stderr show up on initscript output
+      (closes: #278399)
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Tue, 30 Nov 2004 23:49:21 -0200
+
+amavisd-new (20030616p10-4) unstable; urgency=high
+
+  Henrique de Moraes Holschuh <hmh@debian.org>:
+    * Backport do_ascii fixes from 2.1.1.  This makes sure we call
+      Convert::UUlib::CleanUp() no matter what, to avoid empty temporary
+      files clogging up on ${TMPDIR} when UUlib fails for some reason (which
+      is quite common unfortunately).  This patch may also avoid leaking
+      UUlib state for the next decode, but whether this actually can happen
+      is unclear (since we call UUlib::Initialise all the time).
+      I have kept the backport to the minimum, so the stat -> lstat change 
+      from 2.1.1 was not backported.
+    * Add workaround for when Convert::UUlib fails to decode something that
+      it thought it could (such as a procmail recipe!).  Now, do_ascii will
+      create an empty file as a placeholder for the non-decoded part.  This
+      deals with #268100, but it is not clear to me who is at fault here, so
+      I am not reassigning the bug back from libconvert-uulib-perl, nor
+      closing it yet.
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Sun, 29 Aug 2004 13:09:54 -0300
+
+amavisd-new (20030616p10-3) unstable; urgency=medium
+
+  * The fix for #234934 proved beyond a shade of doubt that our perl 5.8.4-2
+    is buggy.  Rework that fix to untaint the string, otherwise perl loops
+    around eating up memory forever.
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Mon,  2 Aug 2004 14:04:31 -0300
+
+amavisd-new (20030616p10-2) unstable; urgency=medium
+
+  * Henrique de Moraes Holschuh <hmh@debian.org>:
+    * New Italian translations, thanks to Cristian Mezzetti
+      <cristian@students.cs.unibo.it> (closes: #261968);
+    * Mention LDAP schema location in README.Debian.  As for how to use
+      amavisd-new with LDAP, well, someone needs to write the docs, and send
+      them in ;-) (closes: #261691);
+    * Fix stupid locale-related bug in rfc2822 date generation, where we
+      were restoring the saved LC_TIME value to LC_CTYPE (!)
+    * Override LC_TIME to "C" on every log message, to work around issues
+      with Unix::Syslog (closes: #256248);
+    * Remove perl 5.8.0 taint+encode bug workaround in safe_encoding, it is
+      corrupting the encoded string (closes: #234934);
+    * Add clamav-daemon recommendations from NEWS.Debian to README.Debian
+      too.  I still want to find a way to get this thing to work out-of-
+      the-box;
+    * mlfi_abort is called every time something causes sendmail to stop a
+      delivery (such as a RSET in the ESMTP dialogue, or a dropped
+      connection).  This indicates no problem with amavisd-new-milter, and
+      such aborts are expected from time to time.  Therefore, log at the
+      debug level, and not as a warning (closes: #255203).
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Sat, 31 Jul 2004 21:08:01 -0300
+
+amavisd-new (20030616p10-1) unstable; urgency=low
+
+  * Henrique de Moraes Holschuh <hmh@debian.org>:
+    * New upstream source
+    * Update of de_DE templates, by Marc Schiffbauer
+      <marc@schiffbauer.net>
+    * amavisd.conf: Stop virus scan on first match instead of calling
+      all scanners regardless
+    * amavisd.conf: Block filenames containing { or } (Windows CLSID crap)
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Mon,  5 Jul 2004 12:12:08 -0300
+
+amavisd-new (20030616p9-1) unstable; urgency=medium
+
+  * A DebConf4 release, uploaded much later :)
+  * Henrique de Moraes Holschuh <hmh@debian.org>:
+    * New upstream source, includes compatibility to new SpamAssassin
+      (closes: #243434)
+    * Update amavis-milter.c with the one in the webpage, since it
+      has important fixes (and will be included in P10 when upstream
+      releases it)
+    * Initscripts: use --name and drop --exec, plus cosmetic fixes
+    * cron.daily: switch back to using su - amavis, since start-stop-daemon
+      --chuid does not initialize the environment completely (closes: #237043)
+    * Add de_DE l10n (closes: #235688)
+    * Add back pidfile control to amavisd-milter, thanks to Brian's patch
+      (closes: #241848)
+    * Document what to do to get the package to work right with clamav in
+      daemon mode, running as a non-priviledged user.  This is a partial
+      fix for #253231
+    * Bump standards-version to 3.6.1, no changes required
+  * Brian May <bam@debian.org>:
+    * Fix typo in README.Debian (closes: #244877)
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Fri, 11 Jun 2004 13:09:50 -0300
+
+amavisd-new (20030616p7-3) unstable; urgency=high
+
+  * Add patch from upstream to preserve entire original mail for virus
+    scanning, if "^MAIL$" is in $keep_decoded_original_re, and enable this in
+    the config file.  THIS IS REQUIRED TO STOP Worm.Bagle.F.
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Wed,  3 Mar 2004 11:27:34 -0300
+
+amavisd-new (20030616p7-2) unstable; urgency=low
+
+  * Henrique de Moraes Holschuh <hmh@debian.org>:
+    * Use the new default clamd socket location
+      (closes: #232047)
+    * Change initscripts to make sure amavis is very dead indeed when
+      we stop it, and to never cleanup() with it alive
+      (closes: #230062)
+    * Default virus destination is now D_DISCARD
+      (closes: #232052)
+    * Change default virus_admin to postmaster@$mydomain, due to
+      the new D_DISCARD default virus destination.  As a side-effect,
+      this (closes: #231046)
+    * Add note about the start links in README.courier
+      (closes: #230084)
+    * Avoid two more startup messages going into logckeck, thanks to
+      Craig small <csmall@debian.org> for the patch
+      (closes: #230481)
+    * Add NEWS.Debian, and update README.Debian warning users to read
+      the new file.  Add apt-listchanges to suggests for automatic
+      NEWS.Debian display
+  * 
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Mon, 23 Feb 2004 11:59:39 -0300
+
+amavisd-new (20030616p7-1) unstable; urgency=low
+
+  * Henrique de Moraes Holschuh <hmh@debian.org>:
+    * New upstream source (closes: #225734)
+      + Huge lot of changes, please see upstream's RELEASE_NOTES file
+      + Better Exim v3 docs (closes: #213422)
+    * Fix build stuff in helper-progs to use new auto*, and to do proper
+      cleanups
+    * Revert initscript to the one in 20030616p5-4, and change it so that
+      we do not compare the perl inode when killing amavis (use --startas
+      instead of --exec for start-stop-daemon).  This way, we are not going
+      to break anymore due to perl upgrades (closes: #226009)
+    * Update en_US templates to the new ones from upstream, but applying
+      s/WAS NOT delivered/WILL NOT BE delivered/
+    * Update copyright file to something that works as a copyright file
+
+ -- Brian May <bam@debian.org>  Mon,  2 Feb 2004 14:00:22 +1100
+
+amavisd-new (20030616p5-6) unstable; urgency=low
+
+  * Add --exec parameter back start-stop-daemon when starting amavisd- new
+    (closes #225614). The start-stop-daemon man page is wrong, it says --exec
+    is only used for checking the existing process.
+
+ -- Brian May <bam@debian.org>  Wed, 31 Dec 2003 20:38:32 +1100
+
+amavisd-new (20030616p5-5) unstable; urgency=low
+
+  * Remove --exec in init.d script so the stop operation will work even
+    if perl has been upgraded (closes: #225195).
+  * Add dumaru to viruses_that_fake_sender_re (closes: #212613).
+  * Remove MIMEDefang headers, too (closes: #215317).
+
+ -- Brian May <bam@debian.org>  Tue, 30 Dec 2003 13:34:33 +1100
+
+amavisd-new (20030616p5-4) unstable; urgency=low
+
+  * Henrique de Moraes Holschuh <hmh@debian.org>:
+    * Use find to kill directories, instead of rm -rf (closes: #216691).
+  * Brian May <bam@debian.org>:
+    * Add amavis as system group, not normal group (closes: #222556).
+    * Document how to enable spamassassin in README.Debian (closes: #213814).
+
+ -- Brian May <bam@debian.org>  Sat, 13 Dec 2003 15:09:04 +1100
+
+amavisd-new (20030616p5-3) unstable; urgency=low
+
+  * Add Gibe, Mimail and Swen to fake-sender viruses list
+    (really, you should just DISABLE the damn notifications... everyone would
+    be better off in the general case). This closes: #211729
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Mon, 22 Sep 2003 19:42:40 -0300
+
+amavisd-new (20030616p5-2) unstable; urgency=high
+
+  * Disable relayhost_is_client by default, and write a note about its
+    loglevel in amavisd.conf (closes: #207887)
+  * SECURITY FIX: Make sure we force directories and regular files to mode
+    0750 so that we can scan unreadable files.  Thanks to Tomasz Papszun
+    <tomek@lodz.tpsa.pl> for noticing this.
+  * Add example of correct domain lists when not using qw() (closes: #207927)
+  * Add -d to cpio invocation, as requested by upstream
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Tue,  9 Sep 2003 10:18:40 -0300
+
+amavisd-new (20030616p5-1) unstable; urgency=low
+
+  * New upstream version (closes: #207673)
+    * fix 'Modification of non-creatable array value attempted' bug when no
+      'Received' header field was present in an infected mail;
+    * caching of SQL lookups on white/blacklist was based on sender address
+      only, instead of sender _and_ recipient. This could lead to
+      white-/blacklisting of one recipient to affect other recipients of the
+      same message;
+    * more obvious logging of HOLD reason in sendmail/milter setup;
+    * $MAXLEVELS zero or undef should disable the limit according to docs, but
+      was not honoured;
+    * if notifications delivery encounters a temporary failure (4xx),
+      propagate this status to the final result instead of only logging a
+      warning;
+    * (amavisd.conf) VirusBuster entry changed to match newer version of the
+      product;
+    * another entry in amavisd.conf for KasperskyLab kavscanner (v4.5?)
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Sat, 30 Aug 2003 12:18:16 -0300
+
+amavisd-new (20030616p4-1) unstable; urgency=low
+
+  * New upstream version.
+    * Fix typo, closes: #199950.
+    * Add sobig.f into faking sender list, closes: #206630.
+    * revert to using alarm() instead of Time::HiRes::alarm()
+    * rise log level for log entries on intentional mail drops
+    * new log entries now say: '... Not sending DSN ...' and provide more
+      information on the reason for dropping DSN
+    * if sender is whitelisted, don't insert 'X-Spam-Flag: YES' header field,
+      don't append spam address extension, and don't quarantine
+      NOTE: the documentation still describes former behaviour
+    * report deaths of command line scanners and some external programs
+      distinctly from normal exits with nonzero exit status
+    * fix replacing * or {}/* in the pattern with actual file names
+    * stop the timer after SMTP transaction is over
+    * sub mail_via_smtp_single: properly report SMTP response code when all
+      recipients are rejected by MTA
+    * use SMTP response code 554 (instead of 550) for rejecting syntactically
+      invalid header (according to rfc2476)
+    * add am_id to SMTP response code generated by one_response_for_all()
+      to make it easier for MTA log to be correlated with amavisd-new log;
+      some cosmetic improvements in the generated SMTP response text
+    * added 'Return-Path:' in notifications to make it more obvious to see
+      envelope address from reports
+    * fix 'Message-ID:' in neutral DSN notifications being inadvertently
+      pushed into the DSN body
+    * report undefined spam score in X-Spam-Status header field as 'hits=-'
+      instead of 'hits=0.0', which can be misleading
+    * indicate blacklisting in X-Spam-Status header field of quarantined
+      messages
+    * add X-Envelope-From header field to quarantined messages
+    * added virus names: tanatos, lentin, bridex
+    * set environment variables LINES and COLUMNS to sensible defaults
+    * another attempt at fixing the Subject header field duplication
+    * rewritten 'Received' header fields parsing to better cope with valid,
+      as well as with more common cases of broken syntax; used when trying
+      to report originator IP address for believed-to-be-faked senders
+    * more permissive parsing of SMTP addresses and options on MAIL FROM
+      and RCPT TO commands
+    * 'neutral' (=space) field in SQL black/whitelists now terminates the
+       lookup
+    * $sa_mail_body_size_limit takes into account some portion of the mail
+      header size
+    * don't send recipient notifications to recipients that have
+      bypass_virus_checks/bypass_banned_checks
+    * fetch modules 'Net::Ping' and 'bytes', which seem to be needed in
+      certain chrooted setups
+    * change log level from 0 to 1 for the log entry 'BAD HEADER from',
+      closes: #204497.
+    * explicitly set pipes and sockets to binmode, as it a default sinc
+      Perl 5.8.1
+    * new file LDAP.schema
+    * updated README.chroot to tell that /dev/urandom is needed
+    * updated README.sendmail-dual
+  * Fix README.exim_v3 _a bit_.  This crap really needs updating.
+    And people wonder why I (hmh@d.o) want to kill all helpers, and support
+    SMTP-proxy mode only for amavisd-new... (closes: #203545)
+  * Add cron.d job, run every 3 hours, to rebuild SpamAssassin databases
+    (if spamassassin is installed) for the amavis user, and to force-expire
+    tokens once per day.  If you have more than one thread of amavisd-new
+    running, spamassassin really needs a rebuild often
+  * Add configurable spamassassin timeout (sa_timeout), and set it to 120s
+    instead of upstream default of 20s (which IS too small) (closes: #204101)
+  * Ship LDAP schema for amavis in /etc/ldap/schema/amavis.schema
+  * Add pidfile hack and syslog support for amavis-milter.c
+  * Add syslog support for amavis.c
+  * Improve header folding: it now uses tab (as everything else in the MTA
+    world) instead of spaces to indent lines
+  * Better Received: line creation in milter/amavis socket mode (if it is
+    enabled for whatever reason)
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Thu, 28 Aug 2003 19:02:16 -0300
+
+amavisd-new (20030616p3-1) unstable; urgency=high
+
+  * New upstream version (closes: #199947)
+    + Fixes LMTP delivery problem with fake-sender viruses (closes: #199479)
+    + Many documentation updates
+    + Some antivirus definition updates
+    + Huge lot of bugfixes (see RELEASE_NOTES)
+    + Much better behaviour when aborting SMTP sessions
+    + Work around several perl 5.8 bugs that allowed a few DoS attacks
+  * Update clam* package names in suggests:
+  * Add cpio to suggests, and when it is available, use it instead of
+    Archive::Tar to unpack tar files, to avoid loading the entire tar file
+    in memory(!)
+  * Add lzop to suggests, since we now support it
+  * Bumped standards version to 3.5.10, no changes needed
+  * Fix helper-progs to use amavis user (instead of amavisd)
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Sun,  6 Jul 2003 11:15:21 -0300
+
+amavisd-new (20030314p2-2) unstable; urgency=low
+
+  * amavisd: LDAP syntax error fix, added by request from Mark Martinec
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Mon, 12 May 2003 11:17:45 -0300
+
+amavisd-new (20030314p2-1) unstable; urgency=low
+
+  * New upstream source:
+    + fixed bug with blacklisted sender (closes: #190467)
+    + fix improper evaluation of bypass_spam_checks* in multi-recipient mail
+    + adding address extensions was not done for *_lovers
+    + rare duplication of Subject: fixed (closes: #190457)
+    + better ^From escaping in mbox files
+    + added paramater $notify_xmailer_header
+    + enable timeouts after SMTP connection has been established
+    + LDAP enhancement: allow "hostname" to be a string or a reference
+      to an array
+    + X-Spam-Status now says WHITELISTED if sender was whitelisted
+    + if mail rejection was due to sender blacklisting, say so in the SMTP
+      response
+    + amavisd.conf: removed option '-ni' in the DrWeb virus scanner entry
+    + amavisd.conf: added entry for 'MkS_Vir daemon'
+    + amavisd.conf: updated entry for 'F-Secure Antivirus' to cope with fsav
+      4.50
+  * ***Upstream now documents dual-sendmail setup***
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Sat, 10 May 2003 10:58:05 -0300
+
+amavisd-new (20030314p1-6) unstable; urgency=low
+
+  * Set local clamd socket to match Debian default (closes: #190079)
+  * Clean up /var/lib/amavis/tmp/amavis-* as well, if it exists; document
+    in config file that one might want to modify the initscript if one
+    changes $TEMPBASE
+  * Minor update to pt_BR l10n files, remove unneeded MIME stuff
+  * Make sure not to wipe the entire disk of someone whose amavis user
+    was created by *another package* with the homedir set to /.  Talk
+    about a very unwise homedir choice... (closes: #190427)
+  * Clean up old stuff on README.Debian about spamassassin <= 2.43
+  * Link /usr/share/doc/amavisd-new-milter to amavisd-new's doc dir
+  * rm -fr /etc/amavis on package purge, if it is a directory
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Thu, 24 Apr 2003 19:57:25 -0300
+
+amavisd-new (20030314p1-5) unstable; urgency=high
+
+  * New read_l10n_templates function to make it easy to have a directory of
+    templates with a common lang and charset.  This fixes the broken
+    semanthics in 20030314p1-4's amavisd.conf Thanks to Petr Vandrovec for a
+    much better charset file handling (closes: #189482)
+  * Rename our daemon to amavisd-new, to avoid initscript hassles with other
+    amavis packages.  This is a workaround for a Debian-wide problem, but it
+    at least fixes the issue for now (closes: #189566)
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Sun, 20 Apr 2003 10:12:32 -0300
+
+amavisd-new (20030314p1-4) unstable; urgency=high
+
+  * Heavy amavisd.conf work: merge in upstream changes, add l10n
+    charset conversion for sites that have perl 5.8
+  * Fix clean target for helper-progs
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Tue, 15 Apr 2003 07:57:02 -0300
+
+amavisd-new (20030314p1-3) unstable; urgency=low
+
+  * Complies to Debian policy 3.5.9 (no changes)
+  * Rework package descriptions a bit
+  * amavisd-new initscript supports reload
+  * Improved amavisd-new-milter initscript
+  * Rename Build-Depends-Indep to Build-Depends, closes: #187934.
+  * Fix typo in README.milter, closes: #188565.
+
+ -- Brian May <bam@debian.org>  Mon, 14 Apr 2003 11:52:05 +1000
+
+amavisd-new (20030314p1-2) unstable; urgency=low
+
+  * Modify README.milter to include required change to $unix_socketname
+    (closes: #187146).
+  * Specify in README.exim_v3 that amavisd-new-milter is required.
+    Closes: #187103.
+  * Hack at helper-progs so it no longer requires a MTA to be installed
+    (closes: #187641).
+
+ -- Brian May <bam@debian.org>  Sun,  6 Apr 2003 13:43:36 +1000
+
+amavisd-new (20030314p1-1) unstable; urgency=low
+
+  * New upstream version.
+  * Depends on libmime-base64-perl already in place, I must have
+    forgotten to close it (closes: #185469).
+  * Incorrect header generation should now be fixed, or so I have been told
+    (closes: #185718).
+  * Change default milter socket name to /var/lib/amavis/amavisd-new-milter.sock.
+  * Document amavisd-new-milter config changes in README.Debian.
+  * amavisd-new-milter now should work fine (closes: #185331).
+    (why didn't 20021227p2-9 auto close this bug?).
+
+ -- Brian May <bam@debian.org>  Thu, 27 Mar 2003 11:59:17 +1100
+
+amavisd-new (20021227p2-9) unstable; urgency=low
+
+  * Fix incorrect depends in amavisd-new-milter package.
+  * debian/rules now cleans helper-progs subdirectory.
+  * Turn of debug by default, the debug code was dodgy.
+  * Remove -p parameter, it didn't seem to do anything.
+  * Changes from 20021227p2-8 not yet in Debian:
+    Add dependancy on libmime-base64-perl required for testing (closes: #185469).
+    Add milter support (closes: #185331).
+  * Assume milter support is correct, as it installs OK on chroot;
+    however nobody seems to keen on testing it... (based on the number and
+    type of errors fixed from -8 to -9).
+
+ -- Brian May <bam@debian.org>  Mon, 24 Mar 2003 14:19:56 +1100
+
+amavisd-new (20021227p2-8) unstable; urgency=low
+
+  * Add dependancy on libmime-base64-perl, required for testing (closes: #185469).
+  * Add milter support (closes: #185331).
+
+ -- Brian May <bam@debian.org>  Sat, 22 Mar 2003 15:53:35 +1100
+
+amavisd-new (20021227p2-7) unstable; urgency=low
+
+  * Really disable Sophos sweep by default. Don't just alter
+  the disused config file.
+
+ -- Brian May <bam@debian.org>  Tue, 18 Mar 2003 15:41:40 +1100
+
+amavisd-new (20021227p2-6) unstable; urgency=low
+
+  * The Debian sweep package was mistaken for Sophos sweep. An
+    audio editor isn't much use as a virus scanner. Disable Sophos
+    by default. Closes: #184639.
+
+ -- Brian May <bam@debian.org>  Mon, 17 Mar 2003 12:19:24 +1100
+
+amavisd-new (20021227p2-5) unstable; urgency=low
+
+  * Tweak postinst a little so that we still try to warn users about a
+    non-system amavis user if adduser fails
+  * Set unarj unpack command to first try arj, then unarj.  Keep suggesting
+    only arj, since unarj is not in main
+  * Add back to logcheck ignore file a few error messages that are common to
+    the normal running of amavisd-new. logcheck is to trap unusual
+    circunstances.  It is a conffile, so if you don't want some lines, just
+    kill them and they will NOT be added back...  Brian is way too nice
+    sometimes :-)
+  * Fix logcheck.ignore entries that were missing the queue id (and thus would
+    never match), thanks to Martin F. Krafft for the heads-up
+  * I don't want to know how the submitter managed to lose the override, but
+    silent breakages are no fun anyway.  Bang out with an error message
+    instead (closes: #183421)
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Tue,  4 Mar 2003 23:12:12 -0300
+
+amavisd-new (20021227p2-4) unstable; urgency=low
+
+  * Fix upgrade from amavis-postfix, correct group should now be added
+    (closes: #182527).
+
+ -- Brian May <bam@debian.org>  Mon,  3 Mar 2003 15:31:44 +1100
+
+amavisd-new (20021227p2-3) unstable; urgency=low
+
+  * Replace suggests unarj with suggests arj - I have been told that arj
+    is command line compatable with unarj. closes: #182284.
+
+ -- Brian May <bam@debian.org>  Wed, 26 Feb 2003 09:31:24 +1100
+
+amavisd-new (20021227p2-2) unstable; urgency=low
+
+  * Fix logcheck entries (closes: #181414).
+
+ -- Brian May <bam@debian.org>  Tue, 18 Feb 2003 10:19:15 +1100
+
+amavisd-new (20021227p2-1) unstable; urgency=low
+
+  * The "Hey, I forgot to look at the BTS in p1-2" release
+  * New upstream patch "p2": fixes missing sender notification for banned
+    filenames, improves helper-progs configure/make, and adds minor tweaks to
+    SAVI-Perl interface and to amavisd.conf
+  * Uploaded to unstable, nobody complained about anything in experimental
+  * Since at least 20021227p1-2, we depend on libdisgest-md5-perl, this work
+    fine for both current unstable and stable, and that's all that matters
+    (closes: #178030)
+  * The new initscript from 20021227p1-2 fixed this issue (closes: #176624)
+  * We work fine without any AVs in upstream 20021227p1 (closes: #162273)
+  * We support only the Direct-MTA-Mode (SMTP/LMTP proxying) now (simpler, and
+    just as fast for anything but sendmail, which isn't fast anyway to begin
+    with -- switch to postfix or exim if you need speed).  SMTP proxy mode
+    shouldn't ever create looping bounces in non-broken configurations: You
+    should NOT pipe any locally-generated bounces through your content scanner
+    in the first place (trivial to do with postfix, I don't know about exim).
+    Also, there's no <<>> borkage in amavisd-new in proxy mode, since the
+    shell is not used anywhere.  Thus, I believe we can close the bug
+    (closes: #159042)
+  * This is the new upstream version (closes: #176859)
+  * Now you can properly configure amavis to REPLACE the address extension
+    instead of appending it, which will fix this issue (closes: #178613)
+  * Move regular do_ascii output to loglevel 4
+  * Rebuilt logcheck.ignore files with most of the level 0 messages, ignoring
+    those that are used only by the socket clients (closes: #176692)
+  * Reworked package description to reflect the fact that we are a SMTP
+    proxy, and don't support the non-SMTP clients anymore (support IS still
+    in the code, and will work if enabled)
+  * Install to debian/tmp and use dh_movefiles.  It is neater this way,
+    especially if building inside a CVS tree
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Wed,  5 Feb 2003 16:09:00 -0200
+
+amavisd-new (20021227p1-2) experimental; urgency=low
+
+  * Cleanup debian/* for lintian and linda-cleaness, and arch all
+  * Add myself to uploaders
+  * Spamassassin support is runtime-selectable, so now we ship with a default
+    "@bypass_spam_checks_acl = qw( . );" (i.e. disabled), and we can move
+    spamassassin to Suggests
+  * Move nomarch to Suggests, since all other unpackers are there
+  * Add libdigest-md5-perl to Depends: for better woody compatibility
+  * Switch to debhelper mode 4, since we have a initscript (invoke-rc.d)
+  * Rewrite most of the initscript so as to have it far more robust
+  * Rename init script to /etc/init.d/amavis
+  * Support ephemeral /var/run, do not ship /var/run/amavis in the deb anymore
+  * Rework postinst to be a bit more resilient on the adduser part, add
+    versioned dependency to adduser 3.34 or better
+  * Make postrm indepondent, by not failing if parts of what we want to remove
+    aren't there anymore
+  * Updated and modified package description a bit
+  * Wrote amavisd(8) manpage
+  * Moved config files to /etc/amavis/
+  * Easy-to-localize template system for the notifications,
+    in /etc/amavis/<lang>, using the new read_text support
+  * Add pt_BR localization
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Sun, 19 Jan 2003 21:53:59 -0200
+
+amavisd-new (20021227p1-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Brian May <bam@debian.org>  Tue,  7 Jan 2003 11:06:19 +1100
+
+amavisd-new (20021116-3) unstable; urgency=low
+
+  * Fix dependancy on libnet-perl.
+
+ -- Brian May <bam@debian.org>  Mon,  6 Jan 2003 10:57:14 +1100
+
+amavisd-new (20021116-2) unstable; urgency=low
+
+  * Use getent instead of id/grep to determine if user/group exists.
+  * Only delete amavis group if it still exists.
+
+ -- Brian May <bam@debian.org>  Sun,  5 Jan 2003 12:06:30 +1100
+
+amavisd-new (20021116-1) unstable; urgency=low
+
+  * New upstream version. Everything has changed and
+    is completely different, so BEWARE!
+  * Please read README.Debian if you haven't already done so.
+
+ -- Brian May <bam@debian.org>  Thu, 19 Dec 2002 15:52:27 +1100
+
+amavis (20020517-25) unstable; urgency=low
+
+  * Apply fix from upstream for new version of antivir (closes:
+    #166481).
+
+ -- Brian May <bam@debian.org>  Tue, 29 Oct 2002 09:22:26 +1100
+
+amavis (20020517-24) unstable; urgency=low
+
+  * Further rules to logcheck file.
+  * Don't add amavis user if it already exists (closes: #166190).
+
+ -- Brian May <bam@snoopy.apana.org.au>  Sun, 27 Oct 2002 10:28:01 +1100
+
+amavis (20020517-23) unstable; urgency=low
+
+  * Change /var/amavis to /var/lib/amavis in README.exim.old and
+    README.exim.older (closes: #164197).
+
+ -- Brian May <bam@snoopy.apana.org.au>  Fri, 11 Oct 2002 19:14:18 +1000
+
+amavis (20020517-22) unstable; urgency=low
+
+  * Include README.Debian in all packages.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Sun,  6 Oct 2002 12:57:34 +1000
+
+amavis (20020517-21) unstable; urgency=low
+
+  * Don't remove dpkg-statoverride settings except for on purge.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Fri,  4 Oct 2002 08:12:35 +1000
+
+amavis (20020517-20) unstable; urgency=low
+
+  * Only delete amavis user on purge.
+  * Only try to add alias entry once, not three times. Once is enough...
+  * Disable spam checking support, it was broken with perl 5.8 and
+  not recommended for use.
+  * Remove dependancy on razor (closes: #162798, #161832, #162310),
+  it was broken with the replacement of razor v1 in Debian with razor
+  v2.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Mon, 30 Sep 2002 13:40:37 +1000
+
+amavis (20020517-19) unstable; urgency=low
+
+  * Apply change from upstream which prevents passing spam on.
+  * Disable spamassassin support by default. Closes: #154886, #159958,
+    #160628.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Sat, 21 Sep 2002 11:37:14 +1000
+
+amavis (20020517-18) unstable; urgency=low
+
+  * Further refinements to logcheck file.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Tue,  3 Sep 2002 10:48:51 +1000
+
+amavis (20020517-17) unstable; urgency=low
+
+  * Add extra rules, as suggested by Russell Coker.
+  * Apply change from linio@asterix.wonder.pl for MkS_Vir.
+  * Include patch to allow encrypted files through Sophos. Patch by
+    Radu Greab <radu@netsoft.ro>, contributed by Ralf G. R. Bergs
+    <rabe@RWTH-Aachen.DE>. Patch has been included in upstreams source.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Fri, 30 Aug 2002 09:39:45 +1000
+
+amavis (20020517-16) unstable; urgency=low
+
+  * Move PID file to /var/run/amavis so it will get removed properly in
+    amavis-milter (closes: #156903).
+
+ -- Brian May <bam@snoopy.apana.org.au>  Tue, 20 Aug 2002 13:09:59 +1000
+
+amavis (20020517-15) unstable; urgency=low
+
+  * Fix REJECT handling in amavis-milter by applying patch from Evan
+    Harris <eharris@puremagic.com>.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Sat, 17 Aug 2002 14:12:48 +1000
+
+amavis (20020517-14) unstable; urgency=low
+
+  * Add fix suggested by Mark Martinec to get rid of these errors
+    (closes: #155589). The headers weren't getting passed in a spam
+    message was detected, so that entity was undefined.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Sat, 17 Aug 2002 13:51:06 +1000
+
+amavis (20020517-13) unstable; urgency=low
+
+  * Add required config change for exim 3.53 in README.exim.old (closes:
+    #155576).
+
+ -- Brian May <bam@snoopy.apana.org.au>  Thu,  8 Aug 2002 08:54:45 +1000
+
+amavis (20020517-12) unstable; urgency=low
+
+  * Hack in correct path to amavis-milter.sock in README.milter.
+  * Update website and authors in copyright file.
+  * Add nomarch support (closes: #155040). While upstream will eventually
+    make the change, we cannot yet use the latest upstream version until
+    Net::SMTP 2.24 is made available in Debian.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Tue,  6 Aug 2002 10:49:39 +1000
+
+amavis (20020517-11) unstable; urgency=low
+
+  * Added README.exim.old from old version of amavisd-new. I assume this
+    works, but it is no longer the recommended instructions from
+    upstream. It is required because exim in Debian unstable is old
+    (closes: #154318).
+
+ -- Brian May <bam@snoopy.apana.org.au>  Fri, 26 Jul 2002 16:49:57 +1000
+
+amavis (20020517-10) unstable; urgency=low
+
+  * Remove undeclared dependancy on unrar (closes: #154077).
+  * Disable arc,lha,unarj,unrar,zoo by default, as these are non-free.
+  * Fix name of PID file in init.d, postfix and exim.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Thu, 25 Jul 2002 10:38:20 +1000
+
+amavis (20020517-9) unstable; urgency=low
+
+  * Add ignore.d files (closes: #153513).
+  * Remove temp files when shutting down or restarting amavis.
+  * Move PID file and LOCK file into /var/run/amavis for exim and postfix
+    (not done for milter, as I cannot test it), as it looks cleaner.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Wed, 24 Jul 2002 09:56:29 +1000
+
+amavis (20020517-8) unstable; urgency=low
+
+  * Update README.Debian.
+  * Change version to 20020517 to make it clear that this is the
+    amavisd-new branch.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Wed, 17 Jul 2002 17:58:01 +1000
+
+amavis (0.3.12pre5.20020517-7) unstable; urgency=low
+
+  * Move recommends for non-free virus scanners to suggests, so package
+    can go into main. Ideally, these need to be replaced by DFSG
+    alternatives (eg. nomarch could be used for arc).
+
+ -- Brian May <bam@snoopy.apana.org.au>  Wed, 17 Jul 2002 10:36:42 +1000
+
+amavis (0.3.12pre5.20020517-6) unstable; urgency=low
+
+  * Fix Rx_tempdir error, by using /var/lib/ instead of /usr/../var/
+    everywhere (closes: #153110, #153011).
+  * Simplify changes from upstream.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Tue, 16 Jul 2002 13:36:30 +1000
+
+amavis (0.3.12pre5.20020517-5) unstable; urgency=low
+
+  * Add missing README files. Closes: #152894.
+  * Dont bounce SPAM to mailing lists. Closes: #152896.
+  * Previous bugs weren't closed: Closes: #152739, #152834.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Sun, 14 Jul 2002 13:44:37 +1000
+
+amavis (0.3.12pre5.20020517-4) unstable; urgency=low
+
+  * Add clam config to configuration file (closes: #152685).
+  * Add clam to amavisd again. Also add extra status
+   information to email, and disable razor checks (closes: #152726).
+  * Add missing build depends (closes #152739, #152834).
+
+ -- Brian May <bam@snoopy.apana.org.au>  Sat, 13 Jul 2002 09:54:12 +1000
+
+amavis (0.3.12pre5.20020517-3) unstable; urgency=low
+
+  * Add missing depends (closes: #152683).
+  * Move into main, as it no longer depends on other packages in contrib.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Fri, 12 Jul 2002 11:13:21 +1000
+
+amavis (0.3.12pre5.20020517-2) unstable; urgency=low
+
+  * Re-Create /var/lib/amavis directory, closes #152664.
+  * Add spamassassin and razor support. Closes: #151954.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Fri, 12 Jul 2002 09:32:09 +1000
+
+amavis (0.3.12pre5.20020517-1) unstable; urgency=low
+
+  * Update to amavisd-new 2002-05-17, hopefully this won't break
+      anything... Closes: #151954.
+  * Use automake maintainer mode.
+  * Create socket file under /var/run/amavis directly to let amavisd run
+      as non-root.
+  * Use /var instead of /usr/../var/ in paths. Closes: #151638.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Thu, 11 Jul 2002 17:37:13 +1000
+
+amavis (0.3.12pre5.20020421-10) unstable; urgency=low
+
+  * Use automake maintainer mode.
+  * Create socket file under /var/run/amavis directly to let amavisd run
+    as non-root.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Wed, 10 Jul 2002 14:38:51 +1000
+
+amavis (0.3.12pre5.20020421-9) unstable; urgency=low
+
+  * Messed up fix for bug #149501, try again.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Tue, 11 Jun 2002 14:16:01 +1000
+
+amavis (0.3.12pre5.20020421-8) unstable; urgency=low
+
+  * Exim version (Not tested).
+  * Fix clam bug (Closes: #149501).
+
+ -- Brian May <bam@snoopy.apana.org.au>  Wed, 22 May 2002 16:31:50 +1000
+
+amavis (0.3.12pre5.20020421-7) unstable; urgency=low
+
+  * Apply patch from Clint Adams <schizo@debian.org> that fixes the error
+    code.
+  * This version fully supports Clam Antivirus. When Clam is uploaded
+    to Debian, this package can go into main.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Fri, 17 May 2002 10:34:24 +1000
+
+amavis (0.3.12pre5.20020421-6) unstable; urgency=low
+
+  * Fix bugs in handling environment variables when introducing clamav
+    support.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Fri, 17 May 2002 09:43:00 +1000
+
+amavis (0.3.12pre5.20020421-5) unstable; urgency=low
+
+  * Add support for Clam Antivirus.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Tue, 14 May 2002 12:38:46 +1000
+
+amavis (0.3.12pre5.20020421-4) unstable; urgency=low
+
+  * Create /var/run/amavis in amavis-postfix.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Wed,  1 May 2002 09:42:29 +1000
+
+amavis (0.3.12pre5.20020421-3) unstable; urgency=low
+
+  * Move socket to /var/run.
+  * Add milter support.
+  * Change priority to extra, closes: #145068.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Tue, 30 Apr 2002 08:59:19 +1000
+
+amavis (0.3.12pre5.20020421-2) unstable; urgency=low
+
+  * Prevent autotools running; it seems to mess up; don't ask me why.
+    Closes: #144224.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Wed, 24 Apr 2002 09:54:59 +1000
+
+amavis (0.3.12pre5.20020421-1) unstable; urgency=low
+
+  * Fix description.
+  * Update to use amavis-new branch.
+  * Updated other CVS files to latest CVS version.
+  * Optimal postfix config has changed, see README.Debian.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Tue, 16 Apr 2002 10:14:55 +1000
+
+amavis (0.3.12pre5.20020310-5) unstable; urgency=low
+
+  * Add perl modules to build depends, as these are automatically
+    checked on build (closes: #140641).
+
+ -- Brian May <bam@snoopy.apana.org.au>  Mon,  1 Apr 2002 10:31:21 +1000
+
+amavis (0.3.12pre5.20020310-4) unstable; urgency=low
+
+  * Rename package to amavis-postfix.
+  * Will upload to Debian if no problems detected (closes: #121205).
+
+ -- Brian May <bam@snoopy.apana.org.au>  Sat, 16 Mar 2002 12:43:29 +1100
+
+amavis (0.3.12pre5.20020310-3) unstable; urgency=low
+
+  * Remove dependancies on non-free archivers.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Thu, 14 Mar 2002 10:29:52 +1100
+
+amavis (0.3.12pre5.20020310-2) unstable; urgency=low
+
+  * Configure in support for all scanners by default.
+  * Fix prestine source.
+  * Make /etc/amavisd.conf a conffile.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Tue, 12 Mar 2002 11:07:36 +1100
+
+amavis (0.3.12pre5.20020310-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Brian May <bam@snoopy.apana.org.au>  Fri,  8 Mar 2002 15:31:24 +1100
+
--- amavisd-new-2.6.4.orig/debian/rules
+++ amavisd-new-2.6.4/debian/rules
@@ -0,0 +1,186 @@
+#!/usr/bin/make -f
+# debian/rules file for amavisd-new 20021116 and newer
+# $Id: rules 1000 2006-11-04 04:35:10Z hmh $
+# GNU copyright 1997 to 1999 by Joey Hess.
+# GNU copyright 2003-2006 by Brian May and Henrique M. Holschuh
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+export DH_ALWAYS_EXCLUDE=CVS
+
+# Main package
+PACKAGE=amavisd-new
+
+# DPatch
+DEB_SOURCE_PACKAGE:=$(PACKAGE)
+include /usr/share/dpatch/dpatch.make
+
+# Other setup
+PKGDIR:=$(CURDIR)/debian/$(PACKAGE)
+TMP:=$(CURDIR)/debian/tmp
+
+# Should we ever need it for the helpers
+DEBUGFLAGS=-g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	DEBUGFLAGS += -O0
+else
+	DEBUGFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+CFLAGS +=$(DEBUGFLAGS)
+
+helper-progs/configure: patch-stamp
+	cd helper-progs && autoheader2.13 && autoconf2.13
+
+configure: configure-stamp
+configure-stamp: patch-stamp helper-progs/configure
+	dh_testdir
+	# Add here commands to configure the package.
+	cd helper-progs && ./configure \
+		--prefix=/usr \
+		--with-runtime-dir=/var/lib/amavis \
+		--with-sockname=/var/lib/amavis/amavisd.sock \
+		--with-user=amavis
+	touch configure-stamp
+
+build: build-stamp
+build-stamp: configure-stamp 
+	dh_testdir
+
+	# Add here commands to compile the package.
+	make -C helper-progs
+	touch build-stamp
+
+clean: clean-patched unpatch
+clean-patched:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	rm -rf build
+	[ ! -f helper-progs/Makefile ] || make -C helper-progs clean
+	rm -rf helper-progs/autom4te.cache
+	rm -f helper-progs/config.h helper-progs/Makefile
+	rm -f helper-progs/config.log helper-progs/config.status helper-progs/config.cache
+	rm -f helper-progs/config.h.in helper-progs/configure
+
+	# Debian housekeeping
+	dh_clean
+	debconf-updatepo || true
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	mkdir -p $(TMP)/usr/sbin
+	install -m 755 amavisd $(TMP)/usr/sbin/amavisd-new
+	install -m 755 amavisd-release amavisd-nanny amavisd-agent $(TMP)/usr/sbin
+	install -m 755 p0f-analyzer.pl $(TMP)/usr/sbin/p0f-analyzer
+	install -m 755 debian/amavisd-new-cronjob $(TMP)/usr/sbin/amavisd-new-cronjob
+
+	mkdir -p $(TMP)/usr/share/amavis
+	cp -r debian/conf $(TMP)/usr/share/amavis/conf.d
+
+	mkdir -p $(TMP)/usr/share/perl5
+	install -m 644 JpegTester.pm $(TMP)/usr/share/perl5/JpegTester.pm
+
+	mkdir -p $(TMP)/etc/amavis
+	cp -r debian/etc/* $(TMP)/etc/amavis
+	find $(TMP)/etc/amavis -type f -exec chmod 644 {} \;
+	find $(TMP)/etc/amavis -type d -exec chmod 755 {} \;
+
+	mkdir -p $(TMP)/etc/ldap/schema
+	install -m 644 LDAP.schema $(TMP)/etc/ldap/schema/amavis.schema
+
+	# Install lintian and linda overrides, if any
+	cd debian ; \
+	for i in *.linda ; do \
+	    [ -r "$$i" ] && { \
+		mkdir -p "$${i%%.linda}/usr/share/linda/overrides" ;\
+		install  -m 644 "$$i" "$${i%%.linda}/usr/share/linda/overrides/$${i%%.linda}" ;\
+	    } ;\
+	done ;\
+	for i in *.lintian ; do \
+	    [ -r "$$i" ] && { \
+		mkdir -p "$${i%%.lintian}/usr/share/lintian/overrides" ;\
+		install  -m 644 "$$i" "$${i%%.lintian}/usr/share/lintian/overrides/$${i%%.lintian}" ;\
+	    } ;\
+	done
+
+	dh_movefiles
+
+	make -C helper-progs install DESTDIR=$(CURDIR)/debian/amavisd-new-milter/usr/sbin
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installdebconf -i -n
+	dh_installdocs -i
+	dh_installexamples -i
+	dh_installmenu -i
+	dh_install
+#	dh_installlogrotate
+#	dh_installpam
+#	dh_installmime
+	dh_installinit -i --error-handler=init_failed --init-script=amavis -- defaults 19 21
+	dh_installcron -i
+	dh_installman -i
+	dh_installinfo -i
+	dh_installchangelogs -i -k RELEASE_NOTES
+	dh_link -i
+	dh_strip -i
+	dh_compress -i
+	dh_fixperms -i
+#	dh_makeshlibs
+	dh_installdeb -i
+	dh_perl -i
+	dh_shlibdeps -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installdebconf -a -n
+#	dh_installdocs -a
+#	dh_installexamples -a
+	dh_installmenu -a
+#	dh_installlogrotate
+#	dh_installpam
+#	dh_installmime
+	dh_installinit -a -- defaults 19 21
+	dh_installcron -a
+	dh_installman -a
+	dh_installinfo -a
+#	dh_installchangelogs -a -k RELEASE_NOTES
+	dh_link -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+#	dh_makeshlibs
+	dh_installdeb -a
+	dh_perl -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build clean clean-patched binary-indep binary-arch binary install configure
+
+#  Extracts upstream templates on top of the Debian ones for en_US
+update-templates-from-upstream:
+	( chmod +x debian/extract-upstream-en_US-templates.pl && \
+	  cd debian/etc/en_US && \
+	  ../../extract-upstream-en_US-templates.pl < ../../../amavisd )
+
+.PHONY: update-templates-from-upstream
--- amavisd-new-2.6.4.orig/debian/amavisd-new.files
+++ amavisd-new-2.6.4/debian/amavisd-new.files
@@ -0,0 +1,3 @@
+etc
+usr/sbin
+usr/share
--- amavisd-new-2.6.4.orig/debian/extract-upstream-en_US-templates.pl
+++ amavisd-new-2.6.4/debian/extract-upstream-en_US-templates.pl
@@ -0,0 +1,38 @@
+#!/usr/bin/perl -T
+
+#
+# This hideous hack is just a quick way to update the en_US templates
+# from the amavisd binary.  Call it with stdin pointing to amavisd,
+# and it will generate the files in the current directory
+#
+
+use strict;
+
+
+my $line;
+my @knowntemplates = (
+	[ 'DELIVERY STATUS NOTIFICATIONS',		'template-dsn.txt' ],
+	[ 'VIRUS.*SENDER NOTIFICATIONS', 		'template-virus-sender.txt' ],
+	[ 'non-spam.*ADMINISTRATOR NOTIFICATIONS', 	'template-virus-admin.txt' ],
+	[ 'VIRUS.*RECIPIENTS NOTIFICATIONS', 		'template-virus-recipient.txt' ],
+	[ 'SPAM SENDER NOTIFICATIONS', 			'template-spam-sender.txt' ],
+	[ 'SPAM ADMINISTRATOR NOTIFICATIONS', 		'template-spam-admin.txt' ]
+);
+
+local($/) = "__DATA__\n";
+while ($line = <STDIN>) {
+	chomp $line;
+	if ( $line =~ /This is a template for/ ) {
+		my $i = $#knowntemplates;
+		while ( $i >= 0 ) {
+			if ($line =~ $knowntemplates[$i][0]) {
+				print "Generating $knowntemplates[$i][1] ...\n";
+				open(DATAOUT, ">$knowntemplates[$i][1]");
+				print DATAOUT $line;
+				close(DATAOUT);
+				last;
+			}
+			$i--;
+		}
+	}
+}
--- amavisd-new-2.6.4.orig/debian/amavisd-new.prerm
+++ amavisd-new-2.6.4/debian/amavisd-new.prerm
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e 
+
+init_failed ()
+{
+	echo "WARNING: Stopping amavisd-new failed! Upgrade or removal may be incomplete!" 
+}
+#DEBHELPER#
+
--- amavisd-new-2.6.4.orig/debian/amavisd-new.examples
+++ amavisd-new-2.6.4/debian/amavisd-new.examples
@@ -0,0 +1,3 @@
+amavisd-agent
+amavisd.conf-default
+amavisd.conf-sample
--- amavisd-new-2.6.4.orig/debian/amavisd-new.cron.daily
+++ amavisd-new-2.6.4/debian/amavisd-new.cron.daily
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+#  Daily maintenance for amavisd-new
+#  $Id: amavisd-new.cron.daily 930 2006-08-10 13:38:45Z hmh $
+# 
+test -e /usr/sbin/amavisd-new-cronjob && exec /usr/sbin/amavisd-new-cronjob sa-clean
--- amavisd-new-2.6.4.orig/debian/amavisd-new-milter.postinst
+++ amavisd-new-2.6.4/debian/amavisd-new-milter.postinst
@@ -0,0 +1,55 @@
+#! /bin/sh
+# postinst script for amavisd-new
+# $Id: amavisd-new-milter.postinst 104 2003-03-28 04:35:57Z hmh $
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+    configure)
+    	# add amavis system user and group (requires adduser >= 3.34)
+	for i in /usr/sbin/amavis-milter
+	do
+		if ! dpkg-statoverride --list $i > /dev/null
+		then
+			dpkg-statoverride --update --add amavis amavis 4755 $i
+		fi
+	done
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
--- amavisd-new-2.6.4.orig/debian/README.Debian
+++ amavisd-new-2.6.4/debian/README.Debian
@@ -0,0 +1,76 @@
+amavisd-new for Debian
+$Id: README.Debian 815 2006-02-18 18:59:25Z hmh $
+===========================================================
+
+* It is a very good idea to read NEWS.Debian often, or to use
+  apt-listchanges.
+
+* The LDAP schema for amavisd-new is installed in 
+  /etc/ldap/schema/amavis.schema.
+
+
+Configuration layout
+--------------------
+
+Configuration is split into two directories, and processed in the order below:
+
+Read-only configuration:  /usr/share/amavis/conf.d/
+  10-debian_scripts:		Stuff you'd better not override
+  20-package:			Packaging decisions, override at will
+
+Read-write conffiles: /etc/amavis/conf.d/
+  01-debian:			Rarely modified settings
+  05-domain_id:			mydomain autodetection, local_domains config
+  05-node_id:			myhostname autodetection
+  15-av_scanners:		AV scanner interface configuration
+  15-content_filter_mode:	Use this to re-enable spamassassin/av checks
+  20-debian_defaults:		Commonly modified settings
+  50-user:			Place your overrides here, if you want
+
+If the package detects legacy config files, it renames them adding a
+".disabled" extension, and the amavisd-new initscript will refuse to start the
+service until these files with a ".disabled" extension are removed or renamed.
+The legacy config files are /etc/amavis.conf and /etc/amavis/amavis.conf.
+
+
+Sendmail Milter
+---------------
+
+Please see README.milter for Debian specific instructions on getting milter
+support running with amavisd-new-milter.  We recommend you use the
+dual-sendmail setup described in README.sendmail-dual, though.  DO notice that
+there are *two* different sockets when using milter.
+
+
+Antivirus and spam-checking
+---------------------------
+
+amavisd-new does not depend on any antivirus, so antivirus checking is not
+enabled by default.  It also does not depend on spamassassin, so spam checking
+is not enabled by default.  They are turned off in
+/usr/share/amavis/conf.d/20-package.  To enable them, edit
+/etc/amavis/conf.d/15-content_filter_mode.
+
+If you use clamav-daemon, make sure that it is configured to init supplementary
+groups when it drops priviledges, and that you add the clamav user to the
+amavis group: add AllowSupplementaryGroups to /etc/clamav/clamd.conf if it is
+not there yet, and run "adduser clamav amavis" as root.
+
+If you use spamassassin with the Bayes database system, you should make sure
+that the spamassassin configuration option "bayes_auto_expire 0" is set in
+spamassassin configure files.  This disables the automatic expiration of tokens
+which causes problems for amavisd-new when activated.  The amavisd-new package
+includes cron jobs that take care of syncing and expiring the token database
+frequently.
+
+
+Debugging
+---------
+
+To debug amavis, run:
+/etc/init.d/amavis debug
+or
+/etc/init.d/amavis debug-sa
+
+
+ -- Brian May <bam@debian.org>, Henrique de Moraes Holschuh <hmh@debian.org>
--- amavisd-new-2.6.4.orig/debian/control
+++ amavisd-new-2.6.4/debian/control
@@ -0,0 +1,46 @@
+Source: amavisd-new
+Section: mail
+Priority: extra
+Maintainer: Brian May <bam@snoopy.debian.net>
+Uploaders: Henrique de Moraes Holschuh <hmh@debian.org>, Alexander Wirt <formorer@debian.org>
+Build-Depends: debhelper (>= 5), libmilter-dev, po-debconf, dpatch (>= 2), patch (>= 2.5.9-3bpo1), dpkg-dev (>= 1.13.19), autoconf2.13
+Standards-Version: 3.8.2
+
+Package: amavisd-new
+Architecture: all
+Depends: debconf | debconf-2.0, adduser (>= 3.34), file, libmime-tools-perl, libconvert-tnef-perl (>= 0.06), libconvert-uulib-perl (>= 1.0.5), libarchive-tar-perl, libarchive-zip-perl (>= 1.14), libmailtools-perl (>= 1.58), libunix-syslog-perl, libnet-server-perl, libtime-hires-perl, libdigest-md5-perl, libmime-base64-perl, libio-stringy-perl, libberkeleydb-perl, libmail-dkim-perl, pax, ${perl:Depends}, ${misc:Depends}, libcompress-zlib-perl (>= 2.015-1~bpo50+1) 
+Provides: amavis
+Conflicts: amavis, logcheck (<= 1.2.62)
+Replaces: amavis
+Suggests: spamassassin (>= 3.1.0a), clamav, clamav-daemon, lha, arj, unrar, zoo, nomarch, cpio, lzop, cabextract, apt-listchanges (>= 2.35), libnet-ldap-perl (>= 1:0.32), libauthen-sasl-perl, libdbi-perl (>= 1.43), dspam, libmail-dkim-perl (>= 0.31), p7zip, rpm, unrar-free
+Description: Interface between MTA and virus scanner/content filters
+ AMaViSd-new is a script that interfaces a mail transport agent (MTA) with
+ zero or more virus scanners, and spamassassin (optional).
+ .
+ It supports all common virus scanners (more than 20 different AVs), with
+ direct talk-to-daemon support for ClamAV, OpenAntiVirus, Trophie, AVG, 
+ f-prot, and Sophos AVs.
+ .
+ AMaViSd-new supports all MTAs through its generic SMTP/LMTP filter mode 
+ (ideal for postfix and exim).  It is faster and safer to use the SMTP/LMTP 
+ filter mode than using the AMaViS pipe client.  It supports sendmail milter
+ through the amavisd-new-milter package.
+
+Package: amavisd-new-milter
+Architecture: any
+Depends: ${shlibs:Depends}, amavisd-new (= ${source:Version}), ${misc:Depends}
+Description: Interface between sendmail-milter and amavisd-new
+ AMaViSd-new is a script that interfaces a mail transport agent (MTA) with
+ zero or more virus scanners, and spamassassin (optional).
+ .
+ It supports all common virus scanners (more than 20 different AVs), with
+ direct talk-to-daemon support for ClamAV, OpenAntiVirus, Trophie, AVG, 
+ f-prot, and Sophos AVs.
+ .
+ AMaViSd-new supports all MTAs through its generic SMTP/LMTP filter mode 
+ (ideal for postfix and exim).  It is faster and safer to use the SMTP/LMTP 
+ filter mode than using the AMaViS pipe client.  It supports sendmail milter
+ through this package.
+ .
+ This package contains the milter client, and a generic command line client
+ for amavisd-new.
--- amavisd-new-2.6.4.orig/debian/disabled.old-headerfolding-patch.diff
+++ amavisd-new-2.6.4/debian/disabled.old-headerfolding-patch.diff
@@ -0,0 +1,36 @@
+Index: amavisd
+===================================================================
+RCS file: /cvsroot/amavisd-new/amavisd-new/amavisd,v
+retrieving revision 1.1.1.15
+retrieving revision 1.44
+diff -u -r1.1.1.15 -r1.44
+--- amavisd	21 Aug 2005 23:46:15 -0000	1.1.1.15
++++ amavisd	25 Feb 2006 15:59:35 -0000	1.44
+@@ -3778,17 +3801,23 @@
+   $str =~ s/\n([ \t]*\n)+/\n/g;    # remove empty lines
+   chomp($str);                     # chop off trailing NL if present
+   if ($structured) {
++    $str =~ s/[ \t]+/ /g;       # collapse spaces and tabs to a single space
+     my(@sublines) = split(/\n/, $str, -1);
+-    $str = ''; my($s) = ''; my($s_l) = 0;
++    $str = ''; my($s) = ''; my($s_l) = 0; my($s_il)=0;
+     for (@sublines) {              # join shorter field sections
+-      if ($s !~ /^\s*\z/ && $s_l + length($_) > 78) {
+-        $str .= "\n"  if $str ne '';
++      if ($s !~ /^\s*\z/ && $s_l + $s_il + length($_) > 78) {
++        $s_il = 8; # length of the initial tab
++        $str .= "\n\t"  if $str ne '';
++        $s =~ s/^[ \t]+//g; # remove leading and trailing whitespace
++        $s =~ s/[ \t]+$//g;
+         $str .= $s; $s = ''; $s_l = 0;
+       }
+       $s .= $_; $s_l += length($_);
+     }
+     if ($s !~ /^\s*\z/) {
+-      $str .= "\n"  if $str ne '';
++      $str .= "\n\t"  if $str ne '';
++      $s =~ s/^[ \t]+//g; # remove leading and trailing whitespace
++      $s =~ s/[ \t]+$//g;
+       $str .= $s;
+     }
+   } elsif (length($str) > 998) {
--- amavisd-new-2.6.4.orig/debian/amavisd-new.postinst
+++ amavisd-new-2.6.4/debian/amavisd-new.postinst
@@ -0,0 +1,149 @@
+#! /bin/sh
+# postinst script for amavisd-new
+# $Id: amavisd-new.postinst 908 2006-06-09 03:42:01Z hmh $
+#
+# see: dh_installdeb(1)
+
+# debconf
+set -e
+. /usr/share/debconf/confmodule
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+    configure)
+	# add amavis system user and group (requires adduser >= 3.34)
+	# don't muck around with this unless you KNOW what you're doing
+	# also, don't attempt to second guess what kind of fucked up
+	# mistakes other amavis packages might have made.  Tell the user
+	# to kill the bogus entry.  We can't simply overwrite it with
+	# usermod, since that would certainly cause severe headaches for
+	# a sysadmin out there...
+	#
+	# I don't care that users migrating from other amavis packages
+	# will have extra work.  Someone lost 30GB because we tried to
+	# be nice once.  See #190414.
+	echo "Creating/updating amavis user account..." >&2
+	addgroup --quiet --system amavis || {
+	  # addgroup failed. Why?
+	  if ! getent group amavis >/dev/null ; then
+	     echo "Could not create system group amavis." >&2
+	     exit 1
+	  fi
+	  # well, the group is there, so just ignore the error
+	}
+	adduser --system --ingroup amavis --home /var/lib/amavis \
+		--gecos "AMaViS system user" --shell /bin/sh \
+		--quiet --disabled-password amavis || {
+	  # adduser failed. Why?
+	  if getent passwd amavis >/dev/null ; then
+	     echo "Non-system user amavis found. I will not overwrite a non-system" >&2
+	     echo "user.  Remove the user and reinstall amavisd-new." >&2
+	     exit 1
+	  fi
+	  # unknown adduser error, simply exit
+	  exit 1
+	}
+
+	# Clean up after #190414
+	homedir=$(getent passwd amavis | cut -d : -f 6)
+	if [ "x${homedir}" = "x/" ] ; then
+	  echo 'WARNING! Homedir of user amavis was set to "/", this is' >&2
+	  echo 'extremely dangerous!  Overriding it to /var/lib/amavis...' >&2
+	  homedir=/var/lib/amavis
+	  usermod -d "${homedir}" amavis
+	fi
+
+	# Sanity-checks (see #367807)
+	if [ ! -d "${homedir}" ] ; then
+	  echo "Broken amavis system user found.  To insure data-safety," >&2
+	  echo "it is up to you the local administrator to remove the broken" >&2
+	  echo "amavis user, or repair it so that it is sane" >&2
+	  exit 1
+	fi
+
+	umask 022
+	for i in /var/lib/amavis /var/lib/amavis/db /var/lib/amavis/tmp \
+		 /var/lib/amavis/virusmails /var/run/amavis
+	do
+		if ! dpkg-statoverride --list "$i" > /dev/null ; then
+			dpkg-statoverride --add amavis amavis 755 "$i"
+			mode="amavis:amavis"
+		else
+			mode=$(dpkg-statoverride --list "$i" | \
+				tr -s " " ":" | cut -d ":" -f -2)
+		fi
+		if [ ! -d "$i" ] ; then
+			mkdir -p "$i"
+		fi
+		chown -R --preserve-root --quiet ${mode} "$i"
+	done
+
+	#
+	# Conffile upgrade handling
+	#
+
+	# from sarge amavisd-new (1.0) and previous
+	# disable the config file, initscript will refuse to run
+	db_fset amavisd-new/outdated_config_style_warning seen false || true
+	for i in /etc/amavisd.conf /etc/amavis/amavisd.conf ; do
+		if [ -e "$i" ] ; then
+			mv "$i" "${i}.disabled" || true
+			db_input high amavisd-new/outdated_config_style_warning || true
+			db_go || true
+		fi
+	done
+
+	# Work around dpkg not deleting removed conffiles
+	
+	# (template directories (with files) removed in 1:2.3.3-2)
+	if dpkg --compare-versions "1:2.3.3-2" gt-nl "$1" ; then
+		for i in pt_BR fr it_IT de_DE ; do
+			if [ -e "/etc/amavis/$i" ] ; then
+				echo "Moving outdated l10n template to /etc/amavis/${i}.outdated_for_2.3.3-2" >&2
+				mv "/etc/amavis/$i" "/etc/amavis/${i}.outdated_for_2.3.3-2"
+			fi
+		done
+	fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# We don't need debconf anymore from here on
+db_stop
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+init_failed () 
+{
+	echo "WARNING: Starting amavisd-new failed. Please check your configuration."
+}
+#DEBHELPER#
+
+exit 0
+
--- amavisd-new-2.6.4.orig/debian/amavisd-new.init
+++ amavisd-new-2.6.4/debian/amavisd-new.init
@@ -0,0 +1,140 @@
+#! /bin/sh
+#
+# amavisd	/etc/init.d/ initscript for amavisd-new
+# 		$Id: amavisd-new.init 800 2006-01-31 00:07:45Z hmh $
+#
+#		Copyright (c) 2003 by Brian May <bam@debian.org>
+#			and Henrique M. Holschuh <hmh@debian.org>
+#		Distributed under the GPL version 2
+#
+#
+# How this thing works:
+#   ${START} must be only what is needed for start-stop-daemon, DO NOT
+#   ADD ANY PARAMETERS HERE!  we might use it for --test, for example.
+#   ${STOP} works just like ${START}, --signal is used with it.
+#
+#   ${PARAMS} are the parameters to give the daemon when really starting
+#   it.
+### BEGIN INIT INFO
+# Provides:          amavisd-new
+# Required-Start:    $syslog $network $local_fs
+# Required-Stop:     $syslog $network $local_fs 
+# Should-Start:      
+# Should-Stop:       
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Starts amavisd-new mailfilter
+# Description:       Launches the amavisd-new mailfilter
+### END INIT INFO
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/amavisd-new
+DAEMON2=/usr/bin/perl
+NAME=amavisd
+DAEMONNAME=amavisd-new
+DESC=amavisd
+
+test -f ${DAEMON} || exit 0
+
+set -e
+
+START="--start --quiet --pidfile /var/run/amavis/${NAME}.pid --name ${DAEMONNAME} --startas ${DAEMON}"
+STOP="--stop --quiet --pidfile /var/run/amavis/${NAME}.pid --name ${DAEMONNAME}"
+PARAMS=
+
+check_noncompatible_upgrade() {
+	for i in /etc/amavisd.conf /etc/amavis/amavisd.conf ; do
+		if [ -e "${i}.disabled" ] ; then
+			echo "Found incompatible config file flag!" >&2
+			echo "Due to safety concerns, amavisd-new will not be started." >&2
+			echo "Refer to /usr/share/doc/amavisd-new/README.Debian for instructions." >&2
+			exit 1
+		fi
+	done
+}
+
+createdir() {
+# $1 = user
+# $2 = group
+# $3 = permissions (octal)
+# $4 = path to directory
+        [ -d "$4" ] || mkdir -p "$4"
+        chown -c -h "$1:$2" "$4"
+        chmod -c "$3" "$4"
+}
+
+fixdirs() {
+	dir=$(dpkg-statoverride --list /var/run/amavis) || {
+		echo "You are missing a dpkg-statoverride on /var/run/amavis.  Fix it, otherwise you risk silent breakage on upgrades." >&2
+		exit 1
+	}
+	[ -z "$dir" ] || createdir $dir
+	:
+}
+
+cleanup() {
+	[ -d /var/lib/amavis ] && 
+	  find /var/lib/amavis -maxdepth 1 -name 'amavis-*' -type d \
+	  	-exec rm -rf "{}" \; >/dev/null 2>&1 || true
+	[ -d /var/lib/amavis/tmp ] && 
+	  find /var/lib/amavis/tmp -maxdepth 1 -name 'amavis-*' -type d \
+	  	-exec rm -rf "{}" \; >/dev/null 2>&1 || true
+	:
+}
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	fixdirs
+  	check_noncompatible_upgrade
+	if start-stop-daemon ${START} -- ${PARAMS} start >/dev/null ; then
+		echo "amavisd-new."
+	else
+		if start-stop-daemon --test ${START} >/dev/null 2>&1; then
+			echo "(failed)."
+			exit 1
+		else
+			echo "(already running)."
+			exit 0
+		fi
+	fi
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	if start-stop-daemon ${STOP} --retry 10 >/dev/null ; then
+		cleanup
+		echo "amavisd-new."
+	else
+		if start-stop-daemon --test ${START} >/dev/null 2>&1; then
+			echo "(not running)."
+			exit 0
+		else
+			echo "(failed)."
+			exit 1
+		fi
+	fi
+	;;
+#  reload)
+#	echo "Reloading $DESC configuration files."
+#	start-stop-daemon ${STOP} --signal 1
+# 	;;
+  restart|force-reload)
+	$0 stop
+	exec $0 start
+	;;
+  debug|debug-sa)
+  	mode="$1"
+  	echo "Trying to run amavisd-new in ${mode} mode..."
+  	fixdirs
+  	check_noncompatible_upgrade
+	exec ${DAEMON} ${PARAMS} "${mode}"
+	;;
+  *)
+	N=/etc/init.d/amavis
+	#echo "Usage: $N {start|stop|restart|reload|force-reload|debug}" >&2
+	echo "Usage: $N {start|stop|restart|force-reload|debug}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
--- amavisd-new-2.6.4.orig/debian/amavisd-new-cronjob.8
+++ amavisd-new-2.6.4/debian/amavisd-new-cronjob.8
@@ -0,0 +1,39 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH AMAVISD-NEW-CRONJOB 8 "2006-08-10"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+amavisd-new-cronjob \- Cronjobs for the Debian amavisd-new package
+.SH SYNOPSIS
+.B amavisd-new-cronjob 
+.I sa-sync
+|
+.I sa-clean
+.br
+.SH DESCRIPTION
+.B amavisd-new-cronjob
+is a helper script that contains the cron job routines used by the
+amavisd-new Debian package.  It exists to help deployment in high-security
+environments, such as SE-Linux.
+.PP
+This helper script is called by entries in the system crontab directories,
+as usual.
+.SH SEE ALSO
+.BR /usr/share/doc/amavisd-new/*
+.br
+.SH AUTHOR
+This manual page was written by Henrique de Moraes Holschuh <hmh@debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
--- amavisd-new-2.6.4.orig/debian/amavisd-new-milter.dirs
+++ amavisd-new-2.6.4/debian/amavisd-new-milter.dirs
@@ -0,0 +1 @@
+usr/sbin
--- amavisd-new-2.6.4.orig/debian/copyright
+++ amavisd-new-2.6.4/debian/copyright
@@ -0,0 +1,43 @@
+$Id: copyright 740 2005-12-26 16:59:50Z hmh $
+
+This package was debianized by Brian May <bam@snoopy.apana.org.au> on
+Fri,  8 Mar 2002 15:31:24 +1100.
+
+The Debian packaging of amavisd-new is:
+  Copyright (c) 2002-2005 by Brian May <bam@debian.org>
+  Copyright (c) 2003-2005 by Henrique de Moraes Holschuh <hmh@debian.org>
+  and distributed in the same license as the upstream source it applies to.
+
+Upstream sources are at http://www.ijs.si/software/amavisd/
+
+Upstream Authors: Mark Martinec <mark.martinec@ijs.si>, and others.
+
+There are lots of different versions of amavis.
+According to Luca Filipozzi <lfilipoz@debian.org>:
+
+amavis-perl : the original (slow) one
+amavisd     : the client/server version
+amavis-ng   : Hilko Bengen's rewrite of amavis-perl/amavisd
+amavisd-new : Marc Martinec's version
+
+This version is amavisd-new.  We have renamed it to amavisd-new to avoid
+clashes with other packages.
+
+Copyright:
+  Copyright (C) 2002-2005 by Mark Martinec and others
+  Copyright (C) 2000-2002 by
+    Chris Mason <cmason@unixzone.com>
+    Lars Hecking <lhecking@users.sourceforge.net>
+    Mogens Kjaer <mk@crc.dk>
+    Juergen Quade <quade@softing.com>
+    Christian Bricart <shiva@aachalon.de>
+
+    This program 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; either version 2 of the License, or
+    (at your option) any later version.
+
+The GPL may be found in /usr/share/common-licenses/GPL on a Debian system.
+
+For JpegTester.pm, the following applies:
+The (new)BSD license applies to this package JpegTester.
--- amavisd-new-2.6.4.orig/debian/amavisd-new-cronjob
+++ amavisd-new-2.6.4/debian/amavisd-new-cronjob
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+# amavisd-new cronjob helper
+#
+# Run it as root or as the amavis user
+#
+# First parameter specifies which cronjob routine to run:
+# 		sa-sync:	spamassassin fast sync
+# 		sa-clean:	spamassassin cleanup
+
+test -e /usr/bin/sa-learn || exit 0
+test -e /usr/sbin/amavisd-new || exit 0
+
+SUUSER="amavis"
+
+set -e
+umask 022
+
+# WATCH OUT FOR PROPER QUOTING LEVEL WHEN CALLING THIS!
+do_amavis_cmd() {
+	if [ "$(id -u -n)" != "${SUUSER}" ]; then
+		exec /bin/su -s /bin/sh - "${SUUSER}" -c "$*"
+	else
+		# to get the same quoting level as the su path
+		CMD="$*"
+		exec ${CMD}
+	fi
+}
+
+case $1 in
+	sa-sync)
+		do_amavis_cmd "/usr/bin/sa-learn --sync" >/dev/null
+		;;
+	sa-clean)
+		do_amavis_cmd "/usr/bin/sa-learn --sync --force-expire" >/dev/null
+		;;
+	*)
+		echo "$0: unknown cron routine $1" >&2
+		exit 1
+		;;
+esac
+
+exit 0
--- amavisd-new-2.6.4.orig/debian/amavisd-new.disabled-patch.utf8-taint-fix
+++ amavisd-new-2.6.4/debian/amavisd-new.disabled-patch.utf8-taint-fix
@@ -0,0 +1,33 @@
+Index: amavisd
+===================================================================
+RCS file: /cvsroot/amavisd-new/amavisd-new/amavisd,v
+retrieving revision 1.1.1.15
+retrieving revision 1.36
+diff -u -r1.1.1.15 -r1.36
+--- amavisd	21 Aug 2005 23:46:15 -0000	1.1.1.15
++++ amavisd	20 Oct 2005 13:56:17 -0000	1.36
+@@ -1392,14 +1392,21 @@
+ 
+ # A wrapper for Encode::encode, avoiding a bug in Perl 5.8.0 which causes
+ # Encode::encode to loop and fill memory when given a tainted string
++# 
++# hmh@d.o : in Debian's 5.8.4-2, trying to restore the taintedness
++# actually causes perl to somehow lose track of the encoding and it
++# completely breaks this sub.  OTOH, perl does loop eating up memory
++# on tainted strings, so we will have to lose taint state for now.
+ sub safe_encode($$;$) {
+   if (!$unicode_aware) { $_[1] }  # just return the second argument
+   else {
+     my($encoding,$str,$check) = @_;
+     $check = 0  if !defined($check);
+-    # taintedness of the string, with UTF-8 flag unconditionally off
+-    my($taint) = Encode::encode('ascii',substr($str,0,0));
+-    $taint . Encode::encode($encoding,untaint($str),$check);  # preserve taint
++    $str = untaint(\$str);
++    return Encode::encode($encoding, $str, $check);  # reattach taintedness
++#    # taintedness of the string, with UTF-8 flag unconditionally off
++#    my($taint) = Encode::encode('ascii',substr($str,0,0));
++#    $taint . Encode::encode($encoding,untaint($str),$check);  # preserve taint
+   }
+ }
+ 
--- amavisd-new-2.6.4.orig/debian/amavisd-new.docs
+++ amavisd-new-2.6.4/debian/amavisd-new.docs
@@ -0,0 +1,2 @@
+AAAREADME.first
+README_FILES/*
--- amavisd-new-2.6.4.orig/debian/amavisd-new.NEWS
+++ amavisd-new-2.6.4/debian/amavisd-new.NEWS
@@ -0,0 +1,87 @@
+amavisd-new (1:2.6.2-2) unstable; urgency=medium
+
+  The virusscanner definitions have been updated to work properly with
+  perl 5.10. Its highly recommended that you update your definitions. Without
+  some viruses my slip through. 
+
+ -- Alexander Wirt <formorer@debian.org>  Fri, 06 Mar 2009 22:12:42 +0100
+
+amavisd-new (1:2.4.2-2) unstable; urgency=low
+ 
+  Since non-free software has no security support non-free unpackers have been
+  disabled. If you want to use them you have to enable them in
+  /etc/amavisd-new/conf.d/01-debian. The following unpackers have been
+  disabled:
+   - unfreeze
+   - lha
+   - rar 
+
+ -- Alexander Wirt <formorer@debian.org>  Tue, 04 Sep 2007 22:23:38 +0200
+
+amavisd-new (1:2.4.2-1) unstable; urgency=low
+
+  There are incompatible changes in the 2.4.0 upstream release, please refer
+  to /usr/share/doc/amavisd-new/changelog.gz for more information.
+
+  * Notification templates incompatibility with 2.4.0 (but not with versions
+    2.3.3 or older).  Will affect only users which use custom notification
+    templates that were based on templates shipped by the 2.4.0 packages.
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Tue, 13 Jun 2006 10:26:14 -0300
+
+amavisd-new (1:2.3.3-6) unstable; urgency=low
+
+  A bug in the default amavisd-new configuration (in 20-debian_defaults) exists
+  in versions 2.3.3-2 up to 2.3.3-5, which caused quarantined messages to be
+  stored in /var/lib/amavis/quarantine (a mbox file) instead of the directory
+  /var/lib/amavis/virusmails.
+ 
+  This bug has been fixed in 2.3.3-6, but the "quarantine" file will be left
+  alone, and it is up to the local administrator to delete that file if it
+  doesn't have anything useful in it.  Local administrators are free to change
+  the quarantine method and storage location if "virusmails" is not to their
+  liking.
+ 
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Thu,  2 Feb 2006 00:06:59 -0200
+
+amavisd-new (1:2.3.3-5) unstable; urgency=low
+
+  Amavisd-new has been modified to support the Debian conf.d style when no
+  config files are supplied in the command line.  The code implementing the
+  conf.d functionality using multiple -c options in the initscript has been
+  removed.
+   
+  Past versions of amavisd-new (in Debian) would use /etc/amavis/amavisd.conf
+  instead of parsing the conf.d config files.
+ 
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Mon, 30 Jan 2006 22:02:08 -0200
+
+amavisd-new (1:2.3.3-2) unstable; urgency=low
+
+  This is the new major upstream stable branch of amavisd-new. 
+  As usual for a major upstream release change:
+  
+    * There is a lot of new functionality
+    * There is a lot of new source code
+    * The configuration file changed in non-backward-compatible ways
+ 
+  So, you will again have to update your configuration manually.  At least such
+  annoyances only happens on major branch changes, and it is much safer than
+  trying to second-guess whatever was done to old amavis configuration files, as
+  they are fully-fledged perl programs by themselves.
+ 
+  The new configuration system uses split files in /usr/share/amavis/conf.d and
+  /etc/amavis/conf.d, which are read in priority order.  First from
+  /usr/share/amavis/conf.d, then /etc/amavis/conf.d.
+  
+  The ones in /usr/share are Debian/upstream land.  You can override anything in
+  them placing files in /etc/amavis/conf.d or editing the ones already in
+  /etc/amavis/conf.d.  It is suggested that all user changes be done to 50-user,
+  overriding whatever Debian options you don't like.
+ 
+  ATTENTION CLAMAV USERS:
+  If you use clamav-daemon, make sure that it is configured to init
+  supplementary groups when it drops privileges, and that you add the clamav
+  user to the amavis group.
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Thu, 20 Oct 2005 11:52:37 -0200
--- amavisd-new-2.6.4.orig/debian/amavisd-new.postrm
+++ amavisd-new-2.6.4/debian/amavisd-new.postrm
@@ -0,0 +1,67 @@
+#! /bin/sh
+# postrm script for amavis-perl
+# $Id: amavisd-new.postrm 864 2006-04-17 12:57:55Z hmh $
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+       purge)
+	[ -r /usr/share/debconf/confmodule ] && {
+		. /usr/share/debconf/confmodule
+		db_purge || true
+		db_stop || true
+	}
+ 
+	for i in /var/lib/amavis /var/lib/amavis/db /var/lib/amavis/tmp \
+		 /var/lib/amavis/virusmails /var/run/amavis
+	do
+		dpkg-statoverride --remove $i || true
+	done
+
+	if getent passwd amavis >/dev/null; then
+		if [ -x /usr/sbin/deluser ]; then
+			deluser --system amavis
+		fi
+	fi
+
+        if getent group amavis >/dev/null; then
+                if [ -x /usr/sbin/delgroup ]; then
+                        delgroup --system amavis
+                fi
+        fi
+	
+	echo "Removing amavis files and directories..."
+	[ -d /var/lib/amavis ] && rm -fr /var/lib/amavis
+	[ -d /etc/amavis ] && rm -fr /etc/amavis
+        ;;
+
+       remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- amavisd-new-2.6.4.orig/debian/TODO
+++ amavisd-new-2.6.4/debian/TODO
@@ -0,0 +1,17 @@
+$Id: TODO 941 2006-08-10 14:48:18Z hmh $
+
+TODO for the packages in experimental (the rest of this file might apply
+ as well):
+
+* Manage all this with UCF, so that we get three-way diffs. Keep
+  *all* shipped revisions to enable intelligent three-way diffs.
+  (?)
+
+* Enhance amavisd-new clamd builtin support init to detect when clamd
+  ain't there?
+
+* Update templates to the new ones. pt-BR is outdated for sure
+* Improve locking on milter to lock before fork, use the new code
+  in rng-tools mt.3 or above
+* get rid of berkeley-db?
+* Provide manpages for all binarys
--- amavisd-new-2.6.4.orig/debian/amavisd-new.install
+++ amavisd-new-2.6.4/debian/amavisd-new.install
@@ -0,0 +1 @@
+debian/logcheck/* /etc/logcheck/
--- amavisd-new-2.6.4.orig/debian/amavisd-new-milter.postrm
+++ amavisd-new-2.6.4/debian/amavisd-new-milter.postrm
@@ -0,0 +1,44 @@
+#! /bin/sh
+# postrm script for amavis-perl
+# $Id: amavisd-new-milter.postrm 104 2003-03-28 04:35:57Z hmh $
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+       purge)
+	for i in /usr/sbin/amavis-milter
+	do
+		dpkg-statoverride --remove $i || true
+	done
+        ;;
+
+       remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- amavisd-new-2.6.4.orig/debian/po/de.po
+++ amavisd-new-2.6.4/debian/po/de.po
@@ -0,0 +1,87 @@
+# Translation of amavisd-new debconf templates to German
+# Copyright (C) Helge Kreutzmann <debian@helgefjell.de>, 2007.
+# This file is distributed under the same license as the amavisd-new package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: amavisd-new 1:2.5.2-2\n"
+"Report-Msgid-Bugs-To: bam@debian.org\n"
+"POT-Creation-Date: 2006-08-10 11:09-0300\n"
+"PO-Revision-Date: 2007-10-23 21:38+0200\n"
+"Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
+"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "Incompatible configuration file layout detected"
+msgstr "Inkompatible Struktur in der Konfigurationsdatei erkannt"
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The Debian packages have changed the way they handle configuration files for "
+"amavisd-new to a better system, which uses multiple files instead of a "
+"single, monolithic file."
+msgstr ""
+"In den Debian-Paketen wurde der Umgang mit Konfigurationsdateien für Amavisd-"
+"new geändert. Es wird jetzt ein besseres System eingesetzt, das mehrere "
+"Dateien statt einer einzigen, monolithischen Datei verwendet."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The old amavisd-new configuration files that are still present in your "
+"system (named either /etc/amavisd.conf or /etc/amavis/amavisd.conf) are "
+"incompatible with this new config file layout."
+msgstr ""
+"Die alten Amavisd-new-Konfigurationsdateien, die noch in Ihrem System "
+"vorhanden sind (sie heißen entweder /etc/amavisd.conf oder /etc/amavis/"
+"amavisd.conf) sind nicht mit dieser neuen Struktur der Konfigurationsdateien "
+"kompatibel."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"You should read /usr/share/doc/amavisd-new/README.Debian to understand the "
+"new configuration layout, and after that you should port your configuration "
+"to the new layout."
+msgstr ""
+"Sie sollten /usr/share/doc/amavisd-new/README.Debian lesen, um die neue "
+"Struktur der Konfiguration zu verstehen. Danach sollten Sie Ihre "
+"Konfiguration an die neue Struktur anpassen."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"For your safety, the old configuration files in your system have been "
+"disabled, and a \".disabled\" postfix was added to their file names.  The "
+"amavisd-new service will refuse to start until you remove (or rename) these "
+"\".disabled\" files."
+msgstr ""
+"Zu Ihrer Sicherheit wurden die alten Konfigurationsdateien deaktiviert und "
+"eine ».disabled«-Endung wurde ihren Dateinamen hinzugefügt. Der Amavisd-new-"
+"Dienst wird nicht starten, bis Sie diese ».disabled«-Dateien entfernt oder "
+"umbenannt haben."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"This safety is in place to avoid starting an unconfigured amavisd-new in "
+"place of your previously configured one.  Do not remove the \".disabled\" "
+"files until you have read the /usr/share/doc/amavisd-new/README.Debian file "
+"and ported your old configuration to the new layout."
+msgstr ""
+"Diese Sicherheitsmaßnahme verhindert, dass Sie ein nicht-konfiguriertes "
+"Amavisd-new statt Ihres bisher konfigurierten starten. Entfernen Sie die »."
+"disabled«-Dateien nicht, bevor Sie die Datei /usr/share/doc/amavisd-new/"
+"README.Debian gelesen und Ihre Konfigurationsdatei auf die neue Struktur "
+"angepasst haben."
--- amavisd-new-2.6.4.orig/debian/po/pt_BR.po
+++ amavisd-new-2.6.4/debian/po/pt_BR.po
@@ -0,0 +1,88 @@
+# amavisd-new Brazilian Portuguese translation
+# Copyright (C) 2008 THE amavisd-new'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the amavisd-new package.
+# Adriano Rafael Gomes <adrianorg@gmail.com>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: amavisd-new 1:2.6.0-1\n"
+"Report-Msgid-Bugs-To: bam@debian.org\n"
+"POT-Creation-Date: 2006-08-10 11:09-0300\n"
+"PO-Revision-Date: 2008-06-14 20:33-0300\n"
+"Last-Translator: Adriano Rafael Gomes <adrianorg@gmail.com>\n"
+"Language-Team: l10n 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: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "Incompatible configuration file layout detected"
+msgstr "Detectado layout de arquivo de configuraĂ§ĂŁo incompatĂ­vel"
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The Debian packages have changed the way they handle configuration files for "
+"amavisd-new to a better system, which uses multiple files instead of a "
+"single, monolithic file."
+msgstr ""
+"Os pacotes Debian alteraram o modo com o qual manipulam os arquivos de "
+"configuraĂ§ĂŁo do amavisd-new para um sistema melhor, que usa mĂşltiplos "
+"arquivos ao invĂ©s de um Ăşnico arquivo monolĂ­tico."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The old amavisd-new configuration files that are still present in your "
+"system (named either /etc/amavisd.conf or /etc/amavis/amavisd.conf) are "
+"incompatible with this new config file layout."
+msgstr ""
+"Os arquivos de configuraĂ§ĂŁo antigos do amavisd-new que ainda estĂŁo presentes "
+"no seu sistema (nomeados como /etc/amavisd.conf ou /etc/amavis/amavisd.conf) "
+"sĂŁo incompatĂ­veis com este novo layout de arquivos de configuraĂ§ĂŁo."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"You should read /usr/share/doc/amavisd-new/README.Debian to understand the "
+"new configuration layout, and after that you should port your configuration "
+"to the new layout."
+msgstr ""
+"VocĂŞ deveria ler /usr/share/doc/amavisd-new/README.Debian para entender o "
+"novo layout de configuraĂ§ĂŁo, e depois disso vocĂŞ deveria portar a sua "
+"configuraĂ§ĂŁo para o novo layout."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"For your safety, the old configuration files in your system have been "
+"disabled, and a \".disabled\" postfix was added to their file names.  The "
+"amavisd-new service will refuse to start until you remove (or rename) these "
+"\".disabled\" files."
+msgstr ""
+"Para sua seguranĂ§a, os arquivos de configuraĂ§ĂŁo antigos em seu sistema foram "
+"desabilitados, e um sufixo \".disabled\" foi adicionado aos seus nomes de "
+"arquivo. O serviĂ§o amavisd-new se recusarĂˇ a iniciar atĂ© que vocĂŞ remova (ou "
+"renomeie) estes arquivos \".disabled\"."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"This safety is in place to avoid starting an unconfigured amavisd-new in "
+"place of your previously configured one.  Do not remove the \".disabled\" "
+"files until you have read the /usr/share/doc/amavisd-new/README.Debian file "
+"and ported your old configuration to the new layout."
+msgstr ""
+"Esta medida de seguranĂ§a Ă© tomada para evitar que se inicie um amavisd-new "
+"desconfigurado no lugar do seu jĂˇ configurado anteriormente. NĂŁo remova os "
+"arquivos \".disabled\" atĂ© que vocĂŞ tenha lido o arquivo /usr/share/doc/"
+"amavisd-new/README.Debian e portado a sua configuraĂ§ĂŁo antiga para o novo "
+"layout."
--- amavisd-new-2.6.4.orig/debian/po/fr.po
+++ amavisd-new-2.6.4/debian/po/fr.po
@@ -0,0 +1,86 @@
+# French translation of amavisd-new debconf
+# This file is distributed under the same license as the amavisd-new package.
+# Gregory Colpart <reg@evolix.fr>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: amavisd-new\n"
+"Report-Msgid-Bugs-To: bam@debian.org\n"
+"POT-Creation-Date: 2006-08-10 11:09-0300\n"
+"PO-Revision-Date: 2006-02-03 02:32+0100\n"
+"Last-Translator: Gregory Colpart <reg@evolix.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "Incompatible configuration file layout detected"
+msgstr "Organisation incorrecte du fichier de configuration"
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The Debian packages have changed the way they handle configuration files for "
+"amavisd-new to a better system, which uses multiple files instead of a "
+"single, monolithic file."
+msgstr ""
+"La gestion des fichiers de configuration d'amavisd-new a changé et ce paquet "
+"utilise désormais plusieurs fichiers ŕ la place d'un seul."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The old amavisd-new configuration files that are still present in your "
+"system (named either /etc/amavisd.conf or /etc/amavis/amavisd.conf) are "
+"incompatible with this new config file layout."
+msgstr ""
+"Les anciens fichiers de configuration d'amavisd-new qui sont toujours "
+"présents sur votre systčme (appelés /etc/amavisd.conf ou /etc/amavis/amavisd."
+"conf) sont incompatibles avec cette nouvelle organisation du fichier de "
+"configuration."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"You should read /usr/share/doc/amavisd-new/README.Debian to understand the "
+"new configuration layout, and after that you should port your configuration "
+"to the new layout."
+msgstr ""
+"Veuillez consulter le fichier /usr/share/doc/amavisd-new/README.Debian pour "
+"comprendre la nouvelle organisation de la configuration. Vous devrez ensuite "
+"migrer votre configuration vers la nouvelle organisation."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"For your safety, the old configuration files in your system have been "
+"disabled, and a \".disabled\" postfix was added to their file names.  The "
+"amavisd-new service will refuse to start until you remove (or rename) these "
+"\".disabled\" files."
+msgstr ""
+"Pour votre sécurité, les anciens fichiers de configuration ont été "
+"désactivés et une extension « .disabled » a été ajoutée aux noms des "
+"fichiers. Le service amavisd-new ne démarrera pas si vous ne supprimez (ou "
+"renommez) pas ces fichiers « .disabled »."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"This safety is in place to avoid starting an unconfigured amavisd-new in "
+"place of your previously configured one.  Do not remove the \".disabled\" "
+"files until you have read the /usr/share/doc/amavisd-new/README.Debian file "
+"and ported your old configuration to the new layout."
+msgstr ""
+"Cette précaution permet d'éviter de démarrer amavisd-new sans qu'il ait été "
+"configuré ŕ la place de votre précédente version opérationnelle. Ne "
+"supprimez pas les fichiers « .disabled » sans avoir lu le fichier /usr/share/"
+"doc/amavisd-new/README.Debian et migré votre ancienne configuration vers la "
+"nouvelle organisation."
--- amavisd-new-2.6.4.orig/debian/po/POTFILES.in
+++ amavisd-new-2.6.4/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] amavisd-new.templates
--- amavisd-new-2.6.4.orig/debian/po/cs.po
+++ amavisd-new-2.6.4/debian/po/cs.po
@@ -0,0 +1,85 @@
+# 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: amavisd-new\n"
+"Report-Msgid-Bugs-To: bam@debian.org\n"
+"POT-Creation-Date: 2006-08-10 11:09-0300\n"
+"PO-Revision-Date: 2006-03-24 19:36+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: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "Incompatible configuration file layout detected"
+msgstr "RozpoznĂˇno nekompatibilnĂ­ rozloĹľenĂ­ konfiguraÄŤnĂ­ho souboru"
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The Debian packages have changed the way they handle configuration files for "
+"amavisd-new to a better system, which uses multiple files instead of a "
+"single, monolithic file."
+msgstr ""
+"DebianĂ­ balĂ­k amavisd-new zmÄ›nil zpĹŻsob, jakĂ˝m spravuje konfiguraÄŤnĂ­ "
+"soubory. NynĂ­ se mĂ­sto jedinĂ©ho monolitickĂ©ho souboru pouĹľĂ­vĂˇ nÄ›kolik "
+"menĹˇĂ­ch."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The old amavisd-new configuration files that are still present in your "
+"system (named either /etc/amavisd.conf or /etc/amavis/amavisd.conf) are "
+"incompatible with this new config file layout."
+msgstr ""
+"StarĂ© konfiguraÄŤnĂ­ soubory amavisd-new (pojmenovanĂ© buÄŹ /etc/amavisd.conf "
+"nebo /etc/amavis/amavisd.conf), kterĂ© jsou stĂˇle nainstalovĂˇny na vaĹˇem "
+"systĂ©mu, jsou nekompatibilnĂ­ s novĂ˝m rozloĹľenĂ­m konfiguraÄŤnĂ­ch souborĹŻ."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"You should read /usr/share/doc/amavisd-new/README.Debian to understand the "
+"new configuration layout, and after that you should port your configuration "
+"to the new layout."
+msgstr ""
+"Nejprve byste si mÄ›li pĹ™eÄŤĂ­st /usr/share/doc/amavisd-new/README.Debian, "
+"abyste porozumÄ›li novĂ©mu rozloĹľenĂ­ konfiguraÄŤnĂ­ch souborĹŻ, a potĂ© byste mÄ›li "
+"pĹ™evĂ©st svĂ© nastavenĂ­ na novĂ© rozloĹľenĂ­."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"For your safety, the old configuration files in your system have been "
+"disabled, and a \".disabled\" postfix was added to their file names.  The "
+"amavisd-new service will refuse to start until you remove (or rename) these "
+"\".disabled\" files."
+msgstr ""
+"Pro vÄ›tĹˇĂ­ bezpeÄŤĂ­ byly starĂ© konfiguraÄŤnĂ­ soubory deaktivovĂˇny a "
+"pĹ™ejmenovĂˇny s pĹ™Ă­ponou \".disabled\". Dokud tyto soubory neodstranĂ­te (nebo "
+"nepĹ™ejmenujete), sluĹľba amavisd-new se odmĂ­tne spustit."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"This safety is in place to avoid starting an unconfigured amavisd-new in "
+"place of your previously configured one.  Do not remove the \".disabled\" "
+"files until you have read the /usr/share/doc/amavisd-new/README.Debian file "
+"and ported your old configuration to the new layout."
+msgstr ""
+"Tato bezpeÄŤnostnĂ­ opatĹ™enĂ­ majĂ­ zabrĂˇnit spuĹˇtÄ›nĂ­ nenastavenĂ©ho amavisd-new. "
+"Soubory \".disabled\" neodstraĹujte, dokud si nepĹ™eÄŤtete soubor /usr/share/"
+"doc/amavisd-new/README.Debian a nepĹ™evedete svĂ© starĂ© nastavenĂ­ na novĂ© "
+"rozloĹľenĂ­."
--- amavisd-new-2.6.4.orig/debian/po/fi.po
+++ amavisd-new-2.6.4/debian/po/fi.po
@@ -0,0 +1,81 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: amavisd-new\n"
+"Report-Msgid-Bugs-To: bam@debian.org\n"
+"POT-Creation-Date: 2006-08-10 11:09-0300\n"
+"PO-Revision-Date: 2008-05-10 16:42+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: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "Incompatible configuration file layout detected"
+msgstr "LĂ¶ydetyt asetustiedostot eivĂ¤t ole yhteensopivia"
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The Debian packages have changed the way they handle configuration files for "
+"amavisd-new to a better system, which uses multiple files instead of a "
+"single, monolithic file."
+msgstr ""
+"Debian-paketin amavisd-new asetustiedostoissa ollaan siirrytty yksittĂ¤isestĂ¤ "
+"suuresta tiedostosta useampaan, paremmin hallittavaan tiedostoon."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The old amavisd-new configuration files that are still present in your "
+"system (named either /etc/amavisd.conf or /etc/amavis/amavisd.conf) are "
+"incompatible with this new config file layout."
+msgstr ""
+"JĂ¤rjestelmĂ¤ssĂ¤ edelleen oleva vanha paketin amavisd-new asetustiedosto "
+"(nimellĂ¤ /etc/amavisd.conf tai /etc/amavis/amavisd.conf tai molemmilla) ei "
+"ole yhteensopiva uuden asetustiedostojen sĂ¤ilytystavan kanssa."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"You should read /usr/share/doc/amavisd-new/README.Debian to understand the "
+"new configuration layout, and after that you should port your configuration "
+"to the new layout."
+msgstr ""
+"Tiedostossa /usr/share/doc/amavisd-new/README.Debian on kuvattu "
+"asetustiedostojen uusi jĂ¤rjestys, johon nykyiset asetukset pitĂ¤isi siirtĂ¤Ă¤."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"For your safety, the old configuration files in your system have been "
+"disabled, and a \".disabled\" postfix was added to their file names.  The "
+"amavisd-new service will refuse to start until you remove (or rename) these "
+"\".disabled\" files."
+msgstr ""
+"TurvallisuussyistĂ¤ vanha jĂ¤rjestelmĂ¤ssĂ¤ oleva asetustiedosto on otettu pois "
+"kĂ¤ytĂ¶stĂ¤ ja sen nimeen on lisĂ¤tty liite â€ť.disabledâ€ť. Palvelu amavisd-new ei "
+"kĂ¤ynnisty ennen kuin kĂ¤ytĂ¶stĂ¤ poistettu tiedosto poistetaan tai nimetĂ¤Ă¤n "
+"uudelleen."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"This safety is in place to avoid starting an unconfigured amavisd-new in "
+"place of your previously configured one.  Do not remove the \".disabled\" "
+"files until you have read the /usr/share/doc/amavisd-new/README.Debian file "
+"and ported your old configuration to the new layout."
+msgstr ""
+"TĂ¤mĂ¤n turvajĂ¤rjestelyn tarkoituksena on estĂ¤Ă¤ ohjelmaa amavisd-new "
+"kĂ¤ynnistymĂ¤stĂ¤ ilman asetuksia. Ă„lĂ¤ poista â€ť.disabledâ€ť-tiedostoja ennen kuin "
+"olet lukenut tiedoston /usr/share/doc/amavisd-new/README.Debian ja siirtĂ¤nyt "
+"vanhat asetukset uusiin tiedostoihin."
--- amavisd-new-2.6.4.orig/debian/po/it.po
+++ amavisd-new-2.6.4/debian/po/it.po
@@ -0,0 +1,87 @@
+# Italian (it) translation of debconf templates for amavisd-new
+# Copyright (C) 2007 Free Software Foundation, Inc.
+# This file is distributed under the same license as the amavisd-new package.
+# Luca Monducci <luca.mo@tiscali.it>, 2007, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: amavisd-new italian debconf templates\n"
+"Report-Msgid-Bugs-To: bam@debian.org\n"
+"POT-Creation-Date: 2006-08-10 11:09-0300\n"
+"PO-Revision-Date: 2008-05-10 10:02+0200\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: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "Incompatible configuration file layout detected"
+msgstr "Rilevata una struttura del file di configurazione non compatibile"
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The Debian packages have changed the way they handle configuration files for "
+"amavisd-new to a better system, which uses multiple files instead of a "
+"single, monolithic file."
+msgstr ""
+"Nei pacchetti Debian Ă¨ stato cambiato il modo con cui sono gestiti i file di "
+"configurazione di amavisd-new con uno migliore, sono usati piĂą file al posto "
+"di un singolo file monolitico."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The old amavisd-new configuration files that are still present in your "
+"system (named either /etc/amavisd.conf or /etc/amavis/amavisd.conf) are "
+"incompatible with this new config file layout."
+msgstr ""
+"I vecchi file di configurazione di amavid-new, ancora presenti nel sistema "
+"(chiamati /etc/amavisd.conf o /etc/amavis/amavisd.conf), sono incompatibili "
+"con la nuova struttura per i file di configurazione."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"You should read /usr/share/doc/amavisd-new/README.Debian to understand the "
+"new configuration layout, and after that you should port your configuration "
+"to the new layout."
+msgstr ""
+"Si consulti /usr/share/doc/amavisd-new/README.Debian per capire la nuova "
+"struttura della configurazione e poi adattare la propria configurazione alla "
+"nuova struttura."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"For your safety, the old configuration files in your system have been "
+"disabled, and a \".disabled\" postfix was added to their file names.  The "
+"amavisd-new service will refuse to start until you remove (or rename) these "
+"\".disabled\" files."
+msgstr ""
+"Per sicurezza i vecchi file di configurazione sono stati disabilitati, in "
+"pratica Ă¨ stato aggiunto il suffisso \".disabled\" al loro nome. Il servizio "
+"amavisd-new non si avvia fino a quando i file \".disabled\" non vengono "
+"rimossi (o rinominati)."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"This safety is in place to avoid starting an unconfigured amavisd-new in "
+"place of your previously configured one.  Do not remove the \".disabled\" "
+"files until you have read the /usr/share/doc/amavisd-new/README.Debian file "
+"and ported your old configuration to the new layout."
+msgstr ""
+"Questa misura di sicurezza impedisce l'avvio di una versione non configurata "
+"di amavisd-new al posto della precedente che era configurata. Non eliminare "
+"i file \".disabled\" fino a quando non si Ă¨ convertito, seguendo le "
+"indicazioni in /usr/share/doc/amavisd-new/README.Debian, la vecchia "
+"configurazione alla nuova struttura."
--- amavisd-new-2.6.4.orig/debian/po/es.po
+++ amavisd-new-2.6.4/debian/po/es.po
@@ -0,0 +1,74 @@
+# amavisd-new po-debconf translation to Spanish
+# Copyright (C) 2009 Software in the Public Interest
+# This file is distributed under the same license as the amavisd-new package.
+#
+# Changes:
+#   - Initial translation
+#       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/
+#     especialmente las notas y normas 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: amavisd-new 1:2.6.1.dfsg-2\n"
+"Report-Msgid-Bugs-To: bam@debian.org\n"
+"POT-Creation-Date: 2006-08-10 11:09-0300\n"
+"PO-Revision-Date: 2009-02-23 17:53+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: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "Incompatible configuration file layout detected"
+msgstr "Se ha detectado un formato incompatible del archivo de configuraciĂłn"
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "The Debian packages have changed the way they handle configuration files for amavisd-new to a better system, which uses multiple files instead of a single, monolithic file."
+msgstr "Los paquetes de Debian han cambiado la forma en que gestionan los archivos de configuraciĂłn de amavisd-new por un sistema mejor, que utiliza varios archivos en lugar de un Ăşnico archivo monolĂ­tico."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "The old amavisd-new configuration files that are still present in your system (named either /etc/amavisd.conf or /etc/amavis/amavisd.conf) are incompatible with this new config file layout."
+msgstr "Los antiguos archivos de configuraciĂłn de amavisd-new que todavĂ­a estĂˇn presentes en el sistema (nombrados como Â«/etc/amavisd.confÂ» o Â«/etc/amavis/amavisd.confÂ») son incompatibles con el nuevo formato de los archivos de configuraciĂłn."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "You should read /usr/share/doc/amavisd-new/README.Debian to understand the new configuration layout, and after that you should port your configuration to the new layout."
+msgstr "DeberĂ­a leer Â«/usr/share/doc/amavisd-new/README.DebianÂ» para entender el nuevo formato de la configuraciĂłn, y despuĂ©s deberĂ­a adaptar la configuraciĂłn al nuevo formato."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "For your safety, the old configuration files in your system have been disabled, and a \".disabled\" postfix was added to their file names.  The amavisd-new service will refuse to start until you remove (or rename) these \".disabled\" files."
+msgstr "Por su seguridad, los antiguos archivos de configuraciĂłn del sistema se han desactivado, y el sufijo Â«.disabledÂ» se ha aĂ±adido a dichos archivos. El servicio amavisd-new no se iniciarĂˇ hasta que elimine (o renombre) los archivos con el sufijo Â«.disabledÂ»."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "This safety is in place to avoid starting an unconfigured amavisd-new in place of your previously configured one.  Do not remove the \".disabled\" files until you have read the /usr/share/doc/amavisd-new/README.Debian file and ported your old configuration to the new layout."
+msgstr "Esta medida de seguridad se ha adoptado para evitar que se inicie un amavisd-new sin configurar en lugar del que estaba anteriormente configurado. No elimine los archivos con el sufijo Â«.disabledÂ» hasta que haya leĂ­do el archivo Â«/usr/share/doc/amavisd-new/README.DebianÂ» y haya adaptado la vieja configuraciĂłn al nuevo formato."
+
--- amavisd-new-2.6.4.orig/debian/po/nl.po
+++ amavisd-new-2.6.4/debian/po/nl.po
@@ -0,0 +1,53 @@
+# 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: amavisd-new\n"
+"Report-Msgid-Bugs-To: bam@debian.org\n"
+"POT-Creation-Date: 2006-08-10 11:09-0300\n"
+"PO-Revision-Date: 2007-03-03 18:20+0100\n"
+"Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
+"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "Incompatible configuration file layout detected"
+msgstr "Incompatibele layout van de configuratiebestanden ontdekt."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "The Debian packages have changed the way they handle configuration files for amavisd-new to a better system, which uses multiple files instead of a single, monolithic file."
+msgstr "De Debian-pakketten behandelen de configuratiebestanden voor amavisd-new nu in een nieuw en beter systeem, dat meerdere bestanden gebruikt i.p.v. Ă©Ă©n groot monolitisch bestand."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "The old amavisd-new configuration files that are still present in your system (named either /etc/amavisd.conf or /etc/amavis/amavisd.conf) are incompatible with this new config file layout."
+msgstr "De op uw systeem aanwezige configuratiebestanden (/etc/amavisd.conf, of /etc/amavis/amavisd.conf) gaan nog uit van de oude opzet, en zijn niet compatibel met de nieuwe opzet."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "You should read /usr/share/doc/amavisd-new/README.Debian to understand the new configuration layout, and after that you should port your configuration to the new layout."
+msgstr "Meer informatie over de nieuwe layout vindt u in /usr/share/doc/amavisd-new/README.Debian, na dit door te lezen kunt u uw configuratie omzetten naar de nieuwe layout."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "For your safety, the old configuration files in your system have been disabled, and a \".disabled\" postfix was added to their file names.  The amavisd-new service will refuse to start until you remove (or rename) these \".disabled\" files."
+msgstr "Voor uw veiligheid zijn de oude configuratiebestanden gedeactiveerd, en is er een 'disabled'-postfix toegevoegd aan hun naam. De 'amavisd-new'-dienst zal weigeren op te starten tot u deze '.disabled'-bestanden verwijdert of hernoemt."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "This safety is in place to avoid starting an unconfigured amavisd-new in place of your previously configured one.  Do not remove the \".disabled\" files until you have read the /usr/share/doc/amavisd-new/README.Debian file and ported your old configuration to the new layout."
+msgstr "Deze beveiliging is in plaats om te vermijden dat u een niet geconfigureerde amavisd-new start i.p.v. uw eerder geconfigureerde. Verwijder de '.disabled' bestanden niet voor u het bestand /usr/share/doc/amavisd-new/README.Debian gelezen heeft en de oude configuratie omgezet is naar de nieuwe opzet."
+
--- amavisd-new-2.6.4.orig/debian/po/ru.po
+++ amavisd-new-2.6.4/debian/po/ru.po
@@ -0,0 +1,87 @@
+# 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 <kozlov.y@gmail.com>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: amavisd-new new\n"
+"Report-Msgid-Bugs-To: bam@debian.org\n"
+"POT-Creation-Date: 2006-08-10 11:09-0300\n"
+"PO-Revision-Date: 2008-05-11 09:10+0400\n"
+"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\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: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "Incompatible configuration file layout detected"
+msgstr "ĐžĐ±Đ˝Đ°Ń€ŃĐ¶ĐµĐ˝Đ° Đ˝ĐµŃĐľĐ˛ĐĽĐµŃŃ‚Đ¸ĐĽĐľŃŃ‚ŃŚ Đ˛ Ń…Ń€Đ°Đ˝ĐµĐ˝Đ¸Đ¸ Đ˝Đ°ŃŃ‚Ń€ĐľĐµĐş"
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The Debian packages have changed the way they handle configuration files for "
+"amavisd-new to a better system, which uses multiple files instead of a "
+"single, monolithic file."
+msgstr ""
+"Đ’ ĐżĐ°ĐşĐµŃ‚Đ°Ń… Debian Đ¸Đ·ĐĽĐµĐ˝Đ¸Đ»ŃŃŹ ŃĐżĐľŃĐľĐ± ĐľĐ±Ń€Đ°Đ±ĐľŃ‚ĐşĐ¸ Ń„Đ°ĐąĐ»ĐľĐ˛ Đ˝Đ°ŃŃ‚Ń€ĐľĐµĐş amavisd-new, "
+"Ń‚ĐµĐżĐµŃ€ŃŚ Đ¸ŃĐżĐľĐ»ŃŚĐ·ŃĐµŃ‚ŃŃŹ Đ˝ĐµŃĐşĐľĐ»ŃŚĐşĐľ Ń„Đ°ĐąĐ»ĐľĐ˛ Đ˛ĐĽĐµŃŃ‚Đľ ĐľĐ´Đ˝ĐľĐłĐľ, Ń…Ń€Đ°Đ˝ŃŹŃ‰ĐµĐłĐľ Đ˛ŃŃ‘, Ń„Đ°ĐąĐ»Đ°."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The old amavisd-new configuration files that are still present in your "
+"system (named either /etc/amavisd.conf or /etc/amavis/amavisd.conf) are "
+"incompatible with this new config file layout."
+msgstr ""
+"ĐˇŃ‚Đ°Ń€Ń‹Đµ Ń„Đ°ĐąĐ»Ń‹ Đ˝Đ°ŃŃ‚Ń€ĐľĐąĐşĐ¸ amavisd-new, ĐşĐľŃ‚ĐľŃ€Ń‹Đµ Đ˝Đ°Ń…ĐľĐ´ŃŹŃ‚ŃŃŹ Đ˛ ŃĐ¸ŃŃ‚ĐµĐĽĐµ (ĐżĐľĐ´ "
+"Đ¸ĐĽĐµĐ˝Đ°ĐĽĐ¸ /etc/amavisd.conf Đ¸Đ»Đ¸ /etc/amavis/amavisd.conf) Đ˝ĐµŃĐľĐ˛ĐĽĐµŃŃ‚Đ¸ĐĽŃ‹ Ń Đ˝ĐľĐ˛Ń‹ĐĽ "
+"ŃĐżĐľŃĐľĐ±ĐľĐĽ Ń…Ń€Đ°Đ˝ĐµĐ˝Đ¸ŃŹ Đ˝Đ°ŃŃ‚Ń€ĐľĐµĐş."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"You should read /usr/share/doc/amavisd-new/README.Debian to understand the "
+"new configuration layout, and after that you should port your configuration "
+"to the new layout."
+msgstr ""
+"Đ’Đ°ĐĽ Đ˝ŃĐ¶Đ˝Đľ ĐżŃ€ĐľŃ‡Đ¸Ń‚Đ°Ń‚ŃŚ Ń„Đ°ĐąĐ» /usr/share/doc/amavisd-new/README.Debian, Đ˛ ĐşĐľŃ‚ĐľŃ€ĐľĐĽ "
+"ĐľĐżĐ¸ŃĐ°Đ˝ Đ˝ĐľĐ˛Ń‹Đą ŃĐżĐľŃĐľĐ± Ń…Ń€Đ°Đ˝ĐµĐ˝Đ¸ŃŹ, Đ¸ ĐżĐľŃĐ»Đµ ŃŤŃ‚ĐľĐłĐľ Đ˛Ń‹ Đ´ĐľĐ»Đ¶Đ˝Ń‹ ĐżĐµŃ€ĐµĐ˝ĐµŃŃ‚Đ¸ ŃĐ˛ĐľĐ¸ "
+"Đ˝Đ°ŃŃ‚Ń€ĐľĐąĐşĐ¸ Đ˛ Đ˝ĐľĐ˛ŃŃŽ ŃĐ¸ŃŃ‚ĐµĐĽŃ."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"For your safety, the old configuration files in your system have been "
+"disabled, and a \".disabled\" postfix was added to their file names.  The "
+"amavisd-new service will refuse to start until you remove (or rename) these "
+"\".disabled\" files."
+msgstr ""
+"Đ’ Ń†ĐµĐ»ŃŹŃ… Đ±ĐµĐ·ĐľĐżĐ°ŃĐ˝ĐľŃŃ‚Đ¸, ŃŃ‚Đ°Ń€Ń‹Đµ Ń„Đ°ĐąĐ»Ń‹ Đ˝Đ°ŃŃ‚Ń€ĐľĐąĐşĐ¸ Đ˛ ŃĐ¸ŃŃ‚ĐµĐĽĐµ Đ±ŃĐ´ŃŃ‚ Đ˛Ń‹ĐşĐ»ŃŽŃ‡ĐµĐ˝Ń‹, Đ° Đş "
+"Đ¸Ń… Đ¸ĐĽĐµĐ˝Đ°ĐĽ Đ±ŃĐ´ĐµŃ‚ Đ´ĐľĐ±Đ°Đ˛Đ»ĐµĐ˝Đľ \".disabled\". ĐˇĐ»ŃĐ¶Đ±Đ° amavisd-new Đ˝Đµ Đ±ŃĐ´ĐµŃ‚ "
+"Đ·Đ°ĐżŃŃĐşĐ°Ń‚ŃŚŃŃŹ, ĐżĐľĐşĐ° Đ˛Ń‹ Đ˝Đµ ŃĐ´Đ°Đ»Đ¸Ń‚Đµ (Đ¸Đ»Đ¸ ĐżĐµŃ€ĐµĐ¸ĐĽĐµĐ˝ŃĐµŃ‚Đµ) ŃŤŃ‚Đ¸ \".disabled\" Ń„Đ°ĐąĐ»Ń‹."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"This safety is in place to avoid starting an unconfigured amavisd-new in "
+"place of your previously configured one.  Do not remove the \".disabled\" "
+"files until you have read the /usr/share/doc/amavisd-new/README.Debian file "
+"and ported your old configuration to the new layout."
+msgstr ""
+"Đ‘ĐµĐ·ĐľĐżĐ°ŃĐ˝ĐµĐą ŃĐľĐ˛ŃĐµĐĽ Đ˛Ń‹ĐşĐ»ŃŽŃ‡Đ¸Ń‚ŃŚ Đ·Đ°ĐżŃŃĐş Đ˝ĐµĐ˝Đ°ŃŃ‚Ń€ĐľĐµĐ˝Đ˝ĐľĐłĐľ amavisd-new, Đ˛ĐĽĐµŃŃ‚Đľ Ń€Đ°Đ±ĐľŃ‚Ń‹ "
+"ŃĐľ ŃŃ‚Đ°Ń€ĐľĐą Đ˝Đ°ŃŃ‚Ń€ĐľĐąĐşĐľĐą. ĐťĐµ ŃĐ´Đ°Đ»ŃŹĐąŃ‚Đµ Ń„Đ°ĐąĐ»Ń‹ \".disabled\", ĐżĐľĐşĐ° Đ˝Đµ ĐżŃ€ĐľŃ‡Đ¸Ń‚Đ°ĐµŃ‚Đµ "
+"Ń„Đ°ĐąĐ» /usr/share/doc/amavisd-new/README.Debian Đ¸ Đ˝Đµ ĐżĐµŃ€ĐµĐ˝ĐµŃŃ‘Ń‚Đµ ŃŃ‚Đ°Ń€ŃŃŽ "
+"Đ˝Đ°ŃŃ‚Ń€ĐľĐąĐşŃ Đ˛ Đ˝ĐľĐ˛Ń‹Đµ Ń„Đ°ĐąĐ»Ń‹."
--- amavisd-new-2.6.4.orig/debian/po/ja.po
+++ amavisd-new-2.6.4/debian/po/ja.po
@@ -0,0 +1,69 @@
+# 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: amavisd-new\n"
+"Report-Msgid-Bugs-To: bam@debian.org\n"
+"POT-Creation-Date: 2006-08-10 11:09-0300\n"
+"PO-Revision-Date: 2007-10-14 17:11+0900\n"
+"Last-Translator: Kenshi Muto <kmuto@debian.org>\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: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "Incompatible configuration file layout detected"
+msgstr "éťžäş’ćŹ›ă®č¨­ĺ®šă•ă‚ˇă‚¤ă«ă¬ă‚¤ă‚˘ă‚¦ăăŚć¤śĺ‡şă•ă‚Śăľă—ăź"
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The Debian packages have changed the way they handle configuration files for "
+"amavisd-new to a better system, which uses multiple files instead of a "
+"single, monolithic file."
+msgstr "Debian ă‘ăă‚±ăĽă‚¸ăŻ amavisd-new ă®č¨­ĺ®šă•ă‚ˇă‚¤ă«ă‚’ç®ˇç†ă™ă‚‹ć–ąćł•ă‚’ă€ĺŤä¸€ă•ă‚ˇă‚¤ă«ă®ă˘ăŽăŞă‚·ăă‚ŻăŞă•ă‚ˇă‚¤ă«ă®ä»Łă‚Źă‚Šă«č¤‡ć•°ă®ă•ă‚ˇă‚¤ă«ă‚’ä˝żăŁăźă€ă‚ă‚Šč‰Żă„ă‚·ă‚ąă†ă ă«ĺ¤‰ć›´ă—ăľă—ăźă€‚"
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The old amavisd-new configuration files that are still present in your "
+"system (named either /etc/amavisd.conf or /etc/amavis/amavisd.conf) are "
+"incompatible with this new config file layout."
+msgstr "ă‚ăŞăźă®ă‚·ă‚ąă†ă ă§ćŹäľ›ă•ă‚Śă¦ă„ă‚‹ĺŹ¤ă„ amavisd-new č¨­ĺ®šă•ă‚ˇă‚¤ă« (/etc/amavisd.conf ăľăźăŻ /etc/amavis/amavisd.conf ă¨ă„ă†ĺŤĺ‰Ť) ăŻă€ă“ă®ć–°ă—ă„č¨­ĺ®šă•ă‚ˇă‚¤ă«ă¬ă‚¤ă‚˘ă‚¦ăă¨äş’ćŹ›ć€§ăŚă‚ă‚Šăľă›ă‚“ă€‚"
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"You should read /usr/share/doc/amavisd-new/README.Debian to understand the "
+"new configuration layout, and after that you should port your configuration "
+"to the new layout."
+msgstr "ć–°ă—ă„č¨­ĺ®šă¬ă‚¤ă‚˘ă‚¦ăă‚’ç†č§Łă™ă‚‹ăźă‚ă«ă€/usr/share/doc/amavisd-new/README.Debian ă‚’čŞ­ă‚“ă§ăŹă ă•ă„ă€‚ăťă‚Śă‹ă‚‰ă€ă‚ăŞăźă®č¨­ĺ®šă‚’ć–°ă—ă„ă¬ă‚¤ă‚˘ă‚¦ăă«ç§»ć¤Ťă—ă¦ăŹă ă•ă„ă€‚"
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"For your safety, the old configuration files in your system have been "
+"disabled, and a \".disabled\" postfix was added to their file names.  The "
+"amavisd-new service will refuse to start until you remove (or rename) these "
+"\".disabled\" files."
+msgstr "ĺ®‰ĺ…¨ă®ăźă‚ă«ă‚ăŞăźă®ă‚·ă‚ąă†ă ă®ĺŹ¤ă„č¨­ĺ®šă•ă‚ˇă‚¤ă«ăŻç„ˇĺŠąă¨ă•ă‚Śă€\".disabled\" ă®ćŽĄĺ°ľčľžăŚăťă‚Śă‚‰ă®ă•ă‚ˇă‚¤ă«ĺŤă«ä»ĺŠ ă•ă‚Śăľă™ă€‚amavisd-new ă‚µăĽă“ă‚ąăŻă€ă‚ăŞăźăŚă“ă‚Śă‚‰ă® \".disabled\" ă•ă‚ˇă‚¤ă«ă‚’ĺ‰Šé™¤ (ă‚ă‚‹ă„ăŻĺŤĺ‰Ťĺ¤‰ć›´) ă™ă‚‹ăľă§ć‹’ĺ¦ă•ă‚Śăľă™ă€‚"
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"This safety is in place to avoid starting an unconfigured amavisd-new in "
+"place of your previously configured one.  Do not remove the \".disabled\" "
+"files until you have read the /usr/share/doc/amavisd-new/README.Debian file "
+"and ported your old configuration to the new layout."
+msgstr "ă“ă®ĺ®‰ĺ…¨čŁ…ç˝®ăŻă€ă‚ăŞăźă®ä»Ąĺ‰Ťă®č¨­ĺ®šă®ä»Łă‚Źă‚Šă«ćśŞč¨­ĺ®šă® amavisd-new ăŚé–‹ĺ§‹ă™ă‚‹ă®ă‚’éżă‘ă‚‹ăźă‚ă®ă‚‚ă®ă§ă™ă€‚/usr/share/doc/amavisd-new/README.Debian ă•ă‚ˇă‚¤ă«ă‚’čŞ­ăżă€ă‚ăŞăźă®ĺŹ¤ă„č¨­ĺ®šă‚’ć–°ă—ă„ă¬ă‚¤ă‚˘ă‚¦ăă«ç§»ć¤Ťă™ă‚‹ăľă§ă€\".disabled\" ă•ă‚ˇă‚¤ă«ă‚’ĺ‰Šé™¤ă—ăŞă„ă§ăŹă ă•ă„ă€‚"
--- amavisd-new-2.6.4.orig/debian/po/sv.po
+++ amavisd-new-2.6.4/debian/po/sv.po
@@ -0,0 +1,90 @@
+# translation of amavisd-new_1:2.6.1.dfsg-1_sv.po to Swedish
+# Copyright (C) 2008
+# This file is distributed under the same license as the amavisd-new package.
+#
+# Martin Ă…gren <martin.agren@gmail.com>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: amavisd-new_1:2.6.1.dfsg-1_sv\n"
+"Report-Msgid-Bugs-To: bam@debian.org\n"
+"POT-Creation-Date: 2006-08-10 11:09-0300\n"
+"PO-Revision-Date: 2008-09-13 16:53+0200\n"
+"Last-Translator: Martin Ă…gren <martin.agren@gmail.com>\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-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "Incompatible configuration file layout detected"
+msgstr "En inkompatibel konfigurationsfilslayout har upptĂ¤ckts"
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The Debian packages have changed the way they handle configuration files for "
+"amavisd-new to a better system, which uses multiple files instead of a "
+"single, monolithic file."
+msgstr ""
+"Debianpaketen har Ă¤ndrat sĂ¤ttet pĂĄ vilket de hanterar "
+"konfigurationsfiler fĂ¶r amavisd-new till ett bĂ¤ttre system, som anvĂ¤nder "
+"flera filer istĂ¤llet fĂ¶r en enda, ogenomtrĂ¤nglig fil."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The old amavisd-new configuration files that are still present in your "
+"system (named either /etc/amavisd.conf or /etc/amavis/amavisd.conf) are "
+"incompatible with this new config file layout."
+msgstr ""
+"De gamla amavisd-new-konfigurationsfilerna som fortfarande finns "
+"i ditt system (de heter antingen /etc/amavisd.conf eller "
+"/etc/amavis/amavisd.conf) Ă¤r "
+"inkompatibla med den nya konfigurationsfilslayouten."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"You should read /usr/share/doc/amavisd-new/README.Debian to understand the "
+"new configuration layout, and after that you should port your configuration "
+"to the new layout."
+msgstr ""
+"Du mĂĄste lĂ¤sa /usr/share/doc/amavisd-new/README.Debian fĂ¶r att "
+"fĂ¶rstĂĄ den nya konfigurationslayouten och dĂ¤refter Ă¶verfĂ¶ra din konfiguration "
+"till den nya layouten."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"For your safety, the old configuration files in your system have been "
+"disabled, and a \".disabled\" postfix was added to their file names.  The "
+"amavisd-new service will refuse to start until you remove (or rename) these "
+"\".disabled\" files."
+msgstr ""
+"FĂ¶r sĂ¤kerhets skull har de gamla konfigurationsfilerna i ditt system "
+"avaktiverats och ett \".disabled\"-suffix lagts till deras filnamn. "
+"amavisd-new-tjĂ¤nsten kommer vĂ¤gra starta tills du tar bort "
+"(eller byter namn pĂĄ) dessa \".disabled\"-filer."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"This safety is in place to avoid starting an unconfigured amavisd-new in "
+"place of your previously configured one.  Do not remove the \".disabled\" "
+"files until you have read the /usr/share/doc/amavisd-new/README.Debian file "
+"and ported your old configuration to the new layout."
+msgstr ""
+"Den hĂ¤r sĂ¤kerhetsmekanismen finns till fĂ¶r att undvika att en "
+"okonfigurerad amavisd-new startas i stĂ¤llet fĂ¶r din tidigare konfigurerade version. "
+"Ta inte bort \".disabled\"-filerna innan du har lĂ¤st /usr/share/doc/amavisd-new/README.Debian och fĂ¶rt Ă¶ver din gamla "
+"konfiguration till den nya layouten."
+
--- amavisd-new-2.6.4.orig/debian/po/templates.pot
+++ amavisd-new-2.6.4/debian/po/templates.pot
@@ -0,0 +1,70 @@
+# 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.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: bam@debian.org\n"
+"POT-Creation-Date: 2006-08-10 11:09-0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\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: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "Incompatible configuration file layout detected"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The Debian packages have changed the way they handle configuration files for "
+"amavisd-new to a better system, which uses multiple files instead of a "
+"single, monolithic file."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The old amavisd-new configuration files that are still present in your "
+"system (named either /etc/amavisd.conf or /etc/amavis/amavisd.conf) are "
+"incompatible with this new config file layout."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"You should read /usr/share/doc/amavisd-new/README.Debian to understand the "
+"new configuration layout, and after that you should port your configuration "
+"to the new layout."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"For your safety, the old configuration files in your system have been "
+"disabled, and a \".disabled\" postfix was added to their file names.  The "
+"amavisd-new service will refuse to start until you remove (or rename) these "
+"\".disabled\" files."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"This safety is in place to avoid starting an unconfigured amavisd-new in "
+"place of your previously configured one.  Do not remove the \".disabled\" "
+"files until you have read the /usr/share/doc/amavisd-new/README.Debian file "
+"and ported your old configuration to the new layout."
+msgstr ""
--- amavisd-new-2.6.4.orig/debian/po/gl.po
+++ amavisd-new-2.6.4/debian/po/gl.po
@@ -0,0 +1,88 @@
+# Galician translation of amavisd-new's debconf templates
+# This file is distributed under the same license as the amavisd-new package.
+# Jacobo Tarrio <jtarrio@debian.org>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: amavisd-new\n"
+"Report-Msgid-Bugs-To: bam@debian.org\n"
+"POT-Creation-Date: 2006-08-10 11:09-0300\n"
+"PO-Revision-Date: 2007-03-05 09:15+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: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "Incompatible configuration file layout detected"
+msgstr ""
+"Detectouse unha disposiciĂłn dos ficheiros de configuraciĂłn incompatible"
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The Debian packages have changed the way they handle configuration files for "
+"amavisd-new to a better system, which uses multiple files instead of a "
+"single, monolithic file."
+msgstr ""
+"Os paquetes Debian modificaron a maneira en que xestionan os ficheiros de "
+"configuraciĂłn de amavisd-new a un sistema mellor que emprega varios "
+"ficheiros no canto dun sĂł ficheiro monolĂ­tico."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The old amavisd-new configuration files that are still present in your "
+"system (named either /etc/amavisd.conf or /etc/amavis/amavisd.conf) are "
+"incompatible with this new config file layout."
+msgstr ""
+"Os ficheiros de configuraciĂłn antigos de amavisd-new que aĂ­nda estĂˇn "
+"presentes no seu sistema (chamados /etc/amavisd.conf ou /etc/amavis/amavisd."
+"conf) son incompatibles con esta nova disposiciĂłn dos ficheiros de "
+"configuraciĂłn."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"You should read /usr/share/doc/amavisd-new/README.Debian to understand the "
+"new configuration layout, and after that you should port your configuration "
+"to the new layout."
+msgstr ""
+"DeberĂ­a consultar /usr/share/doc/amavisd-new/README.Debian para comprender a "
+"nova disposiciĂłn da configuraciĂłn, e despois diso deberĂ­a portar a sĂşa "
+"configuraciĂłn Ăˇ nova disposiciĂłn."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"For your safety, the old configuration files in your system have been "
+"disabled, and a \".disabled\" postfix was added to their file names.  The "
+"amavisd-new service will refuse to start until you remove (or rename) these "
+"\".disabled\" files."
+msgstr ""
+"Para a sĂşa seguridade, desactivĂˇronse os ficheiros de configuraciĂłn antigos, "
+"e engadiuse un sufixo \".disabled\" aos seus nomes. O servizo amavisd-new "
+"non se ha iniciar ata que elimine (ou cambie o nome) dos ficheiros \"."
+"disabled\"."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"This safety is in place to avoid starting an unconfigured amavisd-new in "
+"place of your previously configured one.  Do not remove the \".disabled\" "
+"files until you have read the /usr/share/doc/amavisd-new/README.Debian file "
+"and ported your old configuration to the new layout."
+msgstr ""
+"Este seguro incluiuse para evitar iniciar un amavisd-new no canto do que "
+"tiĂ±a configurado antes. Non elimine os ficheiros \".disabled\" ata que teĂ±a "
+"lido o ficheiro /usr/share/doc/amavisd-new/README.Debian e teĂ±a portada a "
+"sĂşa configuraciĂłn antiga Ăˇ nova disposiciĂłn."
+
--- amavisd-new-2.6.4.orig/debian/po/eu.po
+++ amavisd-new-2.6.4/debian/po/eu.po
@@ -0,0 +1,87 @@
+# translation of amavisd-new-eu.po to Euskara
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Piarres Beobide <pi@beobide.net>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: amavisd-new-eu\n"
+"Report-Msgid-Bugs-To: bam@debian.org\n"
+"POT-Creation-Date: 2006-08-10 11:09-0300\n"
+"PO-Revision-Date: 2008-09-14 01:10+0200\n"
+"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
+"Language-Team: Euskara <debian-l10n-basque@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: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "Incompatible configuration file layout detected"
+msgstr "Konfigurazio fitxategi bateraezin ingurunea antzeman da"
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The Debian packages have changed the way they handle configuration files for "
+"amavisd-new to a better system, which uses multiple files instead of a "
+"single, monolithic file."
+msgstr ""
+"Debian paketeek amavisd-new konfigurazio fitxategien kudeaketa aldatu dute; "
+"modu honek fitxategi ezberdinak erabiltzen ditu fitxategi bakar, "
+"monolitikoaren ordez."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The old amavisd-new configuration files that are still present in your "
+"system (named either /etc/amavisd.conf or /etc/amavis/amavisd.conf) are "
+"incompatible with this new config file layout."
+msgstr ""
+"Amavisd-new konfigurazio zaharra zure sisteman jarraitzen duen ( /etc/"
+"amavisd.conf edo /etc/amavis/amavisd.conf izenarekin) konfigurazio ingurune "
+"berriarekin bateraezinak dira."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"You should read /usr/share/doc/amavisd-new/README.Debian to understand the "
+"new configuration layout, and after that you should port your configuration "
+"to the new layout."
+msgstr ""
+"/usr/share/doc/amavisd-new/README.Debian irakurri behar duzu konfigurazio "
+"ingurune berria ulertzeko, eta hau egin ondoren konfigurazio ingurune "
+"berrira migratu dezakezu."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"For your safety, the old configuration files in your system have been "
+"disabled, and a \".disabled\" postfix was added to their file names.  The "
+"amavisd-new service will refuse to start until you remove (or rename) these "
+"\".disabled\" files."
+msgstr ""
+"Zure segurtasunagatik, zure sistemako konfigurazio fitxategiak desgaitu egin "
+"dira, eta \".disabled\" aurrizkia gehitu zaie fitxategi izenei. Amavisd-new "
+"zerbitzua ez da abiaraziko \".disabled\" fitxategiak ezabatu (edo "
+"berrizendatu) arte."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"This safety is in place to avoid starting an unconfigured amavisd-new in "
+"place of your previously configured one.  Do not remove the \".disabled\" "
+"files until you have read the /usr/share/doc/amavisd-new/README.Debian file "
+"and ported your old configuration to the new layout."
+msgstr ""
+"Segurtasun neurri hau aurretik konfiguraturik zenuenaren ordez konfiguratu "
+"gabeko amavid-new bat abiarazi ez dadin egiten da. Ez ezabatu \".disabled\" "
+"fitxategiak /usr/share/doc/amavisd-new/README.Debian fitxategia irakurri eta "
+"konfigurazio ingurune berrira berritu arte."
--- amavisd-new-2.6.4.orig/debian/po/pt.po
+++ amavisd-new-2.6.4/debian/po/pt.po
@@ -0,0 +1,86 @@
+# Portuguese translation for amavisd-new 
+# This file is distributed under the same license as the amavisd-new package.
+# AndrĂ© Costa <skit@argon.ath.cx>, 2006
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: amavisd-new\n"
+"Report-Msgid-Bugs-To: bam@debian.org\n"
+"POT-Creation-Date: 2006-08-10 11:09-0300\n"
+"PO-Revision-Date: 2006-04-14 23:35+0000\n"
+"Last-Translator: AndrĂ© Costa <skit@argon.ath.cx>\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: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid "Incompatible configuration file layout detected"
+msgstr "Detectado layout do ficheiro de configuraĂ§ĂŁo incompatĂ­vel"
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The Debian packages have changed the way they handle configuration files for "
+"amavisd-new to a better system, which uses multiple files instead of a "
+"single, monolithic file."
+msgstr ""
+"Os pacotes Debian mudaram a maneira como lidam com os ficheiros de "
+"configuraĂ§ĂŁo do amavisd-new para um melhor sistema, o qual usa ficheiros "
+"multiplos em vez de um ficheiro Ăşnico e monolĂ­tico."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"The old amavisd-new configuration files that are still present in your "
+"system (named either /etc/amavisd.conf or /etc/amavis/amavisd.conf) are "
+"incompatible with this new config file layout."
+msgstr ""
+"Os antigos ficheiros de configuraĂ§ĂŁo do amavisd-new que ainda estĂŁo "
+"presentes no seu sistema (chamados /etc/amavisd.conf ou /etc/amavis/amavisd."
+"conf) sĂŁo incompatĂ­veis com o novo layout deste novo ficheiro de "
+"configuraĂ§ĂŁo."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"You should read /usr/share/doc/amavisd-new/README.Debian to understand the "
+"new configuration layout, and after that you should port your configuration "
+"to the new layout."
+msgstr ""
+"VocĂŞ deve ler /usr/share/doc/amavisd-new/README.Debian para perceber o novo "
+"layout de configuraĂ§ĂŁo, e a seguir a isso, deveria modificar a sua "
+"configuraĂ§ĂŁo para o novo layout."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"For your safety, the old configuration files in your system have been "
+"disabled, and a \".disabled\" postfix was added to their file names.  The "
+"amavisd-new service will refuse to start until you remove (or rename) these "
+"\".disabled\" files."
+msgstr ""
+"Para sua seguranĂ§a, os ficheiros antigos de configuraĂ§ĂŁo foram desactivados, "
+"e um sufixo \".disabled\" foi adicionado aos seus nomes. O serviĂ§o amavisd-"
+"new irĂˇ negar-se a iniciar atĂ© que vocĂŞ remova (ou mude o nome) destes "
+"ficheiros \".disabled\"."
+
+#. Type: note
+#. Description
+#: ../amavisd-new.templates:1001
+msgid ""
+"This safety is in place to avoid starting an unconfigured amavisd-new in "
+"place of your previously configured one.  Do not remove the \".disabled\" "
+"files until you have read the /usr/share/doc/amavisd-new/README.Debian file "
+"and ported your old configuration to the new layout."
+msgstr ""
+"Esta seguranĂ§a estĂˇ activa para evitar iniciar um amavisd-new nĂŁo "
+"configurado em detrimento do seu anterior configurado.  NĂŁo remova os "
+"ficheiros \".disabled\" atĂ© que tenha lido o ficheiro /usr/share/doc/amavisd-"
+"new/README.Debian e mudado a sua antiga configuraĂ§ĂŁo para o novolayout."
--- amavisd-new-2.6.4.orig/debian/etc/README.l10n
+++ amavisd-new-2.6.4/debian/etc/README.l10n
@@ -0,0 +1,21 @@
+$Id: README.l10n 742 2005-12-26 17:15:22Z hmh $
+
+First of all, read /usr/share/doc/amavisd-new/README.customize.gz
+
+Amavisd-new is UTF8-aware, and it will do character-set conversion when dealing
+with DSN templates.  The full unicode codespace is available, if used with the
+proper encodings... and you have to use the proper encodings if you don't want
+your DSNs to be flagged as more charset-challenged SPAM by other systems.
+
+ALWAYS respect the charset when adding l10n files.
+
+Amavisd-new does charset conversion twice: one when reading the text files with
+localized templates (to internal perl UTF8), and another when writing the email
+notification (from internal perl UTF8 to $hdr_encoding and $bdy_encoding).
+
+Headers will be RFC2047-encoded if they have any codepoints not allowed by
+RFC2822 after the charset conversions.  The body text charset encoding is
+inserted in the proper MIME header.
+
+More details are available in /usr/share/doc/amavisd-new/RELEASE_NOTES.gz
+
--- amavisd-new-2.6.4.orig/debian/etc/en_US/template-virus-recipient.txt
+++ amavisd-new-2.6.4/debian/etc/en_US/template-virus-recipient.txt
@@ -0,0 +1,47 @@
+#
+# =============================================================================
+# This is a template for VIRUS/BANNED/BAD-HEADER RECIPIENTS NOTIFICATIONS.
+# For syntax and customization instructions see README.customize.
+# Long header fields will be automatically wrapped by the program.
+#
+From: %f
+Date: %d
+Subject: [? [:ccat|major] |Clean mail|Clean mail|MTA-blocked mail|\
+OVERSIZED mail|INVALID HEADER in mail|SPAM|SPAM|UNCHECKED contents in mail|\
+BANNED contents (%F) in mail|VIRUS (%V) in mail]\
+ TO YOU from [?%s|<>|[?%o|(?)|%s]]
+[? [:header_field|To] |To: undisclosed-recipients:;|To: [:header_field|To]]
+[? [:header_field|Cc] |#|Cc: [:header_field|Cc]]
+Message-ID: <VR%i@%h>
+
+[? %#V |[? %#F ||BANNED CONTENTS ALERT]|VIRUS ALERT]
+
+Our content checker found
+[? %#V |#|[:wrap|78|    |  |[?%#V|viruses|virus|viruses]: %V]]
+[? %#F |#|[:wrap|78|    |  |banned [?%#F|names|name|names]: %F]]
+[? %#X |#|[[:wrap|78|    |  |%X]\n]]
+
+in an email to you [? %S |from unknown sender:|from:]
+  %o
+[? %S |claiming to be: %s|#]
+
+Content type: [:ccat|name|main]#
+[? [:ccat|is_blocked_by_nonmain] ||, blocked for [:ccat|name]]
+Our internal reference code for your message is %n/%i
+
+[? %a |#|[:wrap|78||  |First upstream SMTP client IP address: \[%a\] %g]]
+[? %e |#|[:wrap|78||  |According to a 'Received:' trace,\
+ the message originated at: \[%e\], %t]]
+
+[:wrap|78||  |Return-Path: %s[?[:dkim|envsender]|| (OK)]]
+[:wrap|78||  |From: [:header_field|From][?[:dkim|author]|| (dkim:AUTHOR)]]
+[? [:header_field|Sender]|#|\
+[:wrap|78||  |Sender: [:header_field|Sender]\
+[?[:dkim|sender]|| (dkim:SENDER)]]]
+[? %m |#|[:wrap|78||  |Message-ID: %m]]
+[? %r |#|[:wrap|78||  |Resent-Message-ID: %r]]
+[? [:useragent] |#|[:wrap|78||  |[:useragent]]]
+[? %j |#|[:wrap|78||  |Subject: %j]]
+[? %q |Not quarantined.|The message has been quarantined as: %q]
+
+Please contact your system administrator for details.
--- amavisd-new-2.6.4.orig/debian/etc/en_US/charset
+++ amavisd-new-2.6.4/debian/etc/en_US/charset
@@ -0,0 +1,4 @@
+# This is charset for en_US messages.
+# If you are creating new messages, use 'iconv -l' to get possible encodings.
+ascii   # or iso-8859-1
+ignored lines after first one
--- amavisd-new-2.6.4.orig/debian/etc/en_US/template-virus-sender.txt
+++ amavisd-new-2.6.4/debian/etc/en_US/template-virus-sender.txt
@@ -0,0 +1,91 @@
+#
+# =============================================================================
+# This is a template for VIRUS/BANNED SENDER NOTIFICATIONS.
+# For syntax and customization instructions see README.customize.
+# The From, To and Date header fields will be provided automatically.
+# Long header fields will be automatically wrapped by the program.
+#
+Subject: [? [:ccat|major]
+|Clean message from you\
+|Clean message from you\
+|Clean message from you (MTA blocked)\
+|OVERSIZED message from you\
+|BAD-HEADER in message from you\
+|SPAM apparently from you\
+|SPAM apparently from you\
+|A message with UNCHECKED contents from you\
+|BANNED message from you (%F)\
+|VIRUS in message apparently from you (%V)\
+]
+[? %m  |#|In-Reply-To: %m]
+Message-ID: <VS%i@%h>
+
+[? [:ccat|major] |Clean|Clean|MTA-BLOCKED|OVERSIZED|INVALID HEADER|\
+spam|SPAM|UNCHECKED contents|BANNED CONTENTS ALERT|VIRUS ALERT]
+
+Our content checker found
+[? %#V |#|[:wrap|78|    |  |[? %#V |viruses|virus|viruses]: %V]]
+[? %#F |#|[:wrap|78|    |  |banned [? %#F |names|name|names]: %F]]
+[? %#X |#|[[:wrap|78|    |  |%X]\n]]
+
+in email presumably from you %s
+to the following [? %#R |recipients|recipient|recipients]:[
+-> %R]
+
+Our internal reference code for your message is %n/%i
+
+[? %a |#|[:wrap|78||  |First upstream SMTP client IP address: \[%a\] %g]]
+[? %e |#|[:wrap|78||  |According to a 'Received:' trace,\
+ the message originated at: \[%e\], %t]]
+
+[:wrap|78||  |Return-Path: %s[?[:dkim|envsender]|| (OK)]]
+[:wrap|78||  |From: [:header_field|From|100][?[:dkim|author]|| (dkim:AUTHOR)]]
+[? [:header_field|Sender]|#|\
+[:wrap|78||  |Sender: [:header_field|Sender|100]\
+[?[:dkim|sender]|| (dkim:SENDER)]]]
+[? %m |#|[:wrap|78||  |Message-ID: %m]]
+[? %r |#|[:wrap|78||  |Resent-Message-ID: %r]]
+[? %j |#|[:wrap|78||  |Subject: [:header_field|Subject|100]]]
+
+[? %#D |Delivery of the email was stopped!
+
+]#
+[? %#V ||Please check your system for viruses,
+or ask your system administrator to do so.
+
+]#
+[? %#V |[? %#F ||#
+The message [?%#D|has been blocked|triggered this warning] because it contains a component
+(as a MIME part or nested within) with declared name
+or MIME type or contents type violating our access policy.
+
+To transfer contents that may be considered risky or unwanted
+by site policies, or simply too large for mailing, please consider
+publishing your content on the web, and only sending an URL of the
+document to the recipient.
+
+Depending on the recipient and sender site policies, with a little
+effort it might still be possible to send any contents (including
+viruses) using one of the following methods:
+
+- encrypted using pgp, gpg or other encryption methods;
+
+- wrapped in a password-protected or scrambled container or archive
+  (e.g.: zip -e, arj -g, arc g, rar -p, or other methods)
+
+Note that if the contents is not intended to be secret, the
+encryption key or password may be included in the same message
+for recipient's convenience.
+
+We are sorry for inconvenience if the contents was not malicious.
+
+The purpose of these restrictions is to cut the most common propagation
+methods used by viruses and other malware. These often exploit automatic
+mechanisms and security holes in more popular mail readers (Microsoft
+mail readers and browsers are a common target). By requiring an explicit
+and decisive action from the recipient to decode mail, the danger of
+automatic malware propagation is largely reduced.
+#
+# Details of our mail restrictions policy are available at ...
+
+]]#
--- amavisd-new-2.6.4.orig/debian/etc/en_US/template-dsn.txt
+++ amavisd-new-2.6.4/debian/etc/en_US/template-dsn.txt
@@ -0,0 +1,134 @@
+#
+# =============================================================================
+# This is a template for (neutral: non-virus, non-spam, non-banned)
+# DELIVERY STATUS NOTIFICATIONS to sender.
+# For syntax and customization instructions see README.customize.
+# The From, To and Date header fields will be provided automatically.
+# Long header fields will be automatically wrapped by the program.
+#
+Subject: [?%#D|Undeliverable mail|Delivery status notification]\
+[? [:ccat|major] |||, MTA-BLOCKED\
+|, OVERSIZED message\
+|, invalid header[=explain_badh|1]\
+[?[:ccat|minor]||: bad MIME|: unencoded 8-bit character\
+|: improper use of control char|: all-whitespace header field\
+|: header line longer than 998 characters|: header field syntax error\
+|: missing required header field|: duplicate header field|]\
+|, UNSOLICITED BULK EMAIL apparently from you\
+|, UNSOLICITED BULK EMAIL apparently from you\
+|, contents UNCHECKED\
+|, BANNED contents type (%F)\
+|, VIRUS in message apparently from you (%V)\
+]
+Message-ID: <DSN%i@%h>
+
+[? %#D |#|Your message WAS SUCCESSFULLY RELAYED to:[\n  %D]
+[~[:dsn_notify]|["\\bSUCCESS\\b"]|\
+and you explicitly requested a delivery status notification on success.\n]\
+]
+[? %#N |#|The message WAS NOT relayed to:[\n  %N]
+]
+[:wrap|78|||This [?%#D|nondelivery|delivery] report was \
+generated by the program amavisd-new at host %h. \
+Our internal reference code for your message is %n/%i]
+
+# ccat_min 0: other,  1: bad MIME,  2: 8-bit char,  3: NUL/CR,
+#          4: empty,  5: long,  6: syntax,  7: missing,  8: multiple
+[? [:explain_badh] ||[? [:ccat|minor]
+|INVALID HEADER
+|INVALID HEADER: BAD MIME HEADER SECTION OR BAD MIME STRUCTURE
+|INVALID HEADER: INVALID 8-BIT CHARACTERS IN HEADER SECTION
+|INVALID HEADER: INVALID CONTROL CHARACTERS IN HEADER SECTION
+|INVALID HEADER: FOLDED HEADER FIELD MADE UP ENTIRELY OF WHITESPACE
+|INVALID HEADER: HEADER LINE LONGER THAN RFC2822 LIMIT OF 998 CHARACTERS
+|INVALID HEADER: HEADER FIELD SYNTAX ERROR
+|INVALID HEADER: MISSING REQUIRED HEADER FIELD
+|INVALID HEADER: DUPLICATE HEADER FIELD
+|INVALID HEADER
+]
+[[:wrap|78|  |  |%X]\n]
+]\
+#
+[:wrap|78||  |Return-Path: %s[?[:dkim|envsender]|| (OK)]]
+[:wrap|78||  |From: [:header_field|From|100][?[:dkim|author]|| (dkim:AUTHOR)]]
+[? [:header_field|Sender]|#|\
+[:wrap|78||  |Sender: [:header_field|Sender|100]\
+[?[:dkim|sender]|| (dkim:SENDER)]]]
+[? %m |#|[:wrap|78||  |Message-ID: %m]]
+[? %r |#|[:wrap|78||  |Resent-Message-ID: %r]]
+[? %#X|#|[? [:useragent] |#|[:wrap|78||  |[:useragent]]]]
+[? %j |#|[:wrap|78||  |Subject: [:header_field|Subject|100]]]
+
+# ccat_min 0: other,  1: bad MIME,  2: 8-bit char,  3: NUL/CR,
+#          4: empty,  5: long,  6: syntax,  7: missing,  8: multiple
+[? [:explain_badh] ||[? [:ccat|minor]
+|# 0: other
+|# 1: bad MIME
+|# 2: 8-bit char
+WHAT IS AN INVALID CHARACTER IN A MAIL HEADER SECTION?
+
+  The RFC 2822 standard specifies rules for forming internet messages.
+  It does not allow the use of characters with codes above 127 to be
+  used directly (non-encoded) in a mail header section.
+
+  If such characters (e.g. with diacritics) from ISO Latin or other
+  alphabets need to be included in a header section, these characters
+  need to be properly encoded according to RFC 2047. Such encoding is
+  often done transparently by mail reader (MUA), but if automatic
+  encoding is not available (e.g. by some older MUA) it is a user's
+  responsibility to avoid using such characters in a header section,
+  or to encode them manually. Typically the offending header fields
+  in this category are 'Subject', 'Organization', and comment fields
+  in e-mail addresses of 'From', 'To' or 'Cc' header fields.
+
+  Sometimes such invalid header fields are inserted automatically
+  by some MUA, MTA, content checker, or other mail handling service.
+  If this is the case, that service needs to be fixed or properly
+  configured. Typically the offending header fields in this category
+  are 'Date', 'Received', 'X-Mailer', 'X-Priority', 'X-Scanned', etc.
+
+  If you don't know how to fix or avoid the problem, please report it
+  to _your_ postmaster or system manager.
+#
+[~[:useragent]|^X-Mailer:\\s*Microsoft Outlook Express 6\\.00|["
+  If using Microsoft Outlook Express as your MUA, make sure its
+  settings under:
+     Tools -> Options -> Send -> Mail Sending Format -> Plain & HTML
+  are: "MIME format" MUST BE selected,
+  and  "Allow 8-bit characters in headers" MUST NOT be enabled!
+"]]#
+|# 3: NUL/CR
+IMPROPER USE OF CONTROL CHARACTER IN A MESSAGE HEADER SECTION
+
+  The RFC 2822 standard specifies rules for forming internet messages.
+  It does not allow the use of control characters NUL and bare CR
+  to be used directly in a mail header section.
+|# 4: empty
+IMPROPER FOLDED HEADER FIELD MADE UP ENTIRELY OF WHITESPACE
+
+  The RFC 2822 standard specifies rules for forming internet messages.
+  In section '3.2.3. Folding white space and comments' it explicitly
+  prohibits folding of header fields in such a way that any line of a
+  folded header field is made up entirely of white-space characters
+  (control characters SP and HTAB) and nothing else.
+|# 5: long
+HEADER LINE LONGER THAN RFC2822 LIMIT OF 998 CHARACTERS
+
+  The RFC 2822 standard specifies rules for forming internet messages.
+  Section '2.1.1. Line Length Limits' prohibits each line of a header
+  to be more than 998 characters in length (excluding the CRLF).
+|# 6: syntax
+|# 7: missing
+MISSING REQUIRED HEADER FIELD
+
+  The RFC 2822 standard specifies rules for forming internet messages.
+  Section '3.6. Field definitions' specifies that certain header fields
+  are required (origination date field and the originator address field).
+|# 8: multiple
+DUPLICATE HEADER FIELD
+
+  The RFC 2822 standard specifies rules for forming internet messages.
+  Section '3.6. Field definitions' specifies that certain header fields
+  must not occur more than once in a message header section.
+|# other
+]]#
--- amavisd-new-2.6.4.orig/debian/etc/en_US/template-spam-admin.txt
+++ amavisd-new-2.6.4/debian/etc/en_US/template-spam-admin.txt
@@ -0,0 +1,39 @@
+#
+# =============================================================================
+# This is a template for SPAM ADMINISTRATOR NOTIFICATIONS.
+# For syntax and customization instructions see README.customize.
+# Long header fields will be automatically wrapped by the program.
+#
+From: %f
+Date: %d
+Subject: SPAM FROM [?%l||LOCAL ][?%a||\[%a\] ][?%s|<>|[?%o|(?)|%s]]
+To: [? %#T |undisclosed-recipients:;|[%T|, ]]
+[? %#C |#|Cc: [%C|, ]]
+Message-ID: <SA%i@%h>
+
+Content type: [:ccat|name|main]#
+[? [:ccat|is_blocked_by_nonmain] ||, blocked for [:ccat|name]]
+Internal reference code for the message is %n/%i
+
+[? %a |#|[:wrap|78||  |First upstream SMTP client IP address: \[%a\] %g]]
+[? %e |#|[:wrap|78||  |According to a 'Received:' trace,\
+ the message originated at: \[%e\], %t]]
+
+[:wrap|78||  |Return-Path: %s[?[:dkim|envsender]|| (OK)]]
+[:wrap|78||  |From: [:header_field|From][?[:dkim|author]|| (dkim:AUTHOR)]]
+[? [:header_field|Sender]|#|\
+[:wrap|78||  |Sender: [:header_field|Sender]\
+[?[:dkim|sender]|| (dkim:SENDER)]]]
+[? %m |#|[:wrap|78||  |Message-ID: %m]]
+[? %r |#|[:wrap|78||  |Resent-Message-ID: %r]]
+[? [:useragent] |#|[:wrap|78||  |[:useragent]]]
+[? %j |#|[:wrap|78||  |Subject: %j]]
+[? %q |Not quarantined.|The message has been quarantined as: %q]
+
+[? %#D |#|The message WILL BE relayed to:[\n%D]
+]
+[? %#N |#|The message WAS NOT relayed to:[\n%N]
+]
+SpamAssassin report:
+[%A
+]\
--- amavisd-new-2.6.4.orig/debian/etc/en_US/template-virus-admin.txt
+++ amavisd-new-2.6.4/debian/etc/en_US/template-virus-admin.txt
@@ -0,0 +1,54 @@
+#
+# =============================================================================
+# This is a template for non-spam (VIRUS,...) ADMINISTRATOR NOTIFICATIONS.
+# For syntax and customization instructions see README.customize.
+# Long header fields will be automatically wrapped by the program.
+#
+From: %f
+Date: %d
+Subject: [? [:ccat|major] |Clean mail|Clean mail|MTA-blocked mail|\
+OVERSIZED mail|INVALID HEADER in mail|spam|SPAM|UNCHECKED contents in mail|\
+BANNED contents (%F) in mail|VIRUS (%V) in mail]\
+ FROM [?%l||LOCAL ][?%a||\[%a\] ][?%s|<>|[?%o|(?)|%s]]
+To: [? %#T |undisclosed-recipients:;|[%T|, ]]
+[? %#C |#|Cc: [%C|, ]]
+Message-ID: <VA%i@%h>
+
+[? %#V |No viruses were found.
+|A virus was found: %V
+|Two viruses were found:\n  %V
+|%#V viruses were found:\n  %V
+]
+[? %#F |#|[:wrap|78||  |Banned [?%#F|names|name|names]: %F]]
+[? %#X |#|Bad header:[\n[:wrap|78|  |  |%X]]]
+[? %#W |#\
+|Scanner detecting a virus: %W
+|Scanners detecting a virus: %W
+]
+Content type: [:ccat|name|main]#
+[? [:ccat|is_blocked_by_nonmain] ||, blocked for [:ccat|name]]
+Internal reference code for the message is %n/%i
+
+[? %a |#|[:wrap|78||  |First upstream SMTP client IP address: \[%a\] %g]]
+[? %e |#|[:wrap|78||  |According to a 'Received:' trace,\
+ the message originated at: \[%e\], %t]]
+
+[:wrap|78||  |Return-Path: %s[?[:dkim|envsender]|| (OK)]]
+[:wrap|78||  |From: [:header_field|From][?[:dkim|author]|| (dkim:AUTHOR)]]
+[? [:header_field|Sender]|#|\
+[:wrap|78||  |Sender: [:header_field|Sender]\
+[?[:dkim|sender]|| (dkim:SENDER)]]]
+[? %m |#|[:wrap|78||  |Message-ID: %m]]
+[? %r |#|[:wrap|78||  |Resent-Message-ID: %r]]
+[? %j |#|[:wrap|78||  |Subject: %j]]
+[? %q |Not quarantined.|The message has been quarantined as: %q]
+
+[? %#S |Notification to sender will not be mailed.
+
+]#
+[? %#D |#|The message WILL BE relayed to:[\n%D]
+]
+[? %#N |#|The message WAS NOT relayed to:[\n%N]
+]
+[? %#V |#|[? %#v |#|Virus scanner output:[\n  %v]
+]]
--- amavisd-new-2.6.4.orig/debian/etc/en_US/template-spam-sender.txt
+++ amavisd-new-2.6.4/debian/etc/en_US/template-spam-sender.txt
@@ -0,0 +1,48 @@
+#
+# =============================================================================
+# This is a template for SPAM SENDER NOTIFICATIONS.
+# For syntax and customization instructions see README.customize.
+# The From, To and Date header fields will be provided automatically.
+# Long header fields will be automatically wrapped by the program.
+#
+Subject: Considered UNSOLICITED BULK EMAIL, apparently from you
+[? %m  |#|In-Reply-To: %m]
+Message-ID: <SS%i@%h>
+
+A message from %s to:[
+-> %R]
+
+was considered unsolicited bulk e-mail (UBE).
+
+Our internal reference code for your message is %n/%i
+
+The message carried your return address, so it was either a genuine mail
+from you, or a sender address was faked and your e-mail address abused
+by third party, in which case we apologize for undesired notification.
+
+We do try to minimize backscatter for more prominent cases of UBE and
+for infected mail, but for less obvious cases of UBE some balance
+between losing genuine mail and sending undesired backscatter is sought,
+and there can be some collateral damage on both sides.
+
+[? %a |#|[:wrap|78||  |First upstream SMTP client IP address: \[%a\] %g]]
+[? %e |#|[:wrap|78||  |According to a 'Received:' trace,\
+ the message originated at: \[%e\], %t]]
+
+[:wrap|78||  |Return-Path: %s[?[:dkim|envsender]|| (OK)]]
+[:wrap|78||  |From: [:header_field|From|100][?[:dkim|author]|| (dkim:AUTHOR)]]
+[? [:header_field|Sender]|#|\
+[:wrap|78||  |Sender: [:header_field|Sender|100]\
+[?[:dkim|sender]|| (dkim:SENDER)]]]
+[? %m |#|[:wrap|78||  |Message-ID: %m]]
+[? %r |#|[:wrap|78||  |Resent-Message-ID: %r]]
+# [? [:useragent] |#|[:wrap|78||  |[:useragent]]]
+[? %j |#|[:wrap|78||  |Subject: [:header_field|Subject|100]]]
+[? %#X |#|\n[[:wrap|78||  |%X]\n]]
+
+[? %#D |Delivery of the email was stopped!
+]#
+#
+# SpamAssassin report:
+# [%A
+# ]\
--- amavisd-new-2.6.4.orig/debian/etc/conf.d/15-av_scanners
+++ amavisd-new-2.6.4/debian/etc/conf.d/15-av_scanners
@@ -0,0 +1,473 @@
+use strict;
+
+##
+## AV Scanners (Debian version)
+##
+
+@av_scanners = (
+
+# ### http://www.clanfield.info/sophie/ (http://www.vanja.com/tools/sophie/)
+# ['Sophie',
+#   \&ask_daemon, ["{}/\n", '/var/run/sophie'],
+#   qr/(?x)^ 0+ ( : | [\000\r\n]* $)/m,  qr/(?x)^ 1 ( : | [\000\r\n]* $)/m,
+#   qr/(?x)^ [-+]? \d+ : (.*?) [\000\r\n]* $/m ],
+
+# ### http://www.csupomona.edu/~henson/www/projects/SAVI-Perl/
+# ['Sophos SAVI', \&sophos_savi ],
+
+### http://www.clamav.net/
+ ['ClamAV-clamd',
+   \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd.ctl"],
+   qr/\bOK$/m, qr/\bFOUND$/m,
+   qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
+# NOTE: run clamd under the same user as amavisd, or run it under its own
+#   uid such as clamav, add user clamav to the amavis group, and then add
+#   AllowSupplementaryGroups to clamd.conf;
+# NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in
+#   this entry; when running chrooted one may prefer socket "$MYHOME/clamd".
+
+# ### http://www.openantivirus.org/
+# ['OpenAntiVirus ScannerDaemon (OAV)',
+#   \&ask_daemon, ["SCAN {}\n", '127.0.0.1:8127'],
+#   qr/^OK/m, qr/^FOUND: /m, qr/^FOUND: (.+)/m ],
+
+# ### http://www.vanja.com/tools/trophie/
+# ['Trophie',
+#   \&ask_daemon, ["{}/\n", '/var/run/trophie'],
+#   qr/(?x)^ 0+ ( : | [\000\r\n]* $)/m,  qr/(?x)^ 1 ( : | [\000\r\n]* $)/m,
+#   qr/(?x)^ [-+]? \d+ : (.*?) [\000\r\n]* $/m ],
+
+# ### http://www.grisoft.com/
+# ['AVG Anti-Virus',
+#   \&ask_daemon, ["SCAN {}\n", '127.0.0.1:55555'],
+#   qr/^200/m, qr/^403/m, qr/^403 .*?: ([^\r\n]+)/m ],
+
+# ### http://www.f-prot.com/
+# ['F-Prot fpscand',  # F-PROT Antivirus for BSD/Linux/Solaris, version 6
+#   \&ask_daemon,
+#   ["SCAN FILE {}/*\n", '127.0.0.1:10200'],
+#   qr/^(0|8|64) /m,
+#   qr/^([1235679]|1[01345]) |<[^>:]*(?i)(infected|suspicious|unwanted)/m,
+#   qr/(?i)<[^>:]*(?:infected|suspicious|unwanted)[^>:]*: ([^>]*)>/m ],
+
+# ### http://www.f-prot.com/
+# ['F-Prot f-protd',  # old version
+#   \&ask_daemon,
+#   ["GET {}/*?-dumb%20-archive%20-packed HTTP/1.0\r\n\r\n",
+#     ['127.0.0.1:10200', '127.0.0.1:10201', '127.0.0.1:10202',
+#      '127.0.0.1:10203', '127.0.0.1:10204'] ],
+#   qr/(?i)<summary[^>]*>clean<\/summary>/m,
+#   qr/(?i)<summary[^>]*>infected<\/summary>/m,
+#   qr/(?i)<name>(.+)<\/name>/m ],
+
+# ### http://www.sald.com/, http://www.dials.ru/english/, http://www.drweb.ru/
+# ['DrWebD', \&ask_daemon,   # DrWebD 4.31 or later
+#   [pack('N',1).  # DRWEBD_SCAN_CMD
+#    pack('N',0x00280001).   # DONT_CHANGEMAIL, IS_MAIL, RETURN_VIRUSES
+#    pack('N',     # path length
+#      length("$TEMPBASE/amavis-yyyymmddTHHMMSS-xxxxx/parts/pxxx")).
+#    '{}/*'.       # path
+#    pack('N',0).  # content size
+#    pack('N',0),
+#    '/var/drweb/run/drwebd.sock',
+#  # '/var/amavis/var/run/drwebd.sock',   # suitable for chroot
+#  # '/usr/local/drweb/run/drwebd.sock',  # FreeBSD drweb ports default
+#  # '127.0.0.1:3000',                    # or over an inet socket
+#   ],
+#   qr/\A\x00[\x10\x11][\x00\x10]\x00/sm,        # IS_CLEAN,EVAL_KEY; SKIPPED
+#   qr/\A\x00[\x00\x01][\x00\x10][\x20\x40\x80]/sm,# KNOWN_V,UNKNOWN_V,V._MODIF
+#   qr/\A.{12}(?:infected with )?([^\x00]+)\x00/sm,
+# ],
+# # NOTE: If using amavis-milter, change length to:
+# # length("$TEMPBASE/amavis-milter-xxxxxxxxxxxxxx/parts/pxxx").
+
+  ### http://www.kaspersky.com/  (kav4mailservers)
+  ['KasperskyLab AVP - aveclient',
+    ['/usr/local/kav/bin/aveclient','/usr/local/share/kav/bin/aveclient',
+     '/opt/kav/5.5/kav4mailservers/bin/aveclient','aveclient'],
+    '-p /var/run/aveserver -s {}/*',
+    [0,3,6,8], qr/\b(INFECTED|SUSPICION|SUSPICIOUS)\b/m,
+    qr/(?:INFECTED|WARNING|SUSPICION|SUSPICIOUS) (.+)/m,
+  ],
+  # NOTE: one may prefer [0],[2,3,4,5], depending on how suspicious,
+  # currupted or protected archives are to be handled
+
+  ### http://www.kaspersky.com/
+  ['KasperskyLab AntiViral Toolkit Pro (AVP)', ['avp'],
+    '-* -P -B -Y -O- {}', [0,3,6,8], [2,4],    # any use for -A -K   ?
+    qr/infected: (.+)/m,
+    sub {chdir('/opt/AVP') or die "Can't chdir to AVP: $!"},
+    sub {chdir($TEMPBASE) or die "Can't chdir back to $TEMPBASE $!"},
+  ],
+
+  ### The kavdaemon and AVPDaemonClient have been removed from Kasperky
+  ### products and replaced by aveserver and aveclient
+  ['KasperskyLab AVPDaemonClient',
+    [ '/opt/AVP/kavdaemon',       'kavdaemon',
+      '/opt/AVP/AvpDaemonClient', 'AvpDaemonClient',
+      '/opt/AVP/AvpTeamDream',    'AvpTeamDream',
+      '/opt/AVP/avpdc', 'avpdc' ],
+    "-f=$TEMPBASE {}", [0,8], [3,4,5,6], qr/infected: ([^\r\n]+)/m ],
+    # change the startup-script in /etc/init.d/kavd to:
+    #   DPARMS="-* -Y -dl -f=/var/amavis /var/amavis"
+    #   (or perhaps:   DPARMS="-I0 -Y -* /var/amavis" )
+    # adjusting /var/amavis above to match your $TEMPBASE.
+    # The '-f=/var/amavis' is needed if not running it as root, so it
+    # can find, read, and write its pid file, etc., see 'man kavdaemon'.
+    # defUnix.prf: there must be an entry "*/var/amavis" (or whatever
+    #   directory $TEMPBASE specifies) in the 'Names=' section.
+    # cd /opt/AVP/DaemonClients; configure; cd Sample; make
+    # cp AvpDaemonClient /opt/AVP/
+    # su - vscan -c "${PREFIX}/kavdaemon ${DPARMS}"
+
+  ### http://www.centralcommand.com/
+  ['CentralCommand Vexira (new) vascan',
+    ['vascan','/usr/lib/Vexira/vascan'],
+    "-a s --timeout=60 --temp=$TEMPBASE -y $QUARANTINEDIR ".
+    "--log=/var/log/vascan.log {}",
+    [0,3], [1,2,5],
+    qr/(?x)^\s* (?:virus|iworm|macro|mutant|sequence|trojan)\ found:\ ( [^\]\s']+ )\ \.\.\.\ /m ],
+    # Adjust the path of the binary and the virus database as needed.
+    # 'vascan' does not allow to have the temp directory to be the same as
+    # the quarantine directory, and the quarantine option can not be disabled.
+    # If $QUARANTINEDIR is not used, then another directory must be specified
+    # to appease 'vascan'. Move status 3 to the second list if password
+    # protected files are to be considered infected.
+
+  ### http://www.avira.com/
+  ### Avira AntiVir (formerly H+BEDV) or (old) CentralCommand Vexira Antivirus
+  ['Avira AntiVir', ['antivir','vexira'],
+    '--allfiles -noboot -nombr -rs -s -z {}', [0], qr/ALERT:|VIRUS:/m,
+    qr/(?x)^\s* (?: ALERT: \s* (?: \[ | [^']* ' ) |
+         (?i) VIRUS:\ .*?\ virus\ '?) ( [^\]\s']+ )/m ],
+    # NOTE: if you only have a demo version, remove -z and add 214, as in:
+    #  '--allfiles -noboot -nombr -rs -s {}', [0,214], qr/ALERT:|VIRUS:/,
+
+  ### http://www.commandsoftware.com/
+  ['Command AntiVirus for Linux', 'csav',
+    '-all -archive -packed {}', [50], [51,52,53],
+    qr/Infection: (.+)/m ],
+
+  ### http://www.symantec.com/
+  ['Symantec CarrierScan via Symantec CommandLineScanner',
+    'cscmdline', '-a scan -i 1 -v -s 127.0.0.1:7777 {}',
+    qr/^Files Infected:\s+0$/m, qr/^Infected\b/m,
+    qr/^(?:Info|Virus Name):\s+(.+)/m ],
+
+  ### http://www.symantec.com/
+  ['Symantec AntiVirus Scan Engine',
+    'savsecls', '-server 127.0.0.1:7777 -mode scanrepair -details -verbose {}',
+    [0], qr/^Infected\b/m,
+    qr/^(?:Info|Virus Name):\s+(.+)/m ],
+    # NOTE: check options and patterns to see which entry better applies
+
+# ### http://www.f-secure.com/products/anti-virus/  version 4.65
+#  ['F-Secure Antivirus for Linux servers',
+#   ['/opt/f-secure/fsav/bin/fsav', 'fsav'],
+#   '--delete=no --disinf=no --rename=no --archive=yes --auto=yes '.
+#   '--dumb=yes --list=no --mime=yes {}', [0], [3,6,8],
+#   qr/(?:infection|Infected|Suspected): (.+)/m ],
+
+  ### http://www.f-secure.com/products/anti-virus/  version 5.52
+   ['F-Secure Antivirus for Linux servers',
+    ['/opt/f-secure/fsav/bin/fsav', 'fsav'],
+    '--virus-action1=report --archive=yes --auto=yes '.
+    '--dumb=yes --list=no --mime=yes {}', [0], [3,4,6,8],
+    qr/(?:infection|Infected|Suspected|Riskware): (.+)/m ],
+    # NOTE: internal archive handling may be switched off by '--archive=no'
+    #   to prevent fsav from exiting with status 9 on broken archives
+
+# ### http://www.avast.com/
+# ['avast! Antivirus daemon',
+#   \&ask_daemon,	# greets with 220, terminate with QUIT
+#   ["SCAN {}\015\012QUIT\015\012", '/var/run/avast4/mailscanner.sock'],
+#   qr/\t\[\+\]/m, qr/\t\[L\]\t/m, qr/\t\[L\]\t([^[ \t\015\012]+)/m ],
+
+# ### http://www.avast.com/
+# ['avast! Antivirus - Client/Server Version', 'avastlite',
+#   '-a /var/run/avast4/mailscanner.sock -n {}', [0], [1],
+#   qr/\t\[L\]\t([^[ \t\015\012]+)/m ],
+
+  ['CAI InoculateIT', 'inocucmd',  # retired product
+    '-sec -nex {}', [0], [100],
+    qr/was infected by virus (.+)/m ],
+  # see: http://www.flatmtn.com/computer/Linux-Antivirus_CAI.html
+
+  ### http://www3.ca.com/Solutions/Product.asp?ID=156  (ex InoculateIT)
+  ['CAI eTrust Antivirus', 'etrust-wrapper',
+    '-arc -nex -spm h {}', [0], [101],
+    qr/is infected by virus: (.+)/m ],
+    # NOTE: requires suid wrapper around inocmd32; consider flag: -mod reviewer
+    # see http://marc.theaimsgroup.com/?l=amavis-user&m=109229779912783
+
+  ### http://mks.com.pl/english.html
+  ['MkS_Vir for Linux (beta)', ['mks32','mks'],
+    '-s {}/*', [0], [1,2],
+    qr/--[ \t]*(.+)/m ],
+
+  ### http://mks.com.pl/english.html
+  ['MkS_Vir daemon', 'mksscan',
+    '-s -q {}', [0], [1..7],
+    qr/^... (\S+)/m ],
+
+# ### http://www.nod32.com/,  version v2.52 (old)
+# ['ESET NOD32 for Linux Mail servers',
+#   ['/opt/eset/nod32/bin/nod32cli', 'nod32cli'],
+#    '--subdir --files -z --sfx --rtp --adware --unsafe --pattern --heur '.
+#    '-w -a --action-on-infected=accept --action-on-uncleanable=accept '.
+#    '--action-on-notscanned=accept {}',
+#   [0,3], [1,2], qr/virus="([^"]+)"/m ],
+
+# ### http://www.eset.com/, version v2.7 (old)
+# ['ESET NOD32 Linux Mail Server - command line interface',
+#   ['/usr/bin/nod32cli', '/opt/eset/nod32/bin/nod32cli', 'nod32cli'],
+#   '--subdir {}', [0,3], [1,2], qr/virus="([^"]+)"/m ],
+
+# ### http://www.eset.com/, version 2.71.12
+# ['ESET Software ESETS Command Line Interface',
+#   ['/usr/bin/esets_cli', 'esets_cli'],
+#   '--subdir {}', [0], [1,2,3], qr/virus="([^"]+)"/m ],
+
+  ### http://www.eset.com/, version 3.0
+  ['ESET Software ESETS Command Line Interface',
+    ['/usr/bin/esets_cli', 'esets_cli'],
+    '--subdir {}', [0], [1,2,3],
+    qr/:\s*action="(?!accepted)[^"]*"\n.*:\s*virus="([^"]*)"/m ],
+
+  ## http://www.nod32.com/,  NOD32LFS version 2.5 and above
+  ['ESET NOD32 for Linux File servers',
+    ['/opt/eset/nod32/sbin/nod32','nod32'],
+    '--files -z --mail --sfx --rtp --adware --unsafe --pattern --heur '.
+    '-w -a --action=1 -b {}',
+    [0], [1,10], qr/^object=.*, virus="(.*?)",/m ],
+
+# Experimental, based on posting from Rado Dibarbora (Dibo) on 2002-05-31
+# ['ESET Software NOD32 Client/Server (NOD32SS)',
+#   \&ask_daemon2,    # greets with 200, persistent, terminate with QUIT
+#   ["SCAN {}/*\r\n", '127.0.0.1:8448' ],
+#   qr/^200 File OK/m, qr/^201 /m, qr/^201 (.+)/m ],
+
+  ### http://www.norman.com/products_nvc.shtml
+  ['Norman Virus Control v5 / Linux', 'nvcc',
+    '-c -l:0 -s -u -temp:$TEMPBASE {}', [0,10,11], [1,2,14],
+    qr/(?i).* virus in .* -> \'(.+)\'/m ],
+
+  ### http://www.pandasoftware.com/
+  ['Panda CommandLineSecure 9 for Linux',
+    ['/opt/pavcl/usr/bin/pavcl','pavcl'],
+    '-auto -aex -heu -cmp -nbr -nor -nos -eng -nob {}',
+    qr/Number of files infected[ .]*: 0+(?!\d)/m,
+    qr/Number of files infected[ .]*: 0*[1-9]/m,
+    qr/Found virus :\s*(\S+)/m ],
+  # NOTE: for efficiency, start the Panda in resident mode with 'pavcl -tsr'
+  # before starting amavisd - the bases are then loaded only once at startup.
+  # To reload bases in a signature update script:
+  #   /opt/pavcl/usr/bin/pavcl -tsr -ulr; /opt/pavcl/usr/bin/pavcl -tsr
+  # Please review other options of pavcl, for example:
+  #  -nomalw, -nojoke, -nodial, -nohackt, -nospyw, -nocookies
+
+# ### http://www.pandasoftware.com/
+# ['Panda Antivirus for Linux', ['pavcl'],
+#   '-TSR -aut -aex -heu -cmp -nbr -nor -nso -eng {}',
+#   [0], [0x10, 0x30, 0x50, 0x70, 0x90, 0xB0, 0xD0, 0xF0],
+#   qr/Found virus :\s*(\S+)/m ],
+
+# GeCAD AV technology is acquired by Microsoft; RAV has been discontinued.
+# Check your RAV license terms before fiddling with the following two lines!
+# ['GeCAD RAV AntiVirus 8', 'ravav',
+#   '--all --archive --mail {}', [1], [2,3,4,5], qr/Infected: (.+)/m ],
+# # NOTE: the command line switches changed with scan engine 8.5 !
+# # (btw, assigning stdin to /dev/null causes RAV to fail)
+
+  ### http://www.nai.com/
+  ['NAI McAfee AntiVirus (uvscan)', 'uvscan',
+    '--secure -rv --mime --summary --noboot - {}', [0], [13],
+    qr/(?x) Found (?:
+        \ the\ (.+)\ (?:virus|trojan)  |
+        \ (?:virus|trojan)\ or\ variant\ ([^ ]+)  |
+        :\ (.+)\ NOT\ a\ virus)/m,
+  # sub {$ENV{LD_PRELOAD}='/lib/libc.so.6'},
+  # sub {delete $ENV{LD_PRELOAD}},
+  ],
+  # NOTE1: with RH9: force the dynamic linker to look at /lib/libc.so.6 before
+  # anything else by setting environment variable LD_PRELOAD=/lib/libc.so.6
+  # and then clear it when finished to avoid confusing anything else.
+  # NOTE2: to treat encrypted files as viruses replace the [13] with:
+  #  qr/^\s{5,}(Found|is password-protected|.*(virus|trojan))/
+
+  ### http://www.virusbuster.hu/en/
+  ['VirusBuster', ['vbuster', 'vbengcl'],
+    "{} -ss -i '*' -log=$MYHOME/vbuster.log", [0], [1],
+    qr/: '(.*)' - Virus/m ],
+  # VirusBuster Ltd. does not support the daemon version for the workstation
+  # engine (vbuster-eng-1.12-linux-i386-libc6.tgz) any longer. The names of
+  # binaries, some parameters AND return codes have changed (from 3 to 1).
+  # See also the new Vexira entry 'vascan' which is possibly related.
+
+# ### http://www.virusbuster.hu/en/
+# ['VirusBuster (Client + Daemon)', 'vbengd',
+#   '-f -log scandir {}', [0], [3],
+#   qr/Virus found = (.*);/m ],
+# # HINT: for an infected file it always returns 3,
+# # although the man-page tells a different story
+
+  ### http://www.cyber.com/
+  ['CyberSoft VFind', 'vfind',
+    '--vexit {}/*', [0], [23], qr/##==>>>> VIRUS ID: CVDL (.+)/m,
+  # sub {$ENV{VSTK_HOME}='/usr/lib/vstk'},
+  ],
+
+  ### http://www.avast.com/
+  ['avast! Antivirus', ['/usr/bin/avastcmd','avastcmd'],
+    '-a -i -n -t=A {}', [0], [1], qr/\binfected by:\s+([^ \t\n\[\]]+)/m ],
+
+  ### http://www.ikarus-software.com/
+  ['Ikarus AntiVirus for Linux', 'ikarus',
+    '{}', [0], [40], qr/Signature (.+) found/m ],
+
+  ### http://www.bitdefender.com/
+  ['BitDefender', 'bdscan',  # new version
+    '--action=ignore --no-list {}', qr/^Infected files *:0+(?!\d)/m,
+    qr/^(?:Infected files|Identified viruses|Suspect files) *:0*[1-9]/m,
+    qr/(?:suspected|infected): (.*)(?:\033|$)/m ],
+
+  ### http://www.bitdefender.com/
+  ['BitDefender', 'bdc',  # old version
+    '--arc --mail {}', qr/^Infected files *:0+(?!\d)/m,
+    qr/^(?:Infected files|Identified viruses|Suspect files) *:0*[1-9]/m,
+    qr/(?:suspected|infected): (.*)(?:\033|$)/m ],
+  # consider also: --all --nowarn --alev=15 --flev=15.  The --all argument may
+  # not apply to your version of bdc, check documentation and see 'bdc --help'
+
+  ### ArcaVir for Linux and Unix http://www.arcabit.pl/
+  ['ArcaVir for Linux', ['arcacmd','arcacmd.static'],
+    '-v 1 -summary 0 -s {}', [0], [1,2],
+    qr/(?:VIR|WIR):[ \t]*(.+)/m ],
+
+# ['File::Scan', sub {Amavis::AV::ask_av(sub{
+#   use File::Scan; my($fn)=@_;
+#   my($f)=File::Scan->new(max_txt_size=>0, max_bin_size=>0);
+#   my($vname) = $f->scan($fn);
+#   $f->error ? (2,"Error: ".$f->error)
+#   : ($vname ne '') ? (1,"$vname FOUND") : (0,"Clean")}, @_) },
+#   ["{}/*"], [0], [1], qr/^(.*) FOUND$/m ],
+
+# ### fully-fledged checker for JPEG marker segments of invalid length
+# ['check-jpeg',
+#   sub { use JpegTester (); Amavis::AV::ask_av(\&JpegTester::test_jpeg, @_) },
+#   ["{}/*"], undef, [1], qr/^(bad jpeg: .*)$/m ],
+# # NOTE: place file JpegTester.pm somewhere where Perl can find it,
+# #       for example in /usr/local/lib/perl5/site_perl
+
+# ### example: simpleminded checker for JPEG marker segments with
+# ### invalid length (only checks first 32k, which is not thorough enough)
+# ['check-jpeg-simple',
+#   sub { Amavis::AV::ask_av(sub {
+#     my($f)=@_; local(*FF,$_,$1,$2); my(@r)=(0,'not jpeg');
+#     open(FF,$f) or die "jpeg: open err $f: $!";
+#     binmode(FF) or die "jpeg: binmode err $f: $!";
+#     defined read(FF,$_,32000) or die "jpeg: read err $f: $!";
+#     close(FF) or die "jpeg: close err $f: $!";
+#     if (/^\xff\xd8\xff/) {
+#       @r=(0,'jpeg ok');
+#       while (!/\G(?:\xff\xd9|\z)/gc) {          # EOI or eof
+#         if (/\G\xff+(?=\xff|\z)/gc) {}          # fill-bytes before marker
+#         elsif (/\G\xff([\x01\xd0-\xd8])/gc) {}  # TEM, RSTi, SOI
+#         elsif (/\G\xff([^\x00\xff])(..)/gcs) {  # marker segment start
+#           my($n)=unpack("n",$2)-2;
+#           $n=32766 if $n>32766;  # Perl regexp limit
+#           if ($n<0) {@r=(1,"bad jpeg: len=$n, pos=".pos); last}
+#           elsif (/\G.{$n}/gcs) {}          # ok
+#           elsif (/\G.{0,$n}\z/gcs) {last}  # truncated
+#           else {@r=(1,"bad jpeg: unexpected, pos=".pos); last}
+#         }
+#         elsif (/\G[^\xff]+/gc)      {}  # ECS
+#         elsif (/\G(?:\xff\x00)+/gc) {}  # ECS
+#         else {@r=(2,"bad jpeg: unexpected char, pos=".pos); last}
+#       }
+#     }; @r}, @_) },
+#   ["{}/*"], undef, [1], qr/^(bad jpeg: .*)$/m ],
+
+# ### an example/testing/template virus scanner (external), wastes 3 seconds
+# ['wasteful sleeper example',
+#   '/bin/sleep', '3',  # calls external program
+#   undef, undef, qr/no such/m ],
+
+# ### an example/testing/template virus scanner (internal), does nothing
+# ['null',
+#   sub {}, ["{}"],     # supplies its own subroutine, no external program
+#   undef, undef, qr/no such/m ],
+
+);
+
+
+# If no virus scanners from the @av_scanners list produce 'clean' nor
+# 'infected' status (i.e. they all fail to run or the list is empty),
+# then _all_ scanners from the @av_scanners_backup list are tried
+# (again, subject to $first_infected_stops_scan). When there are both
+# daemonized and equivalent or similar command-line scanners available,
+# it is customary to place slower command-line scanners in the
+# @av_scanners_backup list. The default choice is somewhat arbitrary,
+# move entries from one list to another as desired, keeping main scanners
+# in the primary list to avoid warnings.
+
+@av_scanners_backup = (
+
+  ### http://www.clamav.net/   - backs up clamd or Mail::ClamAV
+  ['ClamAV-clamscan', 'clamscan',
+    "--stdout --no-summary -r --tempdir=$TEMPBASE {}",
+    [0], qr/:.*\sFOUND$/m, qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
+
+  ### http://www.f-prot.com/   - backs up F-Prot Daemon, V6
+  ['F-PROT Antivirus for UNIX', ['fpscan'],
+    '--report --mount --adware {}',  # consider: --applications -s 4 -u 3 -z 10
+    [0,8,64],  [1,2,3, 4+1,4+2,4+3, 8+1,8+2,8+3, 12+1,12+2,12+3],
+    qr/^\[Found\s+[^\]]*\]\s+<([^ \t(>]*)/m ],
+
+  ### http://www.f-prot.com/   - backs up F-Prot Daemon (old)
+  ['FRISK F-Prot Antivirus', ['f-prot','f-prot.sh'],
+    '-dumb -archive -packed {}', [0,8], [3,6],   # or: [0], [3,6,8],
+    qr/(?:Infection:|security risk named) (.+)|\s+contains\s+(.+)$/m ],
+
+  ### http://www.trendmicro.com/   - backs up Trophie
+  ['Trend Micro FileScanner', ['/etc/iscan/vscan','vscan'],
+    '-za -a {}', [0], qr/Found virus/m, qr/Found virus (.+) in/m ],
+
+  ### http://www.sald.com/, http://drweb.imshop.de/   - backs up DrWebD
+  ['drweb - DrWeb Antivirus',  # security LHA hole in Dr.Web 4.33 and earlier
+    ['/usr/local/drweb/drweb', '/opt/drweb/drweb', 'drweb'],
+    '-path={} -al -go -ot -cn -upn -ok-',
+    [0,32], [1,9,33], qr' infected (?:with|by)(?: virus)? (.*)$'m ],
+
+   ### http://www.kaspersky.com/
+   ['Kaspersky Antivirus v5.5',
+     ['/opt/kaspersky/kav4fs/bin/kav4fs-kavscanner',
+      '/opt/kav/5.5/kav4unix/bin/kavscanner',
+      '/opt/kav/5.5/kav4mailservers/bin/kavscanner', 'kavscanner'],
+     '-i0 -xn -xp -mn -R -ePASBME {}/*', [0,10,15], [5,20,21,25],
+     qr/(?:INFECTED|WARNING|SUSPICION|SUSPICIOUS) (.*)/m,
+#    sub {chdir('/opt/kav/bin') or die "Can't chdir to kav: $!"},
+#    sub {chdir($TEMPBASE) or die "Can't chdir back to $TEMPBASE $!"},
+   ],
+
+# Commented out because the name 'sweep' clashes with Debian and FreeBSD
+# package/port of an audio editor. Make sure the correct 'sweep' is found
+# in the path when enabling.
+#
+# ### http://www.sophos.com/   - backs up Sophie or SAVI-Perl
+# ['Sophos Anti Virus (sweep)', 'sweep',
+#   '-nb -f -all -rec -ss -sc -archive -cab -mime -oe -tnef '.
+#   '--no-reset-atime {}',
+#   [0,2], qr/Virus .*? found/m,
+#   qr/^>>> Virus(?: fragment)? '?(.*?)'? found/m,
+# ],
+# # other options to consider: -idedir=/usr/local/sav
+
+# Always succeeds and considers mail clean.
+# Potentially useful when all other scanners fail and it is desirable
+# to let mail continue to flow with no virus checking (when uncommented).
+# ['always-clean', sub {0}],
+
+);
+
+1;  # ensure a defined return
--- amavisd-new-2.6.4.orig/debian/etc/conf.d/25-amavis_helpers
+++ amavisd-new-2.6.4/debian/etc/conf.d/25-amavis_helpers
@@ -0,0 +1,23 @@
+use strict;
+
+##
+## Functionality required for amavis helpers like
+## amavis-release.
+##
+
+# Enable required AM.PDP protocol socket.
+#
+# this is incompatible with the old helpers, but one can
+# have multiple inet (not unix) sockets to overcome this
+# issue.  Refer to the amavisd-new documentation for more
+# information
+
+$unix_socketname = "/var/lib/amavis/amavisd.sock";
+
+$interface_policy{'SOCK'} = 'AM.PDP-SOCK';
+$policy_bank{'AM.PDP-SOCK'} = {
+  protocol => 'AM.PDP',
+  auth_required_release => 0, # don't require secret-id for release
+};
+
+1;  # ensure a defined return
--- amavisd-new-2.6.4.orig/debian/etc/conf.d/15-content_filter_mode
+++ amavisd-new-2.6.4/debian/etc/conf.d/15-content_filter_mode
@@ -0,0 +1,27 @@
+use strict;
+
+# You can modify this file to re-enable SPAM checking through spamassassin
+# and to re-enable antivirus checking.
+
+#
+# Default antivirus checking mode
+# Please note, that anti-virus checking is DISABLED by 
+# default.
+# If You wish to enable it, please uncomment the following lines:
+
+
+#@bypass_virus_checks_maps = (
+#   \%bypass_virus_checks, \@bypass_virus_checks_acl, \$bypass_virus_checks_re);
+
+
+#
+# Default SPAM checking mode
+# Please note, that anti-spam checking is DISABLED by 
+# default.
+# If You wish to enable it, please uncomment the following lines:
+
+
+#@bypass_spam_checks_maps = (
+#   \%bypass_spam_checks, \@bypass_spam_checks_acl, \$bypass_spam_checks_re);
+
+1;  # ensure a defined return
--- amavisd-new-2.6.4.orig/debian/etc/conf.d/01-debian
+++ amavisd-new-2.6.4/debian/etc/conf.d/01-debian
@@ -0,0 +1,47 @@
+use strict;
+
+# ADMINISTRATORS:
+# Debian suggests that any changes you need to do that should never
+# be "updated" by the Debian package should be made in another file,
+# overriding the settings in this file.
+#
+# The package will *not* overwrite your settings, but by keeping
+# them separate, you will make the task of merging changes on these
+# configuration files much simpler...
+
+#   see /usr/share/doc/amavisd-new/examples/amavisd.conf-default for
+#       a list of all variables with their defaults;
+#   see /usr/share/doc/amavisd-new/examples/amavisd.conf-sample for
+#       a traditional-style commented file  
+#   [note: the above files were not converted to Debian settings!]
+#
+#   for more details see documentation in /usr/share/doc/amavisd-new
+#   and at http://www.ijs.si/software/amavisd/amavisd-new-docs.html
+
+
+# SETTINGS RARELY MODIFIED BY THE LOCAL ADMIN
+
+$ENV{PATH} = $path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin';
+$file   = 'file';
+$gzip   = 'gzip';
+$bzip2  = 'bzip2';
+$lzop   = 'lzop';
+$rpm2cpio   = ['rpm2cpio.pl','rpm2cpio'];
+$cabextract = 'cabextract';
+$uncompress = ['uncompress', 'gzip -d', 'zcat'];
+#$unfreeze   = ['unfreeze', 'freeze -d', 'melt', 'fcat']; #disabled (non-free, no security support)
+$unfreeze = undef; 
+$arc        = ['nomarch', 'arc'];
+$unarj      = ['arj', 'unarj'];
+#$unrar      = ['rar', 'unrar']; #disabled (non-free, no security support)
+$unrar      = ['unrar-free']; 
+$zoo    = 'zoo';
+#$lha    = 'lha'; #disabled (non-free, no security support)
+$lha	= undef;
+$pax    = 'pax';
+$cpio   = 'cpio';
+$ar     = 'ar';
+$ripole = 'ripole';
+$dspam  = 'dspam';
+
+1;  # ensure a defined return
--- amavisd-new-2.6.4.orig/debian/etc/conf.d/05-node_id
+++ amavisd-new-2.6.4/debian/etc/conf.d/05-node_id
@@ -0,0 +1,13 @@
+use strict;
+
+# $myhostname is used by amavisd-new for node identification, and it is
+# important to get it right (e.g. for ESMTP EHLO, loop detection, and so on).
+
+chomp($myhostname = `hostname --fqdn`);
+
+# To manually set $myhostname, edit the following line with the correct Fully
+# Qualified Domain Name (FQDN) and remove the # at the beginning of the line.
+#
+#$myhostname = "mail.example.com";
+
+1;  # ensure a defined return
--- amavisd-new-2.6.4.orig/debian/etc/conf.d/20-debian_defaults
+++ amavisd-new-2.6.4/debian/etc/conf.d/20-debian_defaults
@@ -0,0 +1,212 @@
+use strict;
+
+# ADMINISTRATORS:
+# Debian suggests that any changes you need to do that should never
+# be "updated" by the Debian package should be made in another file,
+# overriding the settings in this file.
+#
+# The package will *not* overwrite your settings, but by keeping
+# them separate, you will make the task of merging changes on these
+# configuration files much simpler...
+
+#   see /usr/share/doc/amavisd-new/examples/amavisd.conf-default for
+#       a list of all variables with their defaults;
+#   see /usr/share/doc/amavisd-new/examples/amavisd.conf-sample for
+#       a traditional-style commented file  
+#   [note: the above files were not converted to Debian settings!]
+#
+#   for more details see documentation in /usr/share/doc/amavisd-new
+#   and at http://www.ijs.si/software/amavisd/amavisd-new-docs.html
+
+$QUARANTINEDIR = "$MYHOME/virusmails";
+$quarantine_subdir_levels = 1; # enable quarantine dir hashing
+
+$log_recip_templ = undef;    # disable by-recipient level-0 log entries
+$DO_SYSLOG = 1;              # log via syslogd (preferred)
+$syslog_ident = 'amavis';    # syslog ident tag, prepended to all messages
+$syslog_facility = 'mail';
+$syslog_priority = 'debug';  # switch to info to drop debug output, etc
+
+$enable_db = 1;              # enable use of BerkeleyDB/libdb (SNMP and nanny)
+$enable_global_cache = 1;    # enable use of libdb-based cache if $enable_db=1
+
+$inet_socket_port = 10024;   # default listening socket
+
+$sa_spam_subject_tag = '***SPAM*** ';
+$sa_tag_level_deflt  = 2.0;  # add spam info headers if at, or above that level
+$sa_tag2_level_deflt = 6.31; # add 'spam detected' headers at that level
+$sa_kill_level_deflt = 6.31; # triggers spam evasive actions
+$sa_dsn_cutoff_level = 10;   # spam level beyond which a DSN is not sent
+
+$sa_mail_body_size_limit = 200*1024; # don't waste time on SA if mail is larger
+$sa_local_tests_only = 0;    # only tests which do not require internet access?
+
+# Quota limits to avoid bombs (like 42.zip)
+
+$MAXLEVELS = 14;
+$MAXFILES = 1500;
+$MIN_EXPANSION_QUOTA =      100*1024;  # bytes
+$MAX_EXPANSION_QUOTA = 300*1024*1024;  # bytes
+
+# You should:
+#   Use D_DISCARD to discard data (viruses)
+#   Use D_BOUNCE to generate local bounces by amavisd-new
+#   Use D_REJECT to generate local or remote bounces by the calling MTA
+#   Use D_PASS to deliver the message
+#
+# Whatever you do, *NEVER* use D_REJECT if you have other MTAs *forwarding*
+# mail to your account.  Use D_BOUNCE instead, otherwise you are delegating
+# the bounce work to your friendly forwarders, which might not like it at all.
+#
+# On dual-MTA setups, one can often D_REJECT, as this just makes your own
+# MTA generate the bounce message.  Test it first.
+#
+# Bouncing viruses is stupid, always discard them after you are sure the AV
+# is working correctly.  Bouncing real SPAM is also useless, if you cannot
+# D_REJECT it (and don't D_REJECT mail coming from your forwarders!).
+
+$final_virus_destiny      = D_DISCARD;  # (data not lost, see virus quarantine)
+$final_banned_destiny     = D_BOUNCE;   # D_REJECT when front-end MTA
+$final_spam_destiny       = D_BOUNCE;
+$final_bad_header_destiny = D_PASS;     # False-positive prone (for spam)
+
+$enable_dkim_verification = 0; #disabled to prevent warning
+
+$virus_admin = "postmaster\@$mydomain"; # due to D_DISCARD default
+
+# Set to empty ("") to add no header
+$X_HEADER_LINE = "Debian $myproduct_name at $mydomain";
+
+# REMAINING IMPORTANT VARIABLES ARE LISTED HERE BECAUSE OF LONGER ASSIGNMENTS
+
+#
+# DO NOT SEND VIRUS NOTIFICATIONS TO OUTSIDE OF YOUR DOMAIN. EVER.
+#
+# These days, almost all viruses fake the envelope sender and mail headers.
+# Therefore, "virus notifications" became nothing but undesired, aggravating
+# SPAM.  This holds true even inside one's domain.  We disable them all by
+# default, except for the EICAR test pattern.
+#
+
+@viruses_that_fake_sender_maps = (new_RE(
+  [qr'\bEICAR\b'i => 0],            # av test pattern name
+  [qr/.*/ => 1],  # true for everything else
+));
+
+@keep_decoded_original_maps = (new_RE(
+# qr'^MAIL$',   # retain full original message for virus checking (can be slow)
+  qr'^MAIL-UNDECIPHERABLE$', # recheck full mail if it contains undecipherables
+  qr'^(ASCII(?! cpio)|text|uuencoded|xxencoded|binhex)'i,
+# qr'^Zip archive data',     # don't trust Archive::Zip
+));
+
+
+# for $banned_namepath_re, a new-style of banned table, see amavisd.conf-sample
+
+$banned_filename_re = new_RE(
+# qr'^UNDECIPHERABLE$',  # is or contains any undecipherable components
+
+  # block certain double extensions anywhere in the base name
+  qr'\.[^./]*\.(exe|vbs|pif|scr|bat|cmd|com|cpl|dll)\.?$'i,
+
+  qr'\{[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}\}?$'i, # Windows Class ID CLSID, strict
+
+  qr'^application/x-msdownload$'i,                  # block these MIME types
+  qr'^application/x-msdos-program$'i,
+  qr'^application/hta$'i,
+
+# qr'^application/x-msmetafile$'i,	# Windows Metafile MIME type
+# qr'^\.wmf$',				# Windows Metafile file(1) type
+
+# qr'^message/partial$'i, qr'^message/external-body$'i, # rfc2046 MIME types
+
+# [ qr'^\.(Z|gz|bz2)$'           => 0 ],  # allow any in Unix-compressed
+# [ qr'^\.(rpm|cpio|tar)$'       => 0 ],  # allow any in Unix-type archives
+# [ qr'^\.(zip|rar|arc|arj|zoo)$'=> 0 ],  # allow any within such archives
+# [ qr'^application/x-zip-compressed$'i => 0],  # allow any within such archives
+
+  qr'.\.(exe|vbs|pif|scr|bat|cmd|com|cpl)$'i, # banned extension - basic
+# qr'.\.(ade|adp|app|bas|bat|chm|cmd|com|cpl|crt|emf|exe|fxp|grp|hlp|hta|
+#        inf|ins|isp|js|jse|lnk|mda|mdb|mde|mdw|mdt|mdz|msc|msi|msp|mst|
+#        ops|pcd|pif|prg|reg|scr|sct|shb|shs|vb|vbe|vbs|
+#        wmf|wsc|wsf|wsh)$'ix,  # banned ext - long
+
+# qr'.\.(mim|b64|bhx|hqx|xxe|uu|uue)$'i,  # banned extension - WinZip vulnerab.
+
+  qr'^\.(exe-ms)$',                       # banned file(1) types
+# qr'^\.(exe|lha|tnef|cab|dll)$',         # banned file(1) types
+);
+# See http://support.microsoft.com/default.aspx?scid=kb;EN-US;q262631
+# and http://www.cknow.com/vtutor/vtextensions.htm
+
+
+# ENVELOPE SENDER SOFT-WHITELISTING / SOFT-BLACKLISTING
+
+@score_sender_maps = ({ # a by-recipient hash lookup table,
+                        # results from all matching recipient tables are summed
+
+# ## per-recipient personal tables  (NOTE: positive: black, negative: white)
+# 'user1@example.com'  => [{'bla-mobile.press@example.com' => 10.0}],
+# 'user3@example.com'  => [{'.ebay.com'                 => -3.0}],
+# 'user4@example.com'  => [{'cleargreen@cleargreen.com' => -7.0,
+#                           '.cleargreen.com'           => -5.0}],
+
+  ## site-wide opinions about senders (the '.' matches any recipient)
+  '.' => [  # the _first_ matching sender determines the score boost
+
+   new_RE(  # regexp-type lookup table, just happens to be all soft-blacklist
+    [qr'^(bulkmail|offers|cheapbenefits|earnmoney|foryou)@'i         => 5.0],
+    [qr'^(greatcasino|investments|lose_weight_today|market\.alert)@'i=> 5.0],
+    [qr'^(money2you|MyGreenCard|new\.tld\.registry|opt-out|opt-in)@'i=> 5.0],
+    [qr'^(optin|saveonlsmoking2002k|specialoffer|specialoffers)@'i   => 5.0],
+    [qr'^(stockalert|stopsnoring|wantsome|workathome|yesitsfree)@'i  => 5.0],
+    [qr'^(your_friend|greatoffers)@'i                                => 5.0],
+    [qr'^(inkjetplanet|marketopt|MakeMoney)\d*@'i                    => 5.0],
+   ),
+
+#  read_hash("/var/amavis/sender_scores_sitewide"),
+
+# This are some examples for whitelists, since envelope senders can be forged
+# they are not enabled by default. 
+   { # a hash-type lookup table (associative array)
+     #'nobody@cert.org'                        => -3.0,
+     #'cert-advisory@us-cert.gov'              => -3.0,
+     #'owner-alert@iss.net'                    => -3.0,
+     #'slashdot@slashdot.org'                  => -3.0,
+     #'securityfocus.com'                      => -3.0,
+     #'ntbugtraq@listserv.ntbugtraq.com'       => -3.0,
+     #'security-alerts@linuxsecurity.com'      => -3.0,
+     #'mailman-announce-admin@python.org'      => -3.0,
+     #'amavis-user-admin@lists.sourceforge.net'=> -3.0,
+     #'amavis-user-bounces@lists.sourceforge.net' => -3.0,
+     #'spamassassin.apache.org'                => -3.0,
+     #'notification-return@lists.sophos.com'   => -3.0,
+     #'owner-postfix-users@postfix.org'        => -3.0,
+     #'owner-postfix-announce@postfix.org'     => -3.0,
+     #'owner-sendmail-announce@lists.sendmail.org'   => -3.0,
+     #'sendmail-announce-request@lists.sendmail.org' => -3.0,
+     #'donotreply@sendmail.org'                => -3.0,
+     #'ca+envelope@sendmail.org'               => -3.0,
+     #'noreply@freshmeat.net'                  => -3.0,
+     #'owner-technews@postel.acm.org'          => -3.0,
+     #'ietf-123-owner@loki.ietf.org'           => -3.0,
+     #'cvs-commits-list-admin@gnome.org'       => -3.0,
+     #'rt-users-admin@lists.fsck.com'          => -3.0,
+     #'clp-request@comp.nus.edu.sg'            => -3.0,
+     #'surveys-errors@lists.nua.ie'            => -3.0,
+     #'emailnews@genomeweb.com'                => -5.0,
+     #'yahoo-dev-null@yahoo-inc.com'           => -3.0,
+     #'returns.groups.yahoo.com'               => -3.0,
+     #'clusternews@linuxnetworx.com'           => -3.0,
+     #lc('lvs-users-admin@LinuxVirtualServer.org')    => -3.0,
+     #lc('owner-textbreakingnews@CNNIMAIL12.CNN.COM') => -5.0,
+
+     # soft-blacklisting (positive score)
+     #'sender@example.net'                     =>  3.0,
+     #'.example.net'                           =>  1.0,
+
+   },
+  ],  # end of site-wide tables
+});
+
+1;  # ensure a defined return
--- amavisd-new-2.6.4.orig/debian/etc/conf.d/50-user
+++ amavisd-new-2.6.4/debian/etc/conf.d/50-user
@@ -0,0 +1,13 @@
+use strict;
+
+#
+# Place your configuration directives here.  They will override those in
+# earlier files.
+#
+# See /usr/share/doc/amavisd-new/ for documentation and examples of
+# the directives you can use in this file
+#
+
+
+#------------ Do not modify anything below this line -------------
+1;  # ensure a defined return
--- amavisd-new-2.6.4.orig/debian/etc/conf.d/05-domain_id
+++ amavisd-new-2.6.4/debian/etc/conf.d/05-domain_id
@@ -0,0 +1,19 @@
+use strict;
+
+# $mydomain is used just for convenience in the config files and it is not
+# used internally by amavisd-new except in the default X_HEADER_LINE (which
+# Debian overrides by default anyway).
+
+chomp($mydomain = `head -n 1 /etc/mailname`);
+
+# amavisd-new needs to know which email domains are to be considered local
+# to the administrative domain.  Only emails to "local" domains are subject
+# to certain functionality, such as the addition of spam tags.
+#
+# Default local domains to $mydomain and all subdomains.  Remember to
+# override or redefine this if $mydomain is changed later in the config
+# sequence.
+
+@local_domains_acl = ( ".$mydomain" );
+
+1;  # ensure a defined return
--- amavisd-new-2.6.4.orig/debian/etc/conf.d/30-template_localization
+++ amavisd-new-2.6.4/debian/etc/conf.d/30-template_localization
@@ -0,0 +1,42 @@
+use strict;
+
+# l10n (localization) of the AMaViSd-new DSN templates
+# Override or change as necessary
+
+# Select notifications text encoding when Unicode-aware Perl is converting
+# text from internal character representation to external encoding (charset
+# in MIME terminology). Used as argument to Perl Encode::encode subroutine.
+#
+#   to be used in RFC 2047-encoded header field bodies, e.g. in Subject:
+#$hdr_encoding = 'iso-8859-1';  # (default: 'iso-8859-1')
+#
+#   to be used in notification body text: its encoding and Content-type.charset
+#$bdy_encoding = 'iso-8859-1';  # (default: 'iso-8859-1')
+
+# Default template texts for notifications may be overruled by directly
+# assigning new text to template variables, or by reading template text
+# from files. A second argument may be specified in a call to read_text(),
+# specifying character encoding layer to be used when reading from the
+# external file, e.g. 'utf8', 'iso-8859-1', or often just $bdy_encoding.
+# Text will be converted to internal character representation by Perl 5.8.0
+# or later; second argument is ignored otherwise. See PerlIO::encoding,
+# Encode::PerlIO and perluniintro man pages.
+#
+# $notify_sender_templ      = read_text('/var/amavis/notify_sender.txt');
+# $notify_virus_sender_templ= read_text('/var/amavis/notify_virus_sender.txt');
+# $notify_virus_admin_templ = read_text('/var/amavis/notify_virus_admin.txt');
+# $notify_virus_recips_templ= read_text('/var/amavis/notify_virus_recips.txt');
+# $notify_spam_sender_templ = read_text('/var/amavis/notify_spam_sender.txt');
+# $notify_spam_admin_templ  = read_text('/var/amavis/notify_spam_admin.txt');
+
+# If notification template files are collectively available in some directory,
+# you can use read_l10n_templates which calls read_text for each known
+# template.  Name the files as above, and include a file named "charset" with
+# the charset used in the files.  This is how Debian ships l10n templates.
+#
+# syntax: read_l10n_templates(<directory>); OR
+#         read_l10n_templates(<subdirectory>, <master directory>);
+#
+read_l10n_templates('en_US', '/etc/amavis');
+
+1;  # ensure a defined return
--- amavisd-new-2.6.4.orig/debian/patches/45_misc_doc_changes.dpatch
+++ amavisd-new-2.6.4/debian/patches/45_misc_doc_changes.dpatch
@@ -0,0 +1,71 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 45_misc_doc_changes.dpatch by Henrique de Moraes Holschuh <hmh@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Misc doc changes
+
+@DPATCH@
+diff -urNad unstable~/README_FILES/README.courier unstable/README_FILES/README.courier
+--- unstable~/README_FILES/README.courier	2006-11-04 00:42:23.000000000 -0300
++++ unstable/README_FILES/README.courier	2006-11-04 00:42:44.192140909 -0300
+@@ -1,3 +1,7 @@
++Debian Note:  Rename the start links of amavisd-new to S21, or you
++risk trouble. See the last paragraph of this text for more information.
++
++
+ How to use amavisd-new with Courier
+ ***********************************
+ 
+diff -urNad unstable~/README_FILES/README.exim_v3 unstable/README_FILES/README.exim_v3
+--- unstable~/README_FILES/README.exim_v3	2006-11-04 00:42:23.000000000 -0300
++++ unstable/README_FILES/README.exim_v3	2006-11-04 00:42:44.192140909 -0300
+@@ -1,3 +1,9 @@
++Debian notes:
++
++1. Install amavisd-new-milter. It contains /usr/sbin/amavis,
++which is required for the following instructions to work.
++--- cut ---
++
+ +======================================================================+
+ | (Please see instructions in README.exim_v4. The setup described here |
+ | is not recommended with amavisd-new + Exim v4)                       |
+diff -urNad unstable~/README_FILES/README.milter unstable/README_FILES/README.milter
+--- unstable~/README_FILES/README.milter	2006-11-04 00:42:23.000000000 -0300
++++ unstable/README_FILES/README.milter	2006-11-04 00:42:44.193140788 -0300
+@@ -1,3 +1,24 @@
++Debian notes:
++
++1. Install amavisd-new-milter.
++
++2.  The postinst script needs to add lines to one's sendmail.mc file that
++tell it how to communicate with a milter program, e.g.:
++
++define(`MILTER',1)
++INPUT_MAIL_FILTER(`/usr/sbin/amavis-milter',`S=local:/var/lib/amavis/amavisd-new-milter.sock, F=T, T=S:10m;R:10m;E:10m')
++
++Run sendmailconfig.
++
++3.  Change/replace the following settings in /etc/amavis/amavisd.conf:
++
++$unix_socketname = "/var/lib/amavis/amavisd.sock";
++$forward_method = undef;
++$notify_method = $notify_method = 'pipe:flags=q argv=/usr/sbin/sendmail -i -odd -f ${sender} -- ${recipient}';
++
++Contributed and adapted from Susan Kleinmann <sgk@kleinmann.com>.
++[End of Debian Notes]
++
+ ===============================================================================
+ NOTE:
+   A recommended sendmail setup is described in file README.sendmail-dual,
+diff -urNad unstable~/amavisd.conf-default unstable/amavisd.conf-default
+--- unstable~/amavisd.conf-default	2006-11-04 00:42:23.000000000 -0300
++++ unstable/amavisd.conf-default	2006-11-04 00:42:44.191141030 -0300
+@@ -1,5 +1,8 @@
+ use strict;
+ 
++# ADMINSTRATORS: DO NOT CHANGE THIS FILE
++# Change /etc/amavis/conf.d/30-user instead.
++
+ ## A CONFIGURATION FILE FOR AMAVISD-NEW, LISTING ALL CONFIGURATION VARIABLES
+ ## WITH THEIR DEFAULT VALUES (FOR REFERENCE ONLY, NON-AUTHORITATIVE)
+ 
--- amavisd-new-2.6.4.orig/debian/patches/20_safe_path_at_init.dpatch
+++ amavisd-new-2.6.4/debian/patches/20_safe_path_at_init.dpatch
@@ -0,0 +1,21 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 20_safe_path_at_init.dpatch by Henrique de Moraes Holschuh <hmh@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Set a safe path at startup for benefit of the config scripts
+
+@DPATCH@
+diff -urNad amavisd-new~/amavisd amavisd-new/amavisd
+--- amavisd-new~/amavisd	2007-06-27 12:43:00.000000000 +0200
++++ amavisd-new/amavisd	2007-09-17 22:23:08.000000000 +0200
+@@ -10939,6 +10939,10 @@
+ my($desired_user);                       # username or UID
+ if ($> != 0) { $desired_user = $> }      # use effective UID if not root
+ 
++# Use a default, guaranteed safe path during startup, before loading
++# an user-supplied one from the config file
++$ENV{PATH} = "/bin:/usr/bin";
++
+ # collect and parse command line options
+ my($log_level_override, $max_servers_override);
+ my($myhome_override, $tempbase_override, $helpers_home_override);
--- amavisd-new-2.6.4.orig/debian/patches/40_fix_paths.dpatch
+++ amavisd-new-2.6.4/debian/patches/40_fix_paths.dpatch
@@ -0,0 +1,127 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40_fix_paths.dpatch by Henrique de Moraes Holschuh <hmh@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix references to paths that are different in Debian
+
+@DPATCH@
+diff -urNad pkg-amavisd-new~/README_FILES/README.chroot pkg-amavisd-new/README_FILES/README.chroot
+--- pkg-amavisd-new~/README_FILES/README.chroot	2006-01-14 02:02:09.000000000 +0100
++++ pkg-amavisd-new/README_FILES/README.chroot	2008-05-20 19:29:10.000000000 +0200
+@@ -23,6 +23,9 @@
+ If you have Postfix, check its chroot setup script for further hints:
+ postfix-xxx/examples/chroot-setup/<YOUR-OS> and BASIC_CONFIGURATION_README.
+ 
++WARNING: Debian uses different paths, notably /var/lib/amavisd-new.  Be
++sure to adjust the directions in this document accordingly.
++
+ 
+ exit   # This is NOT an automatic script!!!
+        # Don't execute commands without knowing what they will do!!!
+diff -urNad pkg-amavisd-new~/README_FILES/README.old.scanners pkg-amavisd-new/README_FILES/README.old.scanners
+--- pkg-amavisd-new~/README_FILES/README.old.scanners	2005-04-25 01:16:20.000000000 +0200
++++ pkg-amavisd-new/README_FILES/README.old.scanners	2008-05-20 19:29:10.000000000 +0200
+@@ -89,7 +89,7 @@
+ otherwise your logfiles don't show which file(s) is/are infected.
+ 
+ NOTE: AvpDaemon must be running as a daemon, so it should be started at
+-boot time via an init script (or whatver) as <path>/AvpDaemon -* /var/amavis
++boot time via an init script (or whatver) as <path>/AvpDaemon -* /var/lib/amavis
+ 
+ 3.1.2 Kaspersky Anti-Virus
+ AvpLinx fills the log with a lot of trash because of a simple progress
+@@ -799,7 +799,7 @@
+ 
+ # Now restart AVP daemon to load updated virus library
+ system("/usr/local/AvpLinux/AvpDaemon -k");
+-system("/usr/local/AvpLinux/AvpDaemon -* /var/amavis");
++system("/usr/local/AvpLinux/AvpDaemon -* /var/lib/amavis");
+ 
+ # End of perl script
+ 
+diff -urNad pkg-amavisd-new~/README_FILES/README.performance pkg-amavisd-new/README_FILES/README.performance
+--- pkg-amavisd-new~/README_FILES/README.performance	2005-08-12 16:15:59.000000000 +0200
++++ pkg-amavisd-new/README_FILES/README.performance	2008-05-20 19:29:10.000000000 +0200
+@@ -16,7 +16,7 @@
+ Hopefully hardware matches expectations,
+ fast disks and enough memory are paramount.
+ 
+-You may want to put Postfix spool on different disk than /var/amavis,
++You may want to put Postfix spool on different disk than /var/lib/amavis,
+ where amavisd does mail unpacking.
+ 
+ | is there any suggested configuration for this
+diff -urNad pkg-amavisd-new~/README_FILES/README.sendmail pkg-amavisd-new/README_FILES/README.sendmail
+--- pkg-amavisd-new~/README_FILES/README.sendmail	2005-04-25 01:16:34.000000000 +0200
++++ pkg-amavisd-new/README_FILES/README.sendmail	2008-05-20 19:29:10.000000000 +0200
+@@ -212,7 +212,7 @@
+ 
+ /var/spool/mqueue and /var/spool/mqamavis is owned by amavis.
+ 
+-NOTE: as amavis is run as user amavis, /var/virusmails must be owned
++NOTE: as amavis is run as user amavis, /var/lib/amavis/virusmails must be owned
+ by amavis and you have to specify a location for the AMaViS logfile
+ that is writable by user amavis, if writing to a log file directly
+ (not via syslog).
+@@ -291,9 +291,9 @@
+ # i       Deliver interactively (synchronously)
+ 
+ 
+-NOTE: as amavis is run as amavis /var/virusmails must be owned
++NOTE: as amavis is run as amavis /var/lib/amavis/virusmails must be owned
+ by amavis and you have to specify a another location for the AMaViS
+-logfile (normally /var/amavis/amavis.log) to which amavis has
++logfile (normally /var/lib/amavis/amavis.log) to which amavis has
+ write access to.
+ 
+ NOTE: As sendmail will perform most tasks as user amavis now, it may
+diff -urNad pkg-amavisd-new~/README_FILES/README.sendmail-dual pkg-amavisd-new/README_FILES/README.sendmail-dual
+--- pkg-amavisd-new~/README_FILES/README.sendmail-dual	2006-09-15 22:36:47.000000000 +0200
++++ pkg-amavisd-new/README_FILES/README.sendmail-dual	2008-05-20 19:29:10.000000000 +0200
+@@ -427,8 +427,8 @@
+ 
+ - Mail handling is I/O-intensive. For better performance one may place
+   the two mail queue areas (/var/spool/mqueue and /var/spool/mqueue-rx),
+-  and the /var/amavis work directory ($TEMPBASE) on three separate disks.
+-  The /var/amavis/tmp may be a tmpfs or a RAMdisk or delayed-sync fs.
++  and the /var/lib/amavis work directory ($TEMPBASE) on three separate disks.
++  The /var/lib/amavis/tmp may be a tmpfs or a RAMdisk or delayed-sync fs.
+ 
+ - One of the important arguments for choosing the dual-MTA setup is to be
+   able to keep the number of content filtering processes under control,
+diff -urNad pkg-amavisd-new~/amavisd-agent pkg-amavisd-new/amavisd-agent
+--- pkg-amavisd-new~/amavisd-agent	2008-04-10 20:47:12.000000000 +0200
++++ pkg-amavisd-new/amavisd-agent	2008-05-20 19:30:33.000000000 +0200
+@@ -50,7 +50,7 @@
+ 
+ my($dbfile) = 'snmp.db';
+ my($db_home) =  # DB databases directory
+-  defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/amavis/db';
++  defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/lib/amavis/db';
+ 
+ my($wakeuptime) = 10;  # -w, sleep time in seconds, may be fractional
+ my($repeatcount);      # -c, repeat count (when defined)
+diff -urNad pkg-amavisd-new~/amavisd-agent pkg-amavisd-new/amavisd-agent
+--- pkg-amavisd-new~/amavisd-nanny      2008-12-05 17:30:15.000000000 +0000
++++ pkg-amavisd-new/amavisd-nanny       2008-12-05 17:30:38.000000000 +0000
+@@ -58,7 +58,7 @@
+ 
+ my($dbfile) = 'nanny.db';
+ my($db_home) =  # DB databases directory
+-  defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/amavis/db';
++  defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/lib/amavis/db';
+ my($wakeuptime) = 2;  # -w, sleep time in seconds, may be fractional
+ my($repeatcount);     # -c, repeat count (when defined)
+ 
+diff -urNad pkg-amavisd-new~/amavisd-release pkg-amavisd-new/amavisd-release
+--- pkg-amavisd-new~/amavisd-release	2008-03-17 15:43:33.000000000 +0100
++++ pkg-amavisd-new/amavisd-release	2008-05-20 19:29:10.000000000 +0200
+@@ -79,7 +79,7 @@
+ 
+   $log_level = 1;
+ # $socketname = '127.0.0.1:9998';
+-  $socketname = '/var/amavis/amavisd.sock';
++  $socketname = '/var/lib/amavis/amavisd.sock';
+ 
+ sub sanitize_str {
+   my($str, $keep_eol) = @_;
--- amavisd-new-2.6.4.orig/debian/patches/65_fixtldcheck.dpatch
+++ amavisd-new-2.6.4/debian/patches/65_fixtldcheck.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 65_allowdashintld.dpatch by Alexander Wirt <formorer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Accept hostnames according to rfc2181
+
+@DPATCH@
+diff -urNad pkg-amavisd~/amavisd pkg-amavisd/amavisd
+--- pkg-amavisd~/amavisd	2008-06-29 02:37:58.000000000 +0200
++++ pkg-amavisd/amavisd	2008-07-24 20:34:28.000000000 +0200
+@@ -12957,7 +12957,7 @@
+ do_log(0, "Perl version               %s", $]);
+ # insist on a FQDN in $myhostname
+ my($myhn) = c('myhostname');
+-$myhn =~ /[^.]\.[a-zA-Z0-9]+\z/s || lc($myhn) eq 'localhost'
++$myhn =~ /[^.]\..+\z/s || lc($myhn) eq 'localhost'
+   or die <<"EOD";
+   The value of variable \$myhostname is \"$myhn\", but should have been
+   a fully qualified domain name; perhaps uname(3) did not provide such.
--- amavisd-new-2.6.4.orig/debian/patches/55_helper-progs_build_fixes.dpatch
+++ amavisd-new-2.6.4/debian/patches/55_helper-progs_build_fixes.dpatch
@@ -0,0 +1,51 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 55_helper-progs_build_fixes.dpatch by  <hmh@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix sendmail detection
+
+@DPATCH@
+diff -urNad unstable~/helper-progs/Makefile.in unstable/helper-progs/Makefile.in
+--- unstable~/helper-progs/Makefile.in	2006-11-04 00:55:56.000000000 -0300
++++ unstable/helper-progs/Makefile.in	2006-11-04 00:56:34.710451077 -0300
+@@ -15,8 +15,8 @@
+ 
+ all: amavis-milter amavis
+ 
+-amavis-milter.c:
+-	ln -sf amavis-milter-based-on-1.1.2.3.2.40-v2.c amavis-milter.c
++unstripped: FORCE
++	$(MAKE) all DONT_STRIP=1
+ 
+ amavis-milter: amavis-milter.o 
+ 	@CC@ @CFLAGS@ @LDFLAGS@ @PTHREAD_FLAG@ -o amavis-milter amavis-milter.o @LIBMILTER@ @LIBS@
+diff -urNad unstable~/helper-progs/configure.in unstable/helper-progs/configure.in
+--- unstable~/helper-progs/configure.in	2006-11-04 00:55:56.000000000 -0300
++++ unstable/helper-progs/configure.in	2006-11-04 00:56:34.710451077 -0300
+@@ -153,6 +153,10 @@
+    AC_PATH_PROG(SENDMAILPROG, sendmail, no, $PATH:/sbin:/usr/sbin:/usr/lib:/usr/libexec)
+ fi
+ 
++if test "$SENDMAILPROG" = "no" ; then
++   SENDMAILPROG=/usr/sbin/sendmail
++fi
++
+ dnl rm
+ AC_PATH_PROG(RM, rm, no, $PATH)
+ 
+@@ -280,9 +284,9 @@
+ 
+ 
+ 
+-if test "$SENDMAILPROG" != "no" ; then
+-        sendmailversion=`$SENDMAILPROG -bv -d0.1 | $AWK '/Version/ {print $2}'`
+-        echo ""
+-        echo "Info: sendmail version $sendmailversion detected"
+-        echo ""
+-fi
++#if test "$SENDMAILPROG" != "no" ; then
++#        sendmailversion=`$SENDMAILPROG -bv -d0.1 | $AWK '/Version/ {print $2}'`
++#        echo ""
++#        echo "Info: sendmail version $sendmailversion detected"
++#        echo ""
++#fi
--- amavisd-new-2.6.4.orig/debian/patches/50_amavis-milter_pidfile_support.dpatch
+++ amavisd-new-2.6.4/debian/patches/50_amavis-milter_pidfile_support.dpatch
@@ -0,0 +1,102 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_amavis-milter_pidfile_support.dpatch by Henrique de Moraes Holschuh <hmh@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add pidfile support for amavis-milter
+
+@DPATCH@
+diff -urNad unstable~/helper-progs/amavis-milter.c unstable/helper-progs/amavis-milter.c
+--- unstable~/helper-progs/amavis-milter.c	2006-11-04 00:51:26.000000000 -0300
++++ unstable/helper-progs/amavis-milter.c	2006-11-04 00:52:08.214746675 -0300
+@@ -45,6 +45,7 @@
+ #include <arpa/inet.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
++#include <sys/file.h>
+ #include <limits.h>
+ #include <grp.h>
+ #include <pwd.h>
+@@ -127,6 +128,9 @@
+ static struct utsname amavis_uts;
+ static int enable_x_header = 1;  /* enabled by default */
+ 
++pid_t daemon_pid;
++static char pidfile[] = "/var/run/amavis/amavisd-new-milter.pid";
++
+ static void amavis_syslog(const int, const char *, ...);
+ static char *amavis_mkdtemp(char *, int);
+ static int group_member(const char *);
+@@ -146,6 +150,38 @@
+ static sfsistat mlfi_cleanup(SMFICTX *, sfsistat, mybool);
+ 
+ 
++void
++get_lock()
++   /* check if another daemon is running */
++{
++       int otherpid = 0;
++       FILE *daemon_lockfp = NULL;
++       int fd;
++
++        if (((fd = open(pidfile, O_RDWR|O_CREAT, 0644)) == -1 )
++                        || ((daemon_lockfp = fdopen(fd, "r+"))) == NULL)
++        {
++                amavis_syslog(DBG_FATAL, "can't open or create %s", pidfile);
++                exit(EX_UNAVAILABLE);
++        }
++       if ( flock(fd, LOCK_EX|LOCK_NB) != 0 )
++       {
++               fscanf(daemon_lockfp, "%d", &otherpid);
++               amavis_syslog(DBG_INFO, "can't lock %s, running daemon's pid may be %d", pidfile, otherpid);
++               exit(EX_UNAVAILABLE);
++       }
++
++       fcntl(fd, F_SETFD, 1);
++
++       rewind(daemon_lockfp);
++       fprintf(daemon_lockfp, "%d\n", (int) daemon_pid);
++       fflush(daemon_lockfp);
++       ftruncate(fileno(daemon_lockfp), ftell(daemon_lockfp));
++       /* abandon fd and daemon_lockfp even though the file is open. we need to-
++        * keep it open and locked, but we don't need the handles elsewhere.
++        */
++}
++
+ static void
+ amavis_syslog(const int level, const char *fmt, ...)
+ {
+@@ -823,7 +859,7 @@
+ mlfi_abort(SMFICTX *ctx)
+ {
+     struct mlfiPriv *priv = MLFIPRIV;
+-    amavis_syslog(DBG_WARN, "%s: (mlfi_abort)",
++    amavis_syslog(DBG_DEBUG, "%s: (mlfi_abort)",
+ 		(!priv || !priv->mlfi_queueid ? "?" : priv->mlfi_queueid) );
+     return mlfi_cleanup(ctx, SMFIS_CONTINUE, 0);
+ }
+@@ -936,6 +972,7 @@
+ 
+     pid_t pid;
+     int devnull;
++    int result;
+ 
+ #if !defined(HAVE_MKDTEMP) && !defined(HAVE_MKTEMP)
+     int mypid = getpid();
+@@ -1123,9 +1160,15 @@
+ 
+     /* smfi_settimeout(1800); */     /* defaults to 7210 seconds */
+ 
++    daemon_pid = getpid();
++    get_lock();
++
+     /* hand control over to libmilter */
+-    amavis_syslog(DBG_WARN, "Starting, handing off to smfi_main");
+-    return smfi_main();
++    amavis_syslog(DBG_INFO, "Starting, handing off to smfi_main");
++    result=smfi_main();
++
++    remove(pidfile);
++    return(result);
+ }
+ 
+ /* eof */
--- amavisd-new-2.6.4.orig/debian/patches/70_fix_milter_permissions.dpatch
+++ amavisd-new-2.6.4/debian/patches/70_fix_milter_permissions.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 70_fix_milter_permissions.dpatch by Alex Prinsier <debian@aphexer.mailhaven.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: makes the milter tempdir group writeable so that av scanner can access it
+
+@DPATCH@
+diff -urNad pkg-amavisd-new~/helper-progs/amavis-milter.c pkg-amavisd-new/helper-progs/amavis-milter.c
+--- pkg-amavisd-new~/helper-progs/amavis-milter.c	2007-10-07 09:13:35.000000000 +0200
++++ pkg-amavisd-new/helper-progs/amavis-milter.c	2007-10-07 09:18:29.000000000 +0200
+@@ -210,6 +210,8 @@
+ 
+ #ifdef HAVE_MKDTEMP
+     stt = mkdtemp(s);
++    /* make the tempdir groupwriteable */
++    chmod(stt,S_IRWXU|S_IRGRP|S_IXGRP);
+     if (stt == NULL)
+ 	amavis_syslog(DBG_FATAL, "(amavis_mkdtemp) mkdtemp %s failed: %s",
+ 		      s, strerror(errno));
--- amavisd-new-2.6.4.orig/debian/patches/30_conf.d_support_builtin.dpatch
+++ amavisd-new-2.6.4/debian/patches/30_conf.d_support_builtin.dpatch
@@ -0,0 +1,49 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 30_conf.d_support_builtin.dpatch by Henrique de Moraes Holschuh <hmh@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Support Debian conf.d style out-of-the-box without perl hackery
+## DP: in the main legacy config file.
+
+@DPATCH@
+diff -urNad amavisd-new~/amavisd amavisd-new/amavisd
+--- amavisd-new~/amavisd	2007-09-17 22:29:49.000000000 +0200
++++ amavisd-new/amavisd	2007-09-17 22:31:56.000000000 +0200
+@@ -2394,6 +2394,25 @@
+     Amavis::Util::read_text("$dir/template-spam-admin.txt", $file_chset);
+ }
+ 
++# attempt to read a list of config files to use instead of the default
++# one, through an external help script. Used by the Debian distribution.
++sub find_config_files(@) {
++  my(@dirs) = @_;
++  my(@config_files);
++
++# my($old_path) = $ENV{PATH};
++# $ENV{PATH} = "/bin:/usr/bin";
++  foreach my $dir (@dirs) {
++    push(@config_files, `run-parts --list "$dir"`);
++  }
++# $ENV{PATH} = $old_path;
++
++  # untaint and chomp.  This data is secure as we check the files
++  # themselves later
++  chomp(@config_files);
++  map { untaint($_) } @config_files;
++}
++
+ #use CDB_File;
+ #sub tie_hash($$) {
+ # my($hashref, $filename) = @_;
+@@ -11054,7 +11073,10 @@
+   Amavis::Lookup::RE->new(@$Amavis::Conf::map_full_type_to_short_type_re);
+ 
+ # default location of the config file if none specified
+-push(@config_files, '/etc/amavisd.conf')  if !@config_files;
++if (!@config_files) {
++  @config_files = Amavis::Util::find_config_files('/usr/share/amavis/conf.d',
++                                                       '/etc/amavis/conf.d');
++}
+ # Read and evaluate config files, which may override default settings
+ Amavis::Conf::include_config_files(@config_files);
+ Amavis::Conf::supply_after_defaults();
--- amavisd-new-2.6.4.orig/debian/patches/85-clarify_fqdn_error.dpatch
+++ amavisd-new-2.6.4/debian/patches/85-clarify_fqdn_error.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 85-clarify_fqdn_error.dpatch by Alexander Wirt <formorer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: clarify fqdn error message (#451804)
+
+@DPATCH@
+diff -urNad pkg-amavisd~/amavisd pkg-amavisd/amavisd
+--- pkg-amavisd~/amavisd	2008-06-29 02:37:58.000000000 +0200
++++ pkg-amavisd/amavisd	2008-07-24 20:55:51.000000000 +0200
+@@ -12962,7 +12962,8 @@
+   The value of variable \$myhostname is \"$myhn\", but should have been
+   a fully qualified domain name; perhaps uname(3) did not provide such.
+   You must explicitly assign a FQDN of this host to variable \$myhostname
+-  in amavisd.conf, or fix what uname(3) provides as a host's network name!
++  in /etc/amavis/conf.d/05-node_id, or fix what uname(3) provides as a host's 
++  network name!
+ EOD
+ 
+ # $SIG{USR2} = sub {
--- amavisd-new-2.6.4.orig/debian/patches/00list
+++ amavisd-new-2.6.4/debian/patches/00list
@@ -0,0 +1,9 @@
+20_safe_path_at_init
+30_conf.d_support_builtin
+40_fix_paths
+45_misc_doc_changes
+50_amavis-milter_pidfile_support
+55_helper-progs_build_fixes
+65_fixtldcheck.dpatch
+70_fix_milter_permissions.dpatch
+85-clarify_fqdn_error.dpatch
--- amavisd-new-2.6.4.orig/debian/patches/00patch-opts
+++ amavisd-new-2.6.4/debian/patches/00patch-opts
@@ -0,0 +1 @@
+patch_opts="-g0 -f --no-backup-if-mismatch -F0 -U ${workdir:+-d ${workdir}}"
--- amavisd-new-2.6.4.orig/debian/conf/10-debian_scripts
+++ amavisd-new-2.6.4/debian/conf/10-debian_scripts
@@ -0,0 +1,26 @@
+use strict;
+
+# ADMINSTRATORS: DO NOT CHANGE THIS FILE
+# Change the files in /etc/amavis/conf.d instead
+
+# This file contains Debian system settings that are not to be changed
+# unless you really know better.
+
+# Changing or overriding the settings in this file requires changing scripts
+# such as the initscript and maybe the cron scripts, and even the amavis user
+# home directory.
+#
+# You have been warned.  Don't change these settings.
+
+$daemon_user  = 'amavis';
+$daemon_group = 'amavis';
+
+$MYHOME   = '/var/lib/amavis'; # a convenient default for other settings
+$TEMPBASE = "$MYHOME/tmp";     # working directory, needs to be created manually
+$ENV{TMPDIR} = $TEMPBASE;      # environment variable TMPDIR
+$db_home   = "$MYHOME/db";
+
+$pid_file  = "/var/run/amavis/amavisd.pid";
+$lock_file = "/var/run/amavis/amavisd.lock";
+
+1;  # insure a defined return
--- amavisd-new-2.6.4.orig/debian/conf/20-package
+++ amavisd-new-2.6.4/debian/conf/20-package
@@ -0,0 +1,17 @@
+use strict;
+
+# These settings are here just to enable a Debian package that does not
+# depend on clamav.  The local admin is expected to override them
+# in /etc/amavis/conf.d/15-content_filter_mode, if any sort of antivirus
+# support is wanted
+
+@bypass_virus_checks_maps  = (1);  # DISABLE anti-virus code by default
+
+# These settings are here just to enable a Debian package that does not
+# depend on spamassassin.  The local admin is expected to override them
+# in /etc/amavis/conf.d/15-content_filter_mode, if spamassassin support
+# is wanted
+
+@bypass_spam_checks_maps  = (1);  # DISABLE anti-spam code by default
+
+1;  # insure a defined return
--- amavisd-new-2.6.4.orig/debian/logcheck/ignore.d.server/amavisd-new
+++ amavisd-new-2.6.4/debian/logcheck/ignore.d.server/amavisd-new
@@ -0,0 +1,5 @@
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ amavis\[[[:digit:]]+\]: \([-[:digit:]]+\) Passed CLEAN,( \[[.:[:xdigit:]]+\]){0,2} <[^>]*> -> <[^>]*>(,<[^>]*>)*, Message-ID: <[^>]+>( \((added by[^)]+|sfid-[_[:xdigit:]]+)\))?,( Resent-Message-ID: <[^>]+>,)? mail_id: [-+[:alnum:]]+, Hits: (-[.[:digit:]]*)+, size: [[:xdigit:]]+, queued_as: [[:xdigit:]]+( OK id=[-[:alnum:]]+)?, [[:digit:]]+ ms$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ amavis\[[[:digit:]]+\]: \([-[:digit:]]+\) Passed (INFECTED \([-._[:alnum:]]+\)|BAD-HEADER),( \[[.:[:xdigit:]]+\]){1,2} <[^>]*> -> <[^>]*>, quarantine: (virus|badh)-[-+[:alnum:]]+, Message-ID: <[^>]+>( \((added by[^)]+|sfid-[_[:xdigit:]]+)\))?,( Resent-Message-ID: <[^>]+>,)? mail_id: [-+[:alnum:]]+, Hits: (-[.[:digit:]]*)+, size: [[:xdigit:]]+, queued_as: [[:xdigit:]]+( OK id=[-[:alnum:]]+)?, [[:digit:]]+ ms$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ amavis\[[[:digit:]]+\]: \([-[:digit:]]+\) NOTICE: Not sending DSN in response to bulk mail from <[^.]*> containing [[:upper:] ]+, mail intentionally dropped$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ amavis\[[[:digit:]]+\]: \([-[:digit:]]+\) INFO: unfolded [[:digit:]]+ illegal all-whitespace continuation lines$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ amavis\[[[:digit:]]+\]: \([-[:digit:]]+\) WARN: address modified \((sender|recipient)\): <[^>]+> -> <[^>]+>$
--- amavisd-new-2.6.4.orig/debian/logcheck/violations.ignore.d/amavisd-new
+++ amavisd-new-2.6.4/debian/logcheck/violations.ignore.d/amavisd-new
@@ -0,0 +1,2 @@
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ amavis\[[[:digit:]]+\]: \([-[:digit:]]+\) (Blocked|Passed) BAD-HEADER,( \[[.:[:xdigit:]]+\]){2} <[^>]*> -> <[^>]*>, quarantine: badh-[-+[:alnum:]]+, Message-ID: [^[:space:]]*, mail_id: [-+[:alnum:]]+, Hits: -, queued_as: [[:xdigit:]]+, [[:digit:]]+ ms$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ amavis\[[[:digit:]]+\]: \([-[:digit:]]+\) (Blocked|Passed), <[^[:space:]]+> -> <[^[:space:]]+>, Message-ID: <[^[:space:]]+>, Hits: -$
