Version bump, bug #182424. Added 'use antivirus' in initscript depend(), bug #177037.

Package-Manager: portage-2.1.2.9

5 files changed, 215 insertions, 13 deletions

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index 9b895e683d25..483d5eecc3ba 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.109 2007/05/23 22:51:10 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.110 2007/06/18 16:03:06 ticho Exp $
+
+*amavisd-new-2.5.1 (18 Jun 2007)
+
+  18 Jun 2007; Andrej Kacian <ticho@gentoo.org> files/amavisd.rc6,
+  +amavisd-new-2.5.1.ebuild:
+  Version bump, bug #182424. Added 'use antivirus' in initscript depend(), bug
+  #177037.
 
   23 May 2007; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.3.3-r2.ebuild,
   amavisd-new-2.4.1.ebuild, amavisd-new-2.4.2.ebuild,
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index e692dacb65d4..c2cb0792bc0a 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -33,10 +33,10 @@ AUX amavisd-new-2.4.4-qmail-lf-workaround.patch 845 RMD160 95d77a438bc57e9cc7a19
 MD5 ff439c0ce62a4b53a75de5bc7647558c files/amavisd-new-2.4.4-qmail-lf-workaround.patch 845
 RMD160 95d77a438bc57e9cc7a192182fe15705dc45e3f6 files/amavisd-new-2.4.4-qmail-lf-workaround.patch 845
 SHA256 6206976516f904e374da5cf9cb4c0211077d473d52e495b6f3e2bca3348e1635 files/amavisd-new-2.4.4-qmail-lf-workaround.patch 845
-AUX amavisd.rc6 325 RMD160 c93c6d67ae1ea4671f25c6c26e064daae711928d SHA1 76d49382eb244542dd6108b9c61b341937abb54d SHA256 f9882c3106c392c58f482735811fe6c61b03007a83ed5eb01faf24873fc81893
-MD5 4bef198882d5eedd770664a7c008dec6 files/amavisd.rc6 325
-RMD160 c93c6d67ae1ea4671f25c6c26e064daae711928d files/amavisd.rc6 325
-SHA256 f9882c3106c392c58f482735811fe6c61b03007a83ed5eb01faf24873fc81893 files/amavisd.rc6 325
+AUX amavisd.rc6 333 RMD160 f325f40cdedd1cfff72e16c574ef499d4790d1bf SHA1 e026253a61cafdd57728afa6a865268b60e57272 SHA256 9a93b96b95314d46e3d68d9e50b667758689c214c4398436e1959b42eeddb5f2
+MD5 dee1e7c97facbcf4d591d4ccf8ba35cc files/amavisd.rc6 333
+RMD160 f325f40cdedd1cfff72e16c574ef499d4790d1bf files/amavisd.rc6 333
+SHA256 9a93b96b95314d46e3d68d9e50b667758689c214c4398436e1959b42eeddb5f2 files/amavisd.rc6 333
 DIST amavisd-new-2.3.3.tar.gz 772280 RMD160 c2213190582fe8fea9b8f1736e3b3e49b2906887 SHA1 5676f7df377b5af8349c989b9da8fd07ce383242 SHA256 8c6d78cc0a703f0aa36d52fdf833e074c6adca2d21bd334ef381f9e9c92b8f0b
 DIST amavisd-new-2.4.1.tar.gz 841988 RMD160 edd91dde774838345159064ef6012f7927d5aa6c SHA1 1de9fdac377c58a29a93c8a246553c8e363b212c SHA256 c067cbae60ccff3932574fcaf7971c04b118f6b2e9fe6db772d33538b53b0a54
 DIST amavisd-new-2.4.2.tar.gz 854326 RMD160 fd82a0f3a1166d7f70846651b7b91af147b3fb70 SHA1 48893e23b03bb4ef493473b0f066e4f4d65ff1b7 SHA256 80023cc0397560d082dd4152c96b7efc49d3cc2695b4d578ed01b08c3af2bb9a
