Fix for bug #154310

Package-Manager: portage-2.1.1-r2

5 files changed, 302 insertions, 5 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index ec424945e485..e354891c5dc2 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/mutt
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.98 2006/11/11 13:28:48 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.99 2006/11/22 08:17:23 ferdy Exp $
+
+*mutt-1.5.13-r2 (22 Nov 2006)
+
+  22 Nov 2006; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/mutt-1.5.13-paranoid-temp-file.patch, +mutt-1.5.13-r2.ebuild:
+  Fix for bug #154310
 
   11 Nov 2006; Alexander H. Færøy <eroyf@gentoo.org>
   mutt-1.5.13-r1.ebuild:
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index bb8e172d933e..e34aa4245115 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX Muttrc 667 RMD160 0405e73c6a4122869ce9a9bd408068d316740b71 SHA1 e30c96e6f21a30fe576abcb3be65a34accf4e11f SHA256 932940db69c951caaa87a17ee98a8e2262aeadf1e978f6d671b642184c5d545f
 MD5 6064ff5a3d1a71ccdb48f88872feb3a3 files/Muttrc 667
 RMD160 0405e73c6a4122869ce9a9bd408068d316740b71 files/Muttrc 667
@@ -22,6 +25,10 @@ AUX mutt-1.5.12-fix-pop-c.patch 753 RMD160 5d4566b5a22d2077e81b8a091f2749a3abd5f
 MD5 866165cb07d60b1f28c2a27c1c57e3b4 files/mutt-1.5.12-fix-pop-c.patch 753
 RMD160 5d4566b5a22d2077e81b8a091f2749a3abd5f289 files/mutt-1.5.12-fix-pop-c.patch 753
 SHA256 1d1c21865a1aae258eb1991a153b75f99f22e9272a4d0b74478cd65f943f7a2a files/mutt-1.5.12-fix-pop-c.patch 753
+AUX mutt-1.5.13-paranoid-temp-file.patch 2211 RMD160 a29336f375954984eee1698dfd39152ea22fc9b5 SHA1 5d0766c46fde9f0f67a8a15eafb3bcf090451d3a SHA256 8252cf15f44f220995bddd35bbedc1323c58915f0c6898c2ba95baca01bce4e2
+MD5 733b85ed697a1d1325d0076535f2e90c files/mutt-1.5.13-paranoid-temp-file.patch 2211
+RMD160 a29336f375954984eee1698dfd39152ea22fc9b5 files/mutt-1.5.13-paranoid-temp-file.patch 2211
+SHA256 8252cf15f44f220995bddd35bbedc1323c58915f0c6898c2ba95baca01bce4e2 files/mutt-1.5.13-paranoid-temp-file.patch 2211
 AUX mutt-1.5.13-sasl.patch 2468 RMD160 7c0ee6795f8b7a11059f3802b098735897cf7cf2 SHA1 0914414d61face0ca19d44819dac96d03480b8f7 SHA256 f2a646a227dc768d93dba54b7c02d7ea4e0d4c1641f03d3878870821d38e4e50
 MD5 acb389c41ad44abd6dd79073cf5820d4 files/mutt-1.5.13-sasl.patch 2468
 RMD160 7c0ee6795f8b7a11059f3802b098735897cf7cf2 files/mutt-1.5.13-sasl.patch 2468
@@ -55,14 +62,18 @@ EBUILD mutt-1.5.13-r1.ebuild 4347 RMD160 0958b115958cbdb32837f28e82bd696f8203ff7
 MD5 cbfe45cadca388948825bd346f4f2c00 mutt-1.5.13-r1.ebuild 4347
 RMD160 0958b115958cbdb32837f28e82bd696f8203ff74 mutt-1.5.13-r1.ebuild 4347
 SHA256 cb4f26b8f16a13d64034e8932e5da497f0570ec1dceef676e1386cdb43c9f837 mutt-1.5.13-r1.ebuild 4347
+EBUILD mutt-1.5.13-r2.ebuild 4440 RMD160 aa8cc7c6b72a64c38dfc9bd4466e88298c09b3e1 SHA1 f55f252d8b0dd29df6a98412c6b7db87ef7f37d6 SHA256 ba9f94d0b6fbf3d82e7d7474074174af6eacbe70a4c0ec5cb53fb5d2ecdd4b1b
+MD5 e28ccde63c5278e31c8e1115d4ec43c9 mutt-1.5.13-r2.ebuild 4440
+RMD160 aa8cc7c6b72a64c38dfc9bd4466e88298c09b3e1 mutt-1.5.13-r2.ebuild 4440
+SHA256 ba9f94d0b6fbf3d82e7d7474074174af6eacbe70a4c0ec5cb53fb5d2ecdd4b1b mutt-1.5.13-r2.ebuild 4440
 EBUILD mutt-1.5.13.ebuild 4292 RMD160 f37277c666fabc8e953fb40f7090d2fab193c073 SHA1 32a55d6f606fe2c5dfc0b3006f2f8eae203d4d29 SHA256 0791a3cb05dd6e4af94ac82a1c9386f1892293f25ac14cb1c8f612469abb8e1f
 MD5 c03b1c340ac75db9f32565e8657e2cdb mutt-1.5.13.ebuild 4292
 RMD160 f37277c666fabc8e953fb40f7090d2fab193c073 mutt-1.5.13.ebuild 4292
 SHA256 0791a3cb05dd6e4af94ac82a1c9386f1892293f25ac14cb1c8f612469abb8e1f mutt-1.5.13.ebuild 4292
