pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
mutt: Update wip/mutt to 1.6.0
Module Name: pkgsrc-wip
Committed By: Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By: f8l
Date: Mon Apr 4 17:39:56 2016 +0200
Changeset: 81d2e80f7f8a8ebd853d21de33cc04047b2aef55
Modified Files:
mutt/Makefile
mutt/Makefile.common
mutt/distinfo
mutt/options.mk
mutt/patches/patch-af
Added Files:
mutt/TODO
Removed Files:
mutt/patches/patch-crypt.c
Log Message:
mutt: Update wip/mutt to 1.6.0
Changes since Mutt 1.4:
* IMAP
* $imap_check_subscribed will fetch the set of subscribed folders from
your server on connection.
* IMAP server-side simple string search using '=' instead of '~'.
('=' also provides local simple string search.)
* IMAP IDLE support and $imap_idle
* <rename-mailbox> function
* Encryption
* S/MIME support. Please see contrib/smime.rc for suggested settings.
* GPGME support via $crypt_use_gpgme
* Ability to encrypt postponed messages. See $postpone_encrypt and
$postpone_encrypt_as.
* GnuPG fingerprints are used internally when possible.
* $crypt_opportunistic_encrypt automatically enables/disables encryption
based on message recipients.
* Character set support
* IDNA support. Options $idn_decode and $idn_encode control whether
mutt will decode and encode international domains using IDNA.
* SMTPUTF8 support. Support for utf-8 domains without IDNA encoding.
To use this, unset idn_encode.
* $assumed_charset, $attach_charset, $ignore_linear_white_space
* Other changes
* Header caching for IMAP and Maildir. See $header_cache for more details.
* Internal ESMTP relay support. See $smtp_url.
* $mail_check_recent controls whether all unread mail or only new mail
since the last mailbox visit will be reported as new
* Support for saving history across sessions. See $save_history,
$history_file.
* More search patterns:
* thread patterns. Use ~(...) to match all threads that
contain a message that matches ...
* ~l matches all known lists, ~u only subscribed.
* ~$ pattern matches unreferenced messages.
* ~V pattern matches cryptographically verified messages.
* Improved flowed text support: $reflow_text, $reflow_wrap,
$reflow_space_quotes.
* $braille_friendly option will place the cursor at the beginning of
the current line in menus.
* Full large file support.
* Terminal status-line (TS) support, a.k.a. xterm title. see the
following variables: $ts_enabled, $ts_icon_format, $ts_status_format
* Generic spam detection: new configuration commands: 'spam' and
'nospam', new options: $spam_separator, new expando: %H (for
$index_format), new pattern: ~H pattern
* New command line options:
* -A command line option for alias expansion.
* -D will print the value of all variables.
* -E command line option to edit draft and include files.
* -Q queries configuration variables
* New functions:
* you can edit threads via <break-thread> and <link-threads>
* <buffy-list> lists mailboxes with new mail.
* <what-key> displays the keycode for a key press.
* <next-new-then-unread> and <previous-new-then-unread>
* <tag-prefix-cond> and <cond-end>
* $resume_draft_files and $resume_edited_draft files control how
draft files are processed.
* $narrow_tree makes the thread tree narrower.
* new and changed hooks: reply-hook, send2-hook. crypt-hook can be
specified multiple times for the same regexp.
* The $alternates option has turned into the 'alternates' command.
* mime_lookup command specifies a list of MIME types that should not
be treated according to their mailcap entry
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=81d2e80f7f8a8ebd853d21de33cc04047b2aef55
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
mutt/Makefile | 3 +-
mutt/Makefile.common | 3 +-
mutt/TODO | 2 +
mutt/distinfo | 16 +++---
mutt/options.mk | 6 +--
mutt/patches/patch-af | 6 +--
mutt/patches/patch-crypt.c | 124 ---------------------------------------------
7 files changed, 20 insertions(+), 140 deletions(-)
diffs:
diff --git a/mutt/Makefile b/mutt/Makefile
index fce0ef7..ab27ac4 100644
--- a/mutt/Makefile
+++ b/mutt/Makefile
@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.176 2016/03/05 11:28:49 jperkin Exp $
-DISTNAME= mutt-1.5.24
-PKGREVISION= 3
+DISTNAME= mutt-1.6.0
CATEGORIES= mail
MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/
diff --git a/mutt/Makefile.common b/mutt/Makefile.common
index 761208e..7aa13f0 100644
--- a/mutt/Makefile.common
+++ b/mutt/Makefile.common
@@ -1,7 +1,6 @@
# $NetBSD: Makefile.common,v 1.2 2016/02/25 15:00:51 jperkin Exp $
#
-# used by mail/mutt/Makefile
-# used by mail/mutt-kz/Makefile
+# used by wip/mutt/Makefile
.include "../../mk/bsd.prefs.mk"
diff --git a/mutt/TODO b/mutt/TODO
new file mode 100644
index 0000000..29a95d0
--- /dev/null
+++ b/mutt/TODO
@@ -0,0 +1,2 @@
+Revert compressed-mbox patch location to variable-based when a patch for 1.6.0 is released.
+Update sidebar patch location when a patch for 1.6.0 is released.
diff --git a/mutt/distinfo b/mutt/distinfo
index 825a35f..251bd06 100644
--- a/mutt/distinfo
+++ b/mutt/distinfo
@@ -1,18 +1,23 @@
$NetBSD: distinfo,v 1.40 2016/02/22 12:13:26 wiz Exp $
-SHA1 (mutt-1.5.24.tar.gz) = 38a2da5eb01ff83a90a2caee28fa2e95dbfe6898
-RMD160 (mutt-1.5.24.tar.gz) = 7fe7e653c27c9b580f958493638c1248d0ad5591
-SHA512 (mutt-1.5.24.tar.gz) = f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1
-Size (mutt-1.5.24.tar.gz) = 3897115 bytes
+SHA1 (mutt-1.6.0.tar.gz) = bab62759af0873a94dc8b85a62a7a9e09e33c6bb
+RMD160 (mutt-1.6.0.tar.gz) = 1ea7153ef05413d0068b5478acad87927e5cecdb
+SHA512 (mutt-1.6.0.tar.gz) = 601d5f70c7cd30903799714cd85b80f9650a029e621d044075e123656411dde809d5cef24a40ba49860bc242cf4a0b914c703deb5a7125b3a24eeb93f4ae3c4c
+Size (mutt-1.6.0.tar.gz) = 3954591 bytes
SHA1 (patch-1.5.24.rr.compressed.gz) = 8da54323dfc9c1049bf0411db2f552593793e99f
RMD160 (patch-1.5.24.rr.compressed.gz) = 2bf71a26de195ce11ed4ffa25403363cab7c9b72
+SHA512 (patch-1.5.24.rr.compressed.gz) = 43736e38fa3d90a35fc8ed51963fc4e9933e757173709ba06c913595424df31869b648fc2d9642fbe2512a7511869b0b02abaca1858f9159bfb5df6a2b41eb04
Size (patch-1.5.24.rr.compressed.gz) = 10019 bytes
+SHA1 (patch-1.5.24.sidebar.20151111.txt) = efa3b6efd7bdb7053314d75b8188ac46c22ecdc5
+RMD160 (patch-1.5.24.sidebar.20151111.txt) = 521938ab47440e93f73bc5ae358e867ab3d3212c
+SHA512 (patch-1.5.24.sidebar.20151111.txt) = 2e622a34a1d101fe9370cc015b8253492d1649fcb593c6f9cbf6eb3b54119eaca836114dc4e3da83bc8fd9de434503c7d2295981a68dc05fd8e710925e2b1f77
+Size (patch-1.5.24.sidebar.20151111.txt) = 68577 bytes
SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
SHA1 (patch-ab) = 7c307068e129eb71ba251d175186dc9c5b171681
SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044
SHA1 (patch-ad) = 6db5792162a0752ee533f5cd4cb3896e0ca92344
SHA1 (patch-ae) = 6534848a4c27d4a3830edd8d4e19d1181fe396d6
-SHA1 (patch-af) = edc107c535789919ba2cda5f81a4b640b6100b91
+SHA1 (patch-af) = 0c93ba49b77a9ed09c19721ac9ad515ca8749a86
SHA1 (patch-ag) = b7902d2412538f15bc25b123ca742c03a3dd3a12
SHA1 (patch-ah) = dfe747c30a44bb309cccaca1bd5174fccc3c2bed
SHA1 (patch-al) = 49542905cde263b8d4c79f71cce3759024c804a3
@@ -21,4 +26,3 @@ SHA1 (patch-an) = b9cc3e957bb1650c8e22c0edf0ce112f769664a1
SHA1 (patch-ao) = a5dddb01d30f28337ca825c6461139c2d9f288d5
SHA1 (patch-ap) = c6f79d5c4e19efdc15e9d5a59934da52b16b7a62
SHA1 (patch-aq) = e363d8929ced9731a31af1137b111d3476a3d05d
-SHA1 (patch-crypt.c) = 05cc74fe4ff2543029d82cbeedc27302db9ec4a7
diff --git a/mutt/options.mk b/mutt/options.mk
index 72a2083..f3a7895 100644
--- a/mutt/options.mk
+++ b/mutt/options.mk
@@ -122,8 +122,8 @@ CONFIGURE_ARGS+= --disable-hcache
PLIST_VARS+= compressed_mbox
.if !empty(PKG_OPTIONS:Mmutt-compressed-mbox)
PLIST.compressed_mbox= yes
-PATCH_SITES+= http://mutt.org.ua/download/${PKGNAME_NOREV}/
-PATCHFILES+= patch-${PKGVERSION_NOREV}.rr.compressed.gz
+PATCH_SITES+= http://mutt.org.ua/download/mutt-1.5.24/
+PATCHFILES+= patch-1.5.24.rr.compressed.gz
PATCH_DIST_STRIP= -p1
CONFIGURE_ARGS+= --enable-compressed
SUBST_CLASSES+= compress
@@ -152,7 +152,7 @@ CONFIGURE_ARGS+= --disable-smtp
.if !empty(PKG_OPTIONS:Mmutt-sidebar)
# http://www.lunar-linux.org/mutt-sidebar/
PATCH_SITES+= http://lunar-linux.org/~tchan/mutt/
-PATCHFILES+= patch-1.5.23.sidebar.20140412.txt
+PATCHFILES+= patch-1.5.24.sidebar.20151111.txt
PATCH_DIST_STRIP= -p1
PATCH_FUZZ_FACTOR= -F1
.endif
diff --git a/mutt/patches/patch-af b/mutt/patches/patch-af
index 29a8eb1..79bc073 100644
--- a/mutt/patches/patch-af
+++ b/mutt/patches/patch-af
@@ -3,8 +3,8 @@ $NetBSD: patch-af,v 1.6 2015/09/03 14:49:02 wiz Exp $
1.) On some systems, curses.h defines TRUE and FALSE, so conditionalise
them here to avoid compiler complaints about duplicate definitions.
---- lib.h.orig 2014-03-12 16:03:45.000000000 +0000
-+++ lib.h 2014-12-19 20:41:07.000000000 +0000
+--- lib.h.orig 2016-04-02 18:12:22.000000000 +0000
++++ lib.h
@@ -54,8 +54,12 @@
# define N_(a) a
# endif
@@ -18,5 +18,5 @@ $NetBSD: patch-af,v 1.6 2015/09/03 14:49:02 wiz Exp $
+# define FALSE 0
+# endif
- # define HUGE_STRING 5120
+ # define HUGE_STRING 8192
# define LONG_STRING 1024
diff --git a/mutt/patches/patch-crypt.c b/mutt/patches/patch-crypt.c
deleted file mode 100644
index 45bb61a..0000000
--- a/mutt/patches/patch-crypt.c
+++ /dev/null
@@ -1,124 +0,0 @@
-$NetBSD: patch-crypt.c,v 1.1 2016/02/22 12:13:26 wiz Exp $
-
-# HG changeset patch
-# User Kevin McCarthy <kevin%8t8.us@localhost>
-# Date 1449022827 28800
-# Tue Dec 01 18:20:27 2015 -0800
-# Node ID 5e5aff1782dc62044197c2230d346bd492706fbf
-# Parent 428a92464d5bccccda818bed598610db212fcf7c
-Loosen mutt_signed_handler() protocol value consistency check. (closes #3639)
-
-Apparently, for S/MIME, some MUAs mismatch the protocol value of
-the multipart/signed and the content-type of the signature: putting
-"pkcs7-signature" in one and "x-pkcs7-signature" in the other.
-
-Change mutt_signed_handler() to independently verify the values of the
-protocol and the content-type. This still checks for correct values but
-doesn't ensure they match between the two (for S/MIME).
-
---- crypt.c.orig 2013-02-06 13:22:15.000000000 +0000
-+++ crypt.c
-@@ -772,9 +772,8 @@ static void crypt_fetch_signatures (BODY
- int mutt_signed_handler (BODY *a, STATE *s)
- {
- char tempfile[_POSIX_PATH_MAX];
-- char *protocol;
-- int protocol_major = TYPEOTHER;
-- char *protocol_minor = NULL;
-+ int signed_type;
-+ int inconsistent = 0;
-
- BODY *b = a;
- BODY **signatures = NULL;
-@@ -786,29 +785,44 @@ int mutt_signed_handler (BODY *a, STATE
- if (!WithCrypto)
- return -1;
-
-- protocol = mutt_get_parameter ("protocol", a->parameter);
- a = a->parts;
--
-- /* extract the protocol information */
--
-- if (protocol)
-+ signed_type = mutt_is_multipart_signed (b);
-+ if (!signed_type)
- {
-- char major[STRING];
-- char *t;
--
-- if ((protocol_minor = strchr (protocol, '/'))) protocol_minor++;
--
-- strfcpy (major, protocol, sizeof(major));
-- if((t = strchr(major, '/')))
-- *t = '\0';
--
-- protocol_major = mutt_check_mime_type (major);
-+ /* A null protocol value is already checked for in mutt_body_handler() */
-+ state_printf (s, _("[-- Error: "
-+ "Unknown multipart/signed protocol %s! --]\n\n"),
-+ mutt_get_parameter ("protocol", b->parameter));
-+ return mutt_body_handler (a, s);
- }
-
-- /* consistency check */
--
-- if (!(a && a->next && a->next->type == protocol_major &&
-- !mutt_strcasecmp (a->next->subtype, protocol_minor)))
-+ if (!(a && a->next))
-+ inconsistent = 1;
-+ else
-+ {
-+ switch (signed_type)
-+ {
-+ case SIGN:
-+ if (a->next->type != TYPEMULTIPART ||
-+ ascii_strcasecmp (a->next->subtype, "mixed"))
-+ inconsistent = 1;
-+ break;
-+ case PGPSIGN:
-+ if (a->next->type != TYPEAPPLICATION ||
-+ ascii_strcasecmp (a->next->subtype, "pgp-signature"))
-+ inconsistent = 1;
-+ break;
-+ case SMIMESIGN:
-+ if (a->next->type != TYPEAPPLICATION ||
-+ (ascii_strcasecmp (a->next->subtype, "x-pkcs7-signature") &&
-+ ascii_strcasecmp (a->next->subtype, "pkcs7-signature")))
-+ inconsistent = 1;
-+ break;
-+ default:
-+ inconsistent = 1;
-+ }
-+ }
-+ if (inconsistent)
- {
- state_attach_puts (_("[-- Error: "
- "Inconsistent multipart/signed structure! --]\n\n"),
-@@ -816,27 +830,6 @@ int mutt_signed_handler (BODY *a, STATE
- return mutt_body_handler (a, s);
- }
-
--
-- if ((WithCrypto & APPLICATION_PGP)
-- && protocol_major == TYPEAPPLICATION
-- && !ascii_strcasecmp (protocol_minor, "pgp-signature"))
-- ;
-- else if ((WithCrypto & APPLICATION_SMIME)
-- && protocol_major == TYPEAPPLICATION
-- && !(ascii_strcasecmp (protocol_minor, "x-pkcs7-signature")
-- && ascii_strcasecmp (protocol_minor, "pkcs7-signature")))
-- ;
-- else if (protocol_major == TYPEMULTIPART
-- && !ascii_strcasecmp (protocol_minor, "mixed"))
-- ;
-- else
-- {
-- state_printf (s, _("[-- Error: "
-- "Unknown multipart/signed protocol %s! --]\n\n"),
-- protocol);
-- return mutt_body_handler (a, s);
-- }
--
- if (s->flags & M_DISPLAY)
- {
-
Home |
Main Index |
Thread Index |
Old Index