version bump

Package-Manager: portage-2.1.9.49/cvs/Linux x86_64

3 files changed, 191 insertions, 15 deletions

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index 95de49d88782..81e78ca56731 100644
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-filter/amavisd-new
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.168 2011/05/22 15:23:34 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.169 2011/05/22 20:26:45 eras Exp $
+
+*amavisd-new-2.7.0_rc1 (22 May 2011)
+
+  22 May 2011; Eray Aslan <eras@gentoo.org> +amavisd-new-2.7.0_rc1.ebuild:
+  Add and mask amavisd-2.7.0 release candidate
 
   22 May 2011; Eray Aslan <eras@gentoo.org> -amavisd-new-2.7.0_pre15.ebuild:
   Remove old version
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 3a940fba7b31..8ab4edacfd1e 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -12,26 +12,28 @@ DIST amavisd-new-2.6.3.tar.gz 918888 RMD160 911e356dbc2a900734c5c87bdd231846abe4
 DIST amavisd-new-2.6.4.tar.gz 947596 RMD160 010dd9bf49a3c7553996c49553fd0fa84ca7bdab SHA1 993b7ca839ce038fd13f65351950f0ef03d99ff9 SHA256 40fe1b655deb934c7a655a6b5b430df268ec9ac80754b120795bc45d4ae769ef
 DIST amavisd-new-2.6.5.tar.gz 951684 RMD160 c28d9c9fc11ac8d942f82874981b6d9889b8c167 SHA1 1f76196653e19886ee8352815c3f4d80f4984876 SHA256 fe438fb215c6e333de1a82044d954f5e69f85614f40444851ed3959f3e5cf8b2
 DIST amavisd-new-2.6.6.tar.gz 952177 RMD160 e8c27c5c236665a373fc29b2f48d47e9c8eac89b SHA1 c350253b51f912fe3aaa88cdbda72ad031078210 SHA256 4d3ce005f63dce8ce474e07bec001dac545871e2bf5641c1ffebff6b979e33d5
+DIST amavisd-new-2.7.0-rc1.tar.gz 939668 RMD160 60fb4e39eff74572b3803b26c18b8bc3bf0e8f41 SHA1 2b63eabfbdd3c22865b0e5cb02c062433ef5a7de SHA256 8f3e6380b52f31d8be5e27dbbd81f49e078d56e5bfa9ff2a3167df439ed63d34
 EBUILD amavisd-new-2.6.3-r2.ebuild 5476 RMD160 c6a03196d437a0ff4386778fc04befa8ba640796 SHA1 ba0770315c4a67c78696f594f3429adef14c1798 SHA256 879c8eb57b4803c50c18f338148f9592dcf67383d6253f2ab29d34e34d108c48
 EBUILD amavisd-new-2.6.4.ebuild 5451 RMD160 7b2d69e9319e59cb14736697267a72272c0e920e SHA1 70c75582ce88c0def3486300e5186069d80ff637 SHA256 06faa3973c35a1e8cde576d9b6d02d0b485cb50ff882377098d7d4b8d7b31a7c
 EBUILD amavisd-new-2.6.5.ebuild 5503 RMD160 bfef5fdefcb1d871ca6f7931df33733dd6c5d265 SHA1 4dcdbd03b4c6c4faa697f88c0b4d79521ac1476b SHA256 8396b23e232a890851b0056bc57351fc1e5629856bd6ba7174eebcc812e77116
 EBUILD amavisd-new-2.6.6.ebuild 5503 RMD160 a6bd6c4f1139e248763e38fcba3200eb9405bfeb SHA1 b388ba11ab05edcc379b5b76ecf3c7714f13984d SHA256 f8a9cb437a966b50147898f62b448de800855ab8301dea0dbf673873a86ebbf5
