Added ~ppc (#219448), Clean-up

(Portage version: 2.1.5.5)

6 files changed, 10 insertions, 513 deletions

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index 8ce4581a7d0c..1205022b9557 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.122 2008/06/17 15:45:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.123 2008/06/17 16:04:48 dertobi123 Exp $
+
+  17 Jun 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -files/amavisd-new-2.4.1-amavisd.conf-gentoo.patch,
+  -files/amavisd-new-2.4-qmail-lf-workaround.patch,
+  -amavisd-new-2.4.1.ebuild, -amavisd-new-2.5.3.ebuild,
+  amavisd-new-2.6.0.ebuild:
+  Added ~ppc (#219448), Clean-up
 
   17 Jun 2008; Raúl Porcel <armin76@gentoo.org> amavisd-new-2.6.0.ebuild:
   Add ~alpha/~sparc wrt #219448
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild
deleted file mode 100644
index f51e7c315385..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2008 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.1.ebuild,v 1.15 2008/03/01 13:42:47 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
-	milter? ( || ( mail-filter/libmilter >=mail-mta/sendmail-8.12 ) )"
-
-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/rar )
-	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 )"
-
-AMAVIS_ROOT="/var/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
-		elog "Patching with courier support."
-		epatch "amavisd-new-courier.patch" || die "patch failed"
-	fi
-
-	if $(has_version virtual/qmail) ; then
-		elog "Patching with qmail qmqp support."
-		epatch "amavisd-new-qmqpqq.patch" || die "patch failed"
-
-		elog "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
-
-	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
-		elog "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 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
-			elog "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
-			elog "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_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
-}
-
-pkg_postinst() {
-	if ! $(has_version mail-filter/spamassassin) ; then
-		echo
-		elog "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
-		elog "will be performed without it. Since you do not have SpamAssassin installed,"
-		elog "all spam checks have been disabled. To enable them, install SpamAssassin"
-		elog "and comment out the line containing: "
-		elog "@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/amavisd-new-2.5.3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.5.3.ebuild
deleted file mode 100644
index cbc0bc5e6e68..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.5.3.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2008 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.5.3.ebuild,v 1.3 2008/03/01 13:42:47 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="courier ldap milter mysql postgres qmail"
-
-DEPEND=">=sys-apps/sed-4
-	>=dev-lang/perl-5.8.2
-	milter? ( || ( mail-filter/libmilter >=mail-mta/sendmail-8.12 ) )"
-
-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/rar )
-	app-arch/zoo
-	>=dev-perl/Archive-Zip-1.14
-	>=dev-perl/Compress-Zlib-1.35
-	dev-perl/Convert-TNEF
-	>=dev-perl/Convert-UUlib-1.08
-	virtual/perl-MIME-Base64
-	>=dev-perl/MIME-tools-5.415
-	>=dev-perl/MailTools-1.58
-	>=dev-perl/net-server-0.91
-	virtual/perl-Digest-MD5
-	dev-perl/IO-stringy
-	>=virtual/perl-Time-HiRes-1.49
-	dev-perl/Unix-Syslog
-	>=sys-libs/db-3.2
-	dev-perl/BerkeleyDB
-	virtual/mta
-	ldap? ( >=dev-perl/perl-ldap-0.33 )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )"
-
-AMAVIS_ROOT="/var/amavis"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if use courier ; then
-		epatch amavisd-new-courier.patch
-	fi
-
-	if use qmail ; then
-		epatch amavisd-new-qmqpqq.patch
-	fi
-
-	epatch "${FILESDIR}/${PN}-2.4.4-amavisd.conf-gentoo.patch"
-}
-
-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
-
-	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
-
-	newdoc test-messages/README README.samples
-	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES README_FILES/README.* \
-		test-messages/sample* amavisd.conf-default amavisd-agent \
-		amavisd-custom.conf
-
-	dodir /usr/share/doc/${PF}/html
-	insinto /usr/share/doc/${PF}/html
-	doins README_FILES/*.{html,css}
-	dodir /usr/share/doc/${PF}/html/images
-	insinto /usr/share/doc/${PF}/html/images
-	doins README_FILES/images/*
-
-	if use milter ; then
-		cd "${S}/helper-progs"
-		einstall
-		cd "${S}"
-	fi
-
-	for i in whitelist blacklist spam_lovers; do
-		if [ -f ${AMAVIS_ROOT}/${i} ]; then
-			cp "${AMAVIS_ROOT}/${i}" "${D}/${AMAVIS_ROOT}"
-		else
-			touch "${D}"/${AMAVIS_ROOT}/${i}
-		fi
-	done
-
-	if use ldap ; then
-		elog "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
-
-	find "${D}"/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
-	find "${D}"/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
-}
-
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
-
-	if [ -z "$(dnsdomainname)" ] ; then
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
-			/etc/amavisd.conf
-	else
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(dnsdomainname)';:" \
-			/etc/amavisd.conf
-	fi
-
-	if has_version mail-filter/razor ; then
-		if [ ! -d ${AMAVIS_ROOT}/.razor ] ; then
-			elog "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
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if ! has_version mail-filter/spamassassin ; then
-		echo
-		elog "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
-		elog "will be performed without it. Since you do not have SpamAssassin installed,"
-		elog "all spam checks have been disabled. To enable them, install SpamAssassin"
-		elog "and comment out the line containing: "
-		elog "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
-	fi
-	echo
-	ewarn "As of amavisd-new-2.4.5 p0f-analyzer.pl only binds to the loopback interface"
-	ewarn "by default instead of to all interfaces. You will need to change $bind_addr"
-	ewarn "in p0f-analyzer.pl to '0.0.0.0' if p0f-analyzer.pl is running on a different"
-	ewarn "host from amavisd or from other querying clients."
-	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/amavisd-new-2.6.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.6.0.ebuild
index 9093dd31cb3f..f1b90f046b98 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.6.0.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.6.0.ebuild,v 1.3 2008/06/17 15:45:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.6.0.ebuild,v 1.4 2008/06/17 16:04:48 dertobi123 Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.ijs.si/software/amavisd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="courier dkim ldap milter mysql postgres qmail"
 
 DEPEND=">=sys-apps/sed-4
diff --git a/mail-filter/amavisd-new/files/amavisd-new-2.4-qmail-lf-workaround.patch b/mail-filter/amavisd-new/files/amavisd-new-2.4-qmail-lf-workaround.patch
deleted file mode 100644
index cf60deb45d02..000000000000
--- a/mail-filter/amavisd-new/files/amavisd-new-2.4-qmail-lf-workaround.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- amavisd	2006-04-07 22:03:15.000000000 +0200
-+++ amavisd.ticho	2006-04-07 22:07:00.000000000 +0200
-@@ -12914,11 +12914,11 @@
-         # we'll be calling Net::Cmd::datasend directly for speed
-         $smtp_data_fh->flush or die "Error flushing smtp_data_fh: $!";
- 
--        while (($nbytes=$msg->read($buff,16384)) > 0) {
-+        for ($! = 0; defined($buff=$msg->getline); $! = 0) {
-           $smtp_handle->datasend($buff)
-             or die "datasend timed out while sending body";
-         }
--        defined $nbytes or die "Error reading: $!";
-+        defined $buff || $!==0  or die "Error reading: $!";
-       }
-       $smtp_data_fh->close or die "Error closing smtp_data_fh: $!";
-       $smtp_data_fh = undef;
diff --git a/mail-filter/amavisd-new/files/amavisd-new-2.4.1-amavisd.conf-gentoo.patch b/mail-filter/amavisd-new/files/amavisd-new-2.4.1-amavisd.conf-gentoo.patch
deleted file mode 100644
index 980151999c06..000000000000
--- a/mail-filter/amavisd-new/files/amavisd-new-2.4.1-amavisd.conf-gentoo.patch
+++ /dev/null
@@ -1,135 +0,0 @@
---- amavisd.conf-sample	2006-05-08 18:23:38.000000000 +0200
-+++ amavisd.conf-sample.ticho	2006-06-02 22:31:25.000000000 +0200
-@@ -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)
--$daemon_group = 'vscan';   # (no default;  customary: vscan or amavis or sweep)
-+$daemon_user  = 'amavis';   # (no default;  customary: vscan or amavis)
-+$daemon_group = 'amavis';   # (no default;  customary: vscan or amavis or sweep)
- 
- # 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)
--#$TEMPBASE = "$MYHOME/tmp";     # prefer to keep home dir /var/amavis clean?
-+#$TEMPBASE = $MYHOME;	        # (must be set if other config vars use is)
-+$TEMPBASE = "$MYHOME/tmp";     # prefer to keep home dir /var/amavis clean?
- 
- #$db_home = "$MYHOME/db";	# DB databases directory, default "$MYHOME/db"
- 
-@@ -155,7 +155,7 @@
- # feeding amavisd, e.g. with Postfix the 'Max procs' field in the
- # master.cf file, like the '2' in the:  smtp-amavis unix - - n - 2 smtp
- #
--$max_servers  =  2;   # number of pre-forked children          (default 2)
-+$max_servers  =  4;   # number of pre-forked children          (default 2)
- $max_requests = 20;   # retire a child after that many accepts (default 10)
- 
- $child_timeout=5*60;  # abort child if it does not complete its processing in
-@@ -470,7 +470,7 @@
- 
- # Alternatives to consider for spam:
- # - use D_PASS if clients will do filtering based on inserted
--#   mail headers or added address extensions ('plus-addressing');
-+#   mail headers or added address extensions ('plus-addressing')2;
- # - use D_DISCARD, if kill_level is set comfortably high;
- #
- # D_BOUNCE is preferred for viruses, but consider:
-@@ -487,22 +487,45 @@
- # 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 = (
-@@ -684,7 +707,7 @@
- #   or a directory (no trailing slash)
- #   (the default value is undef, meaning no quarantine)
- #
--$QUARANTINEDIR = '/var/virusmails';
-+$QUARANTINEDIR = "$MYHOME/quarantine";
- 
- #$quarantine_subdir_levels = 1;  # add level of subdirs to disperse quarantine
- 
-@@ -1587,7 +1610,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,
-@@ -2007,7 +2030,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\ ([^ ]+)  |
-@@ -2125,7 +2148,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],
-+    '-dumb -ai -archive -packed -server {}', [0,8], [3,6],
-     qr/Infection: (.+)|\s+contains\s+(.+)$/ ],
- 
-   ### http://www.trendmicro.com/   - backs up Trophie