summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEray Aslan <eras@gentoo.org>2012-11-07 12:55:26 +0000
committerEray Aslan <eras@gentoo.org>2012-11-07 12:55:26 +0000
commit05dfd130fcbeca2f7806283e46fbbb1ab2d6b8b9 (patch)
tree0dcec83f76626874342d90453a3d1a45cce3d6a5 /mail-filter/amavisd-new
parentStable for x86, wrt bug #441336 (diff)
downloadhistorical-05dfd130fcbeca2f7806283e46fbbb1ab2d6b8b9.tar.gz
historical-05dfd130fcbeca2f7806283e46fbbb1ab2d6b8b9.tar.bz2
historical-05dfd130fcbeca2f7806283e46fbbb1ab2d6b8b9.zip
Version bump - bug #441988
Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64 Manifest-Sign-Key: 0x77F1F175586A3B1F
Diffstat (limited to 'mail-filter/amavisd-new')
-rw-r--r--mail-filter/amavisd-new/ChangeLog8
-rw-r--r--mail-filter/amavisd-new/Manifest34
-rw-r--r--mail-filter/amavisd-new/amavisd-new-2.8.0.ebuild184
-rw-r--r--mail-filter/amavisd-new/files/amavis-mc.initd24
-rw-r--r--mail-filter/amavisd-new/files/amavisd.initd-r145
-rw-r--r--mail-filter/amavisd-new/metadata.xml1
6 files changed, 280 insertions, 16 deletions
diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index 3d2374eff0c4..fbf6a4abd21f 100644
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for mail-filter/amavisd-new
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.194 2012/10/09 10:03:03 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.195 2012/11/07 12:55:15 eras Exp $
+
+*amavisd-new-2.8.0 (07 Nov 2012)
+
+ 07 Nov 2012; Eray Aslan <eras@gentoo.org> +amavisd-new-2.8.0.ebuild,
+ +files/amavis-mc.initd, +files/amavisd.initd-r1, metadata.xml:
+ Version bump - bug #441988
01 Oct 2012; Eray Aslan <eras@gentoo.org> -amavisd-new-2.6.3-r2.ebuild,
-amavisd-new-2.7.0.ebuild, -amavisd-new-2.7.1.ebuild,
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 5f4fd77d3802..bcfdad5aff7e 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,25 +1,29 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX amavis-mc.initd 546 SHA256 083abfb37dbdad32b9d75b2667701cde291f3c8793e0bd829910d334eddaed63 SHA512 389f09e092d71efdbd06617947b4ab002714fb2a1471573dccf2ab35490f81648d8f28471c48254aba076b538a63253e090e19128bd7117c7119359a120a95f6 WHIRLPOOL 9bbec76cb41ecc657b22d1441a052908cbfa454cd33a5e9c1c192339b1745da917db59e9926aab6f1dea0c2597d39677d7b8ea2be12edb2e6cf6878654ea9018
AUX amavisd.initd 832 SHA256 b1d40ea4a25cf6f03ccd1b5f02adbfd2203944944077e2906b978e48ff6fd80b SHA512 f6aeb51fff579f233a387b43f2bb1f9396ba7d2d3bb058d74cca5aa22b5b8914e30bd1f95a674bafdc81c191bbff5077d7a6682894e6f9f57c99d81006920138 WHIRLPOOL 8f4e863fe2eb4f5c44b202f2c500713273de6d43ec410d953e18f45b12956c2b67775daf79a0c6830405ab857feaa652722c63783e0b5a3a0adc9b67fd1b2578
+AUX amavisd.initd-r1 828 SHA256 0176e34bbc0261bd3c50ae99174af623fe1aa8e8413c3f6196958c02c37d9f1e SHA512 c9fa8c967026a29e486ffb79a10578efa28ba868985a0e83f88ab04987bc0a80a17613e9c92a3c7e03676ab2ee27f07e79cf7b21069161f73c6e517226b7e40f WHIRLPOOL 48958a935e3a79ab44315969b69ff7223241a60a52b14bbbc64daf2363dfb259da8a141c5617f13f7fca6bce2a0b636ac36a4f503f384bdbc5d2c5bc04332306
DIST amavisd-new-2.7.2.tar.gz 945448 SHA256 4665e0fb9a71f483f1123113a006291e37f744a5880f945ccf9fd34d51cb9275 SHA512 f707a5ac9d6acee2f9d144fda86fed92bbf33693858262ab0a95663da50f78a023102d9d50dd5a6a256ef6302a241f9c28d2b190e3efe2110c0eea15557ae756 WHIRLPOOL c0422d80b9dc11a7a2e9cb10092b7c97c02536aa852f70c566ab6e2e6a865b901ad24caf626b8b02ee64979bced7c25f03888827fd47ffbc4e733bb733e08c9e
+DIST amavisd-new-2.8.0.tar.xz 716556 SHA256 c21df73b4ba12322b67779fa5f6f23f57757240568f57d81e94702f0f7c1ce8c SHA512 4c927a6956027d8c953b455d37c0c152950ad392c50de992ecbd1f3525d13c11bc29b845496a2a51713fafbf62b6d589435d385b3bccaa34829049890cf56635 WHIRLPOOL c82d58a4d4337b3b42dcdd2e8b80060bdf288db51bdb5e69a8a1351733b4661d79a52d257f18cd26cf9a334f1195db0d8d9a0e3bf28a1043a49e5946817fba62
EBUILD amavisd-new-2.7.2.ebuild 4291 SHA256 3b9f9cae6315d49734d83299524da54af123d0f72f28ba97a34937a3e314eaaa SHA512 d9ab58dec4466f5a56f0c93a5c88e574f45cef76cc632ef5415ad9c378a6233c17f09750b2d704cb394c15872fcee5d9707e6fd343e082522eb28b5e81808ae7 WHIRLPOOL 8e76512b761b193af2010739907977de0a14ca3970f94609e2c0d3014ce741738144fd15973f95b2174963ac942419cde8b40134ffb1e6b29f095b8ea1bc2fb0
-MISC ChangeLog 36344 SHA256 4e572b42d1cad5ce9cac7ec1666fb043b2dd7fb9a908f2585739aa5ba620ef15 SHA512 6799d9b6328e718c7a8ec423c0de52048e919c27378882625172f5623014dc07357e84331e6250f62a5d52506c4c3fe93a1dd39c2e3b4bc021861dc22eceb631 WHIRLPOOL 99e953b862cd87d032344c59bcdb04c84c3ce5979e682af294e2dee1bb40533478d7150a3ffdabb7148940c1b7e89df482e36fbf2118f598b72a2358ad8f8724
-MISC metadata.xml 501 SHA256 14170b3945a5234a816acf9195f4d91f81620b221f9dc646efba9d14d95196e2 SHA512 6d8fd3c225a8e04de3575958d7826f3a65cbebe4cef092036f3e5e8fb70de4a1543ec7b14e67a1611d0db93cda72640c3a55f676f189d45a707e7861b44fa024 WHIRLPOOL 5194ba20e69a966781b36dded6843c8bb61ada9b37907ce74e504272f4c50a0203b6c771cb9aa8882767498df6b9facc953f2f018b48da2528e1c1f38f56e7e5
+EBUILD amavisd-new-2.8.0.ebuild 4612 SHA256 7d66fb451b88393bbc0a03827e3be6df0b9739990740ea8b8d5fb27d100c68a5 SHA512 2d98937e095ad2171769bb077d9d0e785b1869f804bca2c9f0ee4d2b99cf6f8ed62e8447dc5f02e60063889fd3d070ef2ffc887ff3f5d0292c9eced7e7e2b766 WHIRLPOOL 24cedd582e8a0b9a2cc4ebd0deb28708bb20dbd4995286152c70791d5cb0b17ce5bbfa5e87aa6987d9e4f5818fecc68684ff24bfc041027296cd9d59bb8e01d2
+MISC ChangeLog 36544 SHA256 1786dfe444b7990d5e333dde297bd87c2cc443bfdea21696512d5d16be3598b8 SHA512 d812a8e247ffa7323b98090b81c35c0218c0754ff78872e3761e544dce2c1ef26863f2541a1f9ad997cb7e51d1f5dd921a69f2e31ecf21ee157cdc221b183861 WHIRLPOOL 49ed871226678f8aadbdc5e2d3c4f9a1c72053a6aa983dddcdb17e96c39a28185b022fad3136211e91bd144b3151dc081e02067d2f1ecaaaf15868465190187d
+MISC metadata.xml 558 SHA256 d35f31e5c8a6d678fedb999a042c59eaa48a806558cf4e18f0f359ee64f7167b SHA512 af4c3ab95878fd14ad870c4364b3e4c03b863b2501ab2d899c4d6a8bc58e3d3d488f4fcba685939242d3690f490b9113af3675fdd14159eed8d8c873dd6f516c WHIRLPOOL a1dc324646fe6226f635030f825c25ed6e39cdc0a2c51f1a729f9225ff5e234d6c3f0ea297427d00a9ce3e5bbb64b8cac64fc49db78306bb0e5c077b9f1a437c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJQc/ZjAAoJEHfx8XVYajsfIyoQAKWYmwMbtrz5NbXdc5dejFUx
-6GRajMknigQSfso6t5xHwynYTVbzZpFzvbreDFg7REPIhKnZmPGBjo0BtbR+0SEM
-s9lxZj7hyZ5pGTtbvE7WTTnM4MjabN6enRaZTdRMEXbq1HbNxSKC7moElKIIWocn
-9xBH2gVCWPLMlj0ZsF3qt6yM86uPkdVcd6sSo3REQqw4d+nabTcQbWq/Rf6X2KWP
-vUOeTVJ7RzxNLmeC+ktCbCrg7JuBkeBks1Fyri8VrhR34LzqvL0EWmVJj2712ViU
-f6RorFd462f4vzH9TWOCZ5u5q/fuG6VmfFs1gq6Jya36pD5+4BU2ZsSBbHsF2AXq
-Gl/JTBE7pOGPsHugmamETkODSxt90DPMhJl3y2M8Ji4PvIqACy4j7UsilsoBxPto
-1Lbdm5CnlYpIY70C9tJaqD4UxCCW07oPizm1c5scZKUHyuYUMIcw1jTYkTXSV/Gj
-OX2LwsTXKhVHZqRKArYoClUA7pkAQEqD0+RBOd48P3kbxrtIRSeN4vslKy5UCRkX
-2CcPLPJJifpZ+qeyTfuNfnGklaGRFoIJVEy9hjBNYUXBZKJzpVBPWXXPrL5xzcuL
-cGdY6ASfEND0g54p4Mf7J04LywqKzRqbHS9jezir3HrDcJeDkDEnvOo+IEIMe27a
-iG98nZAUVgz2Hh2/NYDM
-=N7yo
+iQIcBAEBCAAGBQJQmlo+AAoJEHfx8XVYajsf/6sP/1rCgsnrlZWCkcdvMvHZc4d6
+lInxjBM9kZ1jSKrX1LbTPhdGk0YpERhXQj391rZ9sgrv/g7bo3DAUhv81ufI4/p9
+WoBk3vOUOXAn2Usx0/0CqXD5/AO2Hs1IQncFfPCARmhovCsxHm7109nx1DD5rIdz
+F+lfIPs2/ZyqIVoCdlUihPHcRXEyuQNcggNWH1DGryN1agwdUDO7bcbt5MTqzaYi
+AH8jlZGNCRS+8Vs9Kdr12W4KcC+RWhprXvFr/CW7IRM3tbh7TH5T+oEnohHytF6K
+ZnFb+JIEvK+jiFNHPr7IMJN/DthF5Ev82VyF+pyYV+IwunWSG4HerQ8MM72CgJEC
+IgWnsdPLppzxXH6z0InPByhQ1yjeOkCjyv/6FmjhWYvWqtA1CQm3Mk544+33sgWy
+vpPOI+mOqa34im/6K507oUvooJcuxauxX5ZFXVN7hy/mLycQI3+vp7Y2Dw/vbNHX
+N/Y0vfoUm5wQQ/EUmFer9kMKbvxphzPs7JfuDnJL4SGWbVMUBZPq7wyzoQzQ41SB
+M3e4oeo3CzS6MyGcqK3DXCwVPYifMy0+ryF03dUHYjwqBMmJh0/twt7Ljl+CMNtp
+B4rygRT2bXpZKEK6vhser/JJTXVKxd8WYCFuR0a2YkBgXIh9hTIxR+56x1f8Ac4F
+18zRIAgHizyZIGBY+L3t
+=Cyp2
-----END PGP SIGNATURE-----
diff --git a/mail-filter/amavisd-new/amavisd-new-2.8.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.8.0.ebuild
new file mode 100644
index 000000000000..d0d91d60160e
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.8.0.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2012 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.8.0.ebuild,v 1.1 2012/11/07 12:55:15 eras Exp $
+
+EAPI=4
+inherit eutils user
+
+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.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
+
+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/lrzip
+ app-arch/lzop
+ app-arch/ncompress
+ app-arch/p7zip
+ app-arch/pax
+ app-arch/unarj
+ app-arch/unrar
+ app-arch/xz-utils
+ app-arch/zoo
+ net-mail/ripole
+ >=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
+ dev-perl/IO-Socket-IP
+ >=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[perl] )
+ spamassassin? ( mail-filter/spamassassin )
+ zmq? ( dev-perl/ZMQ-LibZMQ2 )"
+
+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" "${S}/amavis-mc" || die
+
+ if ! use dkim ; then
+ sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
+ || die "missing conf file"
+ fi
+
+ if use zmq ; then
+ sed -i -e '/enable_zmq/s/# //' "${S}/amavisd.conf"
+ fi
+}
+
+src_install() {
+ dosbin amavisd amavisd-agent amavisd-nanny amavisd-release \
+ amavisd-signer amavisd-status
+ dobin p0f-analyzer.pl amavisd-submit
+
+ if use snmp ; then
+ dosbin amavisd-snmp-subagent
+ use zmq && dosbin amavisd-snmp-subagent-zmq
+ dodoc AMAVIS-MIB.txt
+ fi
+
+ if use zmq ; then
+ dosbin amavis-services amavis-mc
+ newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
+ fi
+
+ insinto /etc
+ insopts -m0640
+ doins amavisd.conf
+
+ newinitd "${FILESDIR}/amavisd.initd-r1" 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 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}"
+}
diff --git a/mail-filter/amavisd-new/files/amavis-mc.initd b/mail-filter/amavisd-new/files/amavis-mc.initd
new file mode 100644
index 000000000000..f859dbaaf818
--- /dev/null
+++ b/mail-filter/amavisd-new/files/amavis-mc.initd
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavis-mc.initd,v 1.1 2012/11/07 12:55:15 eras Exp $
+
+prog="/usr/sbin/amavis-mc"
+progname="amavis-mc"
+
+depend() {
+ use logger
+ before amavisd-new snmpd
+}
+
+start() {
+ ebegin "Starting ${progname}"
+ start-stop-daemon --start --exec ${prog}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${progname}"
+ start-stop-daemon --stop --interpreted --exec ${prog}
+ eend $?
+}
diff --git a/mail-filter/amavisd-new/files/amavisd.initd-r1 b/mail-filter/amavisd-new/files/amavisd.initd-r1
new file mode 100644
index 000000000000..c456ff446436
--- /dev/null
+++ b/mail-filter/amavisd-new/files/amavisd.initd-r1
@@ -0,0 +1,45 @@
+#!/sbin/runscript
+# Copyright 1999-2012 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-r1,v 1.1 2012/11/07 12:55:15 eras Exp $
+
+extra_started_commands="reload"
+extra_commands="debug debug_sa"
+
+prog="/usr/sbin/amavisd"
+progname="amavisd-new"
+
+depend() {
+ use net logger antivirus snmpd
+ before mta
+}
+
+start() {
+ ebegin "Starting ${progname}"
+ "${prog}" start
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${progname}"
+ "${prog}" stop 1>/dev/null
+ eend $?
+}
+
+reload() {
+ ebegin "Reloading ${progname}"
+ "${prog}" reload 1>/dev/null
+ eend $?
+}
+
+debug() {
+ ebegin "Starting ${progname} in debug mode"
+ "${prog}" debug
+ eend $?
+}
+
+debug_sa() {
+ ebegin "Starting ${progname} in debug-sa mode"
+ "${prog}" debug-sa
+ eend $?
+}
diff --git a/mail-filter/amavisd-new/metadata.xml b/mail-filter/amavisd-new/metadata.xml
index 72688c123820..ad94427b2e9a 100644
--- a/mail-filter/amavisd-new/metadata.xml
+++ b/mail-filter/amavisd-new/metadata.xml
@@ -9,5 +9,6 @@
<flag name='qmail'>Add qmail support</flag>
<flag name='razor'>Add support for mail-filter/razor</flag>
<flag name='spamassassin'>Add support for mail-filter/spamassassin</flag>
+ <flag name='zmq'>Add support for zeromq sockets</flag>
</use>
</pkgmetadata>