From 533adace06f9643bd604cd5fa631dc1a2413bc27 Mon Sep 17 00:00:00 2001 From: Eray Aslan Date: Mon, 5 Dec 2011 13:36:54 +0000 Subject: [PATCH] version bump Package-Manager: portage-2.1.10.39/cvs/Linux x86_64 --- mail-filter/maildrop/ChangeLog | 8 +- mail-filter/maildrop/Manifest | 28 ++-- .../maildrop/files/maildrop-2.5.1-db.patch | 2 +- mail-filter/maildrop/maildrop-2.5.5.ebuild | 138 ++++++++++++++++++ 4 files changed, 164 insertions(+), 12 deletions(-) create mode 100644 mail-filter/maildrop/maildrop-2.5.5.ebuild diff --git a/mail-filter/maildrop/ChangeLog b/mail-filter/maildrop/ChangeLog index 014594d51b05..16db9ea2ebfe 100644 --- a/mail-filter/maildrop/ChangeLog +++ b/mail-filter/maildrop/ChangeLog @@ -1,6 +1,12 @@ # 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.122 2011/10/23 20:16:39 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.123 2011/12/05 13:36:53 eras Exp $ + +*maildrop-2.5.5 (05 Dec 2011) + + 05 Dec 2011; Eray Aslan files/maildrop-2.5.1-db.patch, + +maildrop-2.5.5.ebuild: + version bump 23 Oct 2011; Tim Harder -files/maildrop-2.2.0-db4.patch, -maildrop-2.4.2.ebuild, diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest index d85f0f4af5ff..b748ce8cbfd5 100644 --- a/mail-filter/maildrop/Manifest +++ b/mail-filter/maildrop/Manifest @@ -1,23 +1,31 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX maildrop-1.8.1-disable-fam.patch 2511 RMD160 3fc7bf21d425c6e676475458c99a5ed2d4e93469 SHA1 7b6148b485bbc0379fa849a8af2706b93ea22432 SHA256 e4621bbe990d7a90d703e7a8b8cf07bb59655a22a96e62c275352d28c79684a3 -AUX maildrop-2.5.1-db.patch 2498 RMD160 c39895d8df8cad8fa1a5a82657d115bb950c30af SHA1 1c7f5a3c1eae47186684a6833b3653710119bccb SHA256 9740a68669d31e7b7a234f0ddeec8604bd72dff63006ebd98018e955d94d5f8c +AUX maildrop-2.5.1-db.patch 2512 RMD160 ccd1892a5fca50d2104a3e4a0ff8a1c66c9cf798 SHA1 0a4fa8097a299c8fefd69db05e423d8c1b1572d2 SHA256 194985d2da02add048129eddc7ff9a928944a849b5f303eabfdfb2b0a8beceb8 AUX maildrop-2.5.4-reformime.patch 1066 RMD160 789fa7c527e736b4b66fdbaa9299496920317e0c SHA1 eb573520a272b54abfbc100a0c390ee1c426eaf4 SHA256 fc4877c7df306b3fe4df10209a3d4879c05fa4216da998e9f00cb3ec99177e52 AUX maildrop-testsuite.patch 2141 RMD160 3011d0fcef89cb5ca1b2e566c85b3f95a0daee5b SHA1 b7002eb05132a6dde2e5561f3437f59f5fdd0322 SHA256 ab1fc5d152bf59a1063ea51a3a25e68b0ba096c6a8842fddb7d9f2fd735c3ec2 AUX maildroprc 58 RMD160 1d53d6c05cb809bb9d637ae347d9dee1362f1b09 SHA1 a2fd605991606a3bf89296f2d3f3a5f7a7327aba SHA256 2feec7b63d9b3fae442ddab96810929ce4080871c31a1f23401cd3b61d00add1 DIST maildrop-2.5.4.tar.bz2 2082167 RMD160 a71c08fc2951dd122740870186693ac112e59ebd SHA1 6d9514bb1df207a2036779e14e4f0ea350f5d1ee SHA256 7621b4aede007d478dbd8bf88216e0289c18beddd36bbf429e85e3e66ca9e002 +DIST maildrop-2.5.5.tar.bz2 2158846 RMD160 a614d3761c8b35cee0ea838d6ab5239bde4e08dd SHA1 57b307972b884b4f8fea840c56d2ff37f95139a3 SHA256 7484382852075f452850a082454c8c47a65d52f00fe64e0b1a63ed7ccf25288c EBUILD maildrop-2.5.4.ebuild 3779 RMD160 376e13e47b7c7e98c8400060eb1dec1c806cbcb4 SHA1 14098bc0446f39946e4158d49d54d7c1db4d15b1 SHA256 a5aa4400a5cffba21818b631be971f8431d1e575ab606c20d23c09f0e4b39387 -MISC ChangeLog 23110 RMD160 94e7b4cc35460a44add44459ebd1b7ac22545f3d SHA1 a363499ad36497e114d3cc334a3bcac269ffd94b SHA256 278e7c2a54d58cde09713b60fa82a70a4f687db86f3a216ce1e8e41efcdb7445 +EBUILD maildrop-2.5.5.ebuild 3792 RMD160 f6b10b1c44fbc8dc1097724d4a29a7e0181d7232 SHA1 3c05cfaa76067f9a9d5add772cd266cf6b98ca21 SHA256 c6f42d9f8ad41c598b1438604232139bf95c089d7d00f8ecead409b2681b636f +MISC ChangeLog 23253 RMD160 99f8ca702ad21cebc45a7972f9d9080bdcad36a6 SHA1 9d856cb90640de06fdf041cd6229150963257ce1 SHA256 ae86104bb4acb8bb166dcf2514f1d9fb11d37fda8e27c16fb8a5dc536336bce6 MISC metadata.xml 313 RMD160 a54c7c17c1fb1708ba9987cdad3e1f91bafd5e7e SHA1 c030dc401f831ea71224dbec6685200e34798962 SHA256 8e4845f749808afe7959162a14069b0eb59436401ee3a2ed8661a3bdc18fb5fe -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJOpHYtAAoJEEqz6FtPBkyj7tsH/3+78M+CgyR1rT9+m8e1vuGQ -gUJKsYMXKGK1FllmFxEvV4g1OoCl27D9XN/0CU+vsCkCO9IGsW1IndoE8bHYbnqi -c9DgCLvtG6NvwjhJM3VUoQ1I2m/RmoOw/JSdjGM90ttYCm9pkatsCaiK7GsdvK6l -w8Kr9OPvF4Ui74+fb2ZOSE8lV0DYXy6GL18nSeD5FQFN2K4aIyy5REJ73wDyKq5j -jad8CbDnKq+uRhpLIso8v5c7zr5q6moD8zBmFdhyXaqr4ODk5WZVQ/t3jFI6t5qC -ycDYel1F50+joiXehrDdZA/jsK8qHLjnLhlaaxuK9vAHI6SZRfcYPKfYxhVzOTc= -=ijLB +iQIcBAEBCAAGBQJO3Mj7AAoJEHfx8XVYajsfy54P/0s3LuH5Cq1ikB/JD/LQWP88 +VP50hrQEzuwIDzzSidyvwLsTtkZSBJdFYXl1cHWjjhF0pdyz1EqQae/qRuxOQYV7 +AIlphu4uaCtDPh4vD39mmKgEhKXaslDJFGB72+O8WbSWFmceok2pH+twjdFxDeU8 +yTeN0Jac8fmh/JLam6I/eALQflp3sOW4tHUlMZvoKaaJ3YUXx780TCp1AwSbmrq6 +mawJNpyWcSRA/3xkrSvFs86nycQ8whd++MGefxDdf1SbpO7ID4mfKXu9P1lgJyqN +0Mk5/puMsa0VELOQPgXIaqzOCP77J9DuuHRDTCwwBxpaxA+DBWr43yMNunvhPmo4 +a2DPlomR5NfQro5X6mm8zrZ6CNpDUcpZeVC/0N4LruZZERDZ6A4smjrMkcmDN3zS +Cy7CYWzMqV1aTMSD4LFyOFhlx7Kt6Iuowxozyc2ubW1ThdvsS3ysy0ePinaHDyHS +1p1dFzBEtULGtg1XzjM8mjtr7+Zth4faheRe2Ugq/iQyaVqUSwumq0SBW2PTUYew +0x3xd2/nXvkmDWW70GLj1AQ6h8ULUCgE2y4k81YQ0E+c1ZjtxWa/Vgtewg/2ynCC +RXvl4k2h6xOFTMDEplxd7jwFYnWBPJiF/P8vePn9VAQ2SN3U0rQuQ9BtQun0+E2f +vACNDM+jJC8NEauYbEMm +=OCfw -----END PGP SIGNATURE----- diff --git a/mail-filter/maildrop/files/maildrop-2.5.1-db.patch b/mail-filter/maildrop/files/maildrop-2.5.1-db.patch index e88662a36008..4930fb0d155c 100644 --- a/mail-filter/maildrop/files/maildrop-2.5.1-db.patch +++ b/mail-filter/maildrop/files/maildrop-2.5.1-db.patch @@ -8,7 +8,7 @@ - AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"], - AC_CHECK_LIB(db, db_env_create, [ LIBDB=-ldb; LIBS="-ldb $LIBS"]) - )) -+for dbname in db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db ++for dbname in db-5.2 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db + do + AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], + AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], diff --git a/mail-filter/maildrop/maildrop-2.5.5.ebuild b/mail-filter/maildrop/maildrop-2.5.5.ebuild new file mode 100644 index 000000000000..c4a903b7b6ac --- /dev/null +++ b/mail-filter/maildrop/maildrop-2.5.5.ebuild @@ -0,0 +1,138 @@ +# 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.5.5.ebuild,v 1.1 2011/12/05 13:36:53 eras Exp $ + +EAPI=4 + +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 ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="berkdb debug fam gdbm ldap mysql postgres static-libs authlib +tools" + +CDEPEND="!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 ) + ) + tools? ( + !mail-mta/netqmail + !net-mail/courier-imap + !mail-mta/mini-qmail + )" +DEPEND="${CDEPEND} + dev-util/pkgconfig" +RDEPEND="${CDEPEND} + dev-lang/perl" +REQUIRED_USE="mysql? ( authlib ) + postgres? ( authlib ) + ldap? ( authlib )" + +S=${WORKDIR}/${P%%_pre} + +src_prepare() { + # 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.5.1-db.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 econf anyway + sed -i -e \ + 's~AC_MSG_ERROR(Cannot determine default mailbox)~SPOOLDIR="./.maildir"~' \ + "${S}"/maildrop/configure.in || die "sed failed" + epatch "${FILESDIR}"/${PN}-testsuite.patch + eautoreconf +} + +src_configure() { + local myconf + local mytrustedusers="apache dspam root mail fetchmail" + mytrustedusers+=" 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 \ + --enable-sendmail=/usr/sbin/sendmail \ + --cache-file="${S}"/configuring.cache \ + $(use_enable static-libs static) \ + ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install + + fperms 4755 /usr/bin/maildrop + + dodoc AUTHORS ChangeLog INSTALL NEWS README \ + README.postfix UPGRADE maildroptips.txt + docinto unicode + dodoc unicode/README + docinto maildir + dodoc maildir/AUTHORS maildir/INSTALL maildir/README*.txt + + # bugs #61116 #374009 + if ! use tools ; then + for tool in "maildirmake" "deliverquota"; do + rm "${D}/usr/bin/${tool}" + rm "${D}/usr/share/man/man"[0-9]"/${tool}."[0-9] + rm "${D}/usr/share/maildrop/html/${tool}.html" + done + rm "${D}/usr/share/man/man5/maildir.5" + fi + + dodir "/usr/share/doc/${PF}" + mv "${D}/usr/share/maildrop/html" "${D}/usr/share/doc/${PF}/" || die + rm -rf "${D}"/usr/share/maildrop + + dohtml *.html maildir/*.html + + insinto /etc + doins "${FILESDIR}"/maildroprc +} -- 2.26.2