-MISC ChangeLog 24138 RMD160 19157c247c704a8309242bccd161b138936e944a SHA1 c37a6c831d12d3684fc1284accfa7cf9a4ba6d33 SHA256 c62da1f739622b9e78680bfe9fa30b7386f727a28cf1e1895cb7ee5cb3a1cbd8
-MD5 af5bf4291f62ad23860ed861dc9822e1 ChangeLog 24138
-RMD160 19157c247c704a8309242bccd161b138936e944a ChangeLog 24138
-SHA256 c62da1f739622b9e78680bfe9fa30b7386f727a28cf1e1895cb7ee5cb3a1cbd8 ChangeLog 24138
+MISC ChangeLog 24316 RMD160 0ef4ebc7491dfb7e48aa379f701bd31e70ab5af1 SHA1 1f6667d3d61ca570229234bde7866417a791fb5a SHA256 225157c2c9e1ef4d4715ec823202b1794ab6a66418bd1feaff671032bc29e8b4
+MD5 72fc978b0f579b6e5e46f218de0efe7b ChangeLog 24316
+RMD160 0ef4ebc7491dfb7e48aa379f701bd31e70ab5af1 ChangeLog 24316
+SHA256 225157c2c9e1ef4d4715ec823202b1794ab6a66418bd1feaff671032bc29e8b4 ChangeLog 24316
 MISC metadata.xml 348 RMD160 67219e2080107537dc52f7de5c201a8e52ee0270 SHA1 8aa712f8642faf21ab136add0670cba3f8dc15d4 SHA256 a8c434275334e18b2e8c1b68fc88b5a1f6faef5a4344267d7ed708c0794b386d
 MD5 ab8fa36a71860fbc36c89a2c91745d28 metadata.xml 348
 RMD160 67219e2080107537dc52f7de5c201a8e52ee0270 metadata.xml 348
@@ -79,3 +90,13 @@ SHA256 e79af34a5a8d834a2f5556020b501596f7bdc9a82eaf73896e2e60ebac2a029a files/di
 MD5 3b282ac21c711571ace7792a326aa732 files/digest-mutt-1.5.13-r1 518
 RMD160 f387b5242f64a563bd837a34af0123debb09a151 files/digest-mutt-1.5.13-r1 518
 SHA256 e79af34a5a8d834a2f5556020b501596f7bdc9a82eaf73896e2e60ebac2a029a files/digest-mutt-1.5.13-r1 518