@@ -44,6 +44,7 @@ DIST amavisd-new-2.4.3.tar.gz 876615 RMD160 9301d2ea30bd6a620d827384facc5a1bbace
 DIST amavisd-new-2.4.4.tar.gz 887625 RMD160 3d6ac62f57b68440a7ca3766ff374f4763db6bbf SHA1 20943dd3787c33a1f39c9e486bc00e8f670e3f7e SHA256 b3a11ff3813e8b6c7cdf48c852c7bc672b2c0c6115d1b1dba896cd6358b67889
 DIST amavisd-new-2.4.5.tar.gz 895870 RMD160 3167b7660c84e33b59b87f8b437814c074c0e89c SHA1 2a99083b72d08cad7bf6fa6cc2eb8bd55e44f22b SHA256 cfd9150878ebaf51b021935ebc19f57be1a39f55194ef5e82f589cf80823ac53
 DIST amavisd-new-2.5.0.tar.gz 780990 RMD160 b84a75b57489c6fc3ce4340b420e7fd1339e5f19 SHA1 b520c2bb5a5fd93d894466de10a89573de336da5 SHA256 d5f5238a565868b5150c2591cd06780556d2aa093355475874e6b539e7eb1116
+DIST amavisd-new-2.5.1.tar.gz 786898 RMD160 bd9e5dd9619abbacf4f1b0daf1c1fabda3b68b7c SHA1 1a93e3c773f51d2c5062ee9fc5a4b0a782758c43 SHA256 2ac5a933d62072b3ed9986252003fd3942179618c7ba76d3390570547fc981de
 EBUILD amavisd-new-2.3.3-r2.ebuild 5189 RMD160 16dbf65742321e40eafd72b396636749502ff1e6 SHA1 12e64f45fc19db9001e17b447a4f305e689294e9 SHA256 41043756f7a14fdab4e03ef67509d216b522eacf178c8d472b8561da47c30d53
 MD5 0808bfac28d824f7e9d4bd6b8bbed0a9 amavisd-new-2.3.3-r2.ebuild 5189
 RMD160 16dbf65742321e40eafd72b396636749502ff1e6 amavisd-new-2.3.3-r2.ebuild 5189
@@ -76,10 +77,14 @@ EBUILD amavisd-new-2.5.0.ebuild 5101 RMD160 2fec44d1b75cab27062925f1dc43775c969c
 MD5 56c9b44a037f6b67dabcf72925d430da amavisd-new-2.5.0.ebuild 5101
 RMD160 2fec44d1b75cab27062925f1dc43775c969c3ae6 amavisd-new-2.5.0.ebuild 5101
 SHA256 c20e47da8971dd8093ef09708015dbb8f239b124c00f2b8f2e9f4c45993bbe9b amavisd-new-2.5.0.ebuild 5101
-MISC ChangeLog 23389 RMD160 3b1729d06ef6aaf972426b8d0047f58223add218 SHA1 0aba8d35c583d13029de7750eac6f3bdc2ddcc2a SHA256 6232d3cbe15000c41743b88a3e09a566a0f35ec139feaed0dcf0fab4ab8783c8
-MD5 cecedde07fdcad5959a8e7574bc77788 ChangeLog 23389
-RMD160 3b1729d06ef6aaf972426b8d0047f58223add218 ChangeLog 23389
-SHA256 6232d3cbe15000c41743b88a3e09a566a0f35ec139feaed0dcf0fab4ab8783c8 ChangeLog 23389
+EBUILD amavisd-new-2.5.1.ebuild 5101 RMD160 f280df60e9fc3fe2e255dcbf149de2251a6e43c7 SHA1 9d3dbcf4a18d4506c7f34e00fa57cbd07db40d60 SHA256 5b697900ab521612cfc48840687b6ee0c075a38c94232ed264152ef9c2dde421
+MD5 9b84de4aeb0f7a5e7286856ce79b8dbc amavisd-new-2.5.1.ebuild 5101
+RMD160 f280df60e9fc3fe2e255dcbf149de2251a6e43c7 amavisd-new-2.5.1.ebuild 5101
+SHA256 5b697900ab521612cfc48840687b6ee0c075a38c94232ed264152ef9c2dde421 amavisd-new-2.5.1.ebuild 5101
+MISC ChangeLog 23610 RMD160 043be6bfd3327644fc440de55fee35c050d5a314 SHA1 d42851ef6651490753aaf7b142bd8961893a3888 SHA256 b3610f55d6bcf4ffe7119620e0fc0ff16b4d5943ed033f6d436de756e6f8bee1
+MD5 4d82af23ec2b6907924c543280d3f859 ChangeLog 23610
+RMD160 043be6bfd3327644fc440de55fee35c050d5a314 ChangeLog 23610
+SHA256 b3610f55d6bcf4ffe7119620e0fc0ff16b4d5943ed033f6d436de756e6f8bee1 ChangeLog 23610
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 metadata.xml 184
@@ -108,10 +113,13 @@ SHA256 c53492eedc474159bc50f0ee9f20bd171ad2f0b460f564203bdbaaceeec00ca6 files/di
 MD5 705879c4b6ecad0f9009be76f10bde19 files/digest-amavisd-new-2.5.0 253
 RMD160 951e4cb27d78fd4528a1d1003fe4cd5a4876c01e files/digest-amavisd-new-2.5.0 253
 SHA256 424077e1b845d0c0a4c5877ddca7fac4f9b4749e91ba6de744e74b6b54667632 files/digest-amavisd-new-2.5.0 253
