Remove amavisd-new-20041222.ebuild.

Bring in the ebuild attached in bug #77425
previous was missing some of the improvements.
Thanks to Sune Kloppenborg Jeppesen <jaervosz@gentoo.org>,
Christian Zoffoli <xmerlin@gentoo.org> and everyone have contributed.
(Portage version: 2.0.51-r14)

6 files changed, 207 insertions, 45 deletions

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index d20ed9f848e9..ea947572af2a 100644
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,17 @@
 # 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.19 2005/01/19 19:10:46 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.20 2005/01/19 23:01:32 langthang Exp $
+
+*amavisd-new-2.2.1 (19 Jan 2005)
+
+  19 Jan 2005; Tuấn Văn <langthang@gentoo.org>
+  +files/amavisd-new-2.2.1-amavisd.conf-gentoo.patch,
+  +files/amavisd-new-2.2.1-qmail-lf-workaround.patch,
+  +amavisd-new-2.2.1.ebuild:
+  Remove amavisd-new-20041222.ebuild. Bring in the ebuild attached in bug
+  #77425 as previous was missing some of the improvements. Thanks to Sune
+  Kloppenborg Jeppesen <jaervosz@gentoo.org>, Christian Zoffoli
+  <xmerlin@gentoo.org> and everyone have contributed.
 
 *amavisd-new-0.20040701 (19 Jan 2005)
 
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 2837483419db..dc8026aa3c20 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,18 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 94879a3b84f67682bc6afc073d520cbb amavisd-new-0.20040701.ebuild 4486
 MD5 9581d1aa3dccb95fbc8a97b8b7a4f56d ChangeLog 7236
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 MD5 4d5360e0e4ccf61abd99b2131a7d4d54 amavisd-new-20041222.ebuild 4795
+MD5 280fc48de7fd64c0ae9347c5ac0abf77 amavisd-new-2.2.1.ebuild 4688
 MD5 be145e653e6eb0e6bc8acea937573cb2 files/amavisd.conf 85678
 MD5 1ec247b48d1de4fdbc2a57fc9b338681 files/digest-amavisd-new-20041222 69
 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 4b5c8018b70d0e6a8f52d37653996367 files/digest-amavisd-new-0.20040701 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB7rEP5FrxP71izLARAnPtAJ9CwdGxFMGiP3FldTz0nnarg+xgFQCfdYB/
-25qI4aF0GVN15a1IU4IJgjk=
-=xPMG
------END PGP SIGNATURE-----
+MD5 1ec247b48d1de4fdbc2a57fc9b338681 files/digest-amavisd-new-2.2.1 69
diff --git a/mail-filter/amavisd-new/amavisd-new-20041222.ebuild b/mail-filter/amavisd-new/amavisd-new-2.2.1.ebuild
index 090984d99833..6863bc839de9 100644
--- a/mail-filter/amavisd-new/amavisd-new-20041222.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.2.1.ebuild
@@ -1,13 +1,12 @@
 # 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-20041222.ebuild,v 1.1 2005/01/18 15:54:08 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.2.1.ebuild,v 1.1 2005/01/19 23:01:32 langthang Exp $
 
 inherit eutils
 
-MY_V=2.2.1
 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/${PN}-${MY_V}.tar.gz"
+SRC_URI="http://www.ijs.si/software/amavisd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -34,7 +33,7 @@ RDEPEND="${DEPEND}
 	dev-perl/Convert-TNEF
 	dev-perl/Convert-UUlib
 	dev-perl/MIME-Base64
-	>=dev-perl/MIME-tools-5.413
+	>=dev-perl/MIME-tools-5.415
 	>=dev-perl/MailTools-1.58
 	dev-perl/net-server
 	dev-perl/libnet
@@ -51,8 +50,6 @@ RDEPEND="${DEPEND}
 	postgres? ( dev-perl/DBD-Pg )
 	milter? ( >=mail-mta/sendmail-8.12 )"
 
