Some QA fixes - apply qmail and courier patches conditionally upon USE flags. Install...

Package-Manager: portage-2.1.2.2

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index 6882cffc13ade1babd53da6ac285a71dab2c907c..a50feb375cc7f7935359e80a3578003eaea4e61c 100644 (file)
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-filter/amavisd-new
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.103 2007/03/18 02:44:50 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.104 2007/03/19 19:44:21 ticho Exp $
+
+*amavisd-new-2.4.5-r1 (19 Mar 2007)
+
+  19 Mar 2007; Andrej Kacian <ticho@gentoo.org>
+  +amavisd-new-2.4.5-r1.ebuild:
+  Some QA fixes - apply qmail and courier patches conditionally upon USE
+  flags. Install ldap schema conditionally also based on a USE flag. Few other
+  minor fixes. Thanks to Marius Mauch <genone at gentoo.org> for suggestions.
 
   18 Mar 2007; Marius Mauch <genone@gentoo.org> amavisd-new-2.3.3-r2.ebuild,
   amavisd-new-2.4.1.ebuild, amavisd-new-2.4.2.ebuild,

diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index d6c89d737b112389533545dc0801e22d65202479..d737331eb334aeeda0f7bb85f70937a4ee6ea6f7 100644 (file)
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -67,14 +67,18 @@ EBUILD amavisd-new-2.4.4.ebuild 5116 RMD160 e52b5be0f9b26fb35f828672dd3d36510dc4
 MD5 3c838deff7f95a6915466638a0c4cfb8 amavisd-new-2.4.4.ebuild 5116
 RMD160 e52b5be0f9b26fb35f828672dd3d36510dc459e1 amavisd-new-2.4.4.ebuild 5116
 SHA256 4921a7b7d172b092db217d54930dec10de987ab0aa5d567622ab2764737b2af1 amavisd-new-2.4.4.ebuild 5116
+EBUILD amavisd-new-2.4.5-r1.ebuild 4899 RMD160 0e17719c2d36c670082d627e58c962939d452d7e SHA1 a3e73dfc62a1be7c48dee2beda00f5dcd0498fe4 SHA256 5871884fb93dd261264a529435a4304898329a1185e55551069c9adc670d3276
+MD5 630bcc8f16f7b446f370b946fc5666d0 amavisd-new-2.4.5-r1.ebuild 4899
+RMD160 0e17719c2d36c670082d627e58c962939d452d7e amavisd-new-2.4.5-r1.ebuild 4899
+SHA256 5871884fb93dd261264a529435a4304898329a1185e55551069c9adc670d3276 amavisd-new-2.4.5-r1.ebuild 4899
 EBUILD amavisd-new-2.4.5.ebuild 5458 RMD160 224857c6a379025dec8f2011dec18508f7a02285 SHA1 cc6201a60151928bc77e8daa9f231b976732417f SHA256 19745f7097aa6752d406839e2f5137b2077b3e00747116c7c25498eeee70ab98
 MD5 73e27520458a219d44c8bc55b079f7d5 amavisd-new-2.4.5.ebuild 5458
 RMD160 224857c6a379025dec8f2011dec18508f7a02285 amavisd-new-2.4.5.ebuild 5458
 SHA256 19745f7097aa6752d406839e2f5137b2077b3e00747116c7c25498eeee70ab98 amavisd-new-2.4.5.ebuild 5458
-MISC ChangeLog 21617 RMD160 74418e28a8a6f15801a4abb99486824fa676cf3e SHA1 db02d39fc8b2bec290b2152b75c83d3686ba6458 SHA256 d6e348f88fed1fa3cab8dc21ea0d54db2349522862d1cb28e313523b3cae90a6
-MD5 218f1903dfa20da06221d967aa44a4d1 ChangeLog 21617
-RMD160 74418e28a8a6f15801a4abb99486824fa676cf3e ChangeLog 21617
-SHA256 d6e348f88fed1fa3cab8dc21ea0d54db2349522862d1cb28e313523b3cae90a6 ChangeLog 21617
+MISC ChangeLog 21964 RMD160 0582804a0b66b458472d7b92f1d7d835f7e6a421 SHA1 379cacd6c085b0c22a01a62a44da6bf6e4999f06 SHA256 92c38a6a8a7db1f8b5e518b592a763b9cb763e2d363a3f6e1dfe99ce51a44c6d
+MD5 793ab8b97ff1b94edb9f644e12ea7cd0 ChangeLog 21964
+RMD160 0582804a0b66b458472d7b92f1d7d835f7e6a421 ChangeLog 21964
+SHA256 92c38a6a8a7db1f8b5e518b592a763b9cb763e2d363a3f6e1dfe99ce51a44c6d ChangeLog 21964
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 metadata.xml 184
@@ -100,10 +104,13 @@ SHA256 3efe36b42ef294cc88b43fd99e066f1599af37a38b5764681067bb76b601a091 files/di
 MD5 8a753a8cbf16255eed1625def44bdfa5 files/digest-amavisd-new-2.4.5 253
 RMD160 e972ad004ce2186c1dde42911606a16645c1df95 files/digest-amavisd-new-2.4.5 253
 SHA256 c53492eedc474159bc50f0ee9f20bd171ad2f0b460f564203bdbaaceeec00ca6 files/digest-amavisd-new-2.4.5 253
