Version bump. Closes bug #128698, reported by Matthew Sutton <msutton at circletgsc.org>.

(Portage version: 2.1_pre7-r4)

6 files changed, 337 insertions, 11 deletions

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index eefc470d46d9..2c10f94d0a39 100644
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,15 @@
 # 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.79 2006/04/07 19:35:54 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.80 2006/04/07 20:26:10 ticho Exp $
+
+*amavisd-new-2.4.0 (07 Apr 2006)
+
+  07 Apr 2006; Andrej Kacian <ticho@gentoo.org>
+  +files/amavisd-new-2.4-amavisd.conf-gentoo.patch,
+  +files/amavisd-new-2.4-qmail-lf-workaround.patch,
+  +amavisd-new-2.4.0.ebuild:
+  Version bump. Closes bug #128698, reported by Matthew Sutton <msutton at
+  circletgsc.org>.
 
   07 Apr 2006; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.3.3-r2.ebuild:
   Depend on <=net-server-0.90. Closes bug #129160, reported by Jeremy
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 75017096b24f..6ae320563017 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,12 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 33e6dbfbbf68a3f974f3257414e24c60 ChangeLog 17022
 RMD160 8835e1e49db260fd053b5af9813346fd7bcdd5be ChangeLog 17022
 SHA256 4b27b960476a4dd717521a0ba196200b18de3817a54f14384959aa0bf8f76447 ChangeLog 17022
 MD5 b7b7fc649bb77dd63d3f3eb35b3008ba amavisd-new-2.3.3-r2.ebuild 5478
 RMD160 55d4d5e71ed838673618cc73580305ccdc0cfe18 amavisd-new-2.3.3-r2.ebuild 5478
 SHA256 eee1e7439e7eca811cc318a883daa26ea2c43b18ab1e040d926b066b3ec4c9d4 amavisd-new-2.3.3-r2.ebuild 5478
+MD5 69fa0336c94dc82d4c3f0e2e45b73e3d amavisd-new-2.4.0.ebuild 5226
+RMD160 8bc224681d598f4400e3b91e572c2a91568e7894 amavisd-new-2.4.0.ebuild 5226
+SHA256 bf3360af10e63af54a7b0c8769dd8d35e33e483ab6859317c9820efc76d2aab6 amavisd-new-2.4.0.ebuild 5226
 MD5 ee33de51df853bd8426a4304f264245f files/amavisd-new-2.2.1-qmail-lf-workaround.patch 688
 RMD160 45092cfb4180d5cac8abc38068105b619945dfe6 files/amavisd-new-2.2.1-qmail-lf-workaround.patch 688
 SHA256 5e32e1fbcf172ce108ba1b494722894719ea31ed90d55610bffdb241246cfb57 files/amavisd-new-2.2.1-qmail-lf-workaround.patch 688
@@ -16,19 +16,21 @@ SHA256 df9b91d6bbc0ff7b051e5dd155362607906969f862d9d610379d7e79b42e72bf files/am
 MD5 bfca14b90ddc76f513a6f96752003da5 files/amavisd-new-2.3.3-bsmtp-quarantine.patch 949
 RMD160 2f393892399dc29ebbc76e08e2249be59607f083 files/amavisd-new-2.3.3-bsmtp-quarantine.patch 949
 SHA256 2815958cca7bbccdf6b7aecb345cba9a25177f9158c1867880db69bef71f2036 files/amavisd-new-2.3.3-bsmtp-quarantine.patch 949
+MD5 956f3b18584ab42ac4d05ae69a962583 files/amavisd-new-2.4-amavisd.conf-gentoo.patch 5152
+RMD160 b3941e5c5b0025c4b235c67b108afebaeb9d53c4 files/amavisd-new-2.4-amavisd.conf-gentoo.patch 5152
+SHA256 eaf79bc4b583547c2dbf486715acce7916902223c955cfaf5aab80918c0f3804 files/amavisd-new-2.4-amavisd.conf-gentoo.patch 5152
+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
 MD5 1da4ebb5c79b4892074a61f52aff3eff files/amavisd.rc6 310
 RMD160 c06ac94f57382b5cbb7f9dea94007b927aaf6c8c files/amavisd.rc6 310
 SHA256 c136451b550176c6292554c60e0d41d91e6ad3538dedecbdb48925898623dbd8 files/amavisd.rc6 310
 MD5 d252feb4cca639dcab4ebd07f2b20a90 files/digest-amavisd-new-2.3.3-r2 69
 RMD160 9b929043bd1b91f477cd533d7c4a1cc16708cc19 files/digest-amavisd-new-2.3.3-r2 69
 SHA256 84073b4f97577e56566685a30a8d65e91e0cd590bce94e80b7de942084fff22b files/digest-amavisd-new-2.3.3-r2 69
+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 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 metadata.xml 184
 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58 metadata.xml 184
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFENr8sQlM6RnzZP+IRAsObAKCqwtUGcbhfUX+3gz7OYrwjPP0bkQCfcT7n
-CO0dEFYxvixiHTrvt682MMc=
-=7bmi
------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
new file mode 100644
index 000000000000..e484b3dae5a6
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.0.ebuild
@@ -0,0 +1,184 @@
+# 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.1 2006/04/07 20:26:10 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 [ "$(domainname)" = "(none)" ] ; then
+		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
+			/etc/amavisd.conf
+	else
+		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(domainname)';:" \
+			/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 ${D}/${AMAVIS_ROOT}
+}
diff --git a/mail-filter/amavisd-new/files/amavisd-new-2.4-amavisd.conf-gentoo.patch b/mail-filter/amavisd-new/files/amavisd-new-2.4-amavisd.conf-gentoo.patch
new file mode 100644
index 000000000000..6886f9b3fcf0
--- /dev/null
+++ b/mail-filter/amavisd-new/files/amavisd-new-2.4-amavisd.conf-gentoo.patch
@@ -0,0 +1,112 @@
+--- 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/amavisd-new-2.4-qmail-lf-workaround.patch b/mail-filter/amavisd-new/files/amavisd-new-2.4-qmail-lf-workaround.patch
new file mode 100644
index 000000000000..cf60deb45d02
--- /dev/null
+++ b/mail-filter/amavisd-new/files/amavisd-new-2.4-qmail-lf-workaround.patch
@@ -0,0 +1,16 @@
+--- 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/digest-amavisd-new-2.4.0 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.0
new file mode 100644
index 000000000000..bc426135e6f2
--- /dev/null
+++ b/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.0
@@ -0,0 +1,3 @@
+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