[mutt] 01/01: removing upstream/644992-ipv6-literal.patch which has been integrated upstream https://dev.mutt.org/trac/changeset/2a6bfdb9f869d8f07b453f6697c8de0246e24755

[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 68c1bc5f3cb56481af47cbb73f842c70a3c2585a
Author: Antonio Radici <antonio at debian.org>
Date:   Sun Jun 25 10:00:41 2017 +0100

    removing upstream/644992-ipv6-literal.patch which has been integrated upstream https://dev.mutt.org/trac/changeset/2a6bfdb9f869d8f07b453f6697c8de0246e24755
---
 debian/changelog                                  |  7 +++++
 debian/patches/series                             |  1 -
 debian/patches/upstream/644992-ipv6-literal.patch | 35 -----------------------
 3 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4754855..60d1b59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mutt (1.8.3+neomutt20170609-2) UNRELEASED; urgency=medium
+
+  * debian/patches:
+    + upstream/644992-ipv6-literal.patch removed, already upstream.
+
+ -- Antonio Radici <antonio at debian.org>  Sun, 25 Jun 2017 10:00:09 +0100
+
 mutt (1.8.3+neomutt20170609-1) unstable; urgency=medium
 
   * Switching upstream code to NeoMutt.
diff --git a/debian/patches/series b/debian/patches/series
index 61bd0c9..62011d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,6 +13,5 @@ upstream/383769-score-match.patch
 upstream/771125-CVE-2014-9116-jessie.patch
 upstream/693993-manpage-corrections.patch
 upstream/749483-conststrings.patch
-upstream/644992-ipv6-literal.patch
 upstream/fix_doc_builddir.patch
 upstream/fix_spelling_error.patch
diff --git a/debian/patches/upstream/644992-ipv6-literal.patch b/debian/patches/upstream/644992-ipv6-literal.patch
deleted file mode 100644
index e6b870d..0000000
--- a/debian/patches/upstream/644992-ipv6-literal.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Allow parsing of URIs with IPv6 literal addresses (RFCs 2732 and 3986)
-
-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/url.c
-+++ b/url.c
-@@ -98,7 +98,7 @@
-  *   means no port given. */
- static int ciss_parse_userhost(struct CissUrl *ciss, char *src)
- {
--  char *t = NULL, *p = NULL;
-+  char *t = NULL, *p = NULL, *v = NULL;
- 
-   ciss->user = NULL;
-   ciss->pass = NULL;
-@@ -143,6 +143,16 @@
-   else
-     t = src;
- 
-+  if ((v = strchr (t, '[')))
-+  {
-+    if (!(v = strrchr (v, ']')))
-+    {
-+      v = t;
-+    }
-+  }
-+  else
-+    v = t;
-+
-   if ((p = strchr(t, ':')))
-   {
-     int num;

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