From 601d2297c052d9a751d80f6d0afe8df82f05d5b02701791a62a9c36e89f0511c Mon Sep 17 00:00:00 2001
From: Andreas Stieger <andreas.stieger@gmx.de>
Date: Wed, 18 Nov 2015 12:56:06 +0000
Subject: [PATCH] Accepting request 345013 from
 home:AndreasStieger:branches:network:utilities

GNU wget 1.17

OBS-URL: https://build.opensuse.org/request/show/345013
OBS-URL: https://build.opensuse.org/package/show/network:utilities/wget?expand=0&rev=55
---
 wget-1.16.3.tar.xz     |   3 ---
 wget-1.16.3.tar.xz.sig | Bin 543 -> 0 bytes
 wget-1.17.tar.xz       |   3 +++
 wget-1.17.tar.xz.sig   | Bin 0 -> 543 bytes
 wget-libproxy.patch    |  38 ++++++++++++++++-----------------
 wget.changes           |  25 ++++++++++++++++++++++
 wget.spec              |  47 ++++++++++++++++++++++++++---------------
 7 files changed, 77 insertions(+), 39 deletions(-)
 delete mode 100644 wget-1.16.3.tar.xz
 delete mode 100644 wget-1.16.3.tar.xz.sig
 create mode 100644 wget-1.17.tar.xz
 create mode 100644 wget-1.17.tar.xz.sig

