[mutt] 08/14: upstream/644992-ipv6-literal.patch partially superseded by libidn.

[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 6ebe32f47930085897d60c54b757647f201fb4fa
Author: Antonio Radici <antonio at debian.org>
Date:   Sat Jun 24 10:28:09 2017 +0100

    upstream/644992-ipv6-literal.patch partially superseded by libidn.
---
 debian/changelog                                  |  1 +
 debian/patches/upstream/644992-ipv6-literal.patch | 47 ++++-------------------
 2 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 58bc906..92ffaae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ mutt (1.8.3+20170609-1) UNRELEASED; urgency=medium
       (Closes: 860176).
     + upstream/611410-no-implicit_autoview-for-text-html.patch removed,
       already upstream.
+    + upstream/644992-ipv6-literal.patch partially superseded by libidn.
     + general patch refresh where applicable.
 
  -- Antonio Radici <antonio at debian.org>  Sat, 24 Jun 2017 09:32:46 +0100
diff --git a/debian/patches/upstream/644992-ipv6-literal.patch b/debian/patches/upstream/644992-ipv6-literal.patch
index dd09e9f..e6b870d 100644
--- a/debian/patches/upstream/644992-ipv6-literal.patch
+++ b/debian/patches/upstream/644992-ipv6-literal.patch
@@ -5,53 +5,21 @@ Patch created by by Evgeni Golov <evgeni at golov.de>
 Debian bug: http://bugs.debian.org/644992
 Mutt bug: http://bugs.mutt.org/3681
 
---- a/mutt_socket.c
-+++ b/mutt_socket.c
-@@ -462,6 +462,8 @@
-   int fd;
- 
-   char *host_idna = NULL;
-+  char *host = NULL;
-+  char *tmp = NULL;
-   
- #ifdef HAVE_GETADDRINFO
- /* --- IPv4/6 --- */
-@@ -494,10 +496,18 @@
-   host_idna = conn->account.host;
- # endif
- 
-+  if ((host = strchr(host_idna, '[')) && (tmp = strrchr(host_idna, ']')))
-+  {
-+      *tmp = '\0';
-+      host = strchr(host_idna, '[')+1;
-+  }
-+  else
-+    host = host_idna;
-+
-   if (!option(OPTNOCURSES))
-     mutt_message (_("Looking up %s..."), conn->account.host);
-   
--  rc = getaddrinfo (host_idna, port, &hints, &res);
-+  rc = getaddrinfo (host, port, &hints, &res);
- 
- # ifdef HAVE_LIBIDN
-   FREE (&host_idna);
 --- a/url.c
 +++ b/url.c
-@@ -117,7 +117,7 @@
+@@ -98,7 +98,7 @@
   *   means no port given. */
- static int ciss_parse_userhost (ciss_url_t *ciss, char *src)
+ static int ciss_parse_userhost(struct CissUrl *ciss, char *src)
  {
--  char *t, *p;
-+  char *t, *p, *v;
+-  char *t = NULL, *p = NULL;
++  char *t = NULL, *p = NULL, *v = NULL;
  
    ciss->user = NULL;
    ciss->pass = NULL;
-@@ -162,7 +162,17 @@
+@@ -143,6 +143,16 @@
    else
      t = src;
  
--  if ((p = strchr (t, ':')))
 +  if ((v = strchr (t, '[')))
 +  {
 +    if (!(v = strrchr (v, ']')))
@@ -62,7 +30,6 @@ Mutt bug: http://bugs.mutt.org/3681
 +  else
 +    v = t;
 +
-+  if ((p = strchr (v, ':')))
+   if ((p = strchr(t, ':')))
    {
-     int t;
-     *p++ = '\0';
+     int num;

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