pool/wget
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 454685 from network:utilities

Browse Source 
wget 1.19, IDNA2008 support

OBS-URL: https://build.opensuse.org/request/show/454685
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wget?expand=0&rev=44
This commit is contained in:
Dominique Leuenberger 2017-02-08 09:51:24 +00:00 committed by Git OBS Bridge
commit 98a5661ef1
7 changed files with 97 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wget-1.18.tar.xz
View File

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

BIN
wget-1.18.tar.xz.sig
View File

Binary file not shown.

3
wget-1.19.tar.xz Normal file
View File

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

BIN
wget-1.19.tar.xz.sig Normal file
View File

Binary file not shown.

103
wget-libproxy.patch
View File

@ -1,15 +1,8 @@
--- Index: wget-1.19/configure.ac
configure.ac | 16 ++++++++++++++++
src/Makefile.am | 2 +-
src/retr.c | 37 +++++++++++++++++++++++++++++++++++++
tests/Makefile.am | 1 +
4 files changed, 55 insertions(+), 1 deletion(-)
Index: wget-1.17/configure.ac
=================================================================== ===================================================================
--- wget-1.17.orig/configure.ac --- wget-1.19.orig/configure.ac
+++ wget-1.17/configure.ac +++ wget-1.19/configure.ac
@@ -507,6 +507,22 @@ AS_IF([test x"$with_metalink" != xno], [ @@ -506,6 +506,22 @@ AS_IF([test x"$with_metalink" != xno], [
]) ])
]) ])
@ -32,23 +25,23 @@ Index: wget-1.17/configure.ac
dnl ********************************************************************** dnl **********************************************************************
dnl Checks for IPv6 dnl Checks for IPv6
dnl ********************************************************************** dnl **********************************************************************
Index: wget-1.17/src/Makefile.am Index: wget-1.19/src/Makefile.am
=================================================================== ===================================================================
--- wget-1.17.orig/src/Makefile.am --- wget-1.19.orig/src/Makefile.am
+++ wget-1.17/src/Makefile.am +++ wget-1.19/src/Makefile.am
@@ -41,7 +41,7 @@ endif @@ -64,7 +64,7 @@ wget_SOURCES = connect.c convert.c cooki
nodist_wget_SOURCES = version.c
# The following line is losing on some versions of make! EXTRA_wget_SOURCES = iri.c
DEFS = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\" LDADD = $(LIBOBJS) ../lib/libgnu.a $(GETADDRINFO_LIB) $(HOSTENT_LIB)\
-LIBS = @LIBICONV@ @LIBINTL@ @LIBS@ $(LIB_CLOCK_GETTIME) - $(INET_NTOP_LIB) $(LIBSOCKET) $(LIB_CLOCK_GETTIME) $(LIB_CRYPTO)\
+LIBS = @LIBICONV@ @LIBINTL@ @LIBS@ $(libproxy_LIBS) $(LIB_CLOCK_GETTIME) + $(INET_NTOP_LIB) $(LIBSOCKET) $(libproxy_LIBS) $(LIB_CLOCK_GETTIME) $(LIB_CRYPTO)\
$(LIB_NANOSLEEP) $(LIB_POSIX_SPAWN) $(LIB_SELECT) $(LTLIBICONV) $(LTLIBINTL)\
EXTRA_DIST = css.l css.c css_.c build_info.c.in $(LTLIBTHREAD) $(LTLIBUNISTRING) $(SERVENT_LIB)
AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
Index: wget-1.17/src/retr.c Index: wget-1.19/src/retr.c
=================================================================== ===================================================================
--- wget-1.17.orig/src/retr.c --- wget-1.19.orig/src/retr.c
+++ wget-1.17/src/retr.c +++ wget-1.19/src/retr.c
@@ -58,6 +58,10 @@ as that of the covered work. */ @@ -58,6 +58,10 @@ as that of the covered work. */
#include "iri.h" #include "iri.h"
#include "hsts.h" #include "hsts.h"
@ -60,40 +53,40 @@ Index: wget-1.17/src/retr.c
/* Total size of downloaded files. Used to enforce quota. */ /* Total size of downloaded files. Used to enforce quota. */
SUM_SIZE_INT total_downloaded_bytes; SUM_SIZE_INT total_downloaded_bytes;
@@ -1296,7 +1300,40 @@ getproxy (struct url *u) @@ -1319,7 +1323,40 @@ getproxy (struct url *u)
break; break;
} }
if (!proxy || !*proxy) if (!proxy || !*proxy)
+#ifdef HAVE_LIBPROXY +#ifdef HAVE_LIBPROXY
+ { + {
+ pxProxyFactory *pf = px_proxy_factory_new(); + pxProxyFactory *pf = px_proxy_factory_new();
+ if (!pf) + if (!pf)
+ {
+ debug_logprintf (_("Allocating memory for libproxy failed"));
+ return NULL;
+ }
+ int i;
+ char direct[] = "direct://";
+
+ debug_logprintf (_("asking libproxy about url '%s'\n"), u->url);
+ char **proxies = px_proxy_factory_get_proxies(pf, u->url);
+ if (proxies[0])
+ { + {
+ char *check = NULL; + debug_logprintf (_("Allocating memory for libproxy failed"));
+ asprintf(&check , "%s", proxies[0]); + return NULL;
+ debug_logprintf (_("libproxy suggest to use '%s'\n"), check);
+ if(strcmp(check ,direct) != 0)
+ {
+ asprintf(&proxy , "%s", proxies[0]);
+ debug_logprintf (_("case 2: libproxy setting to use '%s'\n"), proxy);
+ }
+ } + }
+ for(i=0;proxies[i];i++) free(proxies[i]); + int i;
+ free(proxies); + char direct[] = "direct://";
+ px_proxy_factory_free(pf);
+ +
+ if (!proxy || !*proxy) + debug_logprintf (_("asking libproxy about url '%s'\n"), u->url);
+ return NULL; + char **proxies = px_proxy_factory_get_proxies(pf, u->url);
+ if (proxies[0])
+ {
+ char *check = NULL;
+ asprintf(&check , "%s", proxies[0]);
+ debug_logprintf (_("libproxy suggest to use '%s'\n"), check);
+ if(strcmp(check ,direct) != 0)
+ {
+ asprintf(&proxy , "%s", proxies[0]);
+ debug_logprintf (_("case 2: libproxy setting to use '%s'\n"), proxy);
+ }
+ }
+ for(i=0;proxies[i];i++) free(proxies[i]);
+ free(proxies);
+ px_proxy_factory_free(pf);
+
+ if (!proxy || !*proxy)
+ return NULL;
+ } + }
+#else +#else
return NULL; return NULL;
@ -101,15 +94,15 @@ Index: wget-1.17/src/retr.c
/* Handle shorthands. `rewritten_storage' is a kludge to allow /* Handle shorthands. `rewritten_storage' is a kludge to allow
getproxy() to return static storage. */ getproxy() to return static storage. */
Index: wget-1.17/tests/Makefile.am Index: wget-1.19/tests/Makefile.am
=================================================================== ===================================================================
--- wget-1.17.orig/tests/Makefile.am --- wget-1.19.orig/tests/Makefile.am
+++ wget-1.17/tests/Makefile.am +++ wget-1.19/tests/Makefile.am
@@ -32,6 +32,7 @@ @@ -32,6 +32,7 @@
# #
# Version: @VERSION@ # Version: @VERSION@
# #
+LIBS += $(libproxy_LIBS) ++LIBS += $(libproxy_LIBS)
../src/wget$(EXEEXT): ../src/wget$(EXEEXT):
cd ../src && $(MAKE) $(AM_MAKEFLAGS) cd ../src && $(MAKE) $(AM_MAKEFLAGS)