+MD5 3b282ac21c711571ace7792a326aa732 files/digest-mutt-1.5.13-r2 518
+RMD160 f387b5242f64a563bd837a34af0123debb09a151 files/digest-mutt-1.5.13-r2 518
+SHA256 e79af34a5a8d834a2f5556020b501596f7bdc9a82eaf73896e2e60ebac2a029a files/digest-mutt-1.5.13-r2 518
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFFZAeqViELBEf1JB0RApZeAKCFV8ASercxPxVGdfpKGMZf4DykywCfamD2
+iTclcGvbu+nCNnn04f2Ys3Y=
+=9Ghc
+-----END PGP SIGNATURE-----
diff --git a/mail-client/mutt/files/digest-mutt-1.5.13-r2 b/mail-client/mutt/files/digest-mutt-1.5.13-r2
new file mode 100644
index 000000000000..d0fb93f3637b
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.13-r2
@@ -0,0 +1,6 @@
+MD5 b4fccb735c0277bc6c659eb287d65b13 mutt-1.5.13-gentoo-patches.tar.bz2 53418
+RMD160 67274bef651c1c78d1e6878d8bb17316abf9d30e mutt-1.5.13-gentoo-patches.tar.bz2 53418
+SHA256 b0a8737ab8ec42b5f071eb08356a2572c49f98c73c3bf42396fd481c4650ef1d mutt-1.5.13-gentoo-patches.tar.bz2 53418
+MD5 456a138680a6726f14983cb3e9ff4e22 mutt-1.5.13.tar.gz 3442681
+RMD160 9327b7f928aad78a20c2395629113ac2519bb945 mutt-1.5.13.tar.gz 3442681
+SHA256 e0481690c0caf23b5c88359b2dbac70308f8f138663e8fee482b163562fe8da9 mutt-1.5.13.tar.gz 3442681
diff --git a/mail-client/mutt/files/mutt-1.5.13-paranoid-temp-file.patch b/mail-client/mutt/files/mutt-1.5.13-paranoid-temp-file.patch
new file mode 100644
index 000000000000..56ed1c23bb77
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.13-paranoid-temp-file.patch
@@ -0,0 +1,100 @@
+commit f8c42c6286f3077fc8762ba2c8323026b736a3e8
+Author: roessler <roessler>
+Date:   Mon Oct 9 13:39:38 2006 +0000
+
+    From: Thomas Roessler <roessler@does-not-exist.org>
+    
+    Even more paranoid temporary file creation.
+
+diff --git a/lib.c b/lib.c
+index aac0742..d672a8a 100644
+--- a/lib.c
++++ b/lib.c
+@@ -481,14 +481,85 @@ int safe_rename (const char *src, const
+   return 0;
+ }
+ 
++/* Create a temporary directory next to a file name */
++
++int mutt_mkwrapdir (const char *path, char *newfile, size_t nflen, 
++		    char *newdir, size_t ndlen)
++{
++  const char *basename;
++  char parent[_POSIX_PATH_MAX];
++  char *p;
++  int rv;
++
++  strfcpy (parent, NONULL (path), sizeof (parent));
++  
++  if ((p = strrchr (parent, '/')))
++  {
++    *p = '\0';
++    basename = p + 1;
++  }
++  else
++  {
++    strfcpy (parent, ".", sizeof (parent));
++    basename = path;
++  }
++
++  do 
++  {
++    snprintf (newdir, ndlen, "%s/%s", parent, ".muttXXXXXX");
++    mktemp (newdir);
++  } 
++  while ((rv = mkdir (newdir, 0700)) == -1 && errno == EEXIST);
++  
++  if (rv == -1)
++    return -1;
++  
++  snprintf (newfile, nflen, "%s/%s", newdir, NONULL(basename));
++  return 0;  
++}
++
++int mutt_put_file_in_place (const char *path, const char *safe_file, const char *safe_dir)
++{
++  int rv;
++  
++  rv = safe_rename (safe_file, path);
++  unlink (safe_file);
++  rmdir (safe_dir);
++  return rv;
++}
++
+ int safe_open (const char *path, int flags)
+ {
+   struct stat osb, nsb;
+   int fd;
+ 
+-  if ((fd = open (path, flags, 0600)) < 0)
+-    return fd;
++  if (flags & O_EXCL) 
++  {
++    char safe_file[_POSIX_PATH_MAX];
++    char safe_dir[_POSIX_PATH_MAX];
+ 
++    if (mutt_mkwrapdir (path, safe_file, sizeof (safe_file),
++			safe_dir, sizeof (safe_dir)) == -1)
++      return -1;
++    
++    if ((fd = open (safe_file, flags, 0600)) < 0)
++    {
++      rmdir (safe_dir);
++      return fd;
++    }
++    
++    if (mutt_put_file_in_place (path, safe_file, safe_dir) == -1)
++    {
++      close (fd);
++      return -1;
++    }
++  }
++  else
++  {
++    if ((fd = open (path, flags, 0600)) < 0)
++      return fd;
++  }
++    
+   /* make sure the file is not symlink */
+   if (lstat (path, &osb) < 0 || fstat (fd, &nsb) < 0 ||
+       compare_stat(&osb, &nsb) == -1)
diff --git a/mail-client/mutt/mutt-1.5.13-r2.ebuild b/mail-client/mutt/mutt-1.5.13-r2.ebuild
new file mode 100644
index 000000000000..1326633995bd
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.13-r2.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.13-r2.ebuild,v 1.1 2006/11/22 08:17:23 ferdy Exp $
+
+inherit eutils flag-o-matic autotools
+
+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? (
+		mirror://gentoo/${P}-gentoo-patches.tar.bz2
+	)"
+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 ~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"
+
+PATCHDIR="${WORKDIR}"/${P}-gentoo-patches
+
+src_unpack() {
+	unpack ${A} && cd "${S}" || die "unpack failed"
+
+	# Fix for bug #146696
+	epatch "${FILESDIR}"/${P}-sasl.patch
+
+	# Security fix for bug #154310
+	epatch "${FILESDIR}"/${P}-paranoid-temp-file.patch
+
+	if ! use vanilla ; then
+		if ! use nntp ; then
+			rm "${PATCHDIR}"/07-vvv.nntp-gentoo.patch
+			rm "${PATCHDIR}"/08-mixmaster_nntp.patch
+		fi
+
+		for p in "${PATCHDIR}"/*.patch ; do
+			epatch "${p}"
+		done
+
+		AT_M4DIR="m4" eautoreconf
+	else
+		eautoconf
+	fi
+}
+
+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
+}