Revision bump to pull in more patches to fix bug #538892
authorFabian Groffen <grobian@gentoo.org>
Wed, 11 Feb 2015 20:42:30 +0000 (20:42 +0000)
committerFabian Groffen <grobian@gentoo.org>
Wed, 11 Feb 2015 20:42:30 +0000 (20:42 +0000)
Package-Manager: portage-2.2.14-prefix/cvs/SunOS i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

mail-client/mutt/ChangeLog
mail-client/mutt/Manifest
mail-client/mutt/mutt-1.5.23-r6.ebuild [new file with mode: 0644]

index 7e4bc67d2c71c3de4a4c6090e135cf43c2f93bb3..7564559aba67be210c1161481ee16da0a288ecea 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/mutt
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.273 2015/01/10 20:42:04 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.274 2015/02/11 20:42:22 grobian Exp $
+
+*mutt-1.5.23-r6 (11 Feb 2015)
+
+  11 Feb 2015; Fabian Groffen <grobian@gentoo.org> +mutt-1.5.23-r6.ebuild:
+  Revision bump to pull in more patches to fix bug #538892
 
 *mutt-1.5.23-r5 (10 Jan 2015)
 
index 2d743c8638ef64a440da8f542faa758eb404cb1d..5fccdf654b87a06231c0cc2f9faceaed67f12873 100644 (file)
@@ -7,15 +7,17 @@ AUX mutt-1.5.22-cve-2014-0567.patch 564 SHA256 493c7c47a0ae36fb70f07e16de7740cd9
 DIST mutt-1.5.22-gentoo-patches-r2.tar.bz2 81259 SHA256 d4ec35bfaf51276645feb9a7808455e6970aa2c171ed9767d2c6c2f3c9c60f5c SHA512 99b5c37dcd74aabc6c8673321aa13d00dab6bf82ad593ede920897921d633903d1de7fc4a80e04cccf0a5d7673560cb7a4e94830fcae27b60d696cb65315ba50 WHIRLPOOL c164faa5822a8181497a57526dcfe123e2fd5d0aa4db76c702a3794a1adb0fdb56377c4471464828617e44beadd7cd7509c2145fb7ae038b753b61be826bf6ba
 DIST mutt-1.5.22.tar.gz 3782237 SHA256 8feae890ed0758a5108bafaef27bd8fc9c378675acf25a3c620f2c7b7540f3a7 SHA512 96edfafa9460bbaff1c5a78f40735599f53e08f794866822558d59e351646b1d2045afbf97000012a6d9f261649e9b473c01f89ade542712120f9213c657b0a1 WHIRLPOOL 4c13c6f667a8990b933c8e25f43e96ba0562785b4038776949abea45454a1621bf1bb9351a52bec3d69909b9dc643de7f7ba383119f1ab8b20cea77d0bad1da9
 DIST mutt-1.5.23-gentoo-patches-r5.tar.bz2 127745 SHA256 a2c457071b17fc1886c8f0d24728df388c5c90eed3276783db061b92212786f3 SHA512 8f89abcca7048a24f5e37190b479f724eb51eb6a1703bc419c9f200f4ad1cb544fa7283ea6d76519f002aed26c9c2f54bd14e89b845001755a0b98e3317b39f8 WHIRLPOOL 04843ec6df35a34b2f601caaff60c6cd2fe16ab66946c6ab0a3be0ff4570743fdc365f7fb28c00c16b6d88e299d0b1b8fac86e8936474e170d1f0d2331209e2c
