MFH: r417188 r417282 r417417

ftp/wget: Upgrade from 1.16.3_1 to 1.18

PR:		210421 [1], 210512
Submitted by:	Vladimir Krstulja <vlad-fbsd@acheronmedia.com> [1]
Security:	CVE-2016-4971

ftp/wget: fix compilation when IDN and NLS are disabled

PR:		210441
Submitted by:	Helge Oldach <freebsd@oldach.net>

Change AUTHOR: entry in UPDATING to committer

Suggested by:	koobs@

Approved by:	ports-secteam

UPDATING

@@ -5,6 +5,15 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20160621:
+  AFFECTS: users of ftp/wget
+  AUTHOR: vd@FreeBSD.org
+
+  Wget 1.18 fixes a security vulnerability (CVE-2016-4971) and the fix
+  introduces a backward-incompatibility for HTTP->FTP redirects. Any script that
+  relies on the old behaviour must use --trust-server-names in order to trust
+  the HTTP response and redirect to the new filename.
+
 20160412:
   AFFECTS: Users of net/samba42 and net/samba/43
   AUTHOR: timur@FreeBSD.org

ftp/wget/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wget
-DISTVERSION=	1.16.3
-PORTREVISION=	1
+DISTVERSION=	1.18
 CATEGORIES=	ftp www ipv6
 MASTER_SITES=	GNU
 
@@ -13,7 +12,7 @@ COMMENT=	Retrieve files from the Net via HTTP(S) and FTP
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		charsetfix cpe gmake makeinfo perl5 tar:xz
+USES=		charsetfix cpe gmake iconv makeinfo perl5 tar:xz
 USE_PERL5=	build
 CPE_VENDOR=	gnu
 GNU_CONFIGURE=	yes

ftp/wget/distinfo

@@ -1,2 +1,3 @@
-SHA256 (wget-1.16.3.tar.xz) = 67f7b7b0f5c14db633e3b18f53172786c001e153d545cfc85d82759c5c2ffb37
-SIZE (wget-1.16.3.tar.xz) = 1794148
+TIMESTAMP = 1466495244
+SHA256 (wget-1.18.tar.xz) = b5b55b75726c04c06fe253daec9329a6f1a3c0c1878e3ea76ebfebc139ea9cc1
+SIZE (wget-1.18.tar.xz) = 1922376