22089914 Upgrade MUTT to latest version
authorRich Burridge <rich.burridge@oracle.com>
Mon, 18 Jul 2016 08:41:42 -0700
changeset 6427 2005fa2596b7
parent 6425 275bc355ea3e
child 6428 5ab2dde6d87d
22089914 Upgrade MUTT to latest version
components/mutt/Makefile
components/mutt/mutt.license
components/mutt/mutt.p5m
components/mutt/patches/16390278-parfait.patch
components/mutt/patches/6982855-imap-segfault-fix.patch
components/mutt/patches/7076617-flea-cc.patch
components/mutt/patches/PATCHES.patch
components/mutt/patches/fix-version-message.patch
components/mutt/pgpewrap.1
components/mutt/pgpring.1
--- a/components/mutt/Makefile	Sat Jul 16 21:56:47 2016 -0700
+++ b/components/mutt/Makefile	Mon Jul 18 08:41:42 2016 -0700
@@ -26,13 +26,13 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		mutt
-COMPONENT_VERSION=	1.5.21
+COMPONENT_VERSION=	1.6.1
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:2141f36e8d0f4f71c9ca6780001e7cc679fe313e643953fc07f001223e67c4a0
-COMPONENT_ARCHIVE_URL=	ftp://ftp.mutt.org/mutt/devel/$(COMPONENT_ARCHIVE)
+    sha256:98b26cecc6b1713082fc880344fa345c20bd7ded6459abe18c84429c7cf8ed20
+COMPONENT_ARCHIVE_URL=	ftp://ftp.mutt.org/pub/mutt/$(COMPONENT_ARCHIVE)
 COMPONENT_PROJECT_URL=	http://www.mutt.org/
 
-TPNO=			9259
+TPNO=			29951
 
 TEST_TARGET= $(NO_TESTS)
 include $(WS_MAKE_RULES)/common.mk
@@ -51,11 +51,6 @@
 CONFIGURE_OPTIONS  +=		--with-wc-funcs
 CONFIGURE_OPTIONS  +=		--with-sasl
 
-# Add in the C compiler information to the muttbug (a.k.a. flea) script.
-COMPONENT_POST_CONFIGURE_ACTION = \
-	$(GSED) -i 's%XXX-CUSAGE-XXX%$(shell $(CC) -V 2>&1 | head -1)%' \
-	$(BUILD_DIR_64)/muttbug.sh 
-
 REQUIRED_PACKAGES += data/docbook/docbook-dtds
 REQUIRED_PACKAGES += data/docbook/docbook-style-dsssl
 REQUIRED_PACKAGES += data/docbook/docbook-style-xsl
--- a/components/mutt/mutt.license	Sat Jul 16 21:56:47 2016 -0700
+++ b/components/mutt/mutt.license	Mon Jul 18 08:41:42 2016 -0700
@@ -4,16 +4,19 @@
 Please note that this is by no means an exhaustive list of all the
 persons who have been contributing to this program.  Please see the
 manual for a (probably still non complete) list of the persons who
-have been helpful with the development of this program.
+have been helpful with the development of this program.  Please also
+see our source code repository at http://dev.mutt.org/hg/mutt/ for
+the full history of commits.
 
-Copyright (C) 1996-2007 Michael R. Elkins <[email protected]>
+Copyright (C) 1996-2014 Michael R. Elkins <[email protected]>
 Copyright (C) 1996-2002 Brandon Long <[email protected]>
-Copyright (C) 1997-2008 Thomas Roessler <[email protected]>
+Copyright (C) 1997-2009 Thomas Roessler <[email protected]>
 Copyright (C) 1998-2005 Werner Koch <[email protected]>
-Copyright (C) 1999-2009 Brendan Cully <[email protected]>
+Copyright (C) 1999-2014 Brendan Cully <[email protected]>
 Copyright (C) 1999-2002 Tommi Komulainen <[email protected]>
 Copyright (C) 2000-2004 Edmund Grimley Evans <[email protected]>
-Copyright (C) 2006-2008 Rocco Rutte <[email protected]>
+Copyright (C) 2006-2009 Rocco Rutte <[email protected]>
+Copyright (C) 2014-2015 Kevin J. McCarthy <[email protected]>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
--- a/components/mutt/mutt.p5m	Sat Jul 16 21:56:47 2016 -0700
+++ b/components/mutt/mutt.p5m	Mon Jul 18 08:41:42 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+/flea\.1$ -> default mangler.man.stability uncommitted>
@@ -149,8 +149,8 @@
 file path=usr/share/man/man1/flea.1
 file path=usr/share/man/man1/mutt.1
 file path=usr/share/man/man1/muttbug.1
