From 4228ffd4176ab65ecddcf0dd1ef2e62a3d1c7d93 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Sat, 23 Feb 2019 17:45:34 +0000
Subject: [PATCH] Update to version mutt 1.11.3

OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=197
---
 mutt-1.10.0.dif                  |  2 +-
 mutt-1.11.2.tar.gz               |  3 ---
 mutt-1.11.3.tar.gz               |  3 +++
 mutt-1.5.23-carriage-return.path |  4 ++--
 mutt.changes                     | 17 +++++++++++++++++
 mutt.spec                        |  2 +-
 patch-1.5.24.vk.pgp_verbose_mime |  2 +-
 7 files changed, 25 insertions(+), 8 deletions(-)
 delete mode 100644 mutt-1.11.2.tar.gz
 create mode 100644 mutt-1.11.3.tar.gz

diff --git a/mutt-1.10.0.dif b/mutt-1.10.0.dif
index 793d2c6..0b55ff8 100644
--- a/mutt-1.10.0.dif
+++ b/mutt-1.10.0.dif
@@ -97,7 +97,7 @@
      FREE (&methods);
 --- mx.c
 +++ mx.c	2019-01-02 13:03:11.384049677 +0000
-@@ -1435,6 +1435,9 @@ void mx_update_context (CONTEXT *ctx, in
+@@ -1438,6 +1438,9 @@ void mx_update_context (CONTEXT *ctx, in
    {
      h = ctx->hdrs[msgno];
  
diff --git a/mutt-1.11.2.tar.gz b/mutt-1.11.2.tar.gz
deleted file mode 100644
index ca25ea8..0000000
--- a/mutt-1.11.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:da5cd4c39f228914d3933d8cf3a017c8271fdd9b9d81c6e4fc42ad22e1a28723
-size 4579279
diff --git a/mutt-1.11.3.tar.gz b/mutt-1.11.3.tar.gz
new file mode 100644
index 0000000..17625fd
--- /dev/null
+++ b/mutt-1.11.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a542f4c02faecd171b4215ddbd368910faee4a634cca7aea5337586118ab1941
+size 4581196
diff --git a/mutt-1.5.23-carriage-return.path b/mutt-1.5.23-carriage-return.path
index 0fb496f..38ceb5d 100644
--- a/mutt-1.5.23-carriage-return.path
+++ b/mutt-1.5.23-carriage-return.path
@@ -8,7 +8,7 @@
 
 --- crypt-gpgme.c
 +++ crypt-gpgme.c	2019-01-02 13:24:40.244380302 +0000
-@@ -2338,7 +2338,7 @@ static void copy_clearsigned (gpgme_data
+@@ -2343,7 +2343,7 @@ static void copy_clearsigned (gpgme_data
      
      if (armor_header)
      {
@@ -116,7 +116,7 @@
  	key = 1;
      }
    }
-@@ -1232,9 +1232,9 @@ BODY *pgp_sign_message (BODY *a)
+@@ -1237,9 +1237,9 @@ BODY *pgp_sign_message (BODY *a)
     */
    while (fgets (buffer, sizeof (buffer) - 1, pgpout) != NULL)
    {
diff --git a/mutt.changes b/mutt.changes
index f61cc14..727002b 100644
--- a/mutt.changes
+++ b/mutt.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Sat Feb 23 17:41:10 UTC 2019 - Dr. Werner Fink <werner@suse.de>
+
+- Update to mutt 1.11.3
+  * This is a bug-fix release, fixing compilation with LibreSSL
+    and various other bug fixes.
+  * Show top-level decoded smime text/plain parts.
+  * Improve attachment menu for s/mime parts. (closes #113)
+  * Fix tunnels to also retry and write full buffer.
+  * Fix raw socket read/write to follow expected behavior.
+  * Fix gnutls tls_socket_write() to properly retry.
+  * Update the muttrc man page with added commands.
+  * Wrap ssl init calls for LibreSSL too.
+- Modify the patches
+  * mutt-1.10.0.dif
+  * mutt-1.5.23-carriage-return.path
+
 -------------------------------------------------------------------
 Tue Jan 15 07:19:42 UTC 2019 - Dr. Werner Fink <werner@suse.de>
 
diff --git a/mutt.spec b/mutt.spec
index b9799b8..83aa9f1 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -75,7 +75,7 @@ Recommends:     w3m
 Requires(post):   shared-mime-info
 Requires(postun): shared-mime-info
 %endif
-Version:        1.11.2
+Version:        1.11.3
 Release:        0
 Summary:        Mail Program
 # ftp://ftp.mutt.org/mutt/devel/
diff --git a/patch-1.5.24.vk.pgp_verbose_mime b/patch-1.5.24.vk.pgp_verbose_mime
index b451411..2ac9cf0 100644
--- a/patch-1.5.24.vk.pgp_verbose_mime
+++ b/patch-1.5.24.vk.pgp_verbose_mime
@@ -41,7 +41,7 @@
    ** .pp
 --- pgp.c
 +++ pgp.c	2019-01-02 13:22:43.822520945 +0000
-@@ -1296,7 +1296,8 @@ BODY *pgp_sign_message (BODY *a)
+@@ -1301,7 +1301,8 @@ BODY *pgp_sign_message (BODY *a)
    t->disposition = DISPNONE;
    t->encoding = ENC7BIT;
    t->unlink = 1; /* ok to remove this file after sending. */