+DIST mutt-1.5.23-gentoo-patches-r6.tar.bz2 146133 SHA256 8d86fd8ce3be2febf9e13963d5a33088cea34d42e7d5f0eca7fd1bed5cfb12cc SHA512 f6901c1afe651b96a7159a4151738bc2492e9edc4f5f462586278cb2e999affb18e469f81490f3d14b4841bbe8faab32458568795c25784f9d59b30f57278863 WHIRLPOOL 3f9e07ec9eaf029a636e0fb4e1f0723ff4cc202195574748a14ae2950fde6af94f428f017129bcd550caae87dc28933dd0d93bcb7d2066f36255c93da4a5b4f9
 DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854a16cdccd24e5e502626fd37 SHA512 f1b4a7230253651857f61bd7215cce870a613012f613d4c907d401556083726c8ed7d429d57a8bf858c3b5b23683380d4c1494540d86ca80813e22cb6b95bc1e WHIRLPOOL b5a676d204aece8c572d57a027fa5a402b7afe8e5b7d4c83b2d1b1612eb0ac5cb58cd225757732a017f03444e0ea42dacffcf1cf2d46c18ae92d7d3306059c61
 EBUILD mutt-1.5.22-r3.ebuild 8065 SHA256 3260d057237723540fa6b50fd0b4c3bed88e378dae06e4efcf517612acc7d709 SHA512 08693a8c7ae8489dede2d00436d035dbfdcb254219090c02fdfc1722e3ca03068872875d2054535d1c681120b1c01d798af6f43424d6085b94f33aa502224c9a WHIRLPOOL ffe81ecf525b2def51b9e810e786e498f7aa1b31684f38f2138f49e02fdb636bb78c99c1316f3788ebba158189dc967cb748a56aa15d05effec065a09cb7217d
 EBUILD mutt-1.5.23-r5.ebuild 8061 SHA256 e2b9a86f86ff92716573bfa8b636c770ad8bb58d403228bb5b858f93c5be9056 SHA512 371bd1a6db3f3c85544b21c9660d28abbce361538efdd39fdd3e4135f7af5c2642b34f00f65df518d9b479a862566fb6ac4d2f8494e6673f92cd9241ac7e139d WHIRLPOOL 3881ca4cf6cf8962f4f13a6c1fdc198d4b2710bfc45082630e39552160d17816e9ff25bfc8304e9ee5b57fce43c0b633f2302d17e58f38f6c469b8ac53b21c71
-MISC ChangeLog 57975 SHA256 b16605d1d5a3b5bc73a17c1a099e9c2d064adf042fa0485082d04deb3590cb53 SHA512 e5f8c440800d732f176b03fb38487a7e64c3286aec843d14a3a5e24910b6c15174094c79dafda748053aebad4a886e9ee84cf97c111af3d4ce4c22aad4aaf4f9 WHIRLPOOL e786575944283839b35ff73b8252ab407dbdc1237cb72a199bd4ee4ab6f1e155d04e357b062a3da25000d58c253bcd23cea41f4904d3495a514df878ce1ca3d4
+EBUILD mutt-1.5.23-r6.ebuild 8061 SHA256 2cec4d5d35a2fa491e5d4e600a6f70c4c06a9f1622a675d2647d96622c178ea7 SHA512 584bac905b7cc2df0376b59b8db409a8099de96f6600cc47877051200dc7561447454d7bdc10baf94945389504c59c83578a2ede39ecf5769e1c12222d15f33a WHIRLPOOL 3ce70c735610bc0cd3a22dc2c7b97449be607d64bbe9aa3dcd212d5f62b3305b980d0ab195c06ad0b0bba8a0bdbdd9c060bd66bdd454081350f6beb8fed319f2
+MISC ChangeLog 58141 SHA256 a9c5977bb06bd5c63164da1d15ca36e303a87a110b8c805e2bdf7068e8d5fed5 SHA512 accc444985cddbd1bc37ca4243a7938b982a37bec79ca3e43f0720ab8ca996bcd8f68f1a0a1b2ce98ba97ae1c893ff246d6501242bbe3d1897824a416306c526 WHIRLPOOL 5ebd43207dd17b081c29303930e5366cbcb9fecb9a335b1cc210bfb75a7215226dece15935c57e9b55f4cf3819af5ee86209f77a0aa842417cf9b187d816972f
 MISC metadata.xml 650 SHA256 b7ca8aa383b947a5e90eafab3839a9ed2a8c4f36f4890fec19636d774ccf5320 SHA512 26cb0a77d35e30432a88cf487d61da45c52967e8327f605a25f97a455fbb0eb518a44e589e140fa55cd7610b8fd22861c0149ef4ebaadd78173cbf8431adee5a WHIRLPOOL e4a73bbce432f77cc336bc93fed13ac6fc4e0e651643cc06402488383c5297a360c59a90e7e67667e2b48a564f10e5169282fe053a5426ee5f186338eddd2cee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSxjp0ACgkQX3X2B8XHTonrWACfQBdrYMlBjd7e9FD7KDx6FciC
