From a9bc9945f7bde5b7e54f57792b16b3872f3179de Mon Sep 17 00:00:00 2001
From: Tomas Hozza <thozza@redhat.com>
Date: Fri, 31 Oct 2014 14:07:24 +0100
Subject: [PATCH] update to 1.16

- fixes CVE-2014-4877

Signed-off-by: Tomas Hozza <thozza@redhat.com>
---
 .gitignore             |  1 +
 sources                |  2 +-
 wget-rh-modified.patch |  6 +++---
 wget.spec              | 14 ++++++++++++--
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index c5236c6..95a36a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ wget-1.12.tar.bz2
 /wget-1.13.4.tar.bz2
 /wget-1.14.tar.xz
 /wget-1.15.tar.xz
+/wget-1.16.tar.xz
diff --git a/sources b/sources
index 344b562..55e5156 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7a279d5ac5594919124d5526e7143e28  wget-1.15.tar.xz
+fe102975ab3a6c049777883f1bb9ad07  wget-1.16.tar.xz
diff --git a/wget-rh-modified.patch b/wget-rh-modified.patch
index 4b1b6e1..e70f076 100644
--- a/wget-rh-modified.patch
+++ b/wget-rh-modified.patch
@@ -3,9 +3,9 @@
 @@ -561,7 +561,7 @@
  PACKAGE_NAME='wget'
  PACKAGE_TARNAME='wget'
- PACKAGE_VERSION='1.15'
--PACKAGE_STRING='wget 1.15'
-+PACKAGE_STRING='wget 1.15 (Red Hat modified)'
+ PACKAGE_VERSION='1.16'
+-PACKAGE_STRING='wget 1.16'
++PACKAGE_STRING='wget 1.16 (Red Hat modified)'
  PACKAGE_BUGREPORT='bug-wget@gnu.org'
  PACKAGE_URL=''
  
diff --git a/wget.spec b/wget.spec
index 100f205..b791e01 100644
--- a/wget.spec
+++ b/wget.spec
@@ -1,7 +1,7 @@
 Summary: A utility for retrieving files using the HTTP or FTP protocols
 Name: wget
-Version: 1.15
-Release: 3%{?dist}
+Version: 1.16
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Internet
 Url: http://www.gnu.org/software/wget/
@@ -9,11 +9,14 @@ Source: ftp://ftp.gnu.org/gnu/wget/wget-%{version}.tar.xz
 
 Patch1: wget-rh-modified.patch
 Patch2: wget-1.15-path.patch
+Patch3: wget-1.16-dont-run-failing-test.patch
 
 Provides: webclient
 Provides: bundled(gnulib) 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
+# needed for test suite
+BuildRequires: perl-HTTP-Daemon, python3
 BuildRequires: openssl-devel, pkgconfig, texinfo, gettext, autoconf, libidn-devel, libuuid-devel, perl-podlators
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,6 +33,9 @@ support for Proxy servers, and configurability.
 %setup -q
 %patch1 -p0
 %patch2 -p1 -b .path
+# don't run the Test-proxied-https-auth.px test since it fails with OpenSSL
+# upstream is working on fix and will be fixed most probably in 1.16.1
+%patch3 -p1 -b .test
 
 %build
 if pkg-config openssl ; then
@@ -69,6 +75,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/*
 
 %changelog
+* Fri Oct 31 2014 Tomas Hozza <thozza@redhat.com> - 1.16-1
+- update to 1.16
+- fixes CVE-2014-4877
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.15-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild