From 20393766cdbc4912f400daa5750cffdfde94e074046b71aafa8a84e44b0a1287 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 18 Feb 2017 12:04:58 +0000 Subject: [PATCH] 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 --- wget-1.19.1.tar.xz | 3 +++ wget-1.19.1.tar.xz.sig | Bin 0 -> 566 bytes wget-1.19.tar.xz | 3 --- wget-1.19.tar.xz.sig | Bin 566 -> 0 bytes wget-libproxy.patch | 60 ++++++++++++++++++++--------------------- wget.changes | 12 +++++++++ wget.spec | 4 +-- 7 files changed, 47 insertions(+), 35 deletions(-) create mode 100644 wget-1.19.1.tar.xz create mode 100644 wget-1.19.1.tar.xz.sig delete mode 100644 wget-1.19.tar.xz delete mode 100644 wget-1.19.tar.xz.sig diff --git a/wget-1.19.1.tar.xz b/wget-1.19.1.tar.xz new file mode 100644 index 0000000..6a1b38f --- /dev/null +++ b/wget-1.19.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c950b9671881222a4d385b013c9604e98a8025d1988529dfca0e93617744cd2 +size 2111756 diff --git a/wget-1.19.1.tar.xz.sig b/wget-1.19.1.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..43a33c8826fa18bf7743893fa5ac5c8176cc5a2ab35138e0beec06bbc54739b1 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SW*e79j*2vVFXmVM{GoL1b+RFfF#CX9Oq(0$87Wr~nEH5C||W zwxVYQD4r`20EkATt#6I00g_^3$28QD!Y)AKwAs}1+ox8|KZ|_}2&7F}OoS|KSbEYa z%v<8=bT!W`Py!lO{^>E(@(Xcw*x$0`8oT0ZJ-U%^p}lay{Oh5q@B?>nL?DkSnMo2j z^z$A4X|jV`qJ0{LcR3#E;uEK(eLRdK1?J3|$0rA>S7$oR?RC zV@@{TeP?QSjM#Nya0d%)Wv%y)Z1`_G(JBn(%f_Dh1h+ZmKq6rqBq4jL046;s_}jBv z6%|3+J|#4iHNlmRjA?SBY4whuMtdJpMldPTDU`I)EMP#C)vm^@3zs#UeX>-KJ6V}T zjQp%sj=~6_J!$OV2;5MT;@FK7zg_KixhxAosO;q;UPz7Hg#O7l&VRAb*-gfzCp7nQ zKiUE#z9Max?AD;v06TDR3#k~<)=wij_jK#4){Z1L$=em`A0@ zLq@pZjWvYYD@8*qQlpU@c??jJo+Td}yZqIJNi5jph79n|`mem{baajcUXZMJWv6B^s03PXE!TK! zb$?gn@)3}|7?NB$&{(X@ABXG;Yzwt6<5G+7tJm(K6>WiOQqg+Qq025Z8N^bp zo;eMx!9du>GXwc?Dh>Rjypcnq9!h=U>>qQ{hH8W=<409E7-;5Gtf`hdMBKi76%1Ar~u64fGs0y^+lS(56<;n_f%Oi@~_nl zlR2Bo|BmLYAmx8Y0T88Zt|boc;q)~(d4Y)1w27i__4hG>l`(CtMD|OtaQ~7o=>q#k EjI=!kwg3PC diff --git a/wget-libproxy.patch b/wget-libproxy.patch index e05f0fc..aebf6fd 100644 --- a/wget-libproxy.patch +++ b/wget-libproxy.patch @@ -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@ diff --git a/wget.changes b/wget.changes index 49eb2c2..8ca2d33 100644 --- a/wget.changes +++ b/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 diff --git a/wget.spec b/wget.spec index c083f5c..02279e4 100644 --- a/wget.spec +++ b/wget.spec @@ -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+