From 7335f5910ad7d8a5b07ffea88cee4bc3768cfd84 Mon Sep 17 00:00:00 2001
From: Andrej Kacian <ticho@gentoo.org>
Date: Mon, 18 Dec 2006 17:00:35 +0000
Subject: [PATCH] Version bump. Bug #156576, by Janne Pikkarainen <jaba at
 mikrobitti.fi>. Package-Manager: portage-2.1.2_rc3-r5

---
 mail-filter/amavisd-new/ChangeLog             |   9 +-
 mail-filter/amavisd-new/Manifest              |  26 ++-
 .../amavisd-new/amavisd-new-2.4.4.ebuild      | 180 ++++++++++++++++++
 ...mavisd-new-2.4.4-amavisd.conf-gentoo.patch | 115 +++++++++++
 .../files/digest-amavisd-new-2.4.4            |   3 +
 5 files changed, 325 insertions(+), 8 deletions(-)
 create mode 100644 mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild
 create mode 100644 mail-filter/amavisd-new/files/amavisd-new-2.4.4-amavisd.conf-gentoo.patch
 create mode 100644 mail-filter/amavisd-new/files/digest-amavisd-new-2.4.4

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index b2e895dcd62d..fef96b850104 100644
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/amavisd-new
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.97 2006/12/10 20:48:12 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.98 2006/12/18 17:00:35 ticho Exp $
+
+*amavisd-new-2.4.4 (18 Dec 2006)
+
+  18 Dec 2006; Andrej Kacian <ticho@gentoo.org>
+  +files/amavisd-new-2.4.4-amavisd.conf-gentoo.patch,
+  +amavisd-new-2.4.4.ebuild:
+  Version bump. Bug #156576, by Janne Pikkarainen <jaba at mikrobitti.fi>.
 
   10 Dec 2006; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.3.3-r2.ebuild,
   amavisd-new-2.4.1.ebuild, amavisd-new-2.4.2.ebuild,
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 31a274a3c02f..9d4fb02e5521 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -25,6 +25,10 @@ AUX amavisd-new-2.4.2-amavisd.conf-gentoo.patch 5664 RMD160 401bb31a787584638363
 MD5 fd9083fb2224c3fe0c126c611af261a3 files/amavisd-new-2.4.2-amavisd.conf-gentoo.patch 5664
 RMD160 401bb31a787584638363cb807365cbc3841dabb8 files/amavisd-new-2.4.2-amavisd.conf-gentoo.patch 5664
 SHA256 473be5ee6fc391b429fd83647222246b27ff80a52c7dd134a1beaf917b08800d files/amavisd-new-2.4.2-amavisd.conf-gentoo.patch 5664
+AUX amavisd-new-2.4.4-amavisd.conf-gentoo.patch 4878 RMD160 bf7faec0c54aa24bd689db9d1d22cccbdcff47b3 SHA1 18a44d7cf4e155206b26582abf4e3b92682275ea SHA256 b9db712af97ec836f1177fbeeaa284a4eb254f0a4eea1783606553273078fee3
+MD5 863246523bc1dbf39b02d237f0be9cb2 files/amavisd-new-2.4.4-amavisd.conf-gentoo.patch 4878
+RMD160 bf7faec0c54aa24bd689db9d1d22cccbdcff47b3 files/amavisd-new-2.4.4-amavisd.conf-gentoo.patch 4878
+SHA256 b9db712af97ec836f1177fbeeaa284a4eb254f0a4eea1783606553273078fee3 files/amavisd-new-2.4.4-amavisd.conf-gentoo.patch 4878
 AUX amavisd.rc6 310 RMD160 c06ac94f57382b5cbb7f9dea94007b927aaf6c8c SHA1 9674be4ffe07c6dea0c4f4ea34ff74d948536190 SHA256 c136451b550176c6292554c60e0d41d91e6ad3538dedecbdb48925898623dbd8
 MD5 1da4ebb5c79b4892074a61f52aff3eff files/amavisd.rc6 310
 RMD160 c06ac94f57382b5cbb7f9dea94007b927aaf6c8c files/amavisd.rc6 310
