[mutt] 03/03: New upstream release.

[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 034488e82051dd9d07fb45653c7033c18e15469f
Author: Antonio Radici <antonio at debian.org>
Date:   Sat Dec 16 09:14:46 2017 +0000

    New upstream release.
---
 debian/changelog                                   |  8 +++-----
 .../debian-specific/use_usr_bin_editor.patch       |  2 +-
 debian/patches/series                              |  1 -
 .../883106-fix-crash-in-mbox_to_udomain.patch      | 22 ----------------------
 4 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6a0e78e..5d7dd11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,8 @@
-mutt (1.9.1-6) UNRELEASED; urgency=medium
+mutt (1.9.2-1) unstable; urgency=medium
 
-  * debian/patches:
-    + upstream/883106-fix-crash-in-mbox_to_udomain.patch: simple patch to fix
-      a crash in mbox_to_udomain() (Closes: 883106)
+  * New upstream release.
 
- -- Antonio Radici <antonio at debian.org>  Thu, 30 Nov 2017 21:22:13 +0000
+ -- Antonio Radici <antonio at debian.org>  Sat, 16 Dec 2017 09:13:04 +0000
 
 mutt (1.9.1-5) unstable; urgency=medium
 
diff --git a/debian/patches/debian-specific/use_usr_bin_editor.patch b/debian/patches/debian-specific/use_usr_bin_editor.patch
index 77fee98..17d8c98 100644
--- a/debian/patches/debian-specific/use_usr_bin_editor.patch
+++ b/debian/patches/debian-specific/use_usr_bin_editor.patch
@@ -12,7 +12,7 @@ to vi.
 
 --- a/init.c
 +++ b/init.c
-@@ -3485,7 +3485,7 @@
+@@ -3500,7 +3500,7 @@
    {
      p = getenv ("EDITOR");
      if (!p)
diff --git a/debian/patches/series b/debian/patches/series
index ba1386b..d89b8d6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,7 +10,6 @@ misc/gpg.rc-paths.patch
 misc/smime.rc.patch
 upstream/528233-readonly-open.patch
 upstream/383769-score-match.patch
-upstream/883106-fix-crash-in-mbox_to_udomain.patch
 upstream/fast-imap-flag-handling.patch
 upstream/imap-poll-timeout.patch
 upstream/maildir-hash.patch
diff --git a/debian/patches/upstream/883106-fix-crash-in-mbox_to_udomain.patch b/debian/patches/upstream/883106-fix-crash-in-mbox_to_udomain.patch
deleted file mode 100644
index 638c45d..0000000
--- a/debian/patches/upstream/883106-fix-crash-in-mbox_to_udomain.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-This patch fixes bug 883106 in Debian.
-
----
- mutt_idna.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/mutt_idna.c b/mutt_idna.c
-index 2923444f..7a956fdc 100644
---- a/mutt_idna.c
-+++ b/mutt_idna.c
-@@ -57,6 +57,8 @@ static int mbox_to_udomain(const char *mbx, char **user, char **domain)
-   char *p = NULL;
- 
-   mutt_str_replace(&buff, mbx);
-+  if (!buff)
-+    return -1;
- 
-   p = strchr(buff, '@');
-   if (!p || !p[1])
--- 
-2.11.0
-

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