Version bump

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

3 files changed, 179 insertions, 2 deletions

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index 295b8b0b207d..73cfcdc44759 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.154 2010/11/10 13:58:05 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.155 2010/11/18 15:43:17 eras Exp $
+
+*amavisd-new-2.7.0_pre9 (18 Nov 2010)
+
+  18 Nov 2010; Eray Aslan <eras@gentoo.org> +amavisd-new-2.7.0_pre9.ebuild:
+  Version bump
 
   10 Nov 2010; Eray Aslan <eras@gentoo.org> metadata.xml:
   Revise USE flag description
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 0bfe92862633..aeae9c258926 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -9,9 +9,11 @@ DIST amavisd-new-2.6.1.tar.gz 911740 RMD160 c9e248540bfaf9cc6ab967776bd98e164b63
 DIST amavisd-new-2.6.3.tar.gz 918888 RMD160 911e356dbc2a900734c5c87bdd231846abe4f9e8 SHA1 12a120b4fc614a0b3269cb0ec0ee185cb3e7c13f SHA256 47e774579fdab1e1c10ef2295d49cb511b13e05431a7955c73f07e98025d788e
 DIST amavisd-new-2.6.4.tar.gz 947596 RMD160 010dd9bf49a3c7553996c49553fd0fa84ca7bdab SHA1 993b7ca839ce038fd13f65351950f0ef03d99ff9 SHA256 40fe1b655deb934c7a655a6b5b430df268ec9ac80754b120795bc45d4ae769ef
 DIST amavisd-new-2.7.0-pre8.tar.gz 908291 RMD160 2f1e3dea6d61736fe4e76a2bed251831a6ab2a99 SHA1 edf11e265eb2a6c91b08932a0d23740a3b389282 SHA256 21639c51bcf59be007c1e324b9910516ca15e3f6fca29e45e34a243da6eff4e2
+DIST amavisd-new-2.7.0-pre9.tar.gz 909741 RMD160 782d0fcb0021d9f521456153a111ea5b9e50a8fe SHA1 7fb475504a11477f3ee2511c7657869194cbadc4 SHA256 ac3d576f18e4b5d8ac12129f689180c92a454ab04db55fdde8c7c1da0e97589b
 EBUILD amavisd-new-2.6.1-r1.ebuild 5427 RMD160 c8569c93233d3ddb449788acbdf2cc31ed88c771 SHA1 57667a34805bdf7307dfd4b0002f1c5e74722780 SHA256 ec7db3be87e0e964db05bf061c9fa9832d632e22f8c58ecb6c6bfa4b9cc8c3c2
 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.7.0_pre8.ebuild 4284 RMD160 e32cdb26c4b254c16444d8c6d3aff6f5331ce2e0 SHA1 0661fbb7077f9cd027b633c6b417a10b128cf2b3 SHA256 19463593e424b131e20572b351aa8c9a05d0c96e7ae065132726ca225f2623da
-MISC ChangeLog 30976 RMD160 16a293b10f4203c80d33b56c8656710ec6c3e4ab SHA1 5e2095607b619dd8a08e9fbc2ab76369b7792eb7 SHA256 1e90f49af993b6ab59fae62545e88f84ea19e3d26e92efc338c3a074e7a4e398
+EBUILD amavisd-new-2.7.0_pre9.ebuild 4328 RMD160 e1418507506e415e0b61c3cd4049fb2d6be5315f SHA1 9d03cb2a0755a89cab95c402cccffc392fe89a73 SHA256 3b96d84f78c0341f77fd107998bb2a97568e7d65e15717f69be601290c4366a5
+MISC ChangeLog 31107 RMD160 042b418d4a409be03ca057b4f93d219fc78a1595 SHA1 2508b70a7f754a1d56d988ba5fe685d3efcba298 SHA256 5908166cb47ba772e53711af4319baf5a5f82f7bb6009f5ff2d7b1903ba0dc0e
 MISC metadata.xml 492 RMD160 5cc972a4e9a4a4d988864d3860c14faaab49b486 SHA1 2ba196114139a71488d3561cebb5634603f4e6f1 SHA256 9210f93fc9ec4b70f4fc79c08f43bb50f29e02aa33bad7061c0047ac8781d190
diff --git a/mail-filter/amavisd-new/amavisd-new-2.7.0_pre9.ebuild b/mail-filter/amavisd-new/amavisd-new-2.7.0_pre9.ebuild
new file mode 100644
index 000000000000..c7206d7442d7
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.7.0_pre9.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2010 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_pre9.ebuild,v 1.1 2010/11/18 15:43:17 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/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/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
+}
+
+pkg_setup() {
+	enewgroup amavis
+	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
+}
+
+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 \
+		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() {
+	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}"
+}