From: Eray Aslan Date: Wed, 27 Jul 2011 18:24:29 +0000 (+0000) Subject: backport some fixes from 2.5.4 for testing X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=12bae1ee76bce32630ceae8074e8bf05855cf112;p=gentoo.git backport some fixes from 2.5.4 for testing Package-Manager: portage-2.1.10.7/cvs/Linux x86_64 --- diff --git a/mail-filter/maildrop/ChangeLog b/mail-filter/maildrop/ChangeLog index 78365be26038..74e0358d1106 100644 --- a/mail-filter/maildrop/ChangeLog +++ b/mail-filter/maildrop/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for mail-filter/maildrop # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.110 2011/07/27 15:35:26 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.111 2011/07/27 18:24:29 eras Exp $ + +*maildrop-2.4.2-r1 (27 Jul 2011) + + 27 Jul 2011; Eray Aslan +maildrop-2.4.2-r1.ebuild: + backport some fixes from 2.5.4 for testing 27 Jul 2011; Eray Aslan maildrop-2.5.4.ebuild: Hopefully fix default mailbox for real now diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest index 9e697594712c..5ef7e9b84b16 100644 --- a/mail-filter/maildrop/Manifest +++ b/mail-filter/maildrop/Manifest @@ -9,26 +9,27 @@ DIST maildrop-2.4.2.tar.bz2 2413925 RMD160 8f7a93ab242ea83f7c9cc07abd13c0e3acae5 DIST maildrop-2.5.1.tar.bz2 2422151 RMD160 0ff5483790e10cc0a4658278c1154b82f2533d03 SHA1 0d44027e4a19195ab92fbb2d4b3480058690882e SHA256 3bf0d63345b5736b82720fdf0ef1b975b502749c9aed968cae4a51e1d2c3e1e9 DIST maildrop-2.5.3.tar.bz2 2082338 RMD160 412f95503013b6745ec0e4ff98815149b0d3fb04 SHA1 cb1d82264a0d1afe6bfb8745605017864bcc135e SHA256 460cfd948d3cca0f47b55c0570a6c0827a541b371de90228f994f666109e1e65 DIST maildrop-2.5.4.tar.bz2 2082167 RMD160 a71c08fc2951dd122740870186693ac112e59ebd SHA1 6d9514bb1df207a2036779e14e4f0ea350f5d1ee SHA256 7621b4aede007d478dbd8bf88216e0289c18beddd36bbf429e85e3e66ca9e002 +EBUILD maildrop-2.4.2-r1.ebuild 3150 RMD160 8c362e9cb8e4092301b4d157df223e4de43cd74c SHA1 9c75f5bc2148a87d41f314305d5d84e768ad02c3 SHA256 d229ac945014070fdcaf06f9237755c5ca61f1b52bfbb1f66646483217dbb91f EBUILD maildrop-2.4.2.ebuild 2843 RMD160 949aa62027ded33663700dea267b60c3e9094f37 SHA1 04a8fe51df3bccd3cc21381a1785f34633721d00 SHA256 3780da207704b88d6fe75e049aa34a3746bded8a328427dabc2e1d20961686e8 EBUILD maildrop-2.5.1.ebuild 2891 RMD160 32c81f58c8a46dc388487c006aeaf3b28e217a65 SHA1 872e7718a1260efb0bee45543fa19a65604f33da SHA256 b7ab48048d48ac1d7988fbe0691aa2aa7891067fc71ecf80c76f51cf1ad456a9 EBUILD maildrop-2.5.3.ebuild 2978 RMD160 c4f9f698af140adabd1afdc5fab3bac62165535e SHA1 a1ce6c7183da491271316691e0d030d2ff3337af SHA256 9819725773e66a16be7838353fc5abc52a979f2f3e6e35c6309dd912f159e747 EBUILD maildrop-2.5.4.ebuild 3677 RMD160 19e4b9a035bab3045515c7817dde83b2b73ce9ff SHA1 04e28ff4bd3d8d07e7988d9a5424244cb4cd918c SHA256 a39262cc6c8495f0c1a27fffcbd6cc5b4168882ad6fc12c14a2f2d9ea0ab9ebe -MISC ChangeLog 21519 RMD160 22b376ebc8675fc0ef2d74afda40d51db00788f6 SHA1 c3c632151509c3e9db00296fb8acd850819fb480 SHA256 4e69402b959136e84f138e68bdd5db0af58eea7eee94ffc245a66566aff59da7 +MISC ChangeLog 21670 RMD160 39fecd7678dae33d9f7a1c3dfcf9c59b28e5cc9f SHA1 86c1c064a4b920e923971b938e468b1a029d26af SHA256 d64fc90c35ea00d2995ae601ced2acda6689d52330ffe28e6a8e1a271d21f0e8 MISC metadata.xml 313 RMD160 a54c7c17c1fb1708ba9987cdad3e1f91bafd5e7e SHA1 c030dc401f831ea71224dbec6685200e34798962 SHA256 8e4845f749808afe7959162a14069b0eb59436401ee3a2ed8661a3bdc18fb5fe -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCAAGBQJOMDBLAAoJEHfx8XVYajsfZ7IQAILOR/xrqMmkCVqT1ybUAz+d -ghA8N/BVl1OlswAJms3vSwndeIjzV9QzPBUhFkbhWsIgepq3RUE2wwW/mU8/Qr7g -BNOBJe5QGlPGs3JxS1DREb8M3OJ8k1ygowAQ3KvMuTqh3OJfih3CQSylRd1OFgEk -Rw7zk0gTMIMLGZ8pdAHFXf2i67m4mH9A0NPX/r8dQcESikrzxi6gnCQhom5upUR4 -7KgcSjbwvz9DrhcclbPI5QYg4zer8G2G2nrvn1VQ3ffR12fdAGifrMHm6dG+wzca -fzHm/bMewV5+Tiv6i56e943YfIPKp1d45NzlqoMtQr52xzdYFFNMWSmEoXFz1gqj -nbgCvppDnQoNb8Dut+nJBeJ3Ryr50aGtUx+acMUqCL1HBIUlnHOPb0z/L53SYznn -kq9nxDYYbC8f+v5xkhGBzHIRaZr89KxBoH8pPpAFxdPQPvdjJsXKd6nvM5XSaYII -dIPCW5REP2wMb+8OwbvPEbuSo9B3MVcoazW4lGP2i0zs1JZHvWuSplfUhzKvMFL1 -77DGnyTm5b+k23SkfA3XiBtWEgSJNiNazszKtU5ZeiD/5P3U6of51g+Ya99viU68 -Em+twP00NjSwAQWTqa8puAZXXN4NhJvrNTulGGATAhB2/JdEtcorgNg7e5ZEkSbZ -g794XmVEv2svOTR4exbe -=oy4q +iQIcBAEBCAAGBQJOMFfrAAoJEHfx8XVYajsfzyMP/2VaWjQKCYHdkAIuOGxxOfev +St8N5gb5xkmsomRsPW3n+ucTyDb7giGnih4S+f/zOtvHXROuFq7WQ2eRLMMY44X0 +uWcRe80AYD13zOYurcuu5iY1CVk2gKeW9nMjfu9ePBCkVceN7luYZtc9qF2LARS3 +pWQpk77suNTjhyx7VvBvJpFysGeUT1VBGnyKEvgzMMbj7wTZS6NVNRslm2x3prnR +XUlIHdOybXHbRtVFnFmuwYL4FiHvyxWy+C+Fim6dtXQzYXs6x7whZ1BY8I1lEF5L +a5WGCkPHqALyysH7XcjhTttVv8WXRp6tcx+7ywEzWDdYRkMWSciZBm9Fn8PflMh0 +KrBfX4dVovw/ukHwWmx9JjrwC8FNTfBFGICPh+PCRmt+UDuVekmxzfHPfA5v0yom +AfqbgEPJ1zUtlvpZwqG01DEZ/pd6d7P16wfGrk3KbJsX9loDE18npPcQl7sDUlKY +9VAXTP8/JiInMFv6gf5XeuhPp3sh4AEgASprcD8bJCRh3Zfr/VqxJhCB2M9/6aoY +HB6NP7UQfQghnbQpRJm2vror2aKS9ay7vhQCLUO5knt58yiN+buWDExQfN9rRWRq +fzQLlJbThbaa0HX/Z5qSxB8t920/n9Qx/6gHyyxJUZnHx6mN1NZ7zayx7ctz6F5M +43Xy1n3G4WY3Z5/mpZrU +=chDx -----END PGP SIGNATURE----- diff --git a/mail-filter/maildrop/maildrop-2.4.2-r1.ebuild b/mail-filter/maildrop/maildrop-2.4.2-r1.ebuild new file mode 100644 index 000000000000..bc385ed1522f --- /dev/null +++ b/mail-filter/maildrop/maildrop-2.4.2-r1.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-2.4.2-r1.ebuild,v 1.1 2011/07/27 18:24:29 eras Exp $ + +EAPI=2 + +inherit eutils flag-o-matic autotools + +DESCRIPTION="Mail delivery agent/filter" +[[ -z ${PV/?.?/} ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" +[[ -z ${PV/?.?.?/} ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" +[[ -z ${SRC_URI} ]] && SRC_URI="http://www.courier-mta.org/beta/${PN}/${P%%_pre}.tar.bz2" +HOMEPAGE="http://www.courier-mta.org/maildrop/" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86" +IUSE="berkdb debug fam gdbm ldap mysql postgres authlib" + +DEPEND="!mail-mta/courier + net-mail/mailbase + dev-libs/libpcre + net-dns/libidn + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + mysql? ( net-libs/courier-authlib ) + postgres? ( net-libs/courier-authlib ) + ldap? ( net-libs/courier-authlib ) + authlib? ( net-libs/courier-authlib ) + fam? ( virtual/fam ) + !gdbm? ( + berkdb? ( + >=sys-libs/db-3 + ) + )" +RDEPEND="${DEPEND} + dev-lang/perl" + +S=${WORKDIR}/${P%%_pre} + +src_prepare() { +# epatch "${FILESDIR}"/${PN}-2.0.4-makedat.patch + + # Prefer gdbm over berkdb + if use gdbm ; then + use berkdb && elog "Both gdbm and berkdb selected. Using gdbm." + elif use berkdb ; then + epatch "${FILESDIR}"/${PN}-2.2.0-db4.patch + fi + + if ! use fam ; then + epatch "${FILESDIR}"/${PN}-1.8.1-disable-fam.patch + fi + + # no need to error out if no default - it will be given to configure anyway + sed -i -e \ + 's~AC_MSG_ERROR(Cannot determine default mailbox)~SPOOLDIR="./.maildir"~' \ + "${S}"/maildrop/configure.in + + eautoreconf +} + +src_configure() { + local myconf + local mytrustedusers="apache dspam root mail fetchmail \ + daemon postmaster qmaild mmdf vmail alias" + + # These flags make maildrop cry + replace-flags -Os -O2 + filter-flags -fomit-frame-pointer + + if use gdbm ; then + myconf="${myconf} --with-db=gdbm" + elif use berkdb ; then + myconf="${myconf} --with-db=db" + else + myconf="${myconf} --without-db" + fi + + if ! use mysql && ! use postgres && ! use ldap && ! use authlib ; then + myconf="${myconf} --disable-authlib" + fi + + # Default mailbox is $HOME/.maildir for Gentoo + maildrop_cv_SYS_INSTALL_MBOXDIR="./.maildir" econf \ + $(use_enable fam) \ + --disable-dependency-tracker \ + --with-devel \ + --disable-tempdir \ + --enable-syslog=1 \ + --enable-use-flock=1 \ + --enable-use-dotlock=1 \ + --enable-restrict-trusted=1 \ + --enable-trusted-users="${mytrustedusers}" \ + --enable-maildrop-uid=root \ + --enable-maildrop-gid=mail \ + --with-default-maildrop=./.maildir/ \ + --enable-sendmail=/usr/sbin/sendmail \ + --cache-file="${S}"/configuring.cache \ + ${myconf} +} + +src_install() { + make DESTDIR="${D}" install || die + + fperms 4755 /usr/bin/maildrop + + dodoc AUTHORS ChangeLog INSTALL NEWS README \ + README.postfix UPGRADE maildroptips.txt || die + + dodir /usr/share/doc/${PF} + mv "${D}"/usr/share/maildrop/html "${D}"/usr/share/doc/${PF}/ + + dohtml {INSTALL,README,UPGRADE}.html || die + + insinto /etc + doins "${FILESDIR}"/maildroprc || die +}