Version bump, ebuild improvement. Bug #85756.

(Portage version: 2.0.51.20-r5)

5 files changed, 323 insertions, 13 deletions

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index 5cccd9b2f97f..a72cd4529742 100644
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-filter/amavisd-new
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.25 2005/04/20 07:09:28 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.26 2005/05/01 20:16:19 ticho Exp $
+
+*amavisd-new-2.3.0 (01 May 2005)
+
+  01 May 2005; Andrej Kacian <ticho@gentoo.org>
+  +files/amavisd-new-2.3.0-amavisd.conf-gentoo.patch,
+  +amavisd-new-2.3.0.ebuild:
+  Version bump, along with an ebuild improvement by Christian Zoffoli
+  <xmerlin@gentoo.org>. Closes bug #85756.
 
 *amavisd-new-2.2.1-r1 (20 Apr 2005)
 
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index d5f4bc743919..633792a16281 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 64f5a959c20a79a6a534036b9a38b6cf amavisd-new-2.3.0.ebuild 4599
 MD5 0d78e40f5c429dce29343001eca9444a amavisd-new-2.2.1-r1.ebuild 4813
 MD5 d32cf06b19d20e076202a6ef7205e646 ChangeLog 8348
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 MD5 13b88011aa82860b7be5c6f44051d162 amavisd-new-2.2.1.ebuild 4802
+MD5 1f1f4cf9c92f92f966361a8ac08aa543 files/amavisd.rc6 305
+MD5 ccd66b725ef1b2e2ed20d4a1057b03b8 files/amavisd-new-2.2.1-amavisd.conf-gentoo.patch 6849
 MD5 ee33de51df853bd8426a4304f264245f files/amavisd-new-2.2.1-qmail-lf-workaround.patch 688
 MD5 1ec247b48d1de4fdbc2a57fc9b338681 files/digest-amavisd-new-2.2.1 69
-MD5 ccd66b725ef1b2e2ed20d4a1057b03b8 files/amavisd-new-2.2.1-amavisd.conf-gentoo.patch 6849
-MD5 1f1f4cf9c92f92f966361a8ac08aa543 files/amavisd.rc6 305
+MD5 20d1361125dc21db61b44dec3a13dea2 files/digest-amavisd-new-2.3.0 69
 MD5 1ec247b48d1de4fdbc2a57fc9b338681 files/digest-amavisd-new-2.2.1-r1 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCZgA6QlM6RnzZP+IRAioAAJ40peo0kAm6hHjqdLXA7l3YxIes6gCcCUFv