-MISC ChangeLog 32926 RMD160 c506107b1c1fdb09ad07fd468df9e26d82e02db1 SHA1 459e72cfdba92b8da53623607626faf50f1f6db2 SHA256 ad2bbe09b6042defdf53c5b77b27e9b8fcda9b97e45627e803bc68b6554506c4
+EBUILD amavisd-new-2.7.0_rc1.ebuild 4359 RMD160 c50cd7877cda5a98ac9369a70bab209717ebb656 SHA1 dce457bb94fd3f2c46fe216d1c534d829de089bb SHA256 92cf959a70cf169513d37b362f0dbe0482b56f52bcb67f15942ecb16d7fefe04
+MISC ChangeLog 33087 RMD160 6560edf552f4b6cea853f9d847bcb120095039e0 SHA1 67dd2ff6bf3aa2d6db89ead534bb0be760b67387 SHA256 54e3def3e974dce9e61e90c937a056642dc7b55a03ea50e946a705fe4dd2385e
 MISC metadata.xml 492 RMD160 5cc972a4e9a4a4d988864d3860c14faaab49b486 SHA1 2ba196114139a71488d3561cebb5634603f4e6f1 SHA256 9210f93fc9ec4b70f4fc79c08f43bb50f29e02aa33bad7061c0047ac8781d190
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJN2SqEAAoJEHfx8XVYajsfkSgP/RgA6QtwgEyPUeXTzTwxmL4Y
-aJ8mRKFps6OdjlrBF7P6gjkQEYi/80v5HElOyKx0/GXysly7GGukRfAQxTUbnZlM
-MqH2KM3CQY4afSL5Xzx+58eDWWr8WdzE53FHycyqxJq/r/MiFihhwK0iEliJMaq1
-VD/PTvfXw+Cn8vqx6/Ph41nT5hLT1iMqNfnjVZU9oSb5o0Yq10JnRB9Cr5g+9y6N
-hEwHemuaXFEO1gy9j8RUzK8awwasROmEHi54Js7xebZG9isnefBq5DRvPT47SACU
-O70l4yEd74L+7blpYHtAHIikpS0U62KHYtPCJle5M7ho0jVSBL5Tkud31nw2wLme
-CL5gEHIxTFZAr6XuojttSJ5pMbRMojcg5Y13nEKpxnekZN9pWn/7nbcLgdIAxm2T
-sKOQNmF/l/hTigKYdb3OwpPQfNun+w+nfrMWieHaTx+WEbnLPtvPv98+CKF3JIAF
-xbJHpTy5dLZipSVySNl0Ok1HxETmQrnHXVllRCcdwn4weaUs6Tv9LvNf33BC5p4B
-PzFNTqlqk6QGZDt4jebBsSiEEYVjzmPPpslHi7arVq5oWUbx7h1VvyDYt8UA4qpr
-5VDKuCX5v5R4aK6SyxuGOxvxjO3hi6Mg/BryZYV73k3N2te1cXimF1qxqZtpZ2+g
-KQqrMWdErZTNuSToKO2c
-=dxkO
+iQIcBAEBCAAGBQJN2XGUAAoJEHfx8XVYajsf/xQP/iG3P9S/Q0/s+bsgUlHkLg/5
+Aa1F8JDMaZdG+2RWFxCY/WF6VmuK3RYhdzNNd8by1aCyjMWy8295j3QbcBv+YIAI
+xxi5mmZkQlJjKdmumHnCy5BIpu8wWR9iWe0S5mvtaqZWBDqRpizNgZlgFronKpCL
+c8yQZR4w+C8y9Kl8kQl3S/NsaYvQiOEiX7ZcuEApEeAN+EMHCdn5q4LV8Nd/5mRn
+krMbZG41+eVFaxRaH++IwkRcfhy512GfFfsUrgGqYVBYFfoIdo8CZEGEdRTA5T9a
+VGJ2LGHwLgSvY/J+zP7cZqO8tE6GUdpqrP6P/zH/Lg3iQSTJ+NYQpryx+L77QFXo
+rFgPCeoWfblnMC3nAaTyxabiwo4ubUJ/ZalRj3cjMxrC/LGih3Yedb/CRH1xrbcf
+BhsVdbqwaySegl7m/HHYxKdl3ccK26Y2sMXaF/T8RHImowA1YzPFCpr6WT5V1/X0
+rSzCtiMSWE7Tpx0uqfI/BdXcYCvJ95cHuFGuXVzd+Hm/ylnZiP56Q3Q07eMh5WlR
+ImwjH/zKtHoXM0WSUqzDu6UFEFmBubldMKRxyW+amu1en0lcCX68fNU7RfKchxgp
+0Og7t4EXpHrAJuMdwUN1Nw2RMsxjYP9/x89D/aNrSnpDNWO2VTTAVlifxl+O9b8y
+z+xyhGLtlfETodKD7io5
+=VRNp
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/amavisd-new/amavisd-new-2.7.0_rc1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.7.0_rc1.ebuild
new file mode 100644
index 000000000000..0f8151fa3fb2
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.7.0_rc1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2011 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.7.0_rc1.ebuild,v 1.1 2011/05/22 20:26:45 eras Exp $
+
+EAPI=3
+
+inherit eutils
+
+MY_P="${P/_/-}"
+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/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="courier dkim ldap mysql postgres qmail razor snmp spamassassin"
+
+DEPEND=">=sys-apps/sed-4
+	>=dev-lang/perl-5.8.2"
+
+RDEPEND="${DEPEND}
+	>=sys-apps/coreutils-5.0-r3
+	app-arch/cpio
+	app-arch/gzip
+	app-arch/bzip2
+	app-arch/arc
+	app-arch/cabextract
+	app-arch/freeze
+	app-arch/lha
+	app-arch/ncompress
+	app-arch/pax
+	app-arch/unarj
+	app-arch/xz-utils
+	|| ( app-arch/unrar app-arch/rar )
+	app-arch/zoo
+	>=dev-perl/Archive-Zip-1.14
+	>=virtual/perl-IO-Compress-1.35
+	>=virtual/perl-Compress-Raw-Zlib-2.017
+	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-apps/file
+	>=sys-libs/db-4.4.20
+	dev-perl/BerkeleyDB
+	dev-perl/Convert-BinHex
+	>=dev-perl/Mail-DKIM-0.31
+	virtual/mta
+	ldap? ( >=dev-perl/perl-ldap-0.33 )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	razor? ( mail-filter/razor )
+	snmp? ( net-analyzer/net-snmp )
+	spamassassin? ( mail-filter/spamassassin )"
+
+AMAVIS_ROOT="/var/amavis"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	if use courier ; then
+		epatch amavisd-new-courier.patch
+	fi
+
+	if use qmail ; then
+		epatch amavisd-new-qmqpqq.patch
+	fi
+
+	sed -i  \
+		-e '/daemon/s/vscan/amavis/' \
+		-e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \
+		"${S}/amavisd.conf" || die "missing conf file"
+
+	if ! use dkim ; then
+		sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
+			|| die "missing conf file"
+	fi
+}
+
+src_install() {
+	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release \
+		amavisd-signer || die
+	dobin p0f-analyzer.pl amavisd-submit || die
+
+	if use snmp ; then
+		dosbin amavisd-snmp-subagent || die
+		dodoc AMAVIS-MIB.txt || die
+	fi
+
+	insinto /etc
+	insopts -m0640
+	doins amavisd.conf || die "doins failed"
+
+	newinitd "${FILESDIR}/amavisd.initd" amavisd || die "initd failed"
+
+	keepdir "${AMAVIS_ROOT}"
+	keepdir "${AMAVIS_ROOT}/db"
+	keepdir "${AMAVIS_ROOT}/quarantine"
+	keepdir "${AMAVIS_ROOT}/tmp"
+	keepdir "${AMAVIS_ROOT}/var"
+
+	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \
+		amavisd.conf-default amavisd-custom.conf
+
+	docinto README_FILES
+	dodoc README_FILES/README*
+	dohtml README_FILES/*.{html,css}
+	docinto README_FILES/images
+	dodoc README_FILES/images/*.png
+	docinto README_FILES/images/callouts
+	dodoc README_FILES/images/callouts/*.png
+
+	docinto test-messages
+	dodoc test-messages/README
+	dodoc test-messages/sample.tar.gz.compl
+
+	#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
+		dodir /etc/openldap/schema
+		insinto /etc/openldap/schema
+		insopts -o root -g root -m 644
+		newins LDAP.schema ${PN}.schema || die
+	fi
+}
+
+pkg_preinst() {
+	enewgroup amavis
+	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
+	if use razor ; then
+		if [ ! -d "${ROOT}${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
+
+	if ! use spamassassin ; then
+		elog "Disabling anti-spam code in amavisd.conf..."
+		sed -i -e \
+			"/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \
+				"${D}/etc/amavisd.conf"
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.7.0" ; then
+		elog "Amavisd-new ships with a short and condensed config file now."
+		elog "Transferring your current settings to the new format is"
+		elog "recommended for ease of future upgrades."
+	fi
+}
+
+pkg_postinst() {
+	chown root:amavis "${ROOT}/etc/amavisd.conf"
+	chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}"
+}