Fix bug #42738 with patch submitted by José Romildo Malaquias

4 files changed, 74 insertions, 4 deletions

diff --git a/net-mail/mutt/ChangeLog b/net-mail/mutt/ChangeLog
index e594927b577a..b34d499a6885 100644
--- a/net-mail/mutt/ChangeLog
+++ b/net-mail/mutt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/mutt
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mutt/ChangeLog,v 1.47 2004/02/25 22:09:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mutt/ChangeLog,v 1.48 2004/02/26 04:10:36 agriffis Exp $
+
+  25 Feb 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6.ebuild,
+  files/8patch-1.5.6.dyc.source_stat:
+  Fix bug #42738 with patch submitted by José Romildo Malaquias
 
   25 Feb 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6.ebuild:
   Always apply slang fix, even when USE=vanilla
diff --git a/net-mail/mutt/Manifest b/net-mail/mutt/Manifest
index 575402719d9f..dc7837f60525 100644
--- a/net-mail/mutt/Manifest
+++ b/net-mail/mutt/Manifest
@@ -2,8 +2,8 @@ MD5 ddc50e3033c4b3c8a3e120b2c488189f mutt-1.5.4-r1.ebuild 2860
 MD5 ba60edd1ef4959b5a3c8511d97755f08 mutt-1.5.4.ebuild 2615
 MD5 b1516d4df25894190ac3cb387b700093 mutt-1.5.5.1.ebuild 2945
 MD5 e170aef6acb390b5badf3867a6f82f08 mutt-1.4.2.1.ebuild 3376
-MD5 4a485f22d07117fdf4d8f3e2f010617b mutt-1.5.6.ebuild 4093
-MD5 fd0b8e65276c1e945bd3496c49c70ae5 ChangeLog 7350
+MD5 df30af3c57f2205ccbd17a291b3a5651 mutt-1.5.6.ebuild 4244
+MD5 e78a55f3097dc50533daf8ea98577f66 ChangeLog 7522
 MD5 f46d05fe0172cb035a01f40d25242d30 metadata.xml 253
 MD5 b2b515e96b060771a00646405c620755 files/Muttrc 678
 MD5 2aed1ac688ef4a607857a75422066740 files/digest-mutt-1.5.4 280
@@ -12,4 +12,5 @@ MD5 2aed1ac688ef4a607857a75422066740 files/digest-mutt-1.5.4-r1 280
 MD5 78c54f1f293cf702401021c22ca9992a files/Muttrc.color 1177
 MD5 cae412df424c3f499c539c93ebd02e48 files/digest-mutt-1.4.2.1 292
 MD5 245167f81a90f23cdecb1a55dcc7dd1a files/digest-mutt-1.5.5.1 217
+MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531
 MD5 25e242fd402f42d5bd5230dbe9ea68a6 files/slang.patch 493
diff --git a/net-mail/mutt/files/8patch-1.5.6.dyc.source_stat b/net-mail/mutt/files/8patch-1.5.6.dyc.source_stat
new file mode 100644
index 000000000000..da380763263c
--- /dev/null
+++ b/net-mail/mutt/files/8patch-1.5.6.dyc.source_stat
@@ -0,0 +1,61 @@
+? mutt/build
+? mutt/stamp-h1
+Index: mutt/init.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/init.c,v
+retrieving revision 3.19
+diff -u -r3.19 init.c
+--- mutt/init.c	1 Feb 2004 18:00:16 -0000	3.19
++++ mutt/init.c	6 Feb 2004 20:29:08 -0000
+@@ -1368,18 +1368,6 @@
+   char *linebuf = NULL;
+   size_t buflen;
+   pid_t pid;
+-  struct stat s;
+-
+-  if (stat (rcfile, &s) < 0)
+-  {
+-    snprintf (err->data, err->dsize, _("%s: stat: %s"), rcfile, strerror (errno));
+-    return (-1);
+-  }
+-  if (!S_ISREG (s.st_mode))
+-  {
+-    snprintf (err->data, err->dsize, _("%s: not a regular file"), rcfile);
+-    return (-1);
+-  }
+ 
+   if ((f = mutt_open_read (rcfile, &pid)) == NULL)
+   {
+Index: mutt/muttlib.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/muttlib.c,v
+retrieving revision 3.18
+diff -u -r3.18 muttlib.c
+--- mutt/muttlib.c	1 Feb 2004 17:10:43 -0000	3.18
++++ mutt/muttlib.c	6 Feb 2004 20:29:09 -0000
+@@ -1134,6 +1134,8 @@
+ FILE *mutt_open_read (const char *path, pid_t *thepid)
+ {
+   FILE *f;
++  struct stat s;
++
+   int len = mutt_strlen (path);
+ 
+   if (path[len - 1] == '|')
+@@ -1149,6 +1151,16 @@
+   }
+   else
+   {
++    if (stat (path, &s) < 0)
++    {
++      mutt_error (_("%s: stat: %s"), path, strerror (errno));
++      return (NULL);
++    }
++    if (!S_ISREG (s.st_mode))
++    {
++      mutt_error (_("%s: not a regular file"), path);
++      return (NULL);
++    }
+     f = fopen (path, "r");
+     *thepid = -1;
+   }
diff --git a/net-mail/mutt/mutt-1.5.6.ebuild b/net-mail/mutt/mutt-1.5.6.ebuild
index 5013c9a48921..8820f7813821 100644
--- a/net-mail/mutt/mutt-1.5.6.ebuild
+++ b/net-mail/mutt/mutt-1.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mutt/mutt-1.5.6.ebuild,v 1.5 2004/02/25 22:09:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mutt/mutt-1.5.6.ebuild,v 1.6 2004/02/26 04:10:36 agriffis Exp $
 
 IUSE="ssl nls slang crypt imap mbox nntp vanilla"
 
@@ -65,6 +65,10 @@ src_unpack() {
 
 	# Fix a slang problem that is already fixed in upstream cvs
 	epatch ${FILESDIR}/slang.patch
+
+	# Fix ability to read from a subprocess with source script.sh|
+	# Bug #42738 (25 Feb 2004 agriffis)
+	epatch ${FILESDIR}/8patch-1.5.6.dyc.source_stat
 }
 
 src_compile() {