+MD5 8a753a8cbf16255eed1625def44bdfa5 files/digest-amavisd-new-2.4.5-r1 253
+RMD160 e972ad004ce2186c1dde42911606a16645c1df95 files/digest-amavisd-new-2.4.5-r1 253
+SHA256 c53492eedc474159bc50f0ee9f20bd171ad2f0b460f564203bdbaaceeec00ca6 files/digest-amavisd-new-2.4.5-r1 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFF/Ki86J2i8a8J4okRArBfAKCl2NI8IArvzo0QYw3dooy65bKNTQCfR7ho
-Ke38OF4s1iM66UVw0uJv4cw=
-=ZbjO
+iD8DBQFF/ugbQlM6RnzZP+IRAkNZAKCydPOOSH1F8Z2bSB8KNuJ/OHS4mQCfZAvo
+4P2Y3fFOQWWaiwTW1qWmHjc=
+=ik+n
 -----END PGP SIGNATURE-----

diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.5-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.5-r1.ebuild
new file mode 100644 (file)
index 0000000..f34d730
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.5-r1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2007 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.4.5-r1.ebuild,v 1.1 2007/03/19 19:44:21 ticho 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="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="courier ldap milter mysql postgres qmail"
+
+DEPEND=">=sys-apps/sed-4
+       >=dev-lang/perl-5.8.2"
+
+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/zoo
+       dev-perl/Archive-Tar
+       >=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-libnet-1.16
+       dev-perl/IO-stringy
+       >=virtual/perl-Time-HiRes-1.49
+       dev-perl/Unix-Syslog
+       >=sys-libs/db-3.1
+       dev-perl/BerkeleyDB
+       virtual/mta
+       ldap? ( >=dev-perl/perl-ldap-0.33 )
+       mysql? ( dev-perl/DBD-mysql )
+       postgres? ( dev-perl/DBD-Pg )
+       milter? ( || ( >=mail-mta/sendmail-8.12 mail-filter/libmilter ) )"
+
+AMAVIS_ROOT="/var/amavis"
+
+pkg_preinst() {
+       enewgroup amavis
+       enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
+}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       if use courier ; then
+               elog "Patching with courier support."
+               epatch amavisd-new-courier.patch
+       fi
+
+       if use qmail ; then
+               elog "Patching with qmail qmqp support."
+               epatch amavisd-new-qmqpqq.patch
+       fi
+
+       epatch "${FILESDIR}/${PN}-2.4.4-amavisd.conf-gentoo.patch"
+}
+
+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 LICENSE MANIFEST RELEASE_NOTES \
+               README_FILES/* test-messages/sample* amavisd.conf-default amavisd-agent
+
+       if use milter ; then
+               cd "${S}/helper-progs"
+               einstall
+       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() {
+       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/digest-amavisd-new-2.4.5-r1 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.5-r1
new file mode 100644 (file)
index 0000000..fa3876b
--- /dev/null
+++ b/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.5-r1
@@ -0,0 +1,3 @@
+MD5 eef8c03855f9e3a4c6c53c06006d77ea amavisd-new-2.4.5.tar.gz 895870
+RMD160 3167b7660c84e33b59b87f8b437814c074c0e89c amavisd-new-2.4.5.tar.gz 895870
+SHA256 cfd9150878ebaf51b021935ebc19f57be1a39f55194ef5e82f589cf80823ac53 amavisd-new-2.4.5.tar.gz 895870