From 24ea85568eec4c8a08fc608bb98d4fe07056787f8a2f8b4ec0a2cd757caf32b8 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 1 May 2008 13:08:20 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wget?expand=0&rev=5 --- wget-passive-ftp.patch | 11 ----------- wget.changes | 8 ++++++++ wget.spec | 9 +++++++-- wgetrc.patch | 9 +++++++++ 4 files changed, 24 insertions(+), 13 deletions(-) delete mode 100644 wget-passive-ftp.patch create mode 100644 wgetrc.patch diff --git a/wget-passive-ftp.patch b/wget-passive-ftp.patch deleted file mode 100644 index 4d6e530..0000000 --- a/wget-passive-ftp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/sample.wgetrc -+++ doc/sample.wgetrc -@@ -42,7 +42,7 @@ - # firewalls software explicitly supports active FTP and in fact has - # problems supporting passive transfer. If you are in such - # environment, use "passive_ftp = off" to revert to active FTP. --#passive_ftp = off -+passive_ftp = on - - # The "wait" command below makes Wget wait between every connection. - # If, instead, you want Wget to wait only between retries of failed diff --git a/wget.changes b/wget.changes index 94ee893..f1f88a7 100644 --- a/wget.changes +++ b/wget.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Apr 30 19:16:30 CEST 2008 - max@suse.de + +- Let the resolver (/etc/gai.conf) decide whether to prefer IPv4 + or IPv6 if a host has addresses of both kinds (bnc#310224). +- Passive FTP is the default now, so we don't need to set it + explicitly anymore. + ------------------------------------------------------------------- Wed Apr 23 16:39:30 CEST 2008 - max@suse.de diff --git a/wget.spec b/wget.spec index 8de0275..c6236fe 100644 --- a/wget.spec +++ b/wget.spec @@ -18,10 +18,10 @@ License: GPL v3 or later Group: Productivity/Networking/Web/Utilities AutoReqProv: on Version: 1.11.1 -Release: 1 +Release: 4 Summary: A Tool for Mirroring FTP and HTTP Servers Source: %name-%version.tar.bz2 -Patch1: wget-passive-ftp.patch +Patch1: wgetrc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %install_info_prereq @@ -67,6 +67,11 @@ rm -rf $RPM_BUILD_ROOT; %{_bindir}/* %changelog +* Wed Apr 30 2008 max@suse.de +- Let the resolver (/etc/gai.conf) decide whether to prefer IPv4 + or IPv6 if a host has addresses of both kinds (bnc#310224). +- Passive FTP is the default now, so we don't need to set it + explicitly anymore. * Wed Apr 23 2008 max@suse.de - New version 1.11.1: * Migration to the GPLv3+ license. diff --git a/wgetrc.patch b/wgetrc.patch new file mode 100644 index 0000000..af7325b --- /dev/null +++ b/wgetrc.patch @@ -0,0 +1,9 @@ +--- doc/sample.wgetrc ++++ doc/sample.wgetrc +@@ -110,3 +110,6 @@ + # To have Wget follow FTP links from HTML files by default, set this + # to on: + #follow_ftp = off ++ ++# Let the DNS resolver decide whether to prefer IPv4 or Pv6 ++prefer-family = none