rpm/mutt
1
0
Fork 1
forked from pool/mutt
Code Pull Requests Activity

Update to mutt 2.1.5

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=243
This commit is contained in:
Dr. Werner Fink 2022-01-11 11:02:02 +00:00 committed by Git OBS Bridge
parent 85c4ff0526
commit a919701bbb
17 changed files with 192 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
aw.listreply.diff
View File

@ -8,9 +8,9 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
--- init.h
+++ init.h 2020-01-14 13:35:13.352604037 +0000
@@ -1864,6 +1864,13 @@ struct option_t MuttVars[] = {
** from your spool mailbox to your $$mbox mailbox, or as a result of
** a ``$mbox-hook'' command.
@@ -1960,6 +1960,13 @@ struct option_t MuttVars[] = {
** If \fIset\fP, convert the date in the Date header of sent emails into local
** (sender's) timezone.
*/
+ { "list_reply", DT_QUAD, R_NONE, {.l=OPT_LISTREPLY}, {.l=MUTT_NO} },
+ /*
@ -24,7 +24,7 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
** .pp
--- mutt.h
+++ mutt.h 2020-01-14 13:32:27.595685455 +0000
@@ -341,6 +341,7 @@ enum
@@ -342,6 +342,7 @@ enum
#endif
OPT_SUBJECT,
OPT_VERIFYSIG, /* verify PGP signatures */

2
bsc907453-CVE-2014-9116-jessie.patch
View File

@ -18,7 +18,7 @@ Index: mutt/lib.c
--- lib.c
+++ lib.c 2019-01-02 13:25:44.767193676 +0000
@@ -666,6 +666,9 @@ char *mutt_substrdup (const char *begin,
@@ -675,6 +675,9 @@ char *mutt_substrdup (const char *begin,
size_t len;
char *p;

2
mutt-1.10.1-imap.patch
View File

@ -4,7 +4,7 @@
--- browser.c
+++ browser.c 2020-01-14 14:51:44.927127369 +0000
@@ -979,6 +979,16 @@ void _mutt_buffer_select_file (BUFFER *f
@@ -1082,6 +1082,16 @@ void _mutt_buffer_select_file (BUFFER *f
mutt_buffer_strcpy (f, state.entry[menu->current].full_path);

6
mutt-1.13.3.dif
View File

@ -16,7 +16,7 @@
CPPFLAGS="$CPPFLAGS -I${withval}/include"
fi
LDFLAGS="$LDFLAGS -L${withval}/lib"
@@ -801,8 +801,12 @@ AC_ARG_WITH(ssl, AS_HELP_STRING([--with-
@@ -746,8 +746,12 @@ AC_ARG_WITH(ssl, AS_HELP_STRING([--with-
else
if test "$with_ssl" != "yes"
then
@ -31,7 +31,7 @@
fi
saved_LIBS="$LIBS"
@@ -889,8 +893,12 @@ AC_ARG_WITH(sasl, AS_HELP_STRING([--with
@@ -834,8 +838,12 @@ AC_ARG_WITH(sasl, AS_HELP_STRING([--with
if test "$with_sasl" != "yes"
then
@ -98,7 +98,7 @@
else
--- mx.c
+++ mx.c 2020-01-14 13:04:28.102878757 +0000
@@ -1476,6 +1476,9 @@ void mx_update_context (CONTEXT *ctx, in
@@ -1485,6 +1485,9 @@ void mx_update_context (CONTEXT *ctx, in
{
h = ctx->hdrs[msgno];

4
mutt-1.5.15-wrapcolumn.diff
View File

@ -6,10 +6,10 @@ Index: init.h
--- init.h
+++ init.h 2020-01-14 13:28:27.408149074 +0000
@@ -4534,6 +4534,7 @@ struct option_t MuttVars[] = {
@@ -4691,6 +4691,7 @@ struct option_t MuttVars[] = {
** Also see $$copy_decode_weed, $$pipe_decode_weed, $$print_decode_weed.
*/
{ "wrap", DT_NUM, R_PAGER, {.p=&Wrap}, {.l=0} },
{ "wrap", DT_NUM, R_PAGER_FLOW, {.p=&Wrap}, {.l=0} },
+ { "wrapcolumn", DT_SYN, R_NONE, {.p="wrap"}, {.p=0} },
/*
** .pp

4
mutt-1.5.20-sendgroupreplyto.diff
View File

@ -6,7 +6,7 @@
--- init.h
+++ init.h 2020-01-14 13:12:26.725982952 +0000
@@ -3235,6 +3235,13 @@ struct option_t MuttVars[] = {
@@ -3366,6 +3366,13 @@ struct option_t MuttVars[] = {
** .pp
** Also see the $$force_name variable.
*/
@ -22,7 +22,7 @@
** .pp
--- mutt.h
+++ mutt.h 2020-01-14 13:07:33.727426389 +0000
@@ -524,6 +524,7 @@ enum
@@ -527,6 +527,7 @@ enum
OPTSAVEADDRESS,
OPTSAVEEMPTY,
OPTSAVENAME,

2
mutt-1.5.21-mailcap.diff
View File

@ -9,7 +9,7 @@ Index: mutt-1.5.21/init.c
--- init.c
+++ init.c 2019-01-02 13:25:20.795634552 +0000
@@ -3725,7 +3725,7 @@ void mutt_init (int skip_sys_rc, LIST *c
@@ -3750,7 +3750,7 @@ void mutt_init (int skip_sys_rc, LIST *c
else
{
/* Default search path from RFC1524 */

18
mutt-1.5.23-carriage-return.path
View File

@ -8,7 +8,7 @@
--- crypt-gpgme.c
+++ crypt-gpgme.c 2019-11-13 13:46:16.512388398 +0000
@@ -2733,7 +2733,7 @@ static void copy_clearsigned (gpgme_data
@@ -2731,7 +2731,7 @@ static void copy_clearsigned (gpgme_data
if (armor_header)
{
@ -19,7 +19,7 @@
}
--- lib.c
+++ lib.c 2019-11-13 13:42:00.245189313 +0000
@@ -684,6 +684,17 @@ int mutt_strcmp(const char *a, const cha
@@ -693,6 +693,17 @@ int mutt_strcmp(const char *a, const cha
return strcmp(NONULL(a), NONULL(b));
}
@ -39,7 +39,7 @@
return strcasecmp(NONULL(a), NONULL(b));
--- lib.h
+++ lib.h 2019-11-13 13:47:17.399247662 +0000
@@ -200,6 +200,7 @@ int mutt_copy_stream (FILE *, FILE *);
@@ -215,6 +200,7 @@ int mutt_copy_stream (FILE *, FILE *);
int mutt_copy_bytes (FILE *, FILE *, size_t);
int mutt_strcasecmp (const char *, const char *);
int mutt_strcmp (const char *, const char *);
@ -49,7 +49,7 @@
int mutt_strcoll (const char *, const char *);
--- pager.c
+++ pager.c 2019-11-13 13:48:32.257845120 +0000
@@ -840,7 +840,7 @@ resolve_types (char *buf, char *raw, str
@@ -975,7 +975,7 @@ resolve_types (char *buf, char *raw, str
lineInfo[n].type = MT_COLOR_NORMAL;
else if (check_attachment_marker ((char *) raw) == 0)
lineInfo[n].type = MT_COLOR_ATTACHMENT;
@ -60,7 +60,7 @@
--- pgp.c
+++ pgp.c 2019-11-13 13:51:06.746954963 +0000
@@ -373,7 +373,7 @@ static void pgp_copy_clearsigned (FILE *
@@ -371,7 +371,7 @@ static void pgp_copy_clearsigned (FILE *
continue;
}
@ -69,7 +69,7 @@
break;
if (armor_header)
@@ -448,11 +448,11 @@ int pgp_application_pgp_handler (BODY *m
@@ -446,11 +446,11 @@ int pgp_application_pgp_handler (BODY *m
could_not_decrypt = 0;
decrypt_okay_rc = 0;
@ -84,7 +84,7 @@
pgp_keyblock = 1;
else
{
@@ -482,10 +482,10 @@ int pgp_application_pgp_handler (BODY *m
@@ -480,10 +480,10 @@ int pgp_application_pgp_handler (BODY *m
fputs (buf, tmpfp);
@ -98,7 +98,7 @@
break;
/* remember optional Charset: armor header as defined by RfC4880 */
if (mutt_strncmp ("Charset: ", buf, 9) == 0)
@@ -748,11 +748,11 @@ static int pgp_check_traditional_one_bod
@@ -746,11 +746,11 @@ static int pgp_check_traditional_one_bod
{
if (mutt_strncmp ("-----BEGIN PGP ", buf, 15) == 0)
{
@ -113,7 +113,7 @@
key = 1;
}
}
@@ -1300,9 +1300,9 @@ BODY *pgp_sign_message (BODY *a)
@@ -1299,9 +1299,9 @@ BODY *pgp_sign_message (BODY *a)
*/
while (fgets (buffer, sizeof (buffer) - 1, pgpout) != NULL)
{

14
mutt-1.6.1-opennfs.dif
View File

@ -10,7 +10,7 @@
--- Makefile.am
+++ Makefile.am 2020-01-14 13:28:45.787807571 +0000
@@ -33,7 +33,7 @@ mutt_SOURCES = \
@@ -34,7 +34,7 @@ mutt_SOURCES = \
edit.c enter.c flags.c init.c filter.c from.c \
getdomain.c group.c \
handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \
@ -19,13 +19,13 @@
postpone.c query.c recvattach.c recvcmd.c \
rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
score.c send.c sendlib.c signal.c sort.c \
@@ -96,7 +96,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c
@@ -97,7 +97,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c
mutt_dotlock_LDADD = $(LIBOBJS)
mutt_dotlock_DEPENDENCIES = $(LIBOBJS)
-mutt_pgpring_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5.c pgppacket.c ascii.c
+mutt_pgpring_SOURCES = opennfs.c pgppubring.c pgplib.c lib.c extlib.c sha1.c md5.c pgppacket.c ascii.c
mutt_pgpring_LDADD = $(LIBOBJS) $(INTLLIBS)
mutt_pgpring_LDADD = $(LIBOBJS) $(LIBINTL)
mutt_pgpring_DEPENDENCIES = $(LIBOBJS) $(INTLDEPS)
--- mbox.c
@ -73,7 +73,7 @@
{
--- mutt.h
+++ mutt.h 2020-01-14 13:28:45.787807571 +0000
@@ -1199,4 +1199,7 @@ typedef struct
@@ -1202,4 +1202,7 @@ typedef struct
#include "lib.h"
#include "globals.h"
@ -83,7 +83,7 @@
#endif /*MUTT_H*/
--- muttlib.c
+++ muttlib.c 2020-01-14 13:28:45.787807571 +0000
@@ -2599,6 +2599,10 @@ int safe_open (const char *path, int fla
@@ -2534,6 +2534,10 @@ int safe_open (const char *path, int fla
BUFFER *safe_file = NULL;
BUFFER *safe_dir = NULL;
@ -94,7 +94,7 @@
if (flags & O_EXCL)
{
safe_file = mutt_buffer_pool_get ();
@@ -2627,7 +2631,7 @@ int safe_open (const char *path, int fla
@@ -2562,7 +2566,7 @@ int safe_open (const char *path, int fla
if ((fd = open (path, flags & ~O_EXCL, 0600)) < 0)
goto cleanup;
@ -230,7 +230,7 @@
+}
--- sendlib.c
+++ sendlib.c 2020-01-14 13:28:45.787807571 +0000
@@ -2517,7 +2517,11 @@ send_msg (const char *path, char **args,
@@ -2557,7 +2557,11 @@ send_msg (const char *path, char **args,
if (SendmailWait >= 0 && tempfile && *tempfile)
{
/* *tempfile will be opened as stdout */

3
mutt-2.0.7.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:957688c6a521561992d4f2f27cf9feb239c7c6c0042c6061c0e474a7dd26cc91
size 5299366

3
mutt-2.1.5.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:92a309e47e363a97d62425bcb71adceae5ab5c4c413dbcac37fa98ed70c12be0
size 5414049

16
mutt-2.1.5.tar.gz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEiXWpszqjeRA4XFMIre92hIAxa9oFAmHOHKwACgkQre92hIAx
a9q0DhAA2Z99sJwfoQSZcaRab6AXavZ14H6MLh32Aw+zThG+lUd/X2UZmXtD9FuQ
93+EojHRhIcthuATlzF7889glmuab/tQiXrktloGi8poSMcEwEErbSdTmV4Wkq7u
Hb6O15qHicmDO/mEH9E2pkbv4AtXNxT3w6940x/HyZT871Qk+4OHYADDS7cNwrKb
Sfg8fFSidfN6hBg3NiMiGvzg7/ucr0c4A9hPsKGu84ukXjwAlUUmrTAvPgSp0s2Z
uALvwVgVf+Deskq+bRq7NjATvfec7042y9eaUBl1AO1RwWrUZaTrbRPOM2xOTJaA
rmLdvu2LFbBvCv66r9hvgyN1Axx1ExMrB9zxmuDJBnTVd9VtfrlbfkOs/WH1QtGV
e+O5cx8PzGj1m9sujJc8mxaAjaT4L6s6HDP8Cu64ly/4YLFWOq5iEj5WlBqYtwUw
B7cLUCFBVeLbrEOyUFBylfKKNoR4X9ap4jXb+l7x7JYFGBkDocgGjePFpVKxb/If
UNtSVhE3nzTcWhCszQOljYgAMVfkwp7+qSGqkZYmyvq90qmSzMUQ0ZfC/5tGuxKK
Bf1CpU/O4iSntt+3SM5qIlaR6xMctEUws0xtrtT8eKe6bkaqIv7GQLzah2HMbscb
ZPvG7xPUSBC+0xxBc8Zre6dZLH03nWprJrVDWMi5bhj04if6Bwc=
=lz6+
-----END PGP SIGNATURE-----

81
mutt.changes
View File

@ -1,3 +1,84 @@
-------------------------------------------------------------------
Tue Jan 11 10:50:42 UTC 2022 - Dr. Werner Fink <werner@suse.de>
- Update to mutt 2.1.5
* This is a bug-fix release, fixing two SMTP authentication
issues, a crash bug on NetBSD, and a couple other issues.
* Mutt 2.1.4 was released on December 11, 2021. This is a bug-fix
release, fixing a performance issue when used with DavMail.
* Mutt 2.1.3 was released on September 10, 2021. This is a
bug-fix release, fixing some of the fixes in the last release. IMAP
and QRESYNC users are advised to upgrade.
* Mutt 2.1.2 was released on August 24, 2021. This is an
important bug-fix release, fixing a potential data-loss IMAP
bug, a couple QRESYNC bugs, and a few other issues. IMAP users
are strongly advised to upgrade.
* Mutt 2.1.1 was released on July 12, 2021. This is a bug-fix
release, fixing some redraw issues and a problem with the new List
Menu for mbox mailboxes.
* Mutt 2.1.0 was released on June 12, 2021. This release has new
features and bug fixes.
! The -d option allows a negative number. If negative, debug files are
not rotated. The debug level is the absolute value.
+ <view-pager> in the attachment menu uses a copiousoutput mailcap
entry, or falls back to raw text.
+ <view-mailcap>, <view-pager>, and <view-text> functions added to the
compose menu.
+ <view-alt-pager> in the compose menu allows previewing the output
of the $send_multipart_alternative_filter the way <view-pager> does.
+ <list-action>, bound to Esc-L in the index and pager menu, brings
up a menu of operations to perform on mailing list emails, such as
subscribe/unsubscribe.
+ <skip-headers>, bound to 'H' in the pager, will skip to the first
blank line following the headers.
! ~h patterns over IMAP and POP3 will only download the headers of the
message. However with message caching enabled (via $message_cachedir)
the whole message will still be downloaded.
+ $ssl_verify_host_override allows manually specifying the host name
to verify a server certificate against.
! --enable-hcache, with no particular backend enabled, will scan in
the order: kyotocabinet, tokyocabinet, lmdb, qdbm, gdbm, bdb.
! $allow_ansi understands 256-color ANSI escape sequences.
+ $message_id_format can be used to specify a custom message-id
format. Since it's a format string, this can also use a filter.
Please use this option with care, as Mutt won't check if your
message-id is legal.
! mailboxes -nonotify will poll a mailbox for new mail, but will not
trigger new mail notifications (e.g. $beep_new or $new_mail_command).
! $reverse_name affects tagged reply/forward/compose-to-sender
actions too.
! ANSI sequences are filtered for inline-forwarded autoview content,
in addition to replies.
! $forward_decrypt is now a quadoption, defaulting 'yes' for backward
compatibility.
! Pattern functions, (e.g. search and limit) can be interrupted with
ctrl-c.
! The default mailto_allow list now includes cc, in-reply-to, and
references.
+ $sort_browser_mailboxes controls mailbox browsing, and defaults
"unsorted". $sort_browser now only controls directory browsing.
! $sort_browser and $sort_browser_mailboxes "unsorted" now means the
order added (e.g. specified in the muttrc). Switching back to
"unsorted" will now resort in that order (previously it was a no-op.)
! In the browser ".." is excluded from sorting and kept at the top.
! Temp filenames generated for mailcap invocation now allow non-ascii
characters.
+ $local_date_header, when unset, causes the date in the Date header
to be formatted using the GMT timezone.
- Port patches
* aw.listreply.diff
* bsc907453-CVE-2014-9116-jessie.patch
* mutt-1.10.1-imap.patch
* mutt-1.13.3.dif
* mutt-1.5.15-wrapcolumn.diff
* mutt-1.5.20-sendgroupreplyto.diff
* mutt-1.5.21-mailcap.diff
* mutt-1.5.23-carriage-return.path
* mutt-1.6.1-opennfs.dif
* patch-1.5.24.vk.pgp_verbose_mime
* widechar.sidebar.dif
- Add keyring and signing of the tarball
-------------------------------------------------------------------
Wed Jul 14 11:07:24 UTC 2021 - Dr. Werner Fink <werner@suse.de>

52
mutt.keyring Normal file
View File

@ -0,0 +1,52 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
Vpd8jtu9noc=
=uho+
-----END PGP PUBLIC KEY BLOCK-----

6
mutt.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package mutt
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -20,7 +20,7 @@
%bcond_with mutt_openssl
%bcond_without mutt_gnutls
Name: mutt
Version: 2.0.7
Version: 2.1.5
Release: 0
Summary: Mail Program
# ftp://ftp.mutt.org/mutt/devel/
@ -38,6 +38,8 @@ Source6: mutt_oauth2.py-3.6
Source7: mutt_oauth2.py.README
Source8: backports-datetime-fromisoformat-1.0.0.tar.gz
Source9: mutt.mailcap
Source10: https://bitbucket.org/mutt/mutt/downloads/mutt-%{version}.tar.gz.asc
Source11: mutt.keyring
Patch0: %{name}-1.13.3.dif
# http://www.spinnaker.de/mutt/compressed/
Patch2: %{name}-1.5.9i-pgpewrap.diff

6
patch-1.5.24.vk.pgp_verbose_mime
View File

@ -6,7 +6,7 @@
--- globals.h
+++ globals.h 2020-01-14 13:37:00.770606718 +0000
@@ -277,6 +277,8 @@ WHERE char *PgpDefaultKey;
@@ -279,6 +279,8 @@ WHERE char *PgpDefaultKey;
WHERE char *PgpSignAs;
WHERE long PgpTimeout;
WHERE char *PgpEntryFormat;
@ -17,7 +17,7 @@
WHERE char *PgpVerifyCommand;
--- init.h
+++ init.h 2020-01-14 13:41:15.145875625 +0000
@@ -3618,9 +3618,18 @@ struct option_t MuttVars[] = {
@@ -3749,9 +3749,18 @@ struct option_t MuttVars[] = {
** a line quoted text if it also matches $$smileys. This mostly
** happens at the beginning of a line.
*/
@ -41,7 +41,7 @@
** .pp
--- pgp.c
+++ pgp.c 2020-01-14 13:42:29.880485319 +0000
@@ -1363,7 +1363,8 @@ BODY *pgp_sign_message (BODY *a)
@@ -1362,7 +1362,8 @@ BODY *pgp_sign_message (BODY *a)
t->disposition = DISPNONE;
t->encoding = ENC7BIT;
t->unlink = 1; /* ok to remove this file after sending. */

6
widechar.sidebar.dif
View File

@ -3,7 +3,7 @@
1 file changed, 6 insertions(+), 5 deletions(-)
--- handler.c
+++ handler.c 2018-07-04 13:48:57.285110213 +0000
+++ handler.c 2022-01-11 10:41:03.491446992 +0000
@@ -781,7 +781,7 @@ static void enriched_set_flags (const wc
static int text_enriched_handler (BODY *a, STATE *s)
{
@ -12,7 +12,7 @@
+ TEXT, TEXT_GOTWC, LANGLE, TAG, BOGUS_TAG, NEWLINE, ST_EOF, DONE
} state = TEXT;
long bytes = a->length;
LOFF_T bytes = a->length;
@@ -811,7 +811,7 @@ static int text_enriched_handler (BODY *
{
if (state != ST_EOF)
@ -42,7 +42,7 @@
}
break;
@@ -1589,7 +1590,7 @@ void mutt_decode_attachment (BODY *b, ST
@@ -1586,7 +1587,7 @@ void mutt_decode_attachment (BODY *b, ST
* strip all trailing spaces to improve interoperability;
* if $text_flowed is unset, simply verbatim copy input
*/