@@ -33,6 +37,7 @@ DIST amavisd-new-2.3.3.tar.gz 772280 RMD160 c2213190582fe8fea9b8f1736e3b3e49b290
 DIST amavisd-new-2.4.1.tar.gz 841988 RMD160 edd91dde774838345159064ef6012f7927d5aa6c SHA1 1de9fdac377c58a29a93c8a246553c8e363b212c SHA256 c067cbae60ccff3932574fcaf7971c04b118f6b2e9fe6db772d33538b53b0a54
 DIST amavisd-new-2.4.2.tar.gz 854326 RMD160 fd82a0f3a1166d7f70846651b7b91af147b3fb70 SHA1 48893e23b03bb4ef493473b0f066e4f4d65ff1b7 SHA256 80023cc0397560d082dd4152c96b7efc49d3cc2695b4d578ed01b08c3af2bb9a
 DIST amavisd-new-2.4.3.tar.gz 876615 RMD160 9301d2ea30bd6a620d827384facc5a1bbace86db SHA1 d3b8b1a3c1707b120e9230821ba4ede449eed646 SHA256 ff71af590a0dc62bda558a037daceaea3b776d1ef7d0689ab0bfb582d436cf15
+DIST amavisd-new-2.4.4.tar.gz 887625 RMD160 3d6ac62f57b68440a7ca3766ff374f4763db6bbf SHA1 20943dd3787c33a1f39c9e486bc00e8f670e3f7e SHA256 b3a11ff3813e8b6c7cdf48c852c7bc672b2c0c6115d1b1dba896cd6358b67889
 EBUILD amavisd-new-2.3.3-r2.ebuild 5208 RMD160 58617a2670759a0e388f9bdc9bbb2911f1b8f648 SHA1 a7cd71f57ef0709f1b075e14379bdedd19327d93 SHA256 28cfcbc2ec5ee1192e23d63eefe9cea3443387a30471d5fc726f7face92609dc
 MD5 53c6dfa51a7d90c7b526160504cdb57e amavisd-new-2.3.3-r2.ebuild 5208
 RMD160 58617a2670759a0e388f9bdc9bbb2911f1b8f648 amavisd-new-2.3.3-r2.ebuild 5208
@@ -53,10 +58,14 @@ EBUILD amavisd-new-2.4.3.ebuild 5133 RMD160 79ba46a33ad8b5cd0d240950b72b84f1d1d6
 MD5 2485dfbe653652d133eb1cf0e3fd4cf9 amavisd-new-2.4.3.ebuild 5133
 RMD160 79ba46a33ad8b5cd0d240950b72b84f1d1d6feed amavisd-new-2.4.3.ebuild 5133
 SHA256 3be17677141e51e919b988fcf300d844f188909f644621ae228a46f01920878d amavisd-new-2.4.3.ebuild 5133
