Version bump. Let portage keep track of razor config files. Bug #96917.

(Portage version: 2.0.51.22-r1)

4 files changed, 203 insertions, 9 deletions

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index 0ea9237d004a..5bc8d64fd339 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.46 2005/06/06 09:45:10 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.47 2005/06/30 08:48:03 ticho Exp $
+
+*amavisd-new-2.3.2 (30 Jun 2005)
+
+  30 Jun 2005; Andrej Kacian <ticho@gentoo.org> +amavisd-new-2.3.2.ebuild:
+  Version bump. Let portage keep track of razor config files (bug #96917, by
+  Kerin Millar <kerframil at gmail.com>).
 
   06 Jun 2005; Markus Rothe <corsair@gentoo.org> amavisd-new-2.3.0.ebuild:
   Stable on ppc64
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 2b8a75ec5888..5e0d95183132 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,16 +1,18 @@
-MD5 e225fddbec4900bbaa5c9e064c8f1689 ChangeLog 12040
-MD5 9ef3182fc15c8c2de2c0e918c22f5790 amavisd-new-2.2.1-r1.ebuild 4820
+MD5 e5344a75a4160ea26ce4de061eb618b5 amavisd-new-2.3.1.ebuild 5167
 MD5 ed2b2060671d066ffc187b1902912891 amavisd-new-2.2.1-r2.ebuild 5087
-MD5 2e9a4a46a72df5d8efab0f8c92afe16f amavisd-new-2.2.1.ebuild 4809
 MD5 2bbe70fe2a2d29b6d5895112866ff64d amavisd-new-2.3.0.ebuild 5183
-MD5 e5344a75a4160ea26ce4de061eb618b5 amavisd-new-2.3.1.ebuild 5167
+MD5 d0b320d85c17c62310f55c8b88efc2a5 amavisd-new-2.3.2.ebuild 5322
+MD5 9ef3182fc15c8c2de2c0e918c22f5790 amavisd-new-2.2.1-r1.ebuild 4820
+MD5 e9c80c5366d6dee9362aecc8f7cf25d0 ChangeLog 12269
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
+MD5 2e9a4a46a72df5d8efab0f8c92afe16f amavisd-new-2.2.1.ebuild 4809
+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 a9c49eb16b5fa7dfecd54a436bc07200 files/amavisd-new-2.3.0-amavisd.conf-gentoo.patch 6687
-MD5 1f1f4cf9c92f92f966361a8ac08aa543 files/amavisd.rc6 305
 MD5 1ec247b48d1de4fdbc2a57fc9b338681 files/digest-amavisd-new-2.2.1 69
-MD5 1ec247b48d1de4fdbc2a57fc9b338681 files/digest-amavisd-new-2.2.1-r1 69
-MD5 1ec247b48d1de4fdbc2a57fc9b338681 files/digest-amavisd-new-2.2.1-r2 69
 MD5 20d1361125dc21db61b44dec3a13dea2 files/digest-amavisd-new-2.3.0 69
 MD5 d7ee87336e865f363c430fc60f105d44 files/digest-amavisd-new-2.3.1 69
+MD5 64e273484857758e614f8afa7aa14e09 files/digest-amavisd-new-2.3.2 69
+MD5 1ec247b48d1de4fdbc2a57fc9b338681 files/digest-amavisd-new-2.2.1-r1 69
+MD5 1ec247b48d1de4fdbc2a57fc9b338681 files/digest-amavisd-new-2.2.1-r2 69
+MD5 a9c49eb16b5fa7dfecd54a436bc07200 files/amavisd-new-2.3.0-amavisd.conf-gentoo.patch 6687
diff --git a/mail-filter/amavisd-new/amavisd-new-2.3.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.3.2.ebuild
new file mode 100644
index 000000000000..3b31d7e1898f
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.3.2.ebuild
@@ -0,0 +1,185 @@
+# 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.2.ebuild,v 1.1 2005/06/30 08:48:03 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
+	perl-core/MIME-Base64
+	>=dev-perl/MIME-tools-5.415
+	>=dev-perl/MailTools-1.58
+	dev-perl/net-server
+	>=dev-perl/libnet-1.16
+	dev-perl/IO-stringy
+	>=perl-core/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() {
+	if ! $(has_version ">=mail-filter/spamassassin-3.0.0") ; then
+		echo
+		ewarn "WARNING: Amavisd-new will not work with SpamAssassin older than 3.0.0."
+		ewarn "         Consider upgrading your SpamAssassin installation."
+		ebeep 3
+		sleep 5
+	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 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}/${PN}-2.2.1-qmail-lf-workaround.patch" || die "patch failed"
+	fi
+
+	epatch "${FILESDIR}/${PN}-2.3.0-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
+	insopts -m0640
+	newins amavisd.conf-sample amavisd.conf
+	fowners root:amavis /etc/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/razor-agent.conf \
+				${AMAVIS_ROOT}/.razor/server*
+		fi
+	fi
+
+	chown -R amavis:amavis ${D}/${AMAVIS_ROOT}
+	find ${D}/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
+	find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
+}
+
+pkg_postinst() {
+	enewgroup amavis
+	enewuser amavis -1 /bin/false ${AMAVIS_ROOT} amavis
+
+	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
+	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
+}
diff --git a/mail-filter/amavisd-new/files/digest-amavisd-new-2.3.2 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.3.2
new file mode 100644
index 000000000000..9cfd4cd07ad5
--- /dev/null
+++ b/mail-filter/amavisd-new/files/digest-amavisd-new-2.3.2
@@ -0,0 +1 @@
+MD5 4af47f7e0b2aaf71bd5783dc26a576a8 amavisd-new-2.3.2.tar.gz 786156