+MD5 d2d1b3f60ac8d3c1ccaa898733ee1682 files/digest-amavisd-new-2.5.1 253
+RMD160 aeebccbaf4e838ccfbfd3cc66631bc95eb0b9371 files/digest-amavisd-new-2.5.1 253
+SHA256 e334e60529eee708067332ec624d16e31c7a73d76d073a2776abc92542d22656 files/digest-amavisd-new-2.5.1 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGVMVoQlM6RnzZP+IRAiBkAJ9twMSRuIijjQkmFj6fiWIsMND79ACeKvyV
-hQsI8zAKEb99CHAdZ0ckPVA=
-=CTKF
+iD8DBQFGdqzAQlM6RnzZP+IRAn+xAKCRVsS4EHApInb96BVy9omcjRb8bgCgk4sR
+4rMk5F7I3YLKip5D23uzoqw=
+=9OUZ
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/amavisd-new/amavisd-new-2.5.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.5.1.ebuild
new file mode 100644
index 000000000000..233e96abb728
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.5.1.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2007 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.1.ebuild,v 1.1 2007/06/18 16:03:06 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"
+
+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-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 )
+	milter? ( || ( >=mail-mta/sendmail-8.12 mail-filter/libmilter ) )"
+
+AMAVIS_ROOT="/var/amavis"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if use courier ; then
+		elog "Patching with courier support."
+		epatch amavisd-new-courier.patch
+	fi
+
+	if use qmail ; then
+		elog "Patching with qmail qmqp support."
+		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/files/amavisd.rc6 b/mail-filter/amavisd-new/files/amavisd.rc6
index 78f2d1d4a16d..ce1d490ac887 100644
--- a/mail-filter/amavisd-new/files/amavisd.rc6
+++ b/mail-filter/amavisd-new/files/amavisd.rc6
@@ -3,7 +3,8 @@
 depend() {
 	need net
 	use logger
-        before mta
+	use antivirus
+	before mta
 }
 
 start() {
diff --git a/mail-filter/amavisd-new/files/digest-amavisd-new-2.5.1 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.5.1
new file mode 100644
index 000000000000..056c5e9fdb77
--- /dev/null
+++ b/mail-filter/amavisd-new/files/digest-amavisd-new-2.5.1
@@ -0,0 +1,3 @@
+MD5 c0bed5db53dfce6e70047597989523e2 amavisd-new-2.5.1.tar.gz 786898
+RMD160 bd9e5dd9619abbacf4f1b0daf1c1fabda3b68b7c amavisd-new-2.5.1.tar.gz 786898
+SHA256 2ac5a933d62072b3ed9986252003fd3942179618c7ba76d3390570547fc981de amavisd-new-2.5.1.tar.gz 786898