-S="${WORKDIR}/${PN}-${MY_V}"
-
 AMAVIS_ROOT=/var/amavis
 
 src_unpack() {
@@ -62,6 +59,16 @@ src_unpack() {
 		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() {
@@ -81,13 +88,10 @@ src_install() {
 	enewgroup amavis
 	enewuser amavis -1 /bin/false ${AMAVIS_ROOT} amavis
 
-	dosbin amavisd
-	dosbin amavisd-agent
-	dosbin amavisd-nanny
+	dosbin amavisd amavisd-agent amavisd-nanny
 
 	insinto /etc
-	# we now (since 2.2.1) install original conf file
-	doins amavisd.conf
+	newins amavisd.conf-sample amavisd.conf
 	dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '$AMAVIS_ROOT';:" \
 		/etc/amavisd.conf
 	if [ "$(domainname)" = "(none)" ] ; then
@@ -97,7 +101,7 @@ src_install() {
 		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(domainname)';:" \
 			/etc/amavisd.conf
 	fi
-	if ! `has_version mail-filter/spamassassin` ; then
+	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);:" \
@@ -125,9 +129,18 @@ src_install() {
 		fowners amavis:amavis ${AMAVIS_ROOT}/${i}
 	done
 
-	newdoc test-messages/README
-	dodoc AAAREADME.first INSTALL TODO LDAP.schema LICENSE MANIFEST RELEASE_NOTES \
-		README_FILES/* test-messages/sample-* amavisd.conf-default amavisd.conf-sample
+	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"
@@ -136,7 +149,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if `has_version mail-filter/razor` ; then
+	if $(has_version mail-filter/razor) ; then
 		einfo "Setting up initial razor config files..."
 
 		razor-admin -create -home=${ROOT}${AMAVIS_ROOT}/.razor
@@ -145,27 +158,12 @@ pkg_postinst() {
 		chown -R amavis:amavis ${ROOT}${AMAVIS_ROOT}/.razor
 	fi
 
-	if ! `has_version mail-filter/spamassassin` ; then
+	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 line 170 of /etc/amavisd.conf."
+		einfo "and comment out the line containing: "
+		einfo "@bypass_virus_checks_maps = (1); in /etc/amavisd.conf."
 	fi
-
-	einfo
-	einfo "This version (20041222) also changed default config file (/etc/amavisd.conf)"
-	einfo "into much simpler and lighter version. Previous defaults were installed"
-	einfo "for Your convenience at default location (/usr/share/doc/${P})."
-	ewarn
-	ewarn "This version of amavisd-new has a different layout from previous versions"
-	ewarn "available in portage. The socket, pid, and lock file, as well as the"
-	ewarn "temporary, razor, and spamassassin configuration directories have all"
-	ewarn "moved to:"
-	ewarn
-	ewarn "${AMAVIS_ROOT}"
-	ewarn
-	ewarn "It may be necessary to reconfigure any helper applications."
-	ewarn
-
 }
diff --git a/mail-filter/amavisd-new/files/amavisd-new-2.2.1-amavisd.conf-gentoo.patch b/mail-filter/amavisd-new/files/amavisd-new-2.2.1-amavisd.conf-gentoo.patch
new file mode 100644
index 000000000000..25a84f78b1ce
--- /dev/null
+++ b/mail-filter/amavisd-new/files/amavisd-new-2.2.1-amavisd.conf-gentoo.patch
@@ -0,0 +1,145 @@
+--- amavisd-new-2.2.1/amavisd.conf-sample.chris	2005-01-09 19:24:25.000000000 +0100
++++ amavisd-new-2.2.1/amavisd.conf-sample	2005-01-09 19:25:11.784562320 +0100
+@@ -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
+@@ -291,7 +291,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 '\')
+@@ -447,10 +447,29 @@
+ #            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)
+-$final_bad_header_destiny = D_PASS;  # (defaults to D_PASS), D_BOUNCE suggested
++########
++#
++# 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)
+ 
+ # Alternatives to consider for spam:
+ # - use D_PASS if clients will do filtering based on inserted
+@@ -590,7 +609,7 @@
+ #   or a directory (no trailing slash)
+ #   (the default value is undef, meaning no quarantine)
+ #
+-$QUARANTINEDIR = '/var/virusmails';
++$QUARANTINEDIR = "$MYHOME/quarantine";
+ 
+ #$virus_quarantine_method        = 'local:virus-%i-%n';    # default
+ #$spam_quarantine_method         = 'local:spam-%b-%i-%n';  # default
+@@ -725,7 +744,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
+@@ -1428,7 +1447,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';
+ 
+ # 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,
+@@ -1466,7 +1485,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)
+ 
+@@ -1525,7 +1544,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:
+@@ -1798,7 +1817,7 @@
+ 
+   ### http://www.nai.com/
+   ['NAI McAfee AntiVirus (uvscan)', 'uvscan',
+-    '--secure -rv --mime --summary --noboot - {}', [0], [13],
++    '--secure --mime --program --mailbox -rv --summary --noboot --timeout 180 - {}', [0], [13],
+     qr/(?x) Found (?:
+         \ the\ (.+)\ (?:virus|trojan)  |
+         \ (?:virus|trojan)\ or\ variant\ ([^ ]+)  |
+@@ -1909,7 +1928,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 -packed -server {}', [0,8], [3,6],
+     qr/Infection: (.+)/ ],
+ 
+   ### http://www.trendmicro.com/   - backs up Trophie
diff --git a/mail-filter/amavisd-new/files/amavisd-new-2.2.1-qmail-lf-workaround.patch b/mail-filter/amavisd-new/files/amavisd-new-2.2.1-qmail-lf-workaround.patch
new file mode 100644
index 000000000000..f4c7a8eb6d2e
--- /dev/null
+++ b/mail-filter/amavisd-new/files/amavisd-new-2.2.1-qmail-lf-workaround.patch
@@ -0,0 +1,14 @@
+--- amavisd-new-2.2.1/amavisd.chris	2005-01-09 18:05:09.000000000 +0100
++++ amavisd-new-2.2.1/amavisd	2005-01-09 18:05:47.360864816 +0100
+@@ -3948,9 +3948,9 @@
+         # to reduce the likelyhood of a qmail bare-LF bug (bare LF reported
+         # when CR and LF are separated by a TCP packet boundary) one may use
+         # this 'while' line, reading line by line, instead of the normal one:
+-###     while (defined($_=$msg->getline)) {
++        while (defined($_=$msg->getline)) {
+ 
+-        while ($msg->read($_, 16384) > 0) {
++###     while ($msg->read($_, 16384) > 0) {
+           $smtp_handle->datasend($_)
+             or die "datasend timed out while sending body\n";
+         }
diff --git a/mail-filter/amavisd-new/files/digest-amavisd-new-20041222 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.2.1
index ad1a1abda341..ad1a1abda341 100644
--- a/mail-filter/amavisd-new/files/digest-amavisd-new-20041222
+++ b/mail-filter/amavisd-new/files/digest-amavisd-new-2.2.1