-file pgpewrap.1 path=usr/share/man/man1/pgpewrap.1
-file pgpring.1 path=usr/share/man/man1/pgpring.1
+file path=usr/share/man/man1/pgpewrap.1
+file path=usr/share/man/man1/pgpring.1
 file path=usr/share/man/man1/smime_keys.1
 file path=usr/share/man/man5/mbox.5
 file path=usr/share/man/man5/mmdf.5
--- a/components/mutt/patches/16390278-parfait.patch	Sat Jul 16 21:56:47 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-# These patches have been accepted upstream and should thus be removed upon
-# the next upgrade; details in the bug report.
---- mutt-1.5.21/rfc1524.c.orig	Mon Mar  1 09:56:19 2010
-+++ mutt-1.5.21/rfc1524.c	Thu Feb 21 13:05:24 2013
[email protected]@ -68,7 +68,7 @@
-   if (option (OPTMAILCAPSANITIZE))
-     mutt_sanitize_filename (type, 0);
- 
--  while (x < clen && command[x] && y < sizeof (buf) - 1)
-+  while (x < clen - 1 && command[x] && y < sizeof (buf) - 1)
-   {
-     if (command[x] == '\\')
-     {
---- mutt-1.5.21/sendlib.c.orig	Mon Sep 13 10:19:55 2010
-+++ mutt-1.5.21/sendlib.c	Thu Feb 21 13:27:42 2013
[email protected]@ -1664,7 +1664,7 @@
-     /* find the next word and place it in `buf'. it may start with
-      * whitespace we can fold before */
-     next = find_word (p);
--    l = MIN(sizeof (buf), next - p);
-+    l = MIN(sizeof (buf) - 1, next - p);
-     memcpy (buf, p, l);
-     buf[l] = 0;
- 
---- mutt-1.5.21/smime.c.orig	Mon Sep 13 10:19:55 2010
-+++ mutt-1.5.21/smime.c	Fri Feb 22 04:17:00 2013
[email protected]@ -357,7 +357,7 @@
-   char index_file[_POSIX_PATH_MAX];
-   FILE *index;
-   char buf[LONG_STRING];
--  char fields[5][STRING];
-+  char fields[5][STRING+1]; /* +1 due to use of fscanf() below. the max field width does not include the null terminator (see http://dev.mutt.org/trac/ticket/3636) */
-   int numFields, hash_suffix, done, cur; /* The current entry */
-   MUTTMENU* menu;
-   unsigned int hash;
[email protected]@ -470,7 +470,7 @@
-   int addr_len, query_len, found = 0, ask = 0, choice = 0;
-   char cert_path[_POSIX_PATH_MAX];
-   char buf[LONG_STRING], prompt[STRING];
--  char fields[5][STRING];
-+  char fields[5][STRING+1]; /* +1 due to use of fscanf() below. the max field width does not include the null terminator (see http://dev.mutt.org/trac/ticket/3636) */
-   char key[STRING];  
-   int numFields;
-   struct stat info;
--- a/components/mutt/patches/6982855-imap-segfault-fix.patch	Sat Jul 16 21:56:47 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-Index: imap/message.c
-===================================================================
---- mutt-1.5.21.orig/imap/message.c	(revision 6121:6572e8bcd723)
-+++ mutt-1.5.21/imap/message.c	(revision 6185:0e4f1782ea2e)
[email protected]@ -66,5 +66,5 @@
-   FILE *fp;
-   char tempfile[_POSIX_PATH_MAX];
--  int msgno, idx;
-+  int msgno, idx = msgbegin - 1;
-   IMAP_HEADER h;
-   IMAP_STATUS* status;
[email protected]@ -186,5 +186,5 @@
-         }
- 
--        idx = h.sid - 1;
-+        idx++;
-         ctx->hdrs[idx] = imap_hcache_get (idata, h.data->uid);
-         if (ctx->hdrs[idx])
[email protected]@ -212,4 +212,5 @@
-           imap_free_header_data((void**) (void*) &h.data);
-           evalhc = 0;
-+          idx--;
-         }
-       }
[email protected]@ -274,4 +275,5 @@
-         dprint (2, (debugfile, "msg_fetch_header: ignoring fetch response with no body\n"));
-         mfhrc = -1;
-+        msgend--;
-         continue;
-       }
[email protected]@ -280,5 +282,5 @@
-       fputs ("\n\n", fp);
- 
--      idx = h.sid - 1;
-+      idx++;
-       if (idx > msgend)
-       {
[email protected]@ -286,4 +288,5 @@
-                     "unknown message number %d\n", h.sid));
-         mfhrc = -1;
-+        idx--;
-         continue;
-       }
[email protected]@ -293,4 +296,5 @@
- 	dprint (2, (debugfile, "imap_read_headers: message %d is not new\n",
- 		    h.sid));
-+        idx--;
- 	continue;
-       }
--- a/components/mutt/patches/7076617-flea-cc.patch	Sat Jul 16 21:56:47 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
---- mutt-1.5.21/muttbug.sh.in.orig	Thu Dec  1 09:37:14 2011
-+++ mutt-1.5.21/muttbug.sh.in	Fri Dec  2 10:52:31 2011
[email protected]@ -251,14 +251,9 @@
- echo 
- echo "-- Build environment information"
- echo
--echo "(Note: This is the build environment installed on the system"
--echo "muttbug is run on.  Information may or may not match the environment"
--echo "used to build mutt.)"
-+echo "- C compiler version information"
-+echo "XXX-CUSAGE-XXX"
- echo
--echo "- gcc version information"
--echo "@[email protected]"
[email protected]@ -v 2>&1
--echo
- echo "- CFLAGS"
- echo @[email protected]
- 
--- a/components/mutt/patches/PATCHES.patch	Sat Jul 16 21:56:47 2016 -0700
+++ b/components/mutt/patches/PATCHES.patch	Mon Jul 18 08:41:42 2016 -0700
@@ -1,11 +1,11 @@
-diff -ur mutt-1.5.21.orig/PATCHES mutt-1.5.21/PATCHES
---- mutt-1.5.21.orig/PATCHES
-+++ mutt-1.5.21/PATCHES
[email protected]@ -1,0 +1,7 @@
+The list of additional fixes specific to this version of mutt.
+
+This patch will not be sent upstream.
+
+--- mutt-1.6.1/PATCHES.orig	2016-07-08 06:40:32.669372875 -0700
++++ mutt-1.6.1/PATCHES	2016-07-11 06:43:56.612258998 -0700
[email protected]@ -0,0 +1,4 @@
 +In addition, these upstream defects are fixed:
 +#2064 wish: imap operations should be interruptable
