gentoo resync : 18.11.2018

3 files changed, 38 insertions, 2 deletions

diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index e6178e0d8cd5..ada24f1ae74b 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,3 +1,4 @@
+AUX wget-1.19.5-fix-dot-prefixed-domain-matching.patch 1077 BLAKE2B 09a341db55d4c0e47007060ba743f11a509526c01cf9815ee4eb9d21c8ae821f122b3ae10047fbfa69e1da407baea799663661e9dbdba0d6a6ddcaf4eda4eef1 SHA512 971b13380dd0a8f60a8ae423ce98798105cbf5670b86445bec67a869ffaf891be7b48a0a6b02e3575459b64f586b2748be8077925f873dc2e1a4bc5467a95392
 DIST wget-1.19.5.tar.gz 4455797 BLAKE2B 988b80090ff1f62cb527afb33c03b7c6a68bbc1649d42f62061e05e416bebf5b2e9546ebafad3c9cdbf1199a8d2b84f4427c921f23338b02631da357da9b3d61 SHA512 0d4964e0f5adb0c023edc831bde9c9f13f3222f6efc1ce93250d234ab937e92b53921624532fb0e6586151ddfdee6df9a7ca91a2a99b3d16e2e68401c625301b
-EBUILD wget-1.19.5.ebuild 3163 BLAKE2B e0300678d97d7b02bf0c0ab13b7c18d7d808b29bbf47f12612b47aed1636772127d141fc3908fe54ff374ddac20dacd01e59dfbae4fac369d0e69d72d423871d SHA512 9c9ce2698901b8342f3db2bf641a35c430c572bf1ab58cffa210a9801c25fbb9e7ec83a363d47d4f5863ba788ad3d1ef676c96fcfcd10c576564034be9f4d89e
+EBUILD wget-1.19.5-r1.ebuild 3231 BLAKE2B c3c1c75e7f9d2df4e40959c481c1266f78a216a7600788bbebc0d51b0c9203f773b469df6e2797d98b71c0c5a5cbf5146134312af7bcbaf2945c5ded3604f984 SHA512 694cedb34e2687c1e69212b96808251446618669ef947c410852435063a1daea0000d3a883edf86fa552ef7e0ee104ed250ee0ab125f1ded47f9112002959156
 MISC metadata.xml 570 BLAKE2B 00d529ba0b6bcee7b6fc3937de69ead007ac57458c1afecf12cdd84a09637055d55725498e3c648311a494566eab32acc8d2e3de622086a4b599b5b40d0a2d1b SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c
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
index 000000000000..129f0b675414
--- /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
index 15bbc3803482..6db7c1194b03 100644
--- 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
 }