-KJK4CTb+c9ofkA2MH37AOSs=
-=vq7Q
------END PGP SIGNATURE-----
+MD5 13504b8528cc13c668935ff82a0680f1 files/amavisd-new-2.3.0-amavisd.conf-gentoo.patch 6687
diff --git a/mail-filter/amavisd-new/amavisd-new-2.3.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.3.0.ebuild
new file mode 100644
index 000000000000..af82cfcd7fb6
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.3.0.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2005 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.3.0.ebuild,v 1.1 2005/05/01 20:16:19 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="~x86 ~ppc ~amd64 ~sparc ~alpha ~ppc64"
+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
+	dev-perl/Convert-TNEF
+	>=dev-perl/Convert-UUlib-1.051
+	dev-perl/MIME-Base64
+	>=dev-perl/MIME-tools-5.415
+	>=dev-perl/MailTools-1.58
+	dev-perl/net-server
+	>=dev-perl/libnet-1.16
+	dev-perl/Digest-MD5
+	dev-perl/IO-stringy
+	>=dev-perl/Time-HiRes-1.49
+	dev-perl/Unix-Syslog
+	>=sys-libs/db-3.1
+	dev-perl/BerkeleyDB
+	virtual/mta
+	virtual/antivirus
+	ldap? ( dev-perl/perl-ldap )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	milter? ( >=mail-mta/sendmail-8.12 )"
+
+AMAVIS_ROOT=/var/amavis
+
+src_unpack() {
+	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 mail-mta/qmail) || $(has_version mail-mta/qmail-ldap) ; 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
+
+	insinto /etc
+	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
+}
+
+pkg_postinst() {
+	enewgroup amavis
+	enewuser amavis -1 /bin/false ${AMAVIS_ROOT} amavis
+
+	for i in whitelist blacklist spam_lovers; do
+		if [ ! -f ${AMAVIS_ROOT}/${i} ]; then
+			touch ${AMAVIS_ROOT}/${i}
+		fi
+	done
+
+	if $(has_version mail-filter/razor) ; then
+		einfo "Setting up initial razor config files..."
+
+		razor-admin -create -home=${ROOT}${AMAVIS_ROOT}/.razor
+		sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
+			${ROOT}${AMAVIS_ROOT}/.razor/razor-agent.conf
+	fi
+
+	chown -R amavis:amavis ${AMAVIS_ROOT}
+	find ${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
+	find ${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
+
+	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_virus_checks_maps = (1); in /etc/amavisd.conf."
+	fi
+}
diff --git a/mail-filter/amavisd-new/files/amavisd-new-2.3.0-amavisd.conf-gentoo.patch b/mail-filter/amavisd-new/files/amavisd-new-2.3.0-amavisd.conf-gentoo.patch
new file mode 100644
index 000000000000..82d952c6279a
--- /dev/null
+++ b/mail-filter/amavisd-new/files/amavisd-new-2.3.0-amavisd.conf-gentoo.patch
@@ -0,0 +1,143 @@
+--- amavisd.conf-sample	2005-05-01 21:54:59.000000000 +0200
++++ amavisd.conf-sample.ticho	2005-05-01 21:54:38.000000000 +0200
+@@ -73,21 +73,21 @@
+ 
+ # 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"
++$db_home = "$MYHOME/db";	# DB databases directory, default "$MYHOME/db"
+ 
+ # $helpers_home sets environment variable HOME, and is passed as option
+ # 'home_dir_for_helpers' to Mail::SpamAssassin::new. It should be a directory
+ # on a normal persistent file system, not a scratch or temporary file system
+-#$helpers_home = $MYHOME;	# (defaults to $MYHOME)
++$helpers_home = $MYHOME;	# (defaults to $MYHOME)
+ 
+ # Run the daemon in the specified chroot jail if nonempty:
+ #$daemon_chroot_dir = $MYHOME;  # (default is undef, meaning: do not chroot)
+@@ -152,7 +152,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 each task in
+@@ -289,7 +289,7 @@
+ # 3: server, client
+ # 4: decompose parts
+ # 5: more debug details
+-$log_level = 2;		  # (defaults to 0)
++$log_level = 0;		  # (defaults to 0)
+ 
+ # Customizable template for the most interesting log file entry (e.g. with
+ # $log_level=0) (take care to properly quote Perl special characters like '\')
+@@ -445,9 +445,28 @@
+ #            reject original client SMTP session, as the mail has already
+ #            been enqueued.
+ 
+-$final_virus_destiny      = D_BOUNCE;  # (defaults to D_DISCARD)
+-$final_banned_destiny     = D_BOUNCE;  # (defaults to D_BOUNCE)
+-$final_spam_destiny       = D_BOUNCE;  # (defaults to D_BOUNCE)
++########
++#
++# 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.
++# 
++# 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_DISCARD;  # (defaults to D_BOUNCE)
++$final_spam_destiny       = D_DISCARD;  # (defaults to D_BOUNCE)
+ $final_bad_header_destiny = D_PASS;  # (defaults to D_PASS), D_BOUNCE suggested
+ 
+ # Alternatives to consider for spam:
+@@ -588,7 +607,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
+ 
+@@ -728,7 +747,7 @@
+ $defang_virus  = 1;  # default is false: don't modify mail body
+ $defang_banned = 1;  # default is false: don't modify mail body
+ # $defang_bad_header     = 1;  # default is false: don't modify mail body
+-# $defang_undecipherable = 1;  # default is false: don't modify mail body
++$defang_undecipherable = 1;  # default is false: don't modify mail body
+ # $defang_spam = 1;  # default is false: don't modify mail body
+ 
+ $remove_existing_x_scanned_headers = 0; # leave existing X-Virus-Scanned alone
+@@ -1433,7 +1452,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,
+@@ -1489,7 +1508,7 @@
+ # of the option local_tests_only. See Mail::SpamAssassin man page.
+ # If set to 1, no SA tests that require internet access will be performed.
+ #
+-$sa_local_tests_only = 1;   # (default: false)
++$sa_local_tests_only = 0;   # (default: false)
+ #$sa_auto_whitelist = 1;    # turn on AWL in SA 2.63 or older (irrelevant
+                             # for SA 3.0, its cf option is use_auto_whitelist)
+ 
+@@ -1548,7 +1567,7 @@
+ #$sa_spam_report_header = 0; # insert X-Spam-Report header field? default false
+ 
+ # stop anti-virus scanning when the first scanner detects a virus?
+-#$first_infected_stops_scan = 1;  # default is false, all scanners in a section
++$first_infected_stops_scan = 1;  # default is false, all scanners in a section
+                                   # are called
+ 
+ # @av_scanners is a list of n-tuples, where fields semantics is:
+@@ -1833,7 +1852,7 @@
+ 
+   ### http://www.nai.com/
+   ['NAI McAfee AntiVirus (uvscan)', 'uvscan',
+-    '--secure -rv --mime --summary --noboot - {}', [0], [13],
++    '--secure --mime --program --mailbox -rv --mime --summary --noboot --timeout 180 - {}', [0], [13],
+     qr/(?x) Found (?:
+         \ the\ (.+)\ (?:virus|trojan)  |
+         \ (?:virus|trojan)\ or\ variant\ ([^ ]+)  |
+@@ -1945,7 +1964,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.3.0 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.3.0
new file mode 100644
index 000000000000..f8a69ae96e8f
--- /dev/null
+++ b/mail-filter/amavisd-new/files/digest-amavisd-new-2.3.0
@@ -0,0 +1 @@
+MD5 9dfeed1587a6ff1f0327c1d46bb8f631 amavisd-new-2.3.0.tar.gz 777817