View | Details | Raw Unified | Return to bug 233815
Collapse All | Expand All

(-)b/mail/mutt/Makefile (-3 / +3 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	mutt
4
PORTNAME=	mutt
5
DISTVERSION=	1.11.0
5
DISTVERSION=	1.11.1
6
CATEGORIES+=	mail ipv6
6
CATEGORIES+=	mail ipv6
7
MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
7
MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
8
		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
8
		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
Lines 177-183 GREETING_PATCH_PATCHFILES= mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc Link Here
177
QUOTE_PATCH_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
177
QUOTE_PATCH_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
178
			patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv
178
			patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv
179
179
180
NNTP_BROKEN=	NNTP 1.10.0 broken with mutt 1.11.0
180
NNTP_BROKEN=	NNTP 1.10.0 broken with mutt ${DISTVERSION}
181
NNTP_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:-p1:vvv
181
NNTP_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:-p1:vvv
182
NNTP_CONFIGURE_ON=	--enable-nntp
182
NNTP_CONFIGURE_ON=	--enable-nntp
183
NNTP_VARS=	XML_NEEDED=yes
183
NNTP_VARS=	XML_NEEDED=yes
Lines 190-196 DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref Link Here
190
190
191
# un/comment as each VERSION is created for PORTVERSION
191
# un/comment as each VERSION is created for PORTVERSION
192
VVV_PATCH_VERSION=	1.10.0
192
VVV_PATCH_VERSION=	1.10.0
193
#GREETING_PATCH_VERSION=	1.11.0
193
#GREETING_PATCH_VERSION=	1.11.1
194
194
195
.if !defined(VVV_PATCH_VERSION)
195
.if !defined(VVV_PATCH_VERSION)
196
VVV_PATCH_VERSION=	${PORTVERSION}
196
VVV_PATCH_VERSION=	${PORTVERSION}
(-)b/mail/mutt/distinfo (-5 / +5 lines)
Lines 1-8 Link Here
1
TIMESTAMP = 1543291077
1
TIMESTAMP = 1543914710
2
SHA256 (mutt/mutt-1.11.0.tar.gz) = 92c9261933809fed34d66469cb83c7f83bb29f721cd48d608c40cafd299c10e3
2
SHA256 (mutt/mutt-1.11.1.tar.gz) = 705141013662e53b78e49ed545360281f30a09ddda908f4de733277a60b1db05
3
SIZE (mutt/mutt-1.11.0.tar.gz) = 4568953
3
SIZE (mutt/mutt-1.11.1.tar.gz) = 4579062
4
SHA256 (mutt/mutt-1.11.0.vc.greeting) = 57bd75016350e3ab8516f27154016e23a29176d2f1163258d31531f4aa722afc
4
SHA256 (mutt/mutt-1.11.1.vc.greeting) = 57bd75016350e3ab8516f27154016e23a29176d2f1163258d31531f4aa722afc
5
SIZE (mutt/mutt-1.11.0.vc.greeting) = 4560
5
SIZE (mutt/mutt-1.11.1.vc.greeting) = 4560
6
SHA256 (mutt/patch-1.10.0.vvv.nntp.gz) = 895c168f00cd073234c6cbb0d6972b5b390c64bf9ee5a13f58e0ea0652cabe4a
6
SHA256 (mutt/patch-1.10.0.vvv.nntp.gz) = 895c168f00cd073234c6cbb0d6972b5b390c64bf9ee5a13f58e0ea0652cabe4a
7
SIZE (mutt/patch-1.10.0.vvv.nntp.gz) = 60723
7
SIZE (mutt/patch-1.10.0.vvv.nntp.gz) = 60723
8
SHA256 (mutt/patch-1.10.0.vvv.initials.gz) = 7254751c439d4b138e89b47f71bd4e37c1c257130a8c88af91189fd8e4f249bb
8
SHA256 (mutt/patch-1.10.0.vvv.initials.gz) = 7254751c439d4b138e89b47f71bd4e37c1c257130a8c88af91189fd8e4f249bb
(-)a/mail/mutt/files/patch-qresync-crash (-22 lines)
Removed Link Here
1
--- imap/message.c.orig	2018-11-18 18:07:02 UTC
2
+++ imap/message.c
3
@@ -652,6 +652,18 @@ static int read_headers_condstore_qresyn
4
   {
5
     imap_hcache_close (idata);
6
     imap_expunge_mailbox (idata);
7
+
8
+    /* undo expunge count updates.
9
+     * mx_update_context() will do this at the end of the header fetch. */
10
+    ctx->vcount = 0;
11
+    ctx->vsize = 0;
12
+    ctx->tagged = 0;
13
+    ctx->deleted = 0;
14
+    ctx->new = 0;
15
+    ctx->unread = 0;
16
+    ctx->changed = 0;
17
+    ctx->flagged = 0;
18
+
19
     idata->hcache = imap_hcache_open (idata, NULL);
20
     idata->reopen &= ~IMAP_EXPUNGE_PENDING;
21
   }
22
- 

Return to bug 233815