Revbump for possible SASL problem (bug #505804) and updated sidebar (bug #491514)

Package-Manager: portage-2.2.14_rc1-prefix/cvs/Darwin i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

3 files changed, 260 insertions, 5 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 6154b3320c39..44313ebf3161 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/mutt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.269 2014/10/24 17:30:36 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.270 2014/10/24 18:24:05 grobian Exp $
+
+*mutt-1.5.23-r3 (24 Oct 2014)
+
+  24 Oct 2014; Fabian Groffen <grobian@gentoo.org> +mutt-1.5.23-r3.ebuild:
+  Revbump for possible SASL problem (bug #505804) and updated sidebar (bug
+  #491514)
 
   24 Oct 2014; Fabian Groffen <grobian@gentoo.org> mutt-1.5.23-r2.ebuild:
   Remove obsolete configure option, bug #515336
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 403e597054b1..5df28944b6d8 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -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-r2.tar.bz2 87389 SHA256 5d1affbaa353a5e5e10aafe805e962f30a259e96f3448205a414b4e92131402f SHA512 93c95411f99f5dfc96478ed749622105da660102a9fdcd0365caf93138b800b27879633fed53f0b6bb4f712bb0b82d523ce307464fdf6c2e78f2353d73818ff3 WHIRLPOOL 9371116119ae4b04539c9e6049f3745a0536a9a28ae1a6d8acdfedb9e60b7fa131d914ccbee10578c8ac59f343ca8469d05af4b2a777b4cbc4543fb6702650dd
+DIST mutt-1.5.23-gentoo-patches-r3.tar.bz2 122922 SHA256 04bdc47ecc8db8d2912bc0e486e5fcbdda90ef8fb7112ad1e946e7d36378d5e8 SHA512 4c6ec21a52c8463a44f310c3278090cd4b4754b4cbd657e3045bb0b8fb8509aa002334636cc5351f209ed30f7dcf4562e0330165d16d25ef64bec0e4a723615b WHIRLPOOL fd70806275378823375590b7a9b1124b0b11cf8c91cecba7ea504e13f1b579dde908b5be86970214adee090f57b75c59d8e7b494cba2d510d2569e1e07ba8dc8
 DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854a16cdccd24e5e502626fd37 SHA512 f1b4a7230253651857f61bd7215cce870a613012f613d4c907d401556083726c8ed7d429d57a8bf858c3b5b23683380d4c1494540d86ca80813e22cb6b95bc1e WHIRLPOOL b5a676d204aece8c572d57a027fa5a402b7afe8e5b7d4c83b2d1b1612eb0ac5cb58cd225757732a017f03444e0ea42dacffcf1cf2d46c18ae92d7d3306059c61
 EBUILD mutt-1.5.22-r3.ebuild 8041 SHA256 d29454a4795ccd8c725eb1a64d1d60706500f5e3eb04b95bf90105500007c712 SHA512 c5b2e0d93d3e8217c32e547abac76bdf79e81aa5228939145dc8d0e9a4f137db682356c70287f4ba4816b857ee14144faabfe5027d00364075c1c0b801b14c04 WHIRLPOOL 0d545ffb228749103f2dd9d6a114ad066d9a380ba7b04be01634092850ea188f37d60ebc9b63fe32737d3a50f902cba4c8c8845a73f6ffc4db4849dc9640ec48
 EBUILD mutt-1.5.23-r2.ebuild 8029 SHA256 03b8f09b525fe44136a0a3abcec3c37d7e0e713eeeec7ed77abbc49db7d095d1 SHA512 79be6acfbd3d3d7bb4cc9ed21ba9d457b8734ec2da766cfe8d33f386573785e3153c653f0830bbf5bbf03a049d72a51830e214d5b223c5de54a790a566564575 WHIRLPOOL ba88b3775118de6c723bb728f263b4382d45080cfb00e6ab07fb88d735270c333ccd85a4ef279c3e225e9cf094c8025e74661581afb912fa0103da8bf924c492
-MISC ChangeLog 57107 SHA256 cba1010672925913e94c003c79b8287c06b371d33db7bb94012857cf2275f40e SHA512 de50fcef884b9c7765af18f879754404da3bb1a00dd6abf3003b645222bcab559ccb45d5fa8418583897eba8bedc24e7a55b790efab5668fa8272c521ff52d96 WHIRLPOOL ad3f4c9f779c96258777b04260ea57357673fc9e0ad1d41908c35976bf036489492425568406b4b91b83cdb6c55e1288eb318968b3122fc2617c92cded1ea786
+EBUILD mutt-1.5.23-r3.ebuild 7948 SHA256 9a84c5ef904be180b475f7b699cafeab2f61b47be3d40062393bf491fc1c86b1 SHA512 03b3b0e523d9fa20bf557e4a8a706d410d6e04f38ca837e10b41a6b3703beb3373459807f6122555a39dad69b6b81aeb682e82b325ebb2bfbb624a5223ff81e8 WHIRLPOOL 69b70f921cb56f051ef552b7b4715b60b57cc72a9c8bd90fdd99a990167c1e37b6a8ac9fd5043006a96c987b5c7ddcb020caa21825793cf06c5a36d6a89fc9d0
+MISC ChangeLog 57300 SHA256 96b217f4020c65565fe091f8bad585232d839aa1569b3fac755a0fc6fa86c684 SHA512 4a84f957b3ead525db031867d4e2027d60c053d59b89959ad4fa91e061146d11974e1cf20777909cba0c0849257140a58ccd70569ff9b1a390a022560050c4f7 WHIRLPOOL 79f0a57138cf40863f36181ffe9de0e899f2d17b860a5f2313d301072c857d5e952432802973731538cc79f546c904492a0735dfe234684232b373201c2c8018
 MISC metadata.xml 650 SHA256 b7ca8aa383b947a5e90eafab3839a9ed2a8c4f36f4890fec19636d774ccf5320 SHA512 26cb0a77d35e30432a88cf487d61da45c52967e8327f605a25f97a455fbb0eb518a44e589e140fa55cd7610b8fd22861c0149ef4ebaadd78173cbf8431adee5a WHIRLPOOL e4a73bbce432f77cc336bc93fed13ac6fc4e0e651643cc06402488383c5297a360c59a90e7e67667e2b48a564f10e5169282fe053a5426ee5f186338eddd2cee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRKjL0ACgkQX3X2B8XHTokAgQCfYPDGx4zL525Sk+SlnqtLjsf1
-/YcAnA8UzKQ4ZRRBBkYSs/l5f67kntIM
-=JfEr
+iEYEAREIAAYFAlRKmUcACgkQX3X2B8XHTolyGQCfbxt5DZNT6TjTEZXQ3Yh/hYf/
+paUAmweuHnPmfP0lSqK4z0XbdXwjIzOU
+=pfIi
 -----END PGP SIGNATURE-----
diff --git a/mail-client/mutt/mutt-1.5.23-r3.ebuild b/mail-client/mutt/mutt-1.5.23-r3.ebuild
new file mode 100644
index 000000000000..6d2ef44bf6ee
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.23-r3.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2014 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-r3.ebuild,v 1.1 2014/10/24 18:24:05 grobian Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic autotools
+
+PATCHSET_REV="-r3"
+
+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"
+RDEPEND="
+	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 )
+	selinux? ( sec-policy/selinux-mutt )
+	slang? ( sys-libs/slang )
+	!slang? ( >=sys-libs/ncurses-5.2 )
+"
+DEPEND="${RDEPEND}
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| ( www-client/lynx www-client/w3m www-client/elinks )
+	)"
+
+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
+	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
+}