summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEray Aslan <eras@gentoo.org>2010-11-10 11:13:15 +0000
committerEray Aslan <eras@gentoo.org>2010-11-10 11:13:15 +0000
commit50c30f9a9a041bc380a31b69f6b422d5a50a928c (patch)
tree797ffddb5343cf902dce1851d4658309c1a32811 /mail-filter
parentVersion bump #343739 by Andrew Ray. (diff)
downloadhistorical-50c30f9a9a041bc380a31b69f6b422d5a50a928c.tar.gz
historical-50c30f9a9a041bc380a31b69f6b422d5a50a928c.tar.bz2
historical-50c30f9a9a041bc380a31b69f6b422d5a50a928c.zip
Version bump. Following upstream dropped milter USE flag and added snmp.
Bump to EAPI 3. Ebuild clean up and init.d script revision. Bugs #245434 Package-Manager: portage-2.1.9.24/cvs/Linux x86_64
Diffstat (limited to 'mail-filter')
-rw-r--r--mail-filter/amavisd-new/ChangeLog10
-rw-r--r--mail-filter/amavisd-new/Manifest5
-rw-r--r--mail-filter/amavisd-new/amavisd-new-2.7.0_pre8.ebuild170
-rw-r--r--mail-filter/amavisd-new/files/amavisd.initd71
4 files changed, 254 insertions, 2 deletions
diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index 7e6b09485467..aa5641568cd8 100644
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,14 @@
# 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.152 2010/01/02 14:50:21 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.153 2010/11/10 11:13:15 eras Exp $
+
+*amavisd-new-2.7.0_pre8 (10 Nov 2010)
+
+ 10 Nov 2010; Eray Aslan <eras@gentoo.org> +amavisd-new-2.7.0_pre8.ebuild,
+ +files/amavisd.initd:
+ Version bump. Following upstream dropped milter USE flag and added snmp.
+ Bump to EAPI 3. Ebuild clean up and init.d script revision. Bugs #245434
+ #263180 #287284 #320193
02 Jan 2010; Brent Baude <ranger@gentoo.org> amavisd-new-2.6.3-r2.ebuild:
Marking amavisd-new-2.6.3-r2 ppc64 for bug 288933
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 657e169f54ff..e0cf97a053c3 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -3,12 +3,15 @@ AUX amavisd-new-2.6.3-amavisd.conf-gentoo.patch 4882 RMD160 0d6b26e68128f021fb68
AUX amavisd-new-2.6.3-dkimconf.patch 735 RMD160 778aad1195caf735eb44ff2c4e9147e88b68881d SHA1 3ff44615cb9b161da069055eb4fc79f6b24fd70c SHA256 1d0489bfd14d794617c12ec797404373a632b2c26e381d9e09c364cbfa2ae248
AUX amavisd-new-2.6.3-startup.patch 522 RMD160 e7e864c260efc9b7f27c54771956c85fe67fd1eb SHA1 70092348cfc2ab5e8bd1776196a49e76c611b0bf SHA256 ebc531320945ab009da3b59d829d7f6dd938647063ec495ed85d96833eee0647
AUX amavisd-new-dkimconf.patch 735 RMD160 721bc3fdaf15c2838092825e0b88c781841184b0 SHA1 7b57c4c80a92c3d764f9d338dac6146cd37e3080 SHA256 033f6758dc3f62d19f8a269c8ba1e3960f8b55a48aaccbb6d1d0078cd92352a8
+AUX amavisd.initd 1339 RMD160 baf636ef4db3ccbcfeeca70d199a05e12723ab20 SHA1 92cee4273753743d624f2c18265b8b0484398be0 SHA256 e22bee28e03b51aba0495c9c488e0a8775e47e330e58b7e60726c2010a819cd6
AUX amavisd.rc6 371 RMD160 d32a99dd9a229a133741501ec443509e22c6867a SHA1 f353cd12004bff30ac2361df2a2784f697b0cb8d SHA256 f2010650d3ef408359f41e3a84173c2b27300e9d6d2e4f7558ef39858e01da9d
DIST amavisd-new-2.6.1.tar.gz 911740 RMD160 c9e248540bfaf9cc6ab967776bd98e164b636db8 SHA1 51e3e3d9c2aaa33f6a41a84092c82adb94e2a806 SHA256 4c98786e4b694459f6bac42413cd34b7d0165763b908b3234d5407126fb3b13d
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
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
-MISC ChangeLog 30573 RMD160 9d0b063d4d24262b9896d5e249d219bd247d7374 SHA1 0b8360b7045d544c24655d4668449a801c3873aa SHA256 56e7ad4c68cb295137da78404f8b9b306033a7cc162da3c3301f8339f92478c4
+EBUILD amavisd-new-2.7.0_pre8.ebuild 4284 RMD160 e32cdb26c4b254c16444d8c6d3aff6f5331ce2e0 SHA1 0661fbb7077f9cd027b633c6b417a10b128cf2b3 SHA256 19463593e424b131e20572b351aa8c9a05d0c96e7ae065132726ca225f2623da
+MISC ChangeLog 30887 RMD160 4a24a668bd89478ba4af512a6c89063f8b8c26f4 SHA1 f337e2ee3869dfb0a6b6c15a8c4ea32139cd6788 SHA256 723db97783aec3ebecd3a94ec568324139349aa521dcb57545f75538b48dd0fa
MISC metadata.xml 624 RMD160 1b4f583fff7c7aabde0e8696eaac0e297604a208 SHA1 628528ee48c3c366c8c2b5536991735c6d0e0e12 SHA256 4bda1a166dafc8df735495e0d66e1d8fded9fddc9d0366c423614593a9be84dc
diff --git a/mail-filter/amavisd-new/amavisd-new-2.7.0_pre8.ebuild b/mail-filter/amavisd-new/amavisd-new-2.7.0_pre8.ebuild
new file mode 100644
index 000000000000..40e1a0dd020d
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.7.0_pre8.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_pre8.ebuild,v 1.1 2010/11/10 11:13:15 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
+ fi
+
+ insinto /etc
+ insopts -m0640
+ doins amavisd.conf || die
+
+ newinitd "${FILESDIR}/amavisd.initd" amavisd
+
+ 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}"
+}
diff --git a/mail-filter/amavisd-new/files/amavisd.initd b/mail-filter/amavisd-new/files/amavisd.initd
new file mode 100644
index 000000000000..7be641838f1c
--- /dev/null
+++ b/mail-filter/amavisd-new/files/amavisd.initd
@@ -0,0 +1,71 @@
+#!/sbin/runscript
+# 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/files/amavisd.initd,v 1.1 2010/11/10 11:13:15 eras Exp $
+
+opts="${opts} reload debug debug-sa"
+
+prog="/usr/sbin/amavisd"
+progname="amavisd-new"
+conffile="/etc/amavisd.conf"
+
+depend() {
+ need net
+ use logger antivirus snmpd
+ before mta
+}
+
+checkconfig() {
+ local piddir pidfile
+ if [ -r "${conffile}" ] ; then
+ pidfile=$(grep -m1 ^[^#].*pid_file "${conffile}"|sed -e 's/.*"\(.*\)".*/\1/')
+ piddir=${pidfile%/*}
+ if [ ! -d "${piddir:-/var/amavis}" ] ; then
+ checkpath -q -d -o root:amavis -m 0770 "${piddir}" || return 1
+ fi
+ else
+ eerror "Missing conf file."
+ return 1
+ fi
+}
+
+start() {
+ ebegin "Starting ${progname}"
+ checkconfig || return 1
+ "${prog}" start
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${progname}"
+ "${prog}" stop 2>/dev/null
+ eend $?
+}
+
+reload() {
+ ebegin "Reloading ${progname}"
+ "${prog}" reload 2>/dev/null
+ eend $?
+}
+
+restart() {
+ ebegin "Restarting ${progname}"
+ svc_stop
+ sleep 3
+ svc_start
+ eend $?
+}
+
+debug() {
+ ebegin "Starting ${progname} in debug mode"
+ checkconfig || return 1
+ "${prog}" debug
+ eend $?
+}
+
+debug-sa() {
+ ebegin "Starting ${progname} in debug-sa mode"
+ checkconfig || return 1
+ "${prog}" debug-sa
+ eend $?
+}