42
wget.changes
View File

@ -1,3 +1,45 @@
-------------------------------------------------------------------
Sat Feb 4 20:32:08 UTC 2017 - astieger@suse.com
- build with libidn2 to actually support IDNA2008 - FATE#321897
-------------------------------------------------------------------
Fri Feb 3 14:37:20 UTC 2017 - josef.moellers@suse.com
- Update to wget-1.19:
* New option --use-askpass=COMMAND. Fetch user/password by calling
an external program.
* Use IDNA2008 (+ TR46 if available) through libidn2
* When processing a Metalink header, --metalink-index=<number> allows
to process the header's application/metalink4+xml files.
* When processing a Metalink file, --trust-server-names enables the
use of the destination file names specified in the Metalink file,
otherwise a safe destination file name is computed.
* When processing a Metalink file, enforce a safe destination path.
Remove any drive letter prefix under w32, i.e. 'C:D:file'. Call
libmetalink's metalink_check_safe_path() to prevent absolute,
relative, or home paths:
https://tools.ietf.org/html/rfc5854#section-4.1.2.1
https://tools.ietf.org/html/rfc5854#section-4.2.8.3
* When processing a Metalink file, --directory-prefix=<prefix> sets
the top of the retrieval tree to prefix for Metalink downloads.
* When processing a Metalink file, reject downloaded files which don't
agree with their own metalink:size value:
https://tools.ietf.org/html/rfc5854#section-4.2.16
* When processing a Metalink file, with --continue resume partially
downloaded files and keep fully downloaded files even if they fail
the verification.
* When processing a Metalink file, create the parent directories of a
"path/file" destination file name:
https://tools.ietf.org/html/rfc5854#section-4.1.2.1
https://tools.ietf.org/html/rfc5854#section-4.2.8.3
* On a recursive download, append a .tmp suffix to temporary files
that will be deleted after being parsed, and create them
readable/writable only by the owner.
* New make target 'check-valgrind'
* Fix several bugs
* Fix compatibility issues
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 28 15:37:37 UTC 2016 - josef.moellers@suse.com Thu Jul 28 15:37:37 UTC 2016 - josef.moellers@suse.com

6
wget.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package wget # spec file for package wget
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@
%bcond_with regression_tests %bcond_with regression_tests
Name: wget Name: wget
Version: 1.18 Version: 1.19
Release: 0 Release: 0
Summary: A Tool for Mirroring FTP and HTTP Servers Summary: A Tool for Mirroring FTP and HTTP Servers
License: GPL-3.0+ License: GPL-3.0+
@ -36,7 +36,7 @@ Patch8: wget-errno-clobber.patch
BuildRequires: automake BuildRequires: automake
BuildRequires: gpgme-devel >= 0.4.2 BuildRequires: gpgme-devel >= 0.4.2
BuildRequires: libcares-devel BuildRequires: libcares-devel
BuildRequires: libidn-devel BuildRequires: libidn2-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: makeinfo BuildRequires: makeinfo
BuildRequires: openssl-devel BuildRequires: openssl-devel