-MISC ChangeLog 20286 RMD160 dc6f2cdcc12ec3eb7dc762600bbbcf461408843c SHA1 e01ba947ae751e1c2f4ba8e64bdc65243a627f05 SHA256 157d6689a0c4ade6a76421ded05df7506cc463a32174b34821dde189d99a06b0
-MD5 fe05d128adacec56c88a975f42281fd2 ChangeLog 20286
-RMD160 dc6f2cdcc12ec3eb7dc762600bbbcf461408843c ChangeLog 20286
-SHA256 157d6689a0c4ade6a76421ded05df7506cc463a32174b34821dde189d99a06b0 ChangeLog 20286
+EBUILD amavisd-new-2.4.4.ebuild 5126 RMD160 001f518a9449b6b2f8e3addb24c46828238116ae SHA1 6bb4731ced24a095790e32fc50411d589f91e0b6 SHA256 1839e3dad069f58fa7925418473d263a145ab41f8a55a7fec80b89104678101a
+MD5 a2a55b81870ce0107cf65048fadfe6b1 amavisd-new-2.4.4.ebuild 5126
+RMD160 001f518a9449b6b2f8e3addb24c46828238116ae amavisd-new-2.4.4.ebuild 5126
+SHA256 1839e3dad069f58fa7925418473d263a145ab41f8a55a7fec80b89104678101a amavisd-new-2.4.4.ebuild 5126
+MISC ChangeLog 20527 RMD160 e4b1aabd328ee1262baa462b7d7ad5483d3a3ab1 SHA1 a604560415fb8b51e0a41f9a71c85b6cfbbc93ae SHA256 07847746053a1c666e0328780a4bf737109b4b88558c1a66d4555107a91e2881
+MD5 e450a386f3da9301ae6dbd1113f17417 ChangeLog 20527
+RMD160 e4b1aabd328ee1262baa462b7d7ad5483d3a3ab1 ChangeLog 20527
+SHA256 07847746053a1c666e0328780a4bf737109b4b88558c1a66d4555107a91e2881 ChangeLog 20527
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 metadata.xml 184
@@ -76,10 +85,13 @@ SHA256 ff3807ede34c85941b47474b17954f8b97eacd86a8d45e4f8afb52190ee6cac1 files/di
 MD5 5797ce9567bd44923d8c5d17a8a93e83 files/digest-amavisd-new-2.4.3 253
 RMD160 8e6fe47433fb57841e16585dadcc0d6597f00f25 files/digest-amavisd-new-2.4.3 253
 SHA256 071e7e9667b41342dc744663935b714e0858ec0091901e993eaac59dc9822027 files/digest-amavisd-new-2.4.3 253
