# HG changeset patch
# User Rich Burridge <rich.burridge@oracle.com>
# Date 1492466054 25200
# Node ID a8976bcbb84bf579ec354a99aade7bb988497c82
# Parent  8e2a60e33f89d5a54ee8e885a805f779b557c971
25733505 Update mutt to version 1.8.0

diff -r 8e2a60e33f89 -r a8976bcbb84b components/mutt/Makefile
--- a/components/mutt/Makefile	Mon Apr 17 14:50:39 2017 -0700
+++ b/components/mutt/Makefile	Mon Apr 17 14:54:14 2017 -0700
@@ -26,14 +26,14 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		mutt
-COMPONENT_VERSION=	1.6.1
+COMPONENT_VERSION=	1.8.0
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:98b26cecc6b1713082fc880344fa345c20bd7ded6459abe18c84429c7cf8ed20
+    sha256:45841eda12804b460260adff8f3f39cc977744e832486a3c49e182eda967adab
 COMPONENT_ARCHIVE_URL=	ftp://ftp.mutt.org/pub/mutt/$(COMPONENT_ARCHIVE)
 COMPONENT_PROJECT_URL=	http://www.mutt.org/
 COMPONENT_ANITYA_ID=	2035
 
-TPNO=			29951
+TPNO=			34317
 
 # Enable adiheap and adistack security extensions
 ADIHEAP_MODE =	$(ADIHEAP_ENABLE)
diff -r 8e2a60e33f89 -r a8976bcbb84b components/mutt/mutt.license
--- a/components/mutt/mutt.license	Mon Apr 17 14:50:39 2017 -0700
+++ b/components/mutt/mutt.license	Mon Apr 17 14:54:14 2017 -0700
@@ -8,7 +8,7 @@
 see our source code repository at http://dev.mutt.org/hg/mutt/ for
 the full history of commits.
 
-Copyright (C) 1996-2014 Michael R. Elkins <me@cs.hmc.edu>
+Copyright (C) 1996-2016 Michael R. Elkins <me@cs.hmc.edu>
 Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>
 Copyright (C) 1997-2009 Thomas Roessler <roessler@does-not-exist.org>
 Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>
@@ -16,7 +16,7 @@
 Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>
 Copyright (C) 2000-2004 Edmund Grimley Evans <edmundo@rano.org>
 Copyright (C) 2006-2009 Rocco Rutte <pdmef@gmx.net>
-Copyright (C) 2014-2015 Kevin J. McCarthy <kevin@8t8.us>
+Copyright (C) 2014-2016 Kevin J. McCarthy <kevin@8t8.us>
 
     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
diff -r 8e2a60e33f89 -r a8976bcbb84b components/mutt/mutt.p5m
--- a/components/mutt/mutt.p5m	Mon Apr 17 14:50:39 2017 -0700
+++ b/components/mutt/mutt.p5m	Mon Apr 17 14:54:14 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+/flea\.1$ -> default mangler.man.stability uncommitted>
@@ -111,7 +111,10 @@
 file path=usr/share/doc/mutt/samples/pgp6.rc
 file path=usr/share/doc/mutt/samples/sample.mailcap
 file path=usr/share/doc/mutt/samples/sample.muttrc
+file path=usr/share/doc/mutt/samples/sample.muttrc-compress
+file path=usr/share/doc/mutt/samples/sample.muttrc-sidebar
 file path=usr/share/doc/mutt/samples/sample.muttrc-tlr
+file path=usr/share/doc/mutt/samples/sample.vimrc-sidebar
 file path=usr/share/doc/mutt/samples/smime.rc
 file path=usr/share/doc/mutt/samples/smime_keys_test.pl
 file path=usr/share/doc/mutt/security.html
diff -r 8e2a60e33f89 -r a8976bcbb84b components/mutt/patches/PATCHES.patch
--- a/components/mutt/patches/PATCHES.patch	Mon Apr 17 14:50:39 2017 -0700
+++ b/components/mutt/patches/PATCHES.patch	Mon Apr 17 14:54:14 2017 -0700
@@ -4,8 +4,7 @@
 
 --- 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
-@@ -0,0 +1,4 @@
+@@ -0,0 +1,3 @@
 +In addition, these upstream defects are fixed:
 +#2064 wish: imap operations should be interruptable
 +#3392 Whitespace garbage in pager mode
-+#3852 Problem with Compiler: section of 'mutt -v' output for version 1.6.1 on Solaris
diff -r 8e2a60e33f89 -r a8976bcbb84b components/mutt/patches/fix-version-message.patch
--- a/components/mutt/patches/fix-version-message.patch	Mon Apr 17 14:50:39 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-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
-@@ -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