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

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:67f7b7b0f5c14db633e3b18f53172786c001e153d545cfc85d82759c5c2ffb37
-size 1794148

wget-1.17.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bd69d63acbf329a8286ccebbe63cd4fecc998718131a0d4b2ab9239542d2bb87
+size 1884628

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@

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
 

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