summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrej Kacian <ticho@gentoo.org>2006-06-09 21:03:03 +0000
committerAndrej Kacian <ticho@gentoo.org>2006-06-09 21:03:03 +0000
commit600ce69ea28f8925a3cc72bf03ad260e46f411e9 (patch)
tree589148b0e9be8198a82209e674197c910ffa75a4 /mail-filter
parentRemoved 2.4.0 in favor of 2.4.1. See bug #131323, by Markus Heule <mib at ipw... (diff)
downloadhistorical-600ce69ea28f8925a3cc72bf03ad260e46f411e9.tar.gz
historical-600ce69ea28f8925a3cc72bf03ad260e46f411e9.tar.bz2
historical-600ce69ea28f8925a3cc72bf03ad260e46f411e9.zip
Removed 2.4.0 in favor of 2.4.1. See bug #131323, by Markus Heule <mib at ipwar.ch>.
Package-Manager: portage-2.1
Diffstat (limited to 'mail-filter')
-rw-r--r--mail-filter/amavisd-new/Manifest26
-rw-r--r--mail-filter/amavisd-new/amavisd-new-2.4.0.ebuild184
-rw-r--r--mail-filter/amavisd-new/files/amavisd-new-2.4.0-amavisd.conf-gentoo.patch112
-rw-r--r--mail-filter/amavisd-new/files/digest-amavisd-new-2.4.03
4 files changed, 7 insertions, 318 deletions
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 1cef8826effb..c868002e0189 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -17,10 +17,6 @@ AUX amavisd-new-2.4-qmail-lf-workaround.patch 722 RMD160 e7d9bfc83343ca63ffc56f8
MD5 94e64bc4551facaccf22f62feca69b5d files/amavisd-new-2.4-qmail-lf-workaround.patch 722
RMD160 e7d9bfc83343ca63ffc56f85e0dd216c4a2aff30 files/amavisd-new-2.4-qmail-lf-workaround.patch 722
SHA256 988aeb0c74c8d644f716532d8dafbe2a6ace6f0a2aa826cb4c41ece8be662c13 files/amavisd-new-2.4-qmail-lf-workaround.patch 722
-AUX amavisd-new-2.4.0-amavisd.conf-gentoo.patch 5152 RMD160 5753f65df108557cc8dcedb18696d4da2863127e SHA1 ef2044fd96f8e99281cb85c94808446e9bba68f9 SHA256 03d03a35e9addac5f6d56ebd6e763609a3dbffcaed7f36c342dfc1f4104e12cb
-MD5 5016ca81ad91de76977e2e10bdd8f10c files/amavisd-new-2.4.0-amavisd.conf-gentoo.patch 5152
-RMD160 5753f65df108557cc8dcedb18696d4da2863127e files/amavisd-new-2.4.0-amavisd.conf-gentoo.patch 5152
-SHA256 03d03a35e9addac5f6d56ebd6e763609a3dbffcaed7f36c342dfc1f4104e12cb files/amavisd-new-2.4.0-amavisd.conf-gentoo.patch 5152
AUX amavisd-new-2.4.1-amavisd.conf-gentoo.patch 5641 RMD160 1e2b587e22a9f51ae692de41325439fc4feb19ad SHA1 008a421db17efcd65fea6342128a4c069b1938e7 SHA256 2fdbdda5b293e5c3b10c74504a1368ea470e328155823caddfbf7d16f9e79036
MD5 e6b97c52be60c6af986a9b0b8eaa54d5 files/amavisd-new-2.4.1-amavisd.conf-gentoo.patch 5641
RMD160 1e2b587e22a9f51ae692de41325439fc4feb19ad files/amavisd-new-2.4.1-amavisd.conf-gentoo.patch 5641
@@ -30,24 +26,19 @@ MD5 1da4ebb5c79b4892074a61f52aff3eff files/amavisd.rc6 310
RMD160 c06ac94f57382b5cbb7f9dea94007b927aaf6c8c files/amavisd.rc6 310
SHA256 c136451b550176c6292554c60e0d41d91e6ad3538dedecbdb48925898623dbd8 files/amavisd.rc6 310
DIST amavisd-new-2.3.3.tar.gz 772280 RMD160 c2213190582fe8fea9b8f1736e3b3e49b2906887 SHA1 5676f7df377b5af8349c989b9da8fd07ce383242 SHA256 8c6d78cc0a703f0aa36d52fdf833e074c6adca2d21bd334ef381f9e9c92b8f0b
-DIST amavisd-new-2.4.0.tar.gz 825490 RMD160 83f215d66a7d77e5568fe66a469ef2beac9d1417 SHA1 5fe9472a3fe2f8ef994313db8b05429bd57920bc SHA256 f9e5649cb23429bca9db2121470943859063a1733821304bea538c7e76a3aeae
DIST amavisd-new-2.4.1.tar.gz 841988 RMD160 edd91dde774838345159064ef6012f7927d5aa6c SHA1 1de9fdac377c58a29a93c8a246553c8e363b212c SHA256 c067cbae60ccff3932574fcaf7971c04b118f6b2e9fe6db772d33538b53b0a54
EBUILD amavisd-new-2.3.3-r2.ebuild 5489 RMD160 e1957c225187e0d85652adb83e2b3fe4c4b2a559 SHA1 905e58fd52cae8f854b1227b2dc7a9bf2b1c52a8 SHA256 883d41ea495fe942dc20078a38fc897634fab91b0a0d248f78e23dbeee876a51
MD5 de7d1997fec041935959665b31b9269e amavisd-new-2.3.3-r2.ebuild 5489
RMD160 e1957c225187e0d85652adb83e2b3fe4c4b2a559 amavisd-new-2.3.3-r2.ebuild 5489
SHA256 883d41ea495fe942dc20078a38fc897634fab91b0a0d248f78e23dbeee876a51 amavisd-new-2.3.3-r2.ebuild 5489
-EBUILD amavisd-new-2.4.0.ebuild 5333 RMD160 c9333616c157267a3553dd103bd84f705cbf256f SHA1 9e8dfe03eedc0e75a02df062ff60e1d1d63b11b0 SHA256 4a9c180a0a02a0c5c243f049917bd29600b8f8a3f4b516646b8f0dede5455876
-MD5 a7007441f2faa1e7acf000ff4984b777 amavisd-new-2.4.0.ebuild 5333
-RMD160 c9333616c157267a3553dd103bd84f705cbf256f amavisd-new-2.4.0.ebuild 5333
-SHA256 4a9c180a0a02a0c5c243f049917bd29600b8f8a3f4b516646b8f0dede5455876 amavisd-new-2.4.0.ebuild 5333
EBUILD amavisd-new-2.4.1.ebuild 5333 RMD160 98ee9b4d3aa51a4c17ef0cbd32f057870468fc48 SHA1 20b725a0d31fbaaf98e1977ea60457c7446219b9 SHA256 e341775864c7543a8ccbb2105093ac11355a87d9fbebcde9026c79963a7a2883
MD5 2e2c8ce31fdebc7cf5892c24816800ba amavisd-new-2.4.1.ebuild 5333
RMD160 98ee9b4d3aa51a4c17ef0cbd32f057870468fc48 amavisd-new-2.4.1.ebuild 5333
SHA256 e341775864c7543a8ccbb2105093ac11355a87d9fbebcde9026c79963a7a2883 amavisd-new-2.4.1.ebuild 5333
-MISC ChangeLog 18256 RMD160 287f5eda7324a2028482341f6fc33f9a6f8381dc SHA1 db5317b9fea47163116ce14e3b4c0acd30b66736 SHA256 a204ffd06385bbab420045d7598e3e38f9ca2aa08e1935d4debc1ea4a2c53c44
-MD5 d5683d59391496108c26b68fe1541f45 ChangeLog 18256
-RMD160 287f5eda7324a2028482341f6fc33f9a6f8381dc ChangeLog 18256
-SHA256 a204ffd06385bbab420045d7598e3e38f9ca2aa08e1935d4debc1ea4a2c53c44 ChangeLog 18256
+MISC ChangeLog 18477 RMD160 9897de5ec3ff7d403ab843814f8d8a6d35c906ad SHA1 5ad12cfd2767635b24dbba0e24b8fb35c084e6cb SHA256 47541f26acb3ac24656df0abcf765211cd794c40f6180a765894acc6fcfa2c73
+MD5 c43a21318aa6d50e774cb8fbe0cb59ab ChangeLog 18477
+RMD160 9897de5ec3ff7d403ab843814f8d8a6d35c906ad ChangeLog 18477
+SHA256 47541f26acb3ac24656df0abcf765211cd794c40f6180a765894acc6fcfa2c73 ChangeLog 18477
MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 metadata.xml 184
@@ -55,16 +46,13 @@ SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58 metadata
MD5 f59b0d7f558af277b9d70c223cd44ae9 files/digest-amavisd-new-2.3.3-r2 253
RMD160 df53bd7d8886410e2a60c89686cdaa0d183e3082 files/digest-amavisd-new-2.3.3-r2 253
SHA256 267bc36b4f38da775864aa2215b314c36652a5be4ce55d173f733d8edd60537d files/digest-amavisd-new-2.3.3-r2 253
-MD5 ec88a6e10f5bf474a29b62a15c7a04f0 files/digest-amavisd-new-2.4.0 253
-RMD160 574942aab478c178853b5adb053cbd36d2ee5098 files/digest-amavisd-new-2.4.0 253
-SHA256 1cbf0cd691fa7158781472d164195ee0e764962e4a4d38ff392449a3d358ef87 files/digest-amavisd-new-2.4.0 253
MD5 bde25cc23c0895235b8c9f281256d6d4 files/digest-amavisd-new-2.4.1 253
RMD160 e7931a5f593031c730abfbdcc42e43d906e1abca files/digest-amavisd-new-2.4.1 253
SHA256 3112111007ffb987dca3f6a4fdf95b670c09c8974696d373d725a809fe5e5c2a files/digest-amavisd-new-2.4.1 253
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
-iD8DBQFEgKdvQlM6RnzZP+IRAmR1AJ939be8/aS99lp8Q1xYhglh1kaVEwCghnMu
-J5bVIlKAiC1qD97zQfrLa0M=
-=apjv
+iD8DBQFEieIDQlM6RnzZP+IRAgpoAJsFkp8SPrnoD3HlCjXFToHC4/eg0wCfbC7W
+2bX/giqWmCRjFN4oWdMB4II=
+=kusf
-----END PGP SIGNATURE-----
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.0.ebuild
deleted file mode 100644
index c5e12023d207..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.4.0.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# 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.0.ebuild,v 1.4 2006/06/02 20:58:52 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
-
- 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
- if ! $(has_version mail-filter/spamassassin) ; then
- einfo "Disabling anti-spam code in amavisd.conf..."
-
- dosed "s:^#[\t ]*@bypass_spam_checks_maps[\t ]*=[\t ]*(1);:\@bypass_spam_checks_maps = (1);:" \
- /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.0-amavisd.conf-gentoo.patch b/mail-filter/amavisd-new/files/amavisd-new-2.4.0-amavisd.conf-gentoo.patch
deleted file mode 100644
index 0d93818d764f..000000000000
--- a/mail-filter/amavisd-new/files/amavisd-new-2.4.0-amavisd.conf-gentoo.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- amavisd.conf-sample 2006-04-03 16:32:19.000000000 +0200
-+++ amavisd.conf-sample.ticho 2006-04-07 21:56:48.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
-@@ -465,7 +465,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:
-@@ -482,9 +482,34 @@
- # 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)
-+
-+########
-+#
-+# 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
-+#
-+#######
- $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_banned_destiny = D_DISCARD; # (defaults to D_BOUNCE)
-+$final_spam_destiny = D_DISCARD; # (defaults to D_BOUNCE)
- $final_bad_header_destiny = D_PASS; # (defaults to D_PASS)
-
- # to explicitly list all (or most) possible contents category (ccat) keys:
-@@ -679,7 +704,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
-
-@@ -1572,7 +1597,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,
-@@ -1986,7 +2011,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\ ([^ ]+) |
-@@ -2104,7 +2129,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
diff --git a/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.0 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.0
deleted file mode 100644
index bc426135e6f2..000000000000
--- a/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d1a3ea3244a142d8dec6dcb3e3673044 amavisd-new-2.4.0.tar.gz 825490
-RMD160 83f215d66a7d77e5568fe66a469ef2beac9d1417 amavisd-new-2.4.0.tar.gz 825490
-SHA256 f9e5649cb23429bca9db2121470943859063a1733821304bea538c7e76a3aeae amavisd-new-2.4.0.tar.gz 825490