From 720cd6892de9966f6e7babe36c3c8c29b4b16931 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Fri, 8 Jan 2021 08:52:30 +0000 Subject: [PATCH] Accepting request 859583 from home:AndreasStieger:branches:server:mail mutt 2.0.4 OBS-URL: https://build.opensuse.org/request/show/859583 OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=233 --- bug-676388-largefile.patch | 31 ------------------------------- mutt-2.0.3.tar.gz | 3 --- mutt-2.0.4.tar.gz | 3 +++ mutt.changes | 11 +++++++++++ mutt.spec | 4 +--- 5 files changed, 15 insertions(+), 37 deletions(-) delete mode 100644 bug-676388-largefile.patch delete mode 100644 mutt-2.0.3.tar.gz create mode 100644 mutt-2.0.4.tar.gz diff --git a/bug-676388-largefile.patch b/bug-676388-largefile.patch deleted file mode 100644 index bacb8a7..0000000 --- a/bug-676388-largefile.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- - mh.c | 6 +++--- - mutt.h | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - ---- mh.c -+++ mh.c 2020-01-14 13:31:51.368358811 +0000 -@@ -1818,9 +1818,9 @@ static int mh_rewrite_message (CONTEXT * - BUFFER *newpath = NULL; - BUFFER *partpath = NULL; - -- long old_body_offset = h->content->offset; -- long old_body_length = h->content->length; -- long old_hdr_lines = h->lines; -+ LOFF_T old_body_offset = h->content->offset; -+ LOFF_T old_body_length = h->content->length; -+ LOFF_T old_hdr_lines = h->lines; - - if ((dest = mx_open_new_message (ctx, h, 0)) == NULL) - return -1; ---- mutt.h -+++ mutt.h 2020-01-14 13:31:51.368358811 +0000 -@@ -782,7 +782,7 @@ typedef struct body - PARAMETER *parameter; /* parameters of the content-type */ - char *description; /* content-description */ - char *form_name; /* Content-Disposition form-data name param */ -- long hdr_offset; /* offset in stream where the headers begin. -+ LOFF_T hdr_offset; /* offset in stream where the headers begin. - * this info is used when invoking metamail, - * where we need to send the headers of the - * attachment diff --git a/mutt-2.0.3.tar.gz b/mutt-2.0.3.tar.gz deleted file mode 100644 index a0330f6..0000000 --- a/mutt-2.0.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c327cafb7acbfd4a57e7c817148fe438720a4545a5f628926f7745bc752c1ed -size 5292808 diff --git a/mutt-2.0.4.tar.gz b/mutt-2.0.4.tar.gz new file mode 100644 index 0000000..4bfac16 --- /dev/null +++ b/mutt-2.0.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45087e78105e9abc7cc37827865d319081587cb53a94412aa4e3118e937991d4 +size 5293913 diff --git a/mutt.changes b/mutt.changes index 89c71c3..f3b225e 100644 --- a/mutt.changes +++ b/mutt.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Dec 31 08:26:40 UTC 2020 - Andreas Stieger + +- mutt 2.0.4: + * Fix smtp debug segfault on invalid SmtpAuthenticators list + * Fix header cache BDB version checking + * Fix offset to use LOFF_T in a couple places + * Ensure idata->check_status is cleared on mailbox close + * Abort IMAP open if condstore/qresync updates fetch fails +- drop upstreamed bug-676388-largefile.patch + ------------------------------------------------------------------- Sat Dec 5 17:42:33 UTC 2020 - Andreas Stieger diff --git a/mutt.spec b/mutt.spec index 12860c2..523087e 100644 --- a/mutt.spec +++ b/mutt.spec @@ -20,7 +20,7 @@ %bcond_with mutt_openssl %bcond_without mutt_gnutls Name: mutt -Version: 2.0.3 +Version: 2.0.4 Release: 0 Summary: Mail Program # ftp://ftp.mutt.org/mutt/devel/ @@ -41,7 +41,6 @@ Patch2: %{name}-1.5.9i-pgpewrap.diff Patch3: %{name}-1.5.20-sendgroupreplyto.diff Patch4: %{name}-1.5.15-wrapcolumn.diff Patch7: mutt-1.6.1-opennfs.dif -Patch9: bug-676388-largefile.patch # http://www.wolfermann.org/mutt.html Patch11: aw.listreply.diff Patch12: patch-1.5.24.vk.pgp_verbose_mime @@ -154,7 +153,6 @@ Provides translations to the package mutt. %patch3 -b .sendgroupreplyto %patch4 -b .wrapcolumn %patch7 -b .opennfs -%patch9 -b .largefile %patch11 -b .listreply %patch12 -b .pgp_verbose_mtime %patch15 -b .widechar.sidebar