Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/files/
Date: Thu, 26 May 2022 20:31:37
Message-Id: 1653597033.8a998cf457131f6e2b614929809d71f1ded06aa3.conikost@gentoo
1 commit: 8a998cf457131f6e2b614929809d71f1ded06aa3
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Thu May 26 18:13:00 2022 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Thu May 26 20:30:33 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a998cf4
7
8 mail-client/neomutt: remove unused patch(es)
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
12 Closes: https://github.com/gentoo/gentoo/pull/25648
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 ...x-seqset-iterator-when-it-ends-in-a-comma.patch | 37 ----------------------
16 1 file changed, 37 deletions(-)
17
18 diff --git a/mail-client/neomutt/files/0001-Fix-seqset-iterator-when-it-ends-in-a-comma.patch b/mail-client/neomutt/files/0001-Fix-seqset-iterator-when-it-ends-in-a-comma.patch
19 deleted file mode 100644
20 index 06f31ffeb46b..000000000000
21 --- a/mail-client/neomutt/files/0001-Fix-seqset-iterator-when-it-ends-in-a-comma.patch
22 +++ /dev/null
23 @@ -1,37 +0,0 @@
24 -From fa1db5785e5cfd9d3cd27b7571b9fe268d2ec2dc Mon Sep 17 00:00:00 2001
25 -From: Kevin McCarthy <kevin@×××.us>
26 -Date: Mon, 3 May 2021 13:11:30 -0700
27 -Subject: [PATCH] Fix seqset iterator when it ends in a comma
28 -
29 -If the seqset ended with a comma, the substr_end marker would be just
30 -before the trailing nul. In the next call, the loop to skip the
31 -marker would iterate right past the end of string too.
32 -
33 -The fix is simple: place the substr_end marker and skip past it
34 -immediately.
35 ----
36 - imap/util.c | 4 +---
37 - 1 file changed, 1 insertion(+), 3 deletions(-)
38 -
39 -diff --git a/imap/util.c b/imap/util.c
40 -index 52aff7da0..27fb86295 100644
41 ---- a/imap/util.c
42 -+++ b/imap/util.c
43 -@@ -1119,13 +1119,11 @@ int mutt_seqset_iterator_next(struct SeqsetIterator *iter, unsigned int *next)
44 - if (iter->substr_cur == iter->eostr)
45 - return 1;
46 -
47 -- while (!*(iter->substr_cur))
48 -- iter->substr_cur++;
49 - iter->substr_end = strchr(iter->substr_cur, ',');
50 - if (!iter->substr_end)
51 - iter->substr_end = iter->eostr;
52 - else
53 -- *(iter->substr_end) = '\0';
54 -+ *(iter->substr_end++) = '\0';
55 -
56 - char *range_sep = strchr(iter->substr_cur, ':');
57 - if (range_sep)
58 ---
59 -2.30.2
60 -