mail/mutt: Update to 1.11.1

PR:		233815
Submitted by:	Derek Schrock <dereks@lifeofadishwasher.com> (maintainer)
This commit is contained in:
Steve Wills 2018-12-09 00:47:46 +00:00
parent a576db78a1
commit d3b01c90e9
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=487002
3 changed files with 8 additions and 29 deletions

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mutt
DISTVERSION= 1.11.0
DISTVERSION= 1.11.1
CATEGORIES+= mail ipv6
MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
@ -177,7 +177,7 @@ GREETING_PATCH_PATCHFILES= mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc
QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv
NNTP_BROKEN= NNTP 1.10.0 broken with mutt 1.11.0
NNTP_BROKEN= NNTP 1.10.0 broken with mutt ${DISTVERSION}
NNTP_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:-p1:vvv
NNTP_CONFIGURE_ON= --enable-nntp
NNTP_VARS= XML_NEEDED=yes
@ -190,7 +190,7 @@ DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref
# un/comment as each VERSION is created for PORTVERSION
VVV_PATCH_VERSION= 1.10.0
#GREETING_PATCH_VERSION= 1.11.0
#GREETING_PATCH_VERSION= 1.11.1
.if !defined(VVV_PATCH_VERSION)
VVV_PATCH_VERSION= ${PORTVERSION}

View File

@ -1,8 +1,8 @@
TIMESTAMP = 1543291077
SHA256 (mutt/mutt-1.11.0.tar.gz) = 92c9261933809fed34d66469cb83c7f83bb29f721cd48d608c40cafd299c10e3
SIZE (mutt/mutt-1.11.0.tar.gz) = 4568953
SHA256 (mutt/mutt-1.11.0.vc.greeting) = 57bd75016350e3ab8516f27154016e23a29176d2f1163258d31531f4aa722afc
SIZE (mutt/mutt-1.11.0.vc.greeting) = 4560
TIMESTAMP = 1543914710
SHA256 (mutt/mutt-1.11.1.tar.gz) = 705141013662e53b78e49ed545360281f30a09ddda908f4de733277a60b1db05
SIZE (mutt/mutt-1.11.1.tar.gz) = 4579062
SHA256 (mutt/mutt-1.11.1.vc.greeting) = 57bd75016350e3ab8516f27154016e23a29176d2f1163258d31531f4aa722afc
SIZE (mutt/mutt-1.11.1.vc.greeting) = 4560
SHA256 (mutt/patch-1.10.0.vvv.nntp.gz) = 895c168f00cd073234c6cbb0d6972b5b390c64bf9ee5a13f58e0ea0652cabe4a
SIZE (mutt/patch-1.10.0.vvv.nntp.gz) = 60723
SHA256 (mutt/patch-1.10.0.vvv.initials.gz) = 7254751c439d4b138e89b47f71bd4e37c1c257130a8c88af91189fd8e4f249bb

View File

@ -1,21 +0,0 @@
--- imap/message.c.orig 2018-11-18 18:07:02 UTC
+++ imap/message.c
@@ -652,6 +652,18 @@ static int read_headers_condstore_qresyn
{
imap_hcache_close (idata);
imap_expunge_mailbox (idata);
+
+ /* undo expunge count updates.
+ * mx_update_context() will do this at the end of the header fetch. */
+ ctx->vcount = 0;
+ ctx->vsize = 0;
+ ctx->tagged = 0;
+ ctx->deleted = 0;
+ ctx->new = 0;
+ ctx->unread = 0;
+ ctx->changed = 0;
+ ctx->flagged = 0;
+
idata->hcache = imap_hcache_open (idata, NULL);
idata->reopen &= ~IMAP_EXPUNGE_PENDING;
}