Version bump (#219448)

Package-Manager: portage-2.1.5.5

4 files changed, 210 insertions, 12 deletions

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index 88aee1a65537..6dd1cbea1b12 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.119 2008/03/23 23:16:47 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.120 2008/06/14 18:22:15 dertobi123 Exp $
+
+*amavisd-new-2.6.0 (14 Jun 2008)
+
+  14 Jun 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  +files/amavisd-new-dkimconf.patch, +amavisd-new-2.6.0.ebuild:
+  Version bump (#219448)
 
   23 Mar 2008; Markus Meier <maekke@gentoo.org> amavisd-new-2.5.2.ebuild:
   amd64 stable, bug #199333
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 77f53fbf1f3f..9db30c5d092b 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,22 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX amavisd-new-2.4-qmail-lf-workaround.patch 722 RMD160 e7d9bfc83343ca63ffc56f85e0dd216c4a2aff30 SHA1 1b7b9a4fb8d299bc9de3e307fb5952428d8143fa SHA256 988aeb0c74c8d644f716532d8dafbe2a6ace6f0a2aa826cb4c41ece8be662c13
 AUX amavisd-new-2.4.1-amavisd.conf-gentoo.patch 5641 RMD160 1e2b587e22a9f51ae692de41325439fc4feb19ad SHA1 008a421db17efcd65fea6342128a4c069b1938e7 SHA256 2fdbdda5b293e5c3b10c74504a1368ea470e328155823caddfbf7d16f9e79036
 AUX amavisd-new-2.4.4-amavisd.conf-gentoo.patch 4878 RMD160 bf7faec0c54aa24bd689db9d1d22cccbdcff47b3 SHA1 18a44d7cf4e155206b26582abf4e3b92682275ea SHA256 b9db712af97ec836f1177fbeeaa284a4eb254f0a4eea1783606553273078fee3
+AUX amavisd-new-dkimconf.patch 735 RMD160 721bc3fdaf15c2838092825e0b88c781841184b0 SHA1 7b57c4c80a92c3d764f9d338dac6146cd37e3080 SHA256 033f6758dc3f62d19f8a269c8ba1e3960f8b55a48aaccbb6d1d0078cd92352a8
 AUX amavisd.rc6 333 RMD160 f325f40cdedd1cfff72e16c574ef499d4790d1bf SHA1 e026253a61cafdd57728afa6a865268b60e57272 SHA256 9a93b96b95314d46e3d68d9e50b667758689c214c4398436e1959b42eeddb5f2
 DIST amavisd-new-2.4.1.tar.gz 841988 RMD160 edd91dde774838345159064ef6012f7927d5aa6c SHA1 1de9fdac377c58a29a93c8a246553c8e363b212c SHA256 c067cbae60ccff3932574fcaf7971c04b118f6b2e9fe6db772d33538b53b0a54
 DIST amavisd-new-2.5.2.tar.gz 788546 RMD160 b7bc998ac34428b62cf74e1c114b295a9f322652 SHA1 2465131448ce10dac8511450695ff63bc565e6db SHA256 5f590850c505017c2633f47ced483aae23ec857e2a782f763eb16f9f9f3fceef
 DIST amavisd-new-2.5.3.tar.gz 789275 RMD160 49b97ff3782b42f8aaba7beb73440398d83638d9 SHA1 2e1460ad505ad4251a876ec506d021a392c7c0c0 SHA256 f724654e15eab3fabce22873a5f2a0fcf2db9374ca84979cf066a29360ee533d
+DIST amavisd-new-2.6.0.tar.gz 906076 RMD160 bf93a22864d1df8978583fd1a06ef414e682291d SHA1 efffd55c12d23af803a83e981b0fd2f179190a85 SHA256 e979be2db9d28c2c44293245394c5001cd9a94bbdd0ca3f3b45eac5e7a91521a
 EBUILD amavisd-new-2.4.1.ebuild 5141 RMD160 3b086005f6c232b1b6c69a3fed1f1b74590bd128 SHA1 3d36b230c57a2221a539a62eccb1af6929bb659f SHA256 6cff1dae46650077f1dc910d95a84b68dfa97dd10c01afbca9b392aef4fbcb98
 EBUILD amavisd-new-2.5.2.ebuild 5126 RMD160 e3d935b198af93d6f7b5f3beaf2ddb259d07554b SHA1 2bdb6d2a2d12c0030294a3a1e334079cea1ed8fd SHA256 f6cb2b5670831bdb1d93cd4ce6766bf9bf7469edac0bee5ee2b6597855ded5f8
 EBUILD amavisd-new-2.5.3.ebuild 5048 RMD160 2beca8cdcac289419735b2ddf9def528af0e89d3 SHA1 04e13379022b027962e6631c711bec609b3ff70b SHA256 6f304454b4ffe100727922897eb05961d8161524f07770e9602bdeb12703bbfe
-MISC ChangeLog 25692 RMD160 88516c522ae9ab66e00ec400d055992f2989d911 SHA1 0afc5a8ddc7207be3a199dc11d71db350f728cd7 SHA256 be8e5c155aedbf5ade6d6a8bbb6ad8582a1e4ca75595d60f2fdb6719f032aaf0
+EBUILD amavisd-new-2.6.0.ebuild 5140 RMD160 74d275f3b66059a2e5bf796b4984682bad35cc53 SHA1 5168898682d1d2b2fd2c5666d42ba784b993c000 SHA256 f62056968bafdeacf288bcd1cae9d316acc19041619ed0ea1d35ef994d16a825
+MISC ChangeLog 25876 RMD160 fea81699fe8b891558abffedeb2526e0e5fc13b1 SHA1 f6ce4e00854d544267d570f3870025432ffcd0b9 SHA256 2ee16ac19fef368383aa30f9caa4c3a0397cadec2aae892c4674d989372fae40
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH5uUskKaRLQcq0GIRAu3PAJ0X1ht+8S+BnQIQ613zzEUfxWm21QCglCzb
-PxKwBq0TLU24mDreAfkxEys=
-=tpbM
------END PGP SIGNATURE-----
diff --git a/mail-filter/amavisd-new/amavisd-new-2.6.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.6.0.ebuild
new file mode 100644
index 000000000000..4e521d67ba04
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.6.0.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2008 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.6.0.ebuild,v 1.1 2008/06/14 18:22:15 dertobi123 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="~amd64 ~x86"
+IUSE="courier dkim ldap milter mysql postgres qmail"
+
+DEPEND=">=sys-apps/sed-4
+	>=dev-lang/perl-5.8.2
+	milter? ( || ( mail-filter/libmilter >=mail-mta/sendmail-8.12 ) )"
+
+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/rar )
+	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 )
+	dkim? ( >=dev-perl/Mail-DKIM-0.31 )"
+
+AMAVIS_ROOT="/var/amavis"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if use courier ; then
+		epatch amavisd-new-courier.patch
+	fi
+
+	if use qmail ; then
+		epatch amavisd-new-qmqpqq.patch
+	fi
+
+	epatch "${FILESDIR}/${PN}-2.4.4-amavisd.conf-gentoo.patch"
+
+	if ! use dkim ; then
+		epatch "${FILESDIR}/${PN}-dkimconf.patch"
+	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() {
+	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-new-dkimconf.patch b/mail-filter/amavisd-new/files/amavisd-new-dkimconf.patch
new file mode 100644
index 000000000000..2140326c08ab
--- /dev/null
+++ b/mail-filter/amavisd-new/files/amavisd-new-dkimconf.patch
@@ -0,0 +1,13 @@
+--- amavisd.conf-sample.orig	2008-06-14 20:05:49.487302075 +0200
++++ amavisd.conf-sample	2008-06-14 20:06:02.649294131 +0200
+@@ -102,8 +102,8 @@
+ $enable_db = 1;              # enable use of BerkeleyDB/libdb (SNMP and nanny)
+ $enable_global_cache = 1;    # enable use of libdb-based cache if $enable_db=1
+ 
+-$enable_dkim_verification = 1;  # enable DKIM signatures verification
+-$enable_dkim_signing = 1;    # load DKIM signing code, needs keys in dkim_key()
++$enable_dkim_verification = 0;  # enable DKIM signatures verification
++$enable_dkim_signing = 0;    # load DKIM signing code, needs keys in dkim_key()
+ 
+ # MTA SETTINGS, UNCOMMENT AS APPROPRIATE,
+ # both $forward_method and $notify_method default to 'smtp:[127.0.0.1]:10025'