net-misc/wget: fix dot-prefixed domain matching

Reported-by: Henning Schild <henning@hennsch.de>
Closes: https://github.com/gentoo/gentoo/pull/10416
Package-Manager: Portage-2.3.51, Repoman-2.3.12
RepoMan-Options: --force
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/net-misc/wget/files/wget-1.19.5-fix-dot-prefixed-domain-matching.patch b/net-misc/wget/files/wget-1.19.5-fix-dot-prefixed-domain-matching.patch
new file mode 100644 (file)
index 0000000..129f0b6
--- /dev/null
+++ b/net-misc/wget/files/wget-1.19.5-fix-dot-prefixed-domain-matching.patch
@@ -0,0 +1,33 @@
+From fd85ac9cc623847e9d94d9f9241ab34e2c146cbf Mon Sep 17 00:00:00 2001
+From: Luiz Angelo Daros de Luca <luizluca@gmail.com>
+Date: Thu, 25 Oct 2018 17:39:52 -0300
+Subject: [PATCH] * src/host.c (sufmatch): Fix dot-prefixed domain matching
+
+Current sufmatch does not match when domain is dot-prefixed.
+The example of no_proxy in man (.mit.edu) does use a dot-prefixed
+domain.
+
+Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
+Copyright-paperwork-exempt: Yes
+---
+ src/host.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/host.c b/src/host.c
+index b42cd6e8..2bf848f3 100644
+--- a/src/host.c
++++ b/src/host.c
+@@ -1033,8 +1033,9 @@ sufmatch (const char **list, const char *what)
+       /* Domain or subdomain match
+        * k == -1: exact match
+        * k >= 0 && what[k] == '.': subdomain match
++       * k >= 0 && list[i][0] == '.': dot-prefixed subdomain match
+        */
+-      if (j == -1 && (k == -1 || what[k] == '.'))
++      if (j == -1 && (k == -1 || what[k] == '.' || list[i][0] == '.'))
+         return true;
+     }
+ 
+-- 
+2.18.1
+

diff --git a/net-misc/wget/wget-1.19.5.ebuild b/net-misc/wget/wget-1.19.5-r1.ebuild
similarity index 96%
rename from net-misc/wget/wget-1.19.5.ebuild
rename to net-misc/wget/wget-1.19.5-r1.ebuild
index 15bbc380348204f43d9e907a39f8479a85b7f092..6db7c1194b03c7ccc0831098d77327d67a00ca7e 100644 (file)
--- a/net-misc/wget/wget-1.19.5.ebuild
+++ b/net-misc/wget/wget-1.19.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -49,6 +49,8 @@ DEPEND="
 
 DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
 
+PATCHES=( "${FILESDIR}"/${P}-fix-dot-prefixed-domain-matching.patch )
+
 pkg_setup() {
        use test && python-any-r1_pkg_setup
 }