-F2AAnRQe+NJnjC3UC9YC4r1dk1BRtI/7
-=V9NR
+iEYEAREIAAYFAlTbvrMACgkQX3X2B8XHTon0tACggTJt9ho4wP7pXiCTZ6rQ7UiX
+lpsAnRv/UZdcS0YYVIDorrQ0hPuLc5hK
+=/egt
 -----END PGP SIGNATURE-----
diff --git a/mail-client/mutt/mutt-1.5.23-r6.ebuild b/mail-client/mutt/mutt-1.5.23-r6.ebuild
new file mode 100644 (file)
index 0000000..7bc3db2
--- /dev/null
@@ -0,0 +1,250 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.23-r6.ebuild,v 1.1 2015/02/11 20:42:22 grobian Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic autotools
+
+PATCHSET_REV="-r6"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+       mirror://bitbucket/${PN}/${PN}/downloads/${P}.tar.gz
+       ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
+       mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
+       http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+CDEPEND="
+       app-misc/mime-types
+       nls? ( virtual/libintl )
+       tokyocabinet?  ( dev-db/tokyocabinet )
+       !tokyocabinet? (
+               qdbm?  ( dev-db/qdbm )
+               !qdbm? (
+                       gdbm?  ( sys-libs/gdbm )
+                       !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
+               )
+       )
+       imap?    (
+               gnutls?  ( >=net-libs/gnutls-1.0.17 )
+               !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+               sasl?    ( >=dev-libs/cyrus-sasl-2 )
+       )
+       kerberos? ( virtual/krb5 )
+       pop?     (
+               gnutls?  ( >=net-libs/gnutls-1.0.17 )
+               !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+               sasl?    ( >=dev-libs/cyrus-sasl-2 )
+       )
+       smtp?     (
+               gnutls?  ( >=net-libs/gnutls-1.0.17 )
+               !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+               sasl?    ( >=dev-libs/cyrus-sasl-2 )
+       )
+       idn?     ( net-dns/libidn )
+       gpg?     ( >=app-crypt/gpgme-0.9.0 )
+       smime?   ( >=dev-libs/openssl-0.9.6 )
+       slang? ( sys-libs/slang )
+       !slang? ( >=sys-libs/ncurses-5.2 )
+"
+DEPEND="${CDEPEND}
+       net-mail/mailbase
+       doc? (
+               dev-libs/libxml2
+               dev-libs/libxslt
+               app-text/docbook-xsl-stylesheets
+               || ( www-client/lynx www-client/w3m www-client/elinks )
+       )"
+RDEPEND="${CDEPEND}
+       selinux? ( sec-policy/selinux-mutt )
+"
+PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
+
+src_prepare() {
+       # Post-release hot-fixes grabbed from HG, this is what all following
+       # patches are based on in my Mercurial patchqueue (mq).
+       # If you ever take over or need to modify patches here, just check
+       # out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
+       # the patchqueue as it'll save you a lot of work.
+       # http://prefix.gentooexperimental.org:8000/mutt/
+       # http://prefix.gentooexperimental.org:8000/mutt-patches/
+       for rev in $(eval echo {0..${PR#r}}) ; do
+               local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
+               [[ -e ${revpatch} ]] && \
+                       epatch "${revpatch}"
+       done
+       # fix compilation with ncurses[tinfo], #459260
+       epatch "${PATCHDIR}"/ncurses-tinfo.patch
+
+       # this patch is non-generic and only works because we use a sysconfdir
+       # different from the one used by the mailbase ebuild
+       use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
+
+       # must have fixes to compile or behave correctly, upstream
+       # ignores, disagrees or simply doesn't respond/apply
+       epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
+       # same category, but functional bits
+       epatch "${PATCHDIR}"/dont-reveal-bbc.patch
+
+       # the big feature patches that upstream doesn't want to include, but
+       # nearly every distro has due to their usefulness
+       for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
+               epatch "${p}"
+       done
+
+       # we conditionalise this one, simply because it has considerable
+       # impact on the code
+       if use sidebar ; then
+               epatch "${PATCHDIR}"/sidebar-20140412.patch
+               epatch "${PATCHDIR}"/sidebar-dotpathsep.patch
+               epatch "${PATCHDIR}"/sidebar-counts.patch
+       fi
+
+       local upatches=
+       # allow user patches
+       epatch_user && upatches=" with user patches"
+
+       # patch version string for bug reports
+       sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${upatches}"')"/' \
+               muttlib.c || die "failed patching in Gentoo version"
+
+       # many patches touch the buildsystem, we always need this
+       AT_M4DIR="m4" eautoreconf
+
+       # the configure script contains some "cleverness" whether or not to setgid
+       # the dotlock program, resulting in bugs like #278332
+       sed -i -e 's/@DOTLOCK_GROUP@//' \
+               Makefile.in || die "sed failed"
+
+       # don't just build documentation (lengthy process, with big dependencies)
+       if use !doc ; then
+               sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
+       fi
+}
+
+src_configure() {
+       local myconf="
+               $(use_enable crypt pgp) \
+               $(use_enable debug) \
+               $(use_enable gpg gpgme) \
+               $(use_enable imap) \
+               $(use_enable nls) \
+               $(use_enable nntp) \
+               $(use_enable pop) \
+               $(use_enable smime) \
+               $(use_enable smtp) \
+               $(use_with idn) \
+               $(use_with kerberos gss) \
+               $(use slang && echo --with-slang) \
+               --enable-compressed \
+               --enable-external-dotlock \
+               --enable-nfs-fix \
+               --sysconfdir=${EPREFIX}/etc/${PN} \
+               --with-curses \
+               --with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR} \
+               --with-regex \
+               --with-exec-shell=${EPREFIX}/bin/sh"
+
+       case $CHOST in
+               *-solaris*)
+                       # Solaris has no flock in the standard headers
+                       myconf="${myconf} --enable-fcntl --disable-flock"
+               ;;
+               *)
+                       myconf="${myconf} --disable-fcntl --enable-flock"
+               ;;
+       esac
+
+       # mutt prioritizes gdbm over bdb, so we will too.
+       # hcache feature requires at least one database is in USE.
+       if use tokyocabinet; then
+               myconf="${myconf} --enable-hcache \
+                       --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+       elif use qdbm; then
+               myconf="${myconf} --enable-hcache \
+                       --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
+       elif use gdbm ; then
+               myconf="${myconf} --enable-hcache \
+                       --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
+       elif use berkdb; then
+               myconf="${myconf} --enable-hcache \
+                       --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
+       else
+               myconf="${myconf} --disable-hcache \
+                       --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+       fi
+
+       # there's no need for gnutls, ssl or sasl without socket support
+       if use pop || use imap || use smtp ; then
+               if use gnutls; then
+                       myconf="${myconf} --with-gnutls"
+               elif use ssl; then
+                       myconf="${myconf} --with-ssl"
+               fi
+               # not sure if this should be mutually exclusive with the other two
+               myconf="${myconf} $(use_with sasl)"
+       else
+               myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
+       fi
+
+       if use mbox; then
+               myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
+       else
+               myconf="${myconf} --with-homespool=Maildir"
+       fi
+
+       econf ${myconf} || die "configure failed"
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die "install failed"
+       if use mbox; then
+               insinto /etc/mutt
+               newins "${FILESDIR}"/Muttrc.mbox Muttrc
+       else
+               insinto /etc/mutt
+               doins "${FILESDIR}"/Muttrc
+       fi
+
+       # A newer file is provided by app-misc/mime-types. So we link it.
+       rm "${ED}"/etc/${PN}/mime.types
+       dosym /etc/mime.types /etc/${PN}/mime.types
+
+       # A man-page is always handy, so fake one
+       if use !doc; then
+               emake -C doc DESTDIR="${D}" muttrc.man || die
+               # make the fake slightly better, bug #413405
+               sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
+                       -e 's#in @docdir@,#at http://www.mutt.org/,#' \
+                       -e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
+                       -e "s#@bindir@#${EPREFIX}/usr/bin#" \
+                       doc/mutt.man > mutt.1
+               cp doc/muttbug.man flea.1
+               cp doc/muttrc.man muttrc.5
+               doman mutt.1 flea.1 muttrc.5
+       else
+               # nuke manpages that should be provided by an MTA, bug #177605
+               rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
+                       || ewarn "failed to remove files, please file a bug"
+       fi
+
+       if use !prefix ; then
+               fowners root:mail /usr/bin/mutt_dotlock
+               fperms g+s /usr/bin/mutt_dotlock
+       fi
+
+       dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}
+
+pkg_postinst() {
+       echo
+       elog "If you are new to mutt you may want to take a look at"
+       elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
+       elog "   http://www.gentoo.org/doc/en/guide-to-mutt.xml"
+       echo
+}