diff --git a/wget-1.16.3.tar.xz b/wget-1.16.3.tar.xz
deleted file mode 100644
index 6d23b20..0000000
--- a/wget-1.16.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:67f7b7b0f5c14db633e3b18f53172786c001e153d545cfc85d82759c5c2ffb37
-size 1794148
diff --git a/wget-1.16.3.tar.xz.sig b/wget-1.16.3.tar.xz.sig
deleted file mode 100644
index f2ff62541b8541826ffb23e97ecb9e69361d33c79db7e46ace883bdf0fa95c7c..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 543
zcmV+)0^t3L0vrSY0RjL91p-w4W|#m92@obdZSvt`;pzj+5C1}`(WB(UZ+Ex=2{v;o
zW|9SoFr*;O0lSa`>!0E@m6eqeBw<9OL6#*m-JOoKPp7#QZ5#f`0@L;Yg#7b;Cb`^9
zI>Eh<8-mj6X6meg$=j1ovhZTN0`$*wv**q*K_Vok+$s|%eW^@?#GJA@v{UM5^U^Go
zcvWlRv75NX#N0jz&?5#!#ymC-8T$}}SD@u8A1iK9zN_MsE7L>x_s{lvYWhZq{i<U)
zt&p}Mw7`Y63^Ha-E+=f=-$Dzz#*8n_Hw5fy=lfdXUo#Xpwdyge%+k9F9X18C)1Fwu
zAyS@0V(<UA6So@ht8gG%H$nE~@&H4o)?BQzr=(+Qg;>CnVISIia^YWDH8g^jOopv$
zap3d<(zyZO+*Hy**nyUf-yaOx;MkyD-%uBS>NhNTkPNSpB7vP$|1~F=p4>^J>+asA
z<;7-1{QsY;z=`J<=8LB!yl}`$e@g(8aW;^%<2@IXM=o>-AAzo~Q7aD-HDh*<tmYZ6
z$ko3xn*@TIyo;SRz!1%*kWd5UAu~&aEGxDhk?&T<(dUtu;&D0P<!>P$tD~r^!RYnu
zTo>2jLDKWXG;v&zkJHQKMz8haZ6%o$l={6Voms+Dj~$@~epJBTn`6w$88v<!L&LXr
hR9WIt&4-K>xZ^50Il6n+Oaf!OK(X#2h2^j{(djs45y=1m

diff --git a/wget-1.17.tar.xz b/wget-1.17.tar.xz
new file mode 100644
index 0000000..b492eb2
--- /dev/null
+++ b/wget-1.17.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bd69d63acbf329a8286ccebbe63cd4fecc998718131a0d4b2ab9239542d2bb87
+size 1884628
diff --git a/wget-1.17.tar.xz.sig b/wget-1.17.tar.xz.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..a68e30321ab93835a4c323d594dc4f8c4c06d6c44801fc37e9b48d7e09789ad0
GIT binary patch
literal 543
zcmV+)0^t3L0vrSY0RjL91p-z`lxF}62@obdZSvt`;p(a+5C3=_WM0u|4Aoq$9w2@?
z!4-#ua|0fwip~R3V|aB<7+^i<bKdyNHEBezNq%?pWm*idHKP1hShUfrAp%T`>G+tB
zawdZu5019l1qxgm*&W8W+U^63J$_GpPQt|fGOV9gYSy1j7Lb|tFIzH&PEmR*h4wd-
z8+y`>n{=MqRdo%?AkDkh_U>!l7AtIJjfPqTYo~oZ&`7XHF3EMJL@t=V!i*=K_4`5R
z{lJAGl9qNKG6+_OPLV{M+h|nClC&gZQ5eY00NP&#>xY=*7A^R38isT*+*`Z)b#eb1
z<U>v-qU@_v<v$3RZx)|G^z<oB6WC11*5Vt&u4>W9wE5K8V=Z+~leS*pzbm4)i%0gL
zdM1}Re)7>b*ER6?!@N!^Q!+1h>Zd|;M}LbF4IB<7<~ztQ@-Q`9nl$qP4oYG}l&A=`
z=Zj?(yyYtai_dM?P-gBe^u^PF&A`>m?PsMxcl+g;Bt;7%iODM~0!hf|c|IQ^4-s>n
zHK_ZzvQk7mHCufM=DjpLPlde+_D}$k%bHy#D(V5Nh#tX%bLieCEnG)Um@-=_$<KWK
zSu%r0LkxteI<=MPZPa0~rqqd3&oWe)H`(mBmB#(3C0unE9<CV8L*wbzib&1&^n!2d
hyUCQes`ENYoI2l?TP&8F3TY|_y<1V=5ldC&F=riG1Lyz%

literal 0
HcmV?d00001

diff --git a/wget-libproxy.patch b/wget-libproxy.patch
index 6f55783..bee5a0b 100644
--- a/wget-libproxy.patch
+++ b/wget-libproxy.patch
@@ -5,13 +5,13 @@
  tests/Makefile.am |    1 +
  4 files changed, 55 insertions(+), 1 deletion(-)
 
-Index: wget-1.16.1/configure.ac
+Index: wget-1.17/configure.ac
 ===================================================================
---- wget-1.16.1.orig/configure.ac
-+++ wget-1.16.1/configure.ac
-@@ -466,6 +466,22 @@ else
- fi
- 
+--- wget-1.17.orig/configure.ac
++++ wget-1.17/configure.ac
+@@ -507,6 +507,22 @@ AS_IF([test x"$with_metalink" != xno], [
+   ])
+ ])
  
 +dnl
 +dnl libproxy support
@@ -32,11 +32,11 @@ Index: wget-1.16.1/configure.ac
  dnl **********************************************************************
  dnl Checks for IPv6
  dnl **********************************************************************
-Index: wget-1.16.1/src/Makefile.am
+Index: wget-1.17/src/Makefile.am
 ===================================================================
---- wget-1.16.1.orig/src/Makefile.am
-+++ wget-1.16.1/src/Makefile.am
-@@ -37,7 +37,7 @@ endif
+--- wget-1.17.orig/src/Makefile.am
++++ wget-1.17/src/Makefile.am
+@@ -41,7 +41,7 @@ endif
  
  # The following line is losing on some versions of make!
  DEFS     = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\"
@@ -45,13 +45,13 @@ Index: wget-1.16.1/src/Makefile.am
  
  EXTRA_DIST = css.l css.c css_.c build_info.c.in
  
-Index: wget-1.16.1/src/retr.c
+Index: wget-1.17/src/retr.c
 ===================================================================
---- wget-1.16.1.orig/src/retr.c
-+++ wget-1.16.1/src/retr.c
-@@ -57,6 +57,10 @@ as that of the covered work.  */
- #include "html-url.h"
+--- wget-1.17.orig/src/retr.c
++++ wget-1.17/src/retr.c
+@@ -58,6 +58,10 @@ as that of the covered work.  */
  #include "iri.h"
+ #include "hsts.h"
  
 +#ifdef HAVE_LIBPROXY
 +#include "proxy.h"
@@ -60,7 +60,7 @@ Index: wget-1.16.1/src/retr.c
  /* Total size of downloaded files.  Used to enforce quota.  */
  SUM_SIZE_INT total_downloaded_bytes;
  
-@@ -1268,7 +1272,40 @@ getproxy (struct url *u)
+@@ -1296,7 +1300,40 @@ getproxy (struct url *u)
        break;
      }
    if (!proxy || !*proxy)
@@ -101,10 +101,10 @@ Index: wget-1.16.1/src/retr.c
  
    /* Handle shorthands.  `rewritten_storage' is a kludge to allow
       getproxy() to return static storage. */
-Index: wget-1.16.1/tests/Makefile.am
+Index: wget-1.17/tests/Makefile.am
 ===================================================================
---- wget-1.16.1.orig/tests/Makefile.am
-+++ wget-1.16.1/tests/Makefile.am
+--- wget-1.17.orig/tests/Makefile.am
++++ wget-1.17/tests/Makefile.am
 @@ -32,6 +32,7 @@
  #
  # Version: @VERSION@
diff --git a/wget.changes b/wget.changes
index d810703..267d99f 100644
--- a/wget.changes
+++ b/wget.changes
@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Wed Nov 18 10:15:45 UTC 2015 - astieger@suse.com
+
+- GNU wget 1.17:
+  * Remove FTP passive to active fallback due to privacy concerns.
+    [boo#944858] CVE-2015-7665 was assigned to this problem in a
+                 tails context 
+  * Add support for --if-modified-since.
+  * Add support for metalink through --input-metalink and
+    --metalink-over-http.
+  * Add support for HSTS through --hsts and --hsts-file.
+  * Add option to restrict filenames under VMS.
+  * Add support for --rejected-log which logs to a separate file the
+    reasons why URLs are being rejected and some context around it.
+  * Add support for FTPS.
+  * Do not download/save file on error when --spider enabled
+  * Add --convert-file-only option. This option converts only the
+    filename part of the URLs, leaving the rest of the URLs
+    untouched.
+- packaging changes:
+  * enable metalink support (in ring1)
+  * use system pcre (in ring 0)
+  * use system libuuid (in ring 1)
+  * build with libpsl for cookie domain checking (new)
+  
 -------------------------------------------------------------------
 Mon Mar  9 14:05:22 UTC 2015 - astieger@suse.com
 
diff --git a/wget.spec b/wget.spec
index 67452e5..9763a5c 100644
--- a/wget.spec
+++ b/wget.spec
@@ -17,39 +17,50 @@
 
 
 %bcond_with	regression_tests
-
 Name:           wget
-Version:        1.16.3
+Version:        1.17
 Release:        0
 Summary:        A Tool for Mirroring FTP and HTTP Servers
 License:        GPL-3.0+
 Group:          Productivity/Networking/Web/Utilities
 Url:            https://www.gnu.org/software/wget/
-Source:         https://ftp.gnu.org/gnu/wget/%name-%version.tar.xz
-Source1:        https://ftp.gnu.org/gnu/wget/%name-%version.tar.xz.sig
+Source:         https://ftp.gnu.org/gnu/wget/%{name}-%{version}.tar.xz
+Source1:        https://ftp.gnu.org/gnu/wget/%{name}-%{version}.tar.xz.sig
 Source2:        https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=wget&download=1#/wget.keyring
 Patch0:         wgetrc.patch
 Patch1:         wget-libproxy.patch
 Patch6:         wget-1.14-no-ssl-comp.patch
 # PATCH-FIX-OPENSUSE fix pod syntax for perl 5.18 coolo@suse.de
 Patch7:         wget-fix-pod-syntax.diff
-BuildRequires:  libpng-devel
-%if 0%{suse_version} > 1110
-BuildRequires:  libproxy-devel
-%endif
 BuildRequires:  automake
 BuildRequires:  libidn-devel
+BuildRequires:  libpng-devel
 BuildRequires:  makeinfo
 BuildRequires:  openssl-devel
+BuildRequires:  pkg-config >= 0.9.0
+BuildRequires:  xz
+# FIXME: use proper Requires(pre/post/preun/...)
+PreReq:         %{install_info_prereq}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if %{?suse_version} > 1110
+BuildRequires:  pkgconfig(libmetalink)
+BuildRequires:  pkgconfig(libpcre)
+BuildRequires:  pkgconfig(libpsl)
+BuildRequires:  pkgconfig(uuid)
+%else
+BuildRequires:  libmetalink-devel
+BuildRequires:  libpsl-devel
+BuildRequires:  libuuid-devel
+BuildRequires:  pcre-devel
+%endif
+%if 0%{?suse_version} > 1110
+BuildRequires:  libproxy-devel
+%endif
 %if %{with regression_tests}
 # For the Testsuite
 BuildRequires:  perl-HTTP-Daemon
 BuildRequires:  perl-IO-Socket-SSL
 %endif
-BuildRequires:  pkg-config
-BuildRequires:  xz
-PreReq:         %install_info_prereq
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Wget enables you to retrieve WWW documents or FTP files from a server.
@@ -58,27 +69,29 @@ This can be done in script files or via the command line.
 %prep
 %setup -q
 %patch0
-%if 0%{suse_version} > 1110
+%if 0%{?suse_version} > 1110
 %patch1 -p1
 %endif
 %patch6
 %patch7 -p1
 
 %build
-%if 0%{suse_version} > 1110
+%if 0%{?suse_version} > 1110
 # only wget-libproxy.patch needs this
 autoreconf --force
 %endif
-%configure --with-ssl=openssl
+%configure \
+	--with-ssl=openssl \
+	--with-metalink
 make %{?_smp_mflags}
 
 %check
 %if %{with regression_tests}
-make -C tests/ check
+make %{?_smp_mflags} -C tests/ check
 %endif
 
 %install
-%makeinstall
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 %find_lang %{name}
 
 %post