Accepting request 458483 from home:jmoellers:branches:network:utilities
OBS-URL: https://build.opensuse.org/request/show/458483 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wget?expand=0&rev=67
This commit is contained in:
Git OBS Bridge
parent
1abf1171ca
commit
20393766cd
3
wget-1.19.1.tar.xz
Normal file
3
wget-1.19.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0c950b9671881222a4d385b013c9604e98a8025d1988529dfca0e93617744cd2
|
||||
size 2111756
|
||||
BIN
wget-1.19.1.tar.xz.sig
Normal file
BIN
wget-1.19.1.tar.xz.sig
Normal file
Binary file not shown.
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0f1157bbf4daae19f3e1ddb70c6ccb2067feb834a6aa23c9d9daa7f048606384
|
||||
size 2075916
|
||||
Binary file not shown.
@ -1,7 +1,7 @@
|
||||
Index: wget-1.19/configure.ac
|
||||
Index: wget-1.19.1/configure.ac
|
||||
===================================================================
|
||||
--- wget-1.19.orig/configure.ac
|
||||
+++ wget-1.19/configure.ac
|
||||
--- wget-1.19.1.orig/configure.ac
|
||||
+++ wget-1.19.1/configure.ac
|
||||
@@ -506,6 +506,22 @@ AS_IF([test x"$with_metalink" != xno], [
|
||||
])
|
||||
])
|
||||
@ -25,23 +25,23 @@ Index: wget-1.19/configure.ac
|
||||
dnl **********************************************************************
|
||||
dnl Checks for IPv6
|
||||
dnl **********************************************************************
|
||||
Index: wget-1.19/src/Makefile.am
|
||||
Index: wget-1.19.1/src/Makefile.am
|
||||
===================================================================
|
||||
--- wget-1.19.orig/src/Makefile.am
|
||||
+++ wget-1.19/src/Makefile.am
|
||||
--- wget-1.19.1.orig/src/Makefile.am
|
||||
+++ wget-1.19.1/src/Makefile.am
|
||||
@@ -64,7 +64,7 @@ wget_SOURCES = connect.c convert.c cooki
|
||||
nodist_wget_SOURCES = version.c
|
||||
EXTRA_wget_SOURCES = iri.c
|
||||
LDADD = $(LIBOBJS) ../lib/libgnu.a $(GETADDRINFO_LIB) $(HOSTENT_LIB)\
|
||||
- $(INET_NTOP_LIB) $(LIBSOCKET) $(LIB_CLOCK_GETTIME) $(LIB_CRYPTO)\
|
||||
+ $(INET_NTOP_LIB) $(LIBSOCKET) $(libproxy_LIBS) $(LIB_CLOCK_GETTIME) $(LIB_CRYPTO)\
|
||||
$(LIB_NANOSLEEP) $(LIB_POSIX_SPAWN) $(LIB_SELECT) $(LTLIBICONV) $(LTLIBINTL)\
|
||||
$(LTLIBTHREAD) $(LTLIBUNISTRING) $(SERVENT_LIB)
|
||||
$(LIB_NANOSLEEP) $(LIB_POSIX_SPAWN) $(LIB_SELECT) $(LIBICONV) $(LIBINTL)\
|
||||
$(LIBTHREAD) $(LIBUNISTRING) $(SERVENT_LIB)
|
||||
AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
|
||||
Index: wget-1.19/src/retr.c
|
||||
Index: wget-1.19.1/src/retr.c
|
||||
===================================================================
|
||||
--- wget-1.19.orig/src/retr.c
|
||||
+++ wget-1.19/src/retr.c
|
||||
--- wget-1.19.1.orig/src/retr.c
|
||||
+++ wget-1.19.1/src/retr.c
|
||||
@@ -58,6 +58,10 @@ as that of the covered work. */
|
||||
#include "iri.h"
|
||||
#include "hsts.h"
|
||||
@ -59,12 +59,12 @@ Index: wget-1.19/src/retr.c
|
||||
if (!proxy || !*proxy)
|
||||
+#ifdef HAVE_LIBPROXY
|
||||
+ {
|
||||
+ pxProxyFactory *pf = px_proxy_factory_new();
|
||||
+ if (!pf)
|
||||
+ {
|
||||
+ debug_logprintf (_("Allocating memory for libproxy failed"));
|
||||
+ return NULL;
|
||||
+ }
|
||||
+ pxProxyFactory *pf = px_proxy_factory_new();
|
||||
+ if (!pf)
|
||||
+ {
|
||||
+ debug_logprintf (_("Allocating memory for libproxy failed"));
|
||||
+ return NULL;
|
||||
+ }
|
||||
+ int i;
|
||||
+ char direct[] = "direct://";
|
||||
+
|
||||
@ -72,21 +72,21 @@ Index: wget-1.19/src/retr.c
|
||||
+ 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);
|
||||
+ }
|
||||
+ 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;
|
||||
+ if (!proxy || !*proxy)
|
||||
+ return NULL;
|
||||
+ }
|
||||
+#else
|
||||
return NULL;
|
||||
@ -94,10 +94,10 @@ Index: wget-1.19/src/retr.c
|
||||
|
||||
/* Handle shorthands. `rewritten_storage' is a kludge to allow
|
||||
getproxy() to return static storage. */
|
||||
Index: wget-1.19/tests/Makefile.am
|
||||
Index: wget-1.19.1/tests/Makefile.am
|
||||
===================================================================
|
||||
--- wget-1.19.orig/tests/Makefile.am
|
||||
+++ wget-1.19/tests/Makefile.am
|
||||
--- wget-1.19.1.orig/tests/Makefile.am
|
||||
+++ wget-1.19.1/tests/Makefile.am
|
||||
@@ -32,6 +32,7 @@
|
||||
#
|
||||
# Version: @VERSION@
|
||||
|
||||
12
wget.changes
12
wget.changes
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 16 11:20:07 UTC 2017 - josef.moellers@suse.com
|
||||
|
||||
- Update to wget-1.19.1, mainly bug fixes
|
||||
* Add support for --retry-on-http-error
|
||||
* tests/WgetTests.pm: Add --no-config to wget invocation
|
||||
* Fix regression in .netrc auth in src/http.c
|
||||
* Fix memory leak in src/iri.c
|
||||
* Remove skipping libunistring with --disable-iri
|
||||
* bootstrap.conf: Add gnulib module wcwidth
|
||||
* Fix include/define clash with gnulib's unlink module
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Feb 4 20:32:08 UTC 2017 - astieger@suse.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package wget
|
||||
#
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
%bcond_with regression_tests
|
||||
Name: wget
|
||||
Version: 1.19
|
||||
Version: 1.19.1
|
||||
Release: 0
|
||||
Summary: A Tool for Mirroring FTP and HTTP Servers
|
||||
License: GPL-3.0+
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user