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

Accepting request 110487 from home:dimstar:branches:network:utilities

Browse Source 
Fix bnc#753242 - wget produces confusing output when not using --no-proxy

OBS-URL: https://build.opensuse.org/request/show/110487
OBS-URL: https://build.opensuse.org/package/show/network:utilities/wget?expand=0&rev=24
This commit is contained in:
Andreas Stieger 2012-03-21 20:33:22 +00:00 committed by Git OBS Bridge
parent f316b9ab6e
commit 415a56c43e
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wget-libproxy.patch
View File

@ -62,23 +62,23 @@ Index: src/retr.c
+ pxProxyFactory *pf = px_proxy_factory_new(); + pxProxyFactory *pf = px_proxy_factory_new();
+ if (!pf) + if (!pf)
+ { + {
+ logprintf (LOG_VERBOSE, _("Allocating memory for libproxy failed")); + debug_logprintf (_("Allocating memory for libproxy failed"));
+ return NULL; + return NULL;
+ } + }
+ int i; + int i;
+ char direct[] = "direct://"; + char direct[] = "direct://";
+ +
+ logprintf (LOG_VERBOSE, _("asking libproxy about url '%s'\n"), u->url); + debug_logprintf (_("asking libproxy about url '%s'\n"), u->url);
+ char **proxies = px_proxy_factory_get_proxies(pf, u->url); + char **proxies = px_proxy_factory_get_proxies(pf, u->url);
+ if (proxies[0]) + if (proxies[0])
+ { + {
+ char *check = NULL; + char *check = NULL;
+ asprintf(&check , "%s", proxies[0]); + asprintf(&check , "%s", proxies[0]);
+ logprintf (LOG_VERBOSE, _("libproxy suggest to use '%s'\n"), check); + debug_logprintf (_("libproxy suggest to use '%s'\n"), check);
+ if(strcmp(check ,direct) != 0) + if(strcmp(check ,direct) != 0)
+ { + {
+ asprintf(&proxy , "%s", proxies[0]); + asprintf(&proxy , "%s", proxies[0]);
+ logprintf (LOG_VERBOSE, _("case 2: libproxy setting to use '%s'\n"), proxy); + debug_logprintf (_("case 2: libproxy setting to use '%s'\n"), proxy);
+ } + }
+ } + }
+ for(i=0;proxies[i];i++) free(proxies[i]); + for(i=0;proxies[i];i++) free(proxies[i]);

7
wget.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Mar 21 19:44:53 UTC 2012 - dimstar@opensuse.org
- Adjust wget-libproxy.patch: give debug output only when
opt.debug is set to non-zero values, so when -d is specified.
Fix bnc#753242.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 2 15:59:32 UTC 2011 - coolo@suse.com Fri Dec 2 15:59:32 UTC 2011 - coolo@suse.com

11
wget.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package wget # spec file for package wget
# #
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 SUSE LINUX Products 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
@ -15,13 +15,14 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
Name: wget Name: wget
Version: 1.13.4 Version: 1.13.4
Release: 0 Release: 0
License: GPL-3.0+
Summary: A Tool for Mirroring FTP and HTTP Servers Summary: A Tool for Mirroring FTP and HTTP Servers
Url: http://www.gnu.org/software/wget/ License: GPL-3.0+
Group: Productivity/Networking/Web/Utilities Group: Productivity/Networking/Web/Utilities
Url: http://www.gnu.org/software/wget/
Source: %name-%version.tar.bz2 Source: %name-%version.tar.bz2
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches
Patch0: wgetrc.patch Patch0: wgetrc.patch
@ -32,10 +33,10 @@ BuildRequires: libpng-devel
%if 0%{suse_version} > 1110 %if 0%{suse_version} > 1110
BuildRequires: libproxy-devel BuildRequires: libproxy-devel
%endif %endif
BuildRequires: openssl-devel
BuildRequires: automake BuildRequires: automake
BuildRequires: pkg-config
BuildRequires: libidn-devel BuildRequires: libidn-devel
BuildRequires: openssl-devel
BuildRequires: pkg-config
PreReq: %install_info_prereq PreReq: %install_info_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build