+MD5 83635931b292ec0088abfc75e7e2b8e1 files/digest-amavisd-new-2.4.4 253
+RMD160 baf26470a8658bfbe0780197dd2e93a378ef1827 files/digest-amavisd-new-2.4.4 253
+SHA256 3efe36b42ef294cc88b43fd99e066f1599af37a38b5764681067bb76b601a091 files/digest-amavisd-new-2.4.4 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFfHKYQlM6RnzZP+IRAq3hAJ44qJXb+1ImswH/uMQWLp8A1yjuQACfRRiU
-4QHQ2Vw8Qi5jh0i+1Agy8ZQ=
-=IlfA
+iD8DBQFFhslLQlM6RnzZP+IRAsAoAJ91ZgwtEI0kxobDBb+ciiiuLJzfEgCeMg8z
+ZRyf3645Iw+vbyI7HT4ghLQ=
+=qC++
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild
new file mode 100644
index 000000000000..d8327434fa71
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild,v 1.1 2006/12/18 17:00:35 ticho Exp $
+
+inherit eutils
+
+DESCRIPTION="High-performance interface between the MTA and content checkers."
+HOMEPAGE="http://www.ijs.si/software/amavisd/"
+SRC_URI="http://www.ijs.si/software/amavisd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ldap mysql postgres milter"
+
+DEPEND=">=sys-apps/sed-4
+	>=dev-lang/perl-5.8.2"
+
+RDEPEND="${DEPEND}
+	>=sys-apps/coreutils-5.0-r3
+	app-arch/gzip
+	app-arch/bzip2
+	app-arch/arc
+	app-arch/cabextract
+	app-arch/freeze
+	app-arch/lha
+	app-arch/unarj
+	app-arch/unrar
+	app-arch/zoo
+	dev-perl/Archive-Tar
+	>=dev-perl/Archive-Zip-1.14
+	>=dev-perl/Compress-Zlib-1.35
+	dev-perl/Convert-TNEF
+	>=dev-perl/Convert-UUlib-1.051
+	virtual/perl-MIME-Base64
+	>=dev-perl/MIME-tools-5.415
+	>=dev-perl/MailTools-1.58
+	>=dev-perl/net-server-0.91
+	>=virtual/perl-libnet-1.16
+	dev-perl/IO-stringy
+	>=virtual/perl-Time-HiRes-1.49
+	dev-perl/Unix-Syslog
+	>=sys-libs/db-3.1
+	dev-perl/BerkeleyDB
+	virtual/mta
+	ldap? ( >=dev-perl/perl-ldap-0.33 )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	milter? ( >=mail-mta/sendmail-8.12 )"
+
+AMAVIS_ROOT="/var/amavis"
+
+pkg_preinst() {
+	enewgroup amavis
+	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
+}
+
+src_unpack() {
+	if $(has_version "<mail-filter/spamassassin-3") ; then
+		echo
+		ewarn "WARNING: Amavisd-new will not work with SpamAssassin older than 3.0.0."
+		ewarn "         Consider upgrading your SpamAssassin installation."
+		ebeep 3
+		epause
+	fi
+	unpack ${A}
+	cd ${S}
+	if $(has_version mail-mta/courier) ; then
+		einfo "Patching with courier support."
+		epatch "amavisd-new-courier.patch" || die "patch failed"
+	fi
+
+	if $(has_version virtual/qmail) ; then
+		einfo "Patching with qmail qmqp support."
+		epatch "amavisd-new-qmqpqq.patch" || die "patch failed"
+
+		einfo "Patching with qmail lf bug workaround."
+		epatch "${FILESDIR}/${P%.*}-qmail-lf-workaround.patch" || die "patch failed"
+	fi
+
+	epatch "${FILESDIR}/${P}-amavisd.conf-gentoo.patch" || die "patch failed"
+}
+
+src_compile() {
+	if use milter ; then
+		cd "${S}/helper-progs"
+
+		econf --with-runtime-dir=${AMAVIS_ROOT} \
+			--with-sockname=${AMAVIS_ROOT}/amavisd.sock \
+			--with-user=amavis || die "helper-progs econf failed"
+		emake || die "helper-progs compile problem"
+
+		cd "${S}"
+	fi
+}
+
+src_install() {
+	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release
+
+	dobin p0f-analyzer.pl
+
+	insinto /etc
+	insopts -m0640
+	newins amavisd.conf-sample amavisd.conf
+	dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '$AMAVIS_ROOT';:" \
+		/etc/amavisd.conf
+	if [ "$(dnsdomainname)" = "(none)" ] ; then
+		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
+			/etc/amavisd.conf
+	else
+		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(dnsdomainname)';:" \
+			/etc/amavisd.conf
+	fi
+
+	newinitd "${FILESDIR}/amavisd.rc6" amavisd
+	dosed "s:/var/run/amavis/:$AMAVIS_ROOT/:g" /etc/init.d/amavisd
+
+	keepdir ${AMAVIS_ROOT}
+	keepdir ${AMAVIS_ROOT}/db
+	keepdir ${AMAVIS_ROOT}/quarantine
+	keepdir ${AMAVIS_ROOT}/tmp
+
+	if $(has_version net-nds/openldap ) ; then
+		einfo "Adding ${P} schema to openldap schema dir."
+		dodir /etc/openldap/schema
+		insinto /etc/openldap/schema
+		insopts -o root -g root -m 644
+		newins LDAP.schema ${PN}.schema || die
+		newins LDAP.schema ${PN}.schema.default || die
+	fi
+
+	newdoc test-messages/README README.samples
+	dodoc AAAREADME.first INSTALL LICENSE MANIFEST RELEASE_NOTES \
+		README_FILES/* test-messages/sample* amavisd.conf-default amavisd-agent
+
+	if use milter ; then
+		cd "${S}/helper-progs"
+		einstall
+	fi
+
+	for i in whitelist blacklist spam_lovers; do
+		if [ ! -f ${D}/${AMAVIS_ROOT}/${i} ]; then
+			touch ${D}/${AMAVIS_ROOT}/${i}
+		fi
+	done
+
+	if $(has_version mail-filter/razor) ; then
+		if [ ! -f ${AMAVIS_ROOT}/.razor/razor-agent.conf ] ; then
+			einfo "Setting up initial razor config files..."
+
+			razor-admin -create -home=${D}/${AMAVIS_ROOT}/.razor
+			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
+				${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf
+		else
+			einfo "Copying existing razor config files..."
+			insinto ${AMAVIS_ROOT}/.razor
+			doins ${AMAVIS_ROOT}/.razor/*.{conf,lst}
+		fi
+	fi
+
+	find ${D}/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
+	find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
+}
+
+pkg_postinst() {
+	if ! $(has_version mail-filter/spamassassin) ; then
+		echo
+		einfo "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
+		einfo "will be performed without it. Since you do not have SpamAssassin installed,"
+		einfo "all spam checks have been disabled. To enable them, install SpamAssassin"
+		einfo "and comment out the line containing: "
+		einfo "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
+	fi
+	echo
+	ewarn "Adjusting permissions for /etc/amavisd.conf (0 for world, owner root:amavis)"
+	echo
+	chmod o-rwx /etc/amavisd.conf
+	chown root:amavis /etc/amavisd.conf
+	chown -R amavis:amavis ${AMAVIS_ROOT}
+}
diff --git a/mail-filter/amavisd-new/files/amavisd-new-2.4.4-amavisd.conf-gentoo.patch b/mail-filter/amavisd-new/files/amavisd-new-2.4.4-amavisd.conf-gentoo.patch
new file mode 100644
index 000000000000..02b1e4e17549
--- /dev/null
+++ b/mail-filter/amavisd-new/files/amavisd-new-2.4.4-amavisd.conf-gentoo.patch
@@ -0,0 +1,115 @@
+--- amavisd.conf-sample.orig	2006-12-18 17:14:43.000000000 +0100
++++ amavisd.conf-sample	2006-12-18 17:19:46.000000000 +0100
+@@ -74,14 +74,14 @@
+ 
+ # Set the user and group to which the daemon will change if started as root
+ # (otherwise just keeps the UID unchanged, and these settings have no effect):
+-$daemon_user  = 'vscan';   # (no default;  customary: vscan or amavis), -u
+-$daemon_group = 'vscan';   # (no default;  customary: vscan or amavis), -g
++$daemon_user  = 'amavis';   # (no default;  customary: vscan or amavis), -u
++$daemon_group = 'amavis';   # (no default;  customary: vscan or amavis), -g
+ 
+ # Runtime working directory (cwd), and a place where
+ # temporary directories for unpacking mail are created.
+ # (no trailing slash, may be a scratch file system)
+-$TEMPBASE = $MYHOME;	        # (must be set if other config vars use is), -T
+-#$TEMPBASE = "$MYHOME/tmp";     # prefer to keep home dir /var/amavis clean?
++#$TEMPBASE = $MYHOME;	        # (must be set if other config vars use is), -T
++$TEMPBASE = "$MYHOME/tmp";     # prefer to keep home dir /var/amavis clean?
+ 
+ #$db_home = "$MYHOME/db";    # DB databases directory, default "$MYHOME/db", -D
+ 
+@@ -492,22 +492,43 @@
+ # default setting of an associative array %final_destiny_by_ccat which is
+ # backwards compatible and contains references to these traditional variables:
+ #
+-$final_virus_destiny      = D_DISCARD; # (defaults to D_DISCARD)
+-$final_banned_destiny     = D_BOUNCE;  # (defaults to D_BOUNCE)
+-$final_spam_destiny       = D_BOUNCE;  # (defaults to D_BOUNCE)
+-$final_bad_header_destiny = D_PASS;    # (defaults to D_PASS)
++#$final_virus_destiny      = D_DISCARD; # (defaults to D_DISCARD)
++#$final_banned_destiny     = D_BOUNCE;  # (defaults to D_BOUNCE)
++#$final_spam_destiny       = D_BOUNCE;  # (defaults to D_BOUNCE)
++#$final_bad_header_destiny = D_PASS;    # (defaults to D_PASS)
++
++########
++#
++# Please think about what you are doing when you set these options.
++# If necessary, question your origanization's e-mail policies:
++#
++# D_BOUNCE contributes to the overall spread of virii and spam on the
++# internet. Both the envelope and header from addresses can be forged
++# accurately with no effort, causing the bounces to go to innocent parties,
++# whose addresses have been forged.
++# 
++# D_DISCARD breaks internet mail specifications. However, with a
++# properly implemented Quaratine system, the concern for breaking the
++# specification is addressed to some extent.
++#
++# D_PASS is the safest way to handle e-mails. You must implement
++# client-side filtering to handle this method.
++#
++# -Cory Visi <merlin@gentoo.org> 07/28/04
++#
++#######
+ 
+ # to explicitly list all (or most) possible contents category (ccat) keys:
+-#%final_destiny_by_ccat = (
+-#  CC_VIRUS,      D_DISCARD,
+-#  CC_BANNED,     D_BOUNCE,
+-#  CC_UNCHECKED,  D_PASS,
+-#  CC_SPAM,       D_BOUNCE,
+-#  CC_BADH,       D_PASS,
+-#  CC_OVERSIZED,  D_BOUNCE,
+-#  CC_CLEAN,      D_PASS,
+-#  CC_CATCHALL,   D_PASS,
+-#);
++%final_destiny_by_ccat = (
++  CC_VIRUS,      D_DISCARD,
++  CC_BANNED,     D_BOUNCE,
++  CC_UNCHECKED,  D_PASS,
++  CC_SPAM,       D_DISCARD,
++  CC_BADH,       D_PASS,
++  CC_OVERSIZED,  D_BOUNCE,
++  CC_CLEAN,      D_PASS,
++  CC_CATCHALL,   D_PASS,
++);
+ 
+ # to rely on a catchall ccat key and only list exceptions (alternative 1):
+ #%final_destiny_by_ccat = (
+@@ -689,7 +710,7 @@
+ #   or a directory (no trailing slash)
+ #   (the default value is undef, meaning no quarantine)
+ #
+-$QUARANTINEDIR = '/var/virusmails';  # -Q
++$QUARANTINEDIR = "$MYHOME/quarantine";
+ 
+ #$quarantine_subdir_levels = 1;  # add level of subdirs to disperse quarantine
+ 
+@@ -1658,7 +1679,7 @@
+ # NOTE: if $daemon_chroot_dir is nonempty, the directories will be
+ #       relative to the chroot directory specified;
+ 
+-$path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin';
++$path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin:/opt/bin';
+ 
+ # For external programs specify one string or a search list of strings (first
+ # match wins). The string (or: each string in a list) may be an absolute path,
+@@ -2124,7 +2145,7 @@
+ 
+   ### http://www.nai.com/
+   ['NAI McAfee AntiVirus (uvscan)', 'uvscan',
+-    '--secure -rv --mime --summary --noboot - {}', [0], [13],
++    '--secure -rv --mime --summary --noboot --mailbox --program --timeout 180 - {}', [0], [13],
+     qr/(?x) Found (?:
+         \ the\ (.+)\ (?:virus|trojan)  |
+         \ (?:virus|trojan)\ or\ variant\ ([^ ]+)  |
+@@ -2246,7 +2267,7 @@
+ 
+   ### http://www.f-prot.com/   - backs up F-Prot Daemon
+   ['FRISK F-Prot Antivirus', ['f-prot','f-prot.sh'],
+-    '-dumb -archive -packed {}', [0,8], [3,6],   # or: [0], [3,6,8],
++    '-dumb -ai -archive -packed -server {}', [0,8], [3,6],   # or: [0], [3,6,8],
+     qr/(?:Infection:|security risk named) (.+)|\s+contains\s+(.+)$/ ],
+ 
+   ### http://www.trendmicro.com/   - backs up Trophie
diff --git a/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.4 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.4
new file mode 100644
index 000000000000..7af62ef9a7db
--- /dev/null
+++ b/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.4
@@ -0,0 +1,3 @@
+MD5 08b009ca24dc3676293fc6b80db250a3 amavisd-new-2.4.4.tar.gz 887625
+RMD160 3d6ac62f57b68440a7ca3766ff374f4763db6bbf amavisd-new-2.4.4.tar.gz 887625
+SHA256 b3a11ff3813e8b6c7cdf48c852c7bc672b2c0c6115d1b1dba896cd6358b67889 amavisd-new-2.4.4.tar.gz 887625
-- 
2.26.2