--- a/usr/src/cmd/mutt/METADATA Tue Nov 05 19:52:24 2013 +0000
+++ b/usr/src/cmd/mutt/METADATA Sat Nov 02 19:19:46 2013 +0000
@@ -1,10 +1,10 @@
NAME: mutt
-VERSION: 1.5.21
+VERSION: 1.5.22
DESCRIPTION: The Mutt E-Mail Client
LICENSE: GPLv2
PACKAGE: SUNWmuttr SUNWmutt
PROJECT_URL: http://www.mutt.org/
-SOURCE_DOWNLOAD: ftp://ftp.mutt.org/mutt/devel/mutt-1.5.21.tar.gz
+SOURCE_DOWNLOAD: ftp://ftp.mutt.org/mutt/devel/mutt-1.5.22.tar.gz
SUPPORT: C
BUGTRAQ: solaris/utility/mutt
OSR: 8296
--- a/usr/src/cmd/mutt/Makefile.sfw Tue Nov 05 19:52:24 2013 +0000
+++ b/usr/src/cmd/mutt/Makefile.sfw Sat Nov 02 19:19:46 2013 +0000
@@ -39,21 +39,6 @@
CFGETCMUTT = $(CFGETC)/$(PROJECT)
DOCDIR = $(CFGDOC)/$(PROJECT)
-MANFILES_STUBBED = \
- "$(ROOTMAN1)/pgpewrap.1" \
- "$(ROOTMAN1)/pgpring.1"
-
-# Command to create stubbed man pages
-STUB_MAN = \
- for f in $(MANFILES_STUBBED); \
- do \
- command="`$(ECHO) "$$f" | $(SED) 's@.*/@@; s@\\..*@@'`"; \
- section="`$(ECHO) "$$f" | $(SED) 's@.*\\.@@'`"; \
- $(RM) "$$f"; \
- $(SH) ./stubman.sh "$$command" "$$section" $(DOCDIR) > "$$f"; \
- $(CHMOD) 0444 "$$f"; \
- done; echo
-
POST_PROCESS_MAN = $(SRC)/tools/sunman -n "$(PROJECT)" -p "$(PKG)" \
-s Uncommitted "$(ROOTMAN1)/flea.1" \
-s Uncommitted "$(ROOTMAN1)/mutt.1" \
@@ -99,10 +84,9 @@
all: $(VER)/config.status
(cd $(VER); env - $(SFW_MAKE))
-install: all stubman.sh
+install: all
(cd $(VER); env - $(INSTALL_ENV) $(SFW_MAKE) install \
DESTDIR="$(ROOT)")
- $(STUB_MAN)
$(POST_PROCESS_MAN)
$(VER)/config.status: $(VER)/configure
--- a/usr/src/cmd/mutt/Patches/6982855-imap-segfault-fix.patch Tue Nov 05 19:52:24 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-Index: imap/message.c
-===================================================================
---- imap/message.c.orig (revision 6121:6572e8bcd723)
-+++ imap/message.c (revision 6185:0e4f1782ea2e)
-@@ -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;
-@@ -186,5 +186,5 @@
- }
-
-- idx = h.sid - 1;
-+ idx++;
- ctx->hdrs[idx] = imap_hcache_get (idata, h.data->uid);
- if (ctx->hdrs[idx])
-@@ -212,4 +212,5 @@
- imap_free_header_data((void**) (void*) &h.data);
- evalhc = 0;
-+ idx--;
- }
- }
-@@ -274,4 +275,5 @@
- dprint (2, (debugfile, "msg_fetch_header: ignoring fetch response with no body\n"));
- mfhrc = -1;
-+ msgend--;
- continue;
- }
-@@ -280,5 +282,5 @@
- fputs ("\n\n", fp);
-
-- idx = h.sid - 1;
-+ idx++;
- if (idx > msgend)
- {
-@@ -286,4 +288,5 @@
- "unknown message number %d\n", h.sid));
- mfhrc = -1;
-+ idx--;
- continue;
- }
-@@ -293,4 +296,5 @@
- dprint (2, (debugfile, "imap_read_headers: message %d is not new\n",
- h.sid));
-+ idx--;
- continue;
- }
--- a/usr/src/cmd/mutt/Patches/PATCHES.patch Tue Nov 05 19:52:24 2013 +0000
+++ b/usr/src/cmd/mutt/Patches/PATCHES.patch Sat Nov 02 19:19:46 2013 +0000
@@ -1,7 +1,6 @@
diff -ur PATCHES.orig PATCHES
--- PATCHES.orig
+++ PATCHES
-@@ -1,0 +1,3 @@
+@@ -1,0 +1,2 @@
+In addition, these upstream defects are fixed:
-+#3288 seg fault in mx_update_context
+#3392 Whitespace garbage in pager mode
Binary file usr/src/cmd/mutt/mutt-1.5.21.tar.gz has changed
Binary file usr/src/cmd/mutt/mutt-1.5.22.tar.gz has changed
--- a/usr/src/cmd/mutt/stubman.sh Tue Nov 05 19:52:24 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "@(#)stubman.sh 1.1 08/04/30 SMI"
-#
-
-command="$1"
-section="$2"
-docdir="$3"
-
-cat <<EOF
-.\" Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
-.TH $command $section "28 Feb 2008" "SunOS 5.11" "System Administration Commands"
-.SH NAME
-$command
-.SH SYNOPSIS
-.LP
-Please see the documentation in $docdir for further
-information on this command.
-EOF
--- a/usr/src/pkgdefs/SUNWmutt/pkginfo.tmpl Tue Nov 05 19:52:24 2013 +0000
+++ b/usr/src/pkgdefs/SUNWmutt/pkginfo.tmpl Sat Nov 02 19:19:46 2013 +0000
@@ -39,7 +39,7 @@
SUNW_PKGTYPE="usr"
MAXINST="1000"
CATEGORY="system"
-DESC="Mutt E-Mail Client (1.5.21)"
+DESC="Mutt E-Mail Client (1.5.22)"
VENDOR="COMPANY"
HOTLINE="Please contact your local service provider"
EMAIL=""
--- a/usr/src/pkgdefs/SUNWmuttr/pkginfo.tmpl Tue Nov 05 19:52:24 2013 +0000
+++ b/usr/src/pkgdefs/SUNWmuttr/pkginfo.tmpl Sat Nov 02 19:19:46 2013 +0000
@@ -39,7 +39,7 @@
SUNW_PKGTYPE="root"
MAXINST="1000"
CATEGORY="system"
-DESC="Mutt E-Mail Client (1.5.21) (root)"
+DESC="Mutt E-Mail Client (1.5.22) (root)"
VENDOR="COMPANY"
HOTLINE="Please contact your local service provider"
EMAIL=""