new version.

(Portage version: 2.0.51-r13)

7 files changed, 195 insertions, 15 deletions

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index f0f8daf0b8e1..2f2d5820ffda 100644
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/amavisd-new
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.16 2004/12/29 10:09:40 corsair Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.17 2005/01/18 15:54:08 radek Exp $
+
+*amavisd-new-20041222 (18 Jan 2005)
+
+  18 Jan 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +amavisd-new-20041222.ebuild:
+  New version. 2 new helper apps, new config.
 
   29 Dec 2004; Markus Rothe <corsair@gentoo.org> amavisd-new-20040701.ebuild:
   Added ~ppc64 to KEYWORDS
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index c205d6f0523f..ab394e71c0e6 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,13 +1,15 @@
-MD5 d691883333d7113bd0f898c4404a467c ChangeLog 6616
-MD5 8f6932db0e432e589c41d9928d4198a0 amavisd-new-20030616_p8.ebuild 2630
-MD5 1417aabd41c7b66e06f012fac0edad91 amavisd-new-20030616_p9.ebuild 2901
-MD5 3af7b4ecd978414d95e9261b33b84473 amavisd-new-20040701.ebuild 4468
+MD5 4c817c5a9cbc5dee1b6030d9b698c7b2 amavisd-new-20030616_p8.ebuild 2630
+MD5 96be2c901ab11d75b5842b9d7cb5e907 amavisd-new-20040701.ebuild 4468
+MD5 c3e66bfc9253a77f1ce39b8070054e27 amavisd-new-20030616_p9.ebuild 2901
+MD5 590f2f980a2d3ce8d0aac2b5283bb5dd ChangeLog 6786
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
-MD5 f45025857b1aaeeb225782bf7f35c5c3 files/addr_extensions_in_sql.patch 10222
+MD5 101fdd7d27fadcef2ef4afe7218b9073 amavisd-new-20041222.ebuild 4797
 MD5 be145e653e6eb0e6bc8acea937573cb2 files/amavisd.conf 85678
+MD5 4b5c8018b70d0e6a8f52d37653996367 files/digest-amavisd-new-20040701 72
+MD5 1ec247b48d1de4fdbc2a57fc9b338681 files/digest-amavisd-new-20041222 69
 MD5 1f1f4cf9c92f92f966361a8ac08aa543 files/amavisd.rc6 305
+MD5 3256d64018bee64fa34ed62fb93e44af files/sql_timeout.patch 3282
+MD5 f45025857b1aaeeb225782bf7f35c5c3 files/addr_extensions_in_sql.patch 10222
 MD5 0c677a1cb17705ea75841cabd5d14634 files/digest-amavisd-new-20030616_p8 75
 MD5 0a2364d819d448c49ea72dfe8c2a109a files/digest-amavisd-new-20030616_p9 75
-MD5 4b5c8018b70d0e6a8f52d37653996367 files/digest-amavisd-new-20040701 72
 MD5 b9ac0b985d0cb7da0ab45fa22ebe38c8 files/lost_connection.patch 567
-MD5 3256d64018bee64fa34ed62fb93e44af files/sql_timeout.patch 3282
diff --git a/mail-filter/amavisd-new/amavisd-new-20030616_p8.ebuild b/mail-filter/amavisd-new/amavisd-new-20030616_p8.ebuild
index 512c2a6cee89..98c9784e3f19 100644
--- a/mail-filter/amavisd-new/amavisd-new-20030616_p8.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-20030616_p8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-20030616_p8.ebuild,v 1.4 2004/06/24 22:19:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-20030616_p8.ebuild,v 1.5 2005/01/18 15:54:08 radek Exp $
 
 inherit eutils
 
diff --git a/mail-filter/amavisd-new/amavisd-new-20030616_p9.ebuild b/mail-filter/amavisd-new/amavisd-new-20030616_p9.ebuild
index 0bdbc8e0f933..167fd14906f3 100644
--- a/mail-filter/amavisd-new/amavisd-new-20030616_p9.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-20030616_p9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-20030616_p9.ebuild,v 1.5 2004/06/24 22:19:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-20030616_p9.ebuild,v 1.6 2005/01/18 15:54:08 radek Exp $
 
 inherit eutils
 
diff --git a/mail-filter/amavisd-new/amavisd-new-20040701.ebuild b/mail-filter/amavisd-new/amavisd-new-20040701.ebuild
index 04c36d594d2f..f2345c6841f1 100644
--- a/mail-filter/amavisd-new/amavisd-new-20040701.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-20040701.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-20040701.ebuild,v 1.8 2004/12/29 10:09:40 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-20040701.ebuild,v 1.9 2005/01/18 15:54:08 radek Exp $
 
 inherit eutils
 
diff --git a/mail-filter/amavisd-new/amavisd-new-20041222.ebuild b/mail-filter/amavisd-new/amavisd-new-20041222.ebuild
new file mode 100644
index 000000000000..090984d99833
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-20041222.ebuild
@@ -0,0 +1,171 @@
+# 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 $
+
+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"
+
+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
+	dev-perl/Compress-Zlib
+	dev-perl/Convert-TNEF
+	dev-perl/Convert-UUlib
+	dev-perl/MIME-Base64
+	>=dev-perl/MIME-tools-5.413
+	>=dev-perl/MailTools-1.58
+	dev-perl/net-server
+	dev-perl/libnet
+	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 )"
+
+S="${WORKDIR}/${PN}-${MY_V}"
+
+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
+}
+
+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() {
+	enewgroup amavis
+	enewuser amavis -1 /bin/false ${AMAVIS_ROOT} amavis
+
+	dosbin amavisd
+	dosbin amavisd-agent
+	dosbin amavisd-nanny
+
+	insinto /etc
+	# we now (since 2.2.1) install original conf file
+	doins 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
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/amavisd.rc6" amavisd
+	dosed "s:/var/run/amavis/:$AMAVIS_ROOT/:g" /etc/init.d/amavisd
+
+	keepdir ${AMAVIS_ROOT}
+	fowners amavis:amavis ${AMAVIS_ROOT}
+	fperms 0750 ${AMAVIS_ROOT}
+
+	keepdir ${AMAVIS_ROOT}/db
+	fowners amavis:amavis ${AMAVIS_ROOT}/db
+
+	keepdir ${AMAVIS_ROOT}/quarantine
+	fowners amavis:amavis ${AMAVIS_ROOT}/quarantine
+
+	keepdir ${AMAVIS_ROOT}/tmp
+	fowners amavis:amavis ${AMAVIS_ROOT}/tmp
+	for i in whitelist blacklist spam_lovers; do
+		touch ${D}${AMAVIS_ROOT}/${i}
+		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 use milter ; then
+		cd "${S}/helper-progs"
+		einstall
+	fi
+}
+
+pkg_postinst() {
+	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
+		chown -R amavis:amavis ${ROOT}${AMAVIS_ROOT}/.razor
+	fi
+
+	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."
+	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/digest-amavisd-new-20041222 b/mail-filter/amavisd-new/files/digest-amavisd-new-20041222
new file mode 100644
index 000000000000..ad1a1abda341
--- /dev/null
+++ b/mail-filter/amavisd-new/files/digest-amavisd-new-20041222
@@ -0,0 +1 @@
+MD5 567b6df37a2f049fe23c176e6fd1472f amavisd-new-2.2.1.tar.gz 741461