Fix smime sign handling wrt bug #113593

(Portage version: 2.0.51.22-r3)

5 files changed, 241 insertions, 17 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 0ab620866e9b..a9b584831b15 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/mutt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.68 2005/11/25 12:48:37 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.69 2005/11/26 11:58:58 ferdy Exp $
+
+*mutt-1.5.11-r1 (26 Nov 2005)
+
+  26 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/mutt-1.5.11-fix-smime.patch, +mutt-1.5.11-r1.ebuild:
+  Fix smime sign handling wrt bug #113593
 
   25 Nov 2005; Fabian Groffen <grobian@gentoo.org> mutt-1.5.11.ebuild:
   Marked ppc-macos (bug #112609)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 27d1c13b05c1..06dd2daf2e2b 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,22 +1,25 @@
+MD5 eed6148e7212fc949395a3ba0dc2a605 mutt-1.5.11-r1.ebuild 5771
+MD5 b684c056a91bcad2e4f3d99c9332c1a0 mutt-1.5.8-r2.ebuild 4961
+MD5 327b8e25b061f5295baca07bfddab43d mutt-1.5.10-r1.ebuild 5581
+MD5 1c38dd768b918e43ecb4da6a50184a0e mutt-1.5.11.ebuild 5698
+MD5 cb2a1c4875a1f091afd9577f4f61d2e8 mutt-1.5.8-r1.ebuild 4605
+MD5 8838ca64d9cd8c5e27b83645106b1ddc mutt-1.5.9.ebuild 6268
+MD5 dc42018781b04e0934dcfc4f3a6e6303 mutt-1.4.2.1.ebuild 3331
 MD5 eb77b458ad79bcbb78ede057640947b7 ChangeLog 19605
-MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531
+MD5 ab8fa36a71860fbc36c89a2c91745d28 metadata.xml 348
+MD5 b6fc34b06ff62e2d791baff50be9c43a files/mutt-1.5.11-sasl.patch 777
 MD5 6064ff5a3d1a71ccdb48f88872feb3a3 files/Muttrc 667
+MD5 3f1450d2a3bdb1e595bf5820239364cc files/digest-mutt-1.5.9 659
+MD5 2dfbb4deb083480353ea66f578066061 files/mutt-1.5.9-sasl.patch 1378
+MD5 b1da3a7a15479e6c5f08fb96c33b201e files/mutt-1.5.9-nodoc.patch 382
 MD5 30ce590d0284ffb0896857714c6a47d4 files/Muttrc.mbox 486
-MD5 cae412df424c3f499c539c93ebd02e48 files/digest-mutt-1.4.2.1 292
-MD5 7beb1d2025d90ce7e9e6772507627431 files/digest-mutt-1.5.10-r1 655
-MD5 dfc509d0b1283134c72b0be93dcb1815 files/digest-mutt-1.5.11 653
+MD5 3711d75d5d4a7d648166dcbfad6e10a3 files/mutt-1.5.10-nodoc.patch 406
 MD5 17ca1e2a5696251d01b9b488bcb0fc79 files/digest-mutt-1.5.8-r1 581
 MD5 2f50af3ba9259b1ac0dcf7faa2e9545e files/digest-mutt-1.5.8-r2 662
-MD5 3f1450d2a3bdb1e595bf5820239364cc files/digest-mutt-1.5.9 659
-MD5 3711d75d5d4a7d648166dcbfad6e10a3 files/mutt-1.5.10-nodoc.patch 406
-MD5 b6fc34b06ff62e2d791baff50be9c43a files/mutt-1.5.11-sasl.patch 777
-MD5 b1da3a7a15479e6c5f08fb96c33b201e files/mutt-1.5.9-nodoc.patch 382
-MD5 2dfbb4deb083480353ea66f578066061 files/mutt-1.5.9-sasl.patch 1378
+MD5 7beb1d2025d90ce7e9e6772507627431 files/digest-mutt-1.5.10-r1 655
+MD5 dfc509d0b1283134c72b0be93dcb1815 files/digest-mutt-1.5.11-r1 653
+MD5 84043a248b5e649cd1e4d18ca06a82dc files/mutt-1.5.11-fix-smime.patch 314
+MD5 dfc509d0b1283134c72b0be93dcb1815 files/digest-mutt-1.5.11 653
+MD5 cae412df424c3f499c539c93ebd02e48 files/digest-mutt-1.4.2.1 292
+MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531
 MD5 25e242fd402f42d5bd5230dbe9ea68a6 files/slang.patch 493
-MD5 ab8fa36a71860fbc36c89a2c91745d28 metadata.xml 348
-MD5 dc42018781b04e0934dcfc4f3a6e6303 mutt-1.4.2.1.ebuild 3331
-MD5 327b8e25b061f5295baca07bfddab43d mutt-1.5.10-r1.ebuild 5581
-MD5 1c38dd768b918e43ecb4da6a50184a0e mutt-1.5.11.ebuild 5698
-MD5 cb2a1c4875a1f091afd9577f4f61d2e8 mutt-1.5.8-r1.ebuild 4605
-MD5 b684c056a91bcad2e4f3d99c9332c1a0 mutt-1.5.8-r2.ebuild 4961
-MD5 8838ca64d9cd8c5e27b83645106b1ddc mutt-1.5.9.ebuild 6268
diff --git a/mail-client/mutt/files/digest-mutt-1.5.11-r1 b/mail-client/mutt/files/digest-mutt-1.5.11-r1
new file mode 100644
index 000000000000..cf9bd5eb74c9
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.11-r1
@@ -0,0 +1,9 @@
+MD5 00e6f8f7c37d4840e5e30583ebee21ce mutt-1.5.11.tar.gz 3187375
+MD5 ba2f45b05aa7ef453dbd3dccddf7baef patch-1.5.10.tt.assumed_charset.1.gz 2565
+MD5 95ec112ae0ce2cbd1b67bcc68756bf97 patch-1.5.11.rr.compressed.gz 9995
+MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
+MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
+MD5 b65ec75e68ff9a0b6aca59d40822affc mutt-1.5.4-imap-fcc-status.patch 380
+MD5 93ea23bda53ca73a724954ee076bcfc3 patch-1.5.4.lpr.collapse_flagged 4790
+MD5 d1ced97761933447ee3b8d8af9b20163 patch-1.5.11.vvv.nntp-gentoo.bz2 44351
+MD5 404cb8677bb50937405531931629562f mutt-1.5.7-mixmaster+nntp.patch 310
diff --git a/mail-client/mutt/files/mutt-1.5.11-fix-smime.patch b/mail-client/mutt/files/mutt-1.5.11-fix-smime.patch
new file mode 100644
index 000000000000..b91fdccc9a02
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.11-fix-smime.patch
@@ -0,0 +1,11 @@
+diff -u -r3.43 -r3.44
+--- mutt/smime.c	2005/09/17 20:46:11	3.43
++++ mutt/smime.c	2005/10/05 19:20:22	3.44
+@@ -1989,7 +1989,6 @@
+ 
+     if ((p = smime_ask_for_key (_("Sign as: "), NULL, 0))) 
+     {
+-      p[mutt_strlen (p)-1] = '\0';
+       mutt_str_replace (&SmimeDefaultKey, p);
+ 	
+       msg->security |= SIGN;
diff --git a/mail-client/mutt/mutt-1.5.11-r1.ebuild b/mail-client/mutt/mutt-1.5.11-r1.ebuild
new file mode 100644
index 000000000000..56199912435b
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.11-r1.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.11-r1.ebuild,v 1.1 2005/11/26 11:58:58 ferdy Exp $
+
+inherit eutils flag-o-matic
+
+patch_assumed_charset="patch-1.5.10.tt.assumed_charset.1.gz"
+patch_compressed="patch-${PV}.rr.compressed.gz"
+patch_mbox_hook="patch-1.5.6.dw.mbox-hook.1"
+patch_pgp_timeout="patch-1.5.6.dw.pgp-timeout.1"
+patch_imap_fcc_status="mutt-1.5.4-imap-fcc-status.patch"
+patch_collapse_flagged="patch-1.5.4.lpr.collapse_flagged"
+opt_patch_nntp="patch-${PV}.vvv.nntp-gentoo.bz2"
+
+DESCRIPTION="a small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org"
+SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
+	!vanilla? (
+		http://www.emaillab.org/${PN}/1.5.10/${patch_assumed_charset}
+		http://mutt.kiev.ua/download/${P}/${patch_compressed}
+		http://www.woolridge.ca/${PN}/patches/${patch_mbox_hook}
+		http://www.woolridge.ca/${PN}/patches/${patch_pgp_timeout}
+		http://www.plumlocosoft.com/software/download/${patch_imap_fcc_status}
+		http://debian.lpr.ch/Mutt/${patch_collapse_flagged}
+		nntp? (
+			http://dev.gentoo.org/~ferdy/distfiles/${opt_patch_nntp}
+			mirror://gentoo/mutt-1.5.7-mixmaster+nntp.patch
+		)
+	)"
+IUSE="berkdb buffysize cjk crypt debug gdbm gnutls gpgme idn imap mbox nls nntp pop sasl smime ssl vanilla"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+RDEPEND="nls? ( sys-devel/gettext )
+	>=sys-libs/ncurses-5.2
+	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 )
+	)
+	pop?     (
+		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 )
+	gpgme?   ( >=app-crypt/gpgme-0.9.0 )
+	smime?   ( >=dev-libs/openssl-0.9.6 )
+	app-misc/mime-types"
+DEPEND="${RDEPEND}
+	net-mail/mailbase
+	~sys-devel/autoconf-2.59
+	!vanilla? ( sys-devel/automake )"
+
+pkg_setup() {
+	if ! use imap; then
+		echo
+		einfo "The USE variable 'imap' is not in your USE flags."
+		einfo "For imap support in mutt, you will need to restart the build with USE=imap"
+		echo
+	fi
+}
+
+src_unpack() {
+	unpack ${P}.tar.gz && cd ${S} || die "unpack failed"
+
+	# Fix configure.in sasl checking
+	epatch "${FILESDIR}/${P}-sasl.patch"
+
+	# Fix smime message signing
+	epatch "${FILESDIR}/${P}-fix-smime.patch"
+
+	if ! use vanilla ; then
+		for p in ${!patch_*} ; do
+			epatch ${DISTDIR}/${!p}
+		done
+
+		if use nntp; then
+			epatch ${DISTDIR}/${opt_patch_nntp}
+			# Allow mutt to build with mixmaster and nntp both enabled
+			epatch ${DISTDIR}/mutt-1.5.7-mixmaster+nntp.patch
+		fi
+
+		rm -rf configure autom4te.cache
+		aclocal -I m4					|| die "aclocal failed"
+		autoheader						|| die "autoheader failed"
+		emake -C m4 -f Makefile.am.in	|| die "emake in m4 failed"
+		automake --foreign				|| die "automake failed"
+	fi
+
+	WANT_AUTOCONF=2.59 autoconf		|| die "autoconf failed"
+}
+
+src_compile() {
+	declare myconf="
+		$(use_enable nls) \
+		$(use_enable gpgme) \
+		$(use_enable imap) \
+		$(use_enable pop) \
+		$(use_enable crypt pgp) \
+		$(use_enable smime) \
+		$(use_enable cjk default-japanese) \
+		$(use_enable debug) \
+		$(use_with idn) \
+		--with-curses \
+		--sysconfdir=/etc/${PN} \
+		--with-docdir=/usr/share/doc/${PN}-${PVR} \
+		--with-regex \
+		--disable-fcntl --enable-flock \
+		--enable-nfs-fix --enable-external-dotlock \
+		--with-mixmaster"
+
+	# See Bug #22787
+	unset WANT_AUTOCONF_2_5 WANT_AUTOCONF
+
+	# mutt prioritizes gdbm over bdb, so we will too.
+	# hcache feature requires at least one database is in USE.
+	if use gdbm; then
+		myconf="${myconf} --enable-hcache --with-gdbm --without-bdb"
+	elif use berkdb; then
+		myconf="${myconf} --enable-hcache --with-bdb --without-gdbm"
+	else
+		myconf="${myconf} --disable-hcache --without-gdbm --without-bdb"
+	fi
+
+	# there's no need for gnutls, ssl or sasl without either pop or imap.
+	# in fact mutt's configure will bail if you do:
+	#   --without-pop --without-imap --with-ssl
+	if use pop || use imap; 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
+
+	# See Bug #11170
+	case ${ARCH} in
+		alpha|ppc) replace-flags "-O[3-9]" "-O2" ;;
+	esac
+
+	if use buffysize; then
+		ewarn "USE=buffy-size is just a workaround. Disable it if you don't need it."
+		myconf="${myconf} --enable-buffy-size"
+	fi
+
+	if use mbox; then
+		myconf="${myconf} --with-mailpath=/var/spool/mail"
+	else
+		myconf="${myconf} --with-homespool=Maildir"
+	fi
+
+	if ! use vanilla; then
+		# rr.compressed patch
+		myconf="${myconf} --enable-compressed"
+
+		# nntp patch
+		myconf="${myconf} $(use_enable nntp)"
+	fi
+
+	econf ${myconf} || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "install failed"
+	find ${D}/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip
+	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 ${D}/etc/${PN}/mime.types
+	dosym /etc/mime.types /etc/${PN}/mime.types
+
+	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}
+
+pkg_postinst() {
+	echo
+	einfo "If you are new to mutt you may want to take a look at"
+	einfo "the Gentoo QuickStart Guide to Mutt E-Mail:"
+	einfo "   http://www.gentoo.org/doc/en/guide-to-mutt.xml"
+	echo
+}