-+#3288 seg fault in mx_update_context
 +#3392 Whitespace garbage in pager mode
-+#3537 flea/muttbug tries to run C compiler with -v option to get the version number
-+#3635 potential buffer overruns
-+#3636 Possible buffer overflow in smime.c
++#3852 Problem with Compiler: section of "mutt -v" output for version 1.6.1 on Solaris
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mutt/patches/fix-version-message.patch	Mon Jul 18 08:41:42 2016 -0700
@@ -0,0 +1,23 @@
+The Studio C compiler doesn't understand '-v' or '--version' options
+when doing:
+
+  $ mutt -v
+
+This problem has been fixed upstream. See:
+https://dev.mutt.org/trac/ticket/3852
+
+--- mutt-1.6.1/Makefile.in.orig	2016-07-08 06:23:52.142383932 -0700
++++ mutt-1.6.1/Makefile.in	2016-07-08 11:02:13.004791220 -0700
[email protected]@ -1306,9 +1306,9 @@
+ 
+ conststrings.c: txt2c config.status
+ 	( \
+-		$(CC) -v || \
+-		$(CC) --version || \
+-		$(CC) -V || \
++		($(CC) -v >/dev/null 2>&1 && $(CC) -v) || \
++		($(CC) --version >/dev/null 2>&1 && $(CC) --version) || \
++		($(CC) -V >/dev/null 2>&1 && $(CC) -V) || \
+ 		echo "unknown compiler"; \
+ 	) 2>&1 | ${srcdir}/txt2c.sh cc_version >conststrings_c
+ 	echo "$(CFLAGS)" | ${srcdir}/txt2c.sh cc_cflags >>conststrings_c
--- a/components/mutt/pgpewrap.1	Sat Jul 16 21:56:47 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-.\" Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
-.TH pgpewrap 1 "28 Feb 2008" "SunOS 5.11" "System Administration Commands"
-.SH NAME
-pgpewrap
-.SH SYNOPSIS
-.LP
-Please see the documentation in /usr/share/doc/mutt for further
-information on this command.
--- a/components/mutt/pgpring.1	Sat Jul 16 21:56:47 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-.\" Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
-.TH pgpring 1 "28 Feb 2008" "SunOS 5.11" "System Administration Commands"
-.SH NAME
-pgpring
-.SH SYNOPSIS
-.LP
-Please see the documentation in /usr/share/doc/mutt for further
-information on this command.