[mutt] 01/01: neomutt-devel/836812-user-agent-temp-fix.patch: hardcode the NeoMutt version, it will be fixed in the next NeoMutt release (Closes: 836812).

[Antonio Radici]

This is an automated email from the git hooks/post-receive script.

antonio pushed a commit to branch master
in repository mutt.

commit 2d463e9f72b16eabdd7193b87e8989d520834a91
Author: Antonio Radici <antonio at debian.org>
Date:   Wed Sep 7 06:39:07 2016 +0100

    neomutt-devel/836812-user-agent-temp-fix.patch: hardcode the NeoMutt version, it will be fixed in the next NeoMutt release (Closes: 836812).
---
 debian/changelog                                         |  6 ++++--
 .../neomutt-devel/836812-user-agent-temp-fix.patch       | 16 ++++++++++++++++
 debian/patches/series                                    |  1 +
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 287d4d3..b9740ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,10 +13,12 @@ mutt (1.7.0-2) UNRELEASED; urgency=medium
       length of DSA and Elgamal keys (Closes: 741213).
     + upstream/549204-clear-N-on-readonly-imap-folders.patch: to clear the N
       flag on readonly IMAP mailboxes (Closes: 549204).
-    + neomutt-devel/832971-reset-xlabel.patch to reset X-Label properly for
-      newer versions of mutt (Closes: 832971).
     + upstream/569038-interrupt-socket-read-write.patch: allow the interruption
       of operations which can be long-running
+    + neomutt-devel/832971-reset-xlabel.patch to reset X-Label properly for
+      newer versions of mutt (Closes: 832971).
+    + neomutt-devel/836812-user-agent-temp-fix.patch: hardcode the NeoMutt
+      version, it will be fixed in the next NeoMutt release (Closes: 836812).
       (Closes: 569038, 774746, 423931, 599136, 618425).
   * debian/extra/rc/notmuch.rc: restored the notmuch keybindings
     (Closes: 836148).
diff --git a/debian/patches/neomutt-devel/836812-user-agent-temp-fix.patch b/debian/patches/neomutt-devel/836812-user-agent-temp-fix.patch
new file mode 100644
index 0000000..83d3506
--- /dev/null
+++ b/debian/patches/neomutt-devel/836812-user-agent-temp-fix.patch
@@ -0,0 +1,16 @@
+Hardcode the NeoMutt version in the User-Agent, this problem is going to be
+fixed by the next NeoMutt release, so the patch will be dropped then.
+
+Upstream issue: https://github.com/neomutt/neomutt/issues/128 
+
+--- a/sendlib.c
++++ b/sendlib.c
+@@ -2107,7 +2107,7 @@
+   if (mode == 0 && !privacy && option (OPTXMAILER) && !has_agent)
+   {
+     /* Add a vanity header */
+-    fprintf (fp, "User-Agent: NeoMutt/%s (%s)\n", PACKAGE_VERSION, OldMuttVer);
++    fprintf (fp, "User-Agent: NeoMutt/20160827 (%s)\n", OldMuttVer);
+   }
+ 
+   return (ferror (fp) == 0 ? 0 : -1);
diff --git a/debian/patches/series b/debian/patches/series
index 4466cb6..a3b5931 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 neomutt-20160827.patch
 neomutt-devel/sensible-browser.patch
 neomutt-devel/832971-reset-xlabel.patch
+neomutt-devel/836812-user-agent-temp-fix.patch
 debian-specific/Muttrc.patch
 debian-specific/Md.etc_mailname_gethostbyname.patch
 debian-specific/use_usr_bin_editor.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mutt/mutt.git