head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.6 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.4 pkgsrc-2012Q4-base:1.7 pkgsrc-2011Q4:1.7.0.2 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q3:1.6.0.10 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.6.0.8 pkgsrc-2011Q2-base:1.6 pkgsrc-2011Q1:1.6.0.6 pkgsrc-2011Q1-base:1.6 pkgsrc-2010Q4:1.6.0.4 pkgsrc-2010Q4-base:1.6 pkgsrc-2010Q3:1.6.0.2 pkgsrc-2009Q4:1.5.0.44 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.42 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.40 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.38 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.36 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.34 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.32 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.30 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.28 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.26 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.24 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.22 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.20 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.18 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.16 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.14 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.12 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.10 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.5.0.8 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.5.0.6 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.4 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.5.0.2 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.4.0.4 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.4.0.2 netbsd-1-6-1-base:1.4 buildlink2-base:1.2; locks; strict; comment @# @; 1.7 date 2011.10.24.15.22.01; author ryoon; state dead; branches; next 1.6; 1.6 date 2010.11.23.08.22.47; author tron; state Exp; branches 1.6.2.1; next 1.5; 1.5 date 2003.12.08.21.44.35; author wiz; state dead; branches; next 1.4; 1.4 date 2002.12.16.11.39.02; author wiz; state Exp; branches; next 1.3; 1.3 date 2002.10.21.14.46.27; author mycroft; state Exp; branches; next 1.2; 1.2 date 2000.08.16.06.38.47; author itojun; state dead; branches; next 1.1; 1.1 date 2000.03.26.14.16.47; author itojun; state Exp; branches; next ; 1.6.2.1 date 2010.11.23.08.22.47; author spz; state dead; branches; next 1.6.2.2; 1.6.2.2 date 2010.11.23.21.14.45; author spz; state Exp; branches; next ; desc @@ 1.7 log @Update to 1.13.4 * Remove ssl option, and add gnutls and openssl options. The default is openssl like before. * All security patches are included in upstream's tar ball. * Remove ac_cv_func_sigsetjmp=yes line, because not defined now. Tested on NetBSD/i386 4.0.1, 5.1 5.99.56. Changelog: * Changes in Wget 1.13.4 ** Now --version and --help work again. ** Fix a build error on solaris 10 sparc. ** Now --timestamping and --continue work well together. ** Return a network failure when FTP downloads fail and --timestamping is specified. * Changes in Wget 1.13.3 ** Support HTTP/1.1 ** Now by default the GNU TLS library for secure connections, instead of OpenSSL. ** Fix some portability issues. ** Handle properly malformed status line in a HTTP response. ** Ignore zero length domains in $no_proxy. ** Set new cookies after an authorization failure. ** Exit with failure if -k is specified and -O is not a regular file. ** Cope better with unclosed html tags. ** Print diagnostic messages to stderr, not stdout. ** Do not use an additional HEAD request when --content-disposition is used, but use directly GET. ** Report the average transfer speed correctly when multiple URL's are specified and -c influences the transferred data amount. ** GNU TLS backend works again. ** Now --timestamping and --continue works well together. ** By default, on server redirects, use the original URL to get the local file name. Close CVE-2010-2252. This introduces a backward-incompatibility; any script that relies on the old behaviour must use --trust-server-names. ** Fix a problem when -k is used and some URLs are specified trough CSS. ** Convert correctly URLs that need to be encoded to local files when following links. ** Use persistent connections with proxies supporting them. ** Print the total download time as part of the summary for recursive downloads. ** Now it is possible to specify a different startup configuration file trough the --config option. ** Fix an infinite loop with the error ' has sprung into existence' on a network error and -nc is used. ** Now --adjust-extension does not modify the file extension if the file ends in .htm. ** Support HTTP/1.1 307 redirects keep request method. ** Now --no-parent doesn't fetch undesired files if HTTP and HTTPS are used by the same host on different pages. ** Do not attempt to remove the file if it is not in the accept rules but it is the output destination file. ** Introduce `show_all_dns_entries' to print all IP addresses corresponding to a DNS name when it is resolved. @ text @$NetBSD: patch-af,v 1.6 2010/11/23 08:22:47 tron Exp $ Back port of patch for CVE-2010-2252 for to version 1.12 of "wget" taken from Debian: http://packages.debian.org/sid/wget http://ftp.de.debian.org/debian/pool/main/w/wget/wget_1.12-2.1.debian.tar.gz --- src/retr.c.orig 2009-09-04 17:31:54.000000000 +0100 +++ src/retr.c 2010-11-22 18:53:25.000000000 +0000 @@@@ -689,7 +689,8 @@@@ #endif || (proxy_url && proxy_url->scheme == SCHEME_HTTP)) { - result = http_loop (u, &mynewloc, &local_file, refurl, dt, proxy_url, iri); + result = http_loop (u, orig_parsed, &mynewloc, &local_file, refurl, dt, + proxy_url, iri); } else if (u->scheme == SCHEME_FTP) { @ 1.6 log @Add Debian's "wget" 1.12 backport of the fix for CVE-2010-2252. @ text @d1 1 a1 1 $NetBSD$ @ 1.6.2.1 log @file patch-af was added on branch pkgsrc-2010Q3 on 2010-11-23 21:14:45 +0000 @ text @d1 20 @ 1.6.2.2 log @Pullup ticket 3278 - requested by tron security fixes Revisions pulled up: - pkgsrc/net/wget/Makefile 1.102 - pkgsrc/net/wget/distinfo 1.36 Files added: pkgsrc/net/wget/patches/patch-aa pkgsrc/net/wget/patches/patch-ab pkgsrc/net/wget/patches/patch-ac pkgsrc/net/wget/patches/patch-ad pkgsrc/net/wget/patches/patch-ae pkgsrc/net/wget/patches/patch-af ------------------------------------------------------------------------- Module Name: pkgsrc Committed By: tron Date: Tue Nov 23 08:22:47 UTC 2010 Modified Files: pkgsrc/net/wget: Makefile distinfo Added Files: pkgsrc/net/wget/patches: patch-aa patch-ab patch-ac patch-ad patch-ae patch-af Log Message: Add Debian's "wget" 1.12 backport of the fix for CVE-2010-2252. To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 pkgsrc/net/wget/Makefile cvs rdiff -u -r1.35 -r1.36 pkgsrc/net/wget/distinfo cvs rdiff -u -r0 -r1.11 pkgsrc/net/wget/patches/patch-aa \ pkgsrc/net/wget/patches/patch-ac cvs rdiff -u -r0 -r1.9 pkgsrc/net/wget/patches/patch-ab cvs rdiff -u -r0 -r1.10 pkgsrc/net/wget/patches/patch-ad cvs rdiff -u -r0 -r1.8 pkgsrc/net/wget/patches/patch-ae cvs rdiff -u -r0 -r1.6 pkgsrc/net/wget/patches/patch-af @ text @a0 20 $NetBSD: patch-af,v 1.6 2010/11/23 08:22:47 tron Exp $ Back port of patch for CVE-2010-2252 for to version 1.12 of "wget" taken from Debian: http://packages.debian.org/sid/wget http://ftp.de.debian.org/debian/pool/main/w/wget/wget_1.12-2.1.debian.tar.gz --- src/retr.c.orig 2009-09-04 17:31:54.000000000 +0100 +++ src/retr.c 2010-11-22 18:53:25.000000000 +0000 @@@@ -689,7 +689,8 @@@@ #endif || (proxy_url && proxy_url->scheme == SCHEME_HTTP)) { - result = http_loop (u, &mynewloc, &local_file, refurl, dt, proxy_url, iri); + result = http_loop (u, orig_parsed, &mynewloc, &local_file, refurl, dt, + proxy_url, iri); } else if (u->scheme == SCHEME_FTP) { @ 1.5 log @Update to 1.9.1: * Wget 1.9.1 is a bugfix release with no user-visible changes. * Changes in Wget 1.9. ** It is now possible to specify that POST method be used for HTTP requests. For example, `wget --post-data="id=foo&data=bar" URL' will send a POST request with the specified contents. ** IPv6 support is available, although it's still experimental. ** The `--timeout' option now also affects DNS lookup and establishing the TCP connection. Previously it only affected reading and writing data. Those three timeouts can be set separately using `--dns-timeout', `--connection-timeout', and `--read-timeout', respectively. ** Download speed shown by the progress bar is based on the data recently read, rather than the average speed of the entire download. The ETA projection is still based on the overall average. ** It is now possible to connect to FTP servers through FWTK firewalls. Set ftp_proxy to an FTP URL, and Wget will automatically log on to the proxy as "username@@host". ** The new option `--retry-connrefused' makes Wget retry downloads even in the face of refused connections, which are otherwise considered a fatal error. ** The new option `--dns-cache=off' may be used to prevent Wget from caching DNS lookups. ** Wget no longer escapes characters in local file names based on whether they're appropriate in URLs. Escaping can still occur for nonprintable characters or for '/', but no longer for frequent characters such as space. You can use the new option --restrict-file-names to relax or strengthen these rules, which can be useful if you dislike the default or if you're downloading to non-native partitions. ** Handling of HTML comments has been dumbed down to conform to what users expect and other browsers do: instead of being treated as SGML declaration, a comment is terminated at the first occurrence of "-->". Use `--strict-comments' to revert to the old behavior. ** Wget now correctly handles relative URIs that begin with "//", such as "//img.foo.com/foo.jpg". ** Boolean options in `.wgetrc' and on the command line now accept values "yes" and "no" along with the traditional "on" and "off". ** It is now possible to specify decimal values for timeouts, waiting periods, and download rate. For instance, `--wait=0.5' now works as expected, as does `--dns-timeout=0.5' and even `--limit-rate=2.5k'. @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.4 2002/12/16 11:39:02 wiz Exp $ d3 15 a17 18 --- src/cookies.c.orig Sun May 19 05:04:53 2002 +++ src/cookies.c @@@@ -491,7 +491,12 @@@@ parse_set_cookies (const char *sc) { case S_NAME_PRE: if (ISSPACE (c)) - FETCH (c, p); + { + FETCH1 (c, p); + /* drop trailing whitespace */ + if (!c) + state = S_DONE; + } else if (ATTR_NAME_CHAR (c)) { name_b = p - 1; @@@@ -622,7 +627,11 @@@@ parse_set_cookies (const char *sc) } d19 2 a20 10 if (state == S_DONE) - return cookie; + { + if (!cookie->attr) + goto eof; + return cookie; + } delete_cookie (cookie); if (state == S_ERROR) @ 1.4 log @Update to 1.8.2, with the recently discovered security problem already fixed (patches from RedHat RPM). Note: this package does not support IPv6 any longer, since no updated IPv6 patch for wget-1.8.2 exists (to my knowledge). The next major wget release is expected to contain IPv6 support. Uservisible changes since 1.7: ** A new progress indicator is now available and used by default. You can choose the progress bar type with `--progress=TYPE'. Two types are available, "bar" (the new default), and "dot" (the old dotted indicator). You can permanently revert to the old progress indicator by putting `progress = dot' in your `.wgetrc'. ** You can limit the download rate of the retrieval using the `--limit-rate' option. For example, `wget --limit-rate=15k URL' will tell Wget not to download the body of the URL faster than 15 kilobytes per second. ** Recursive retrieval and link conversion have been revamped: *** Wget now traverses links breadth-first. This makes the calculation of depth much more reliable than before. Also, recursive downloads are faster and consume *significantly* less memory than before. *** Links are converted only when the entire retrieval is complete. This is the only safe thing to do, as only then is it known what URLs have been downloaded. *** BASE tags are handled correctly when converting links. Since Wget already resolves when resolving handling URLs, link conversion now makes the BASE tags point to an empty string. *** HTML anchors are now handled correctly. Links to an anchor in the same document (), which used to confuse Wget, are now converted correctly. *** When in page-requisites (-p) mode, no-parent (-np) is ignored when retrieving for inline images, stylesheets, and other documents needed to display the page. *** Page-requisites (-p) mode now works with frames. In other words, `wget -p URL-THAT-USES-FRAMES' will now download the frame HTML files, and all the files that they need to be displayed properly. ** `--base' now works conjunction with `--input-file', providing a base for each URL and thereby allowing the URLs in the file to be relative. ** If a host has more than one IP address, Wget uses the other addresses when accessing the first one fails. ** Host directories now contain port information if the URL is at a non-standard port. ** Wget now supports the robots.txt directives specified in . ** URL parser has been fixed, especially the infamous overzealous quoting. Wget no longer dequotes reserved characters, e.g. `%3F' is no longer translated to `?', nor `%2B' to `+'. Unsafe characters which are not reserved are still escaped, of course. ** No more than 20 successive redirections are allowed. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Ignore trailing whitespace at the end of a Set-Cookie tag -- but still error on a completely empty one. @ text @d3 3 a5 3 --- src/cookies.c.orig Sun May 27 19:34:56 2001 +++ src/cookies.c Mon Oct 21 14:27:38 2002 @@@@ -474,7 +474,12 @@@@ d19 1 a19 1 @@@@ -605,7 +610,11 @@@@ @ 1.2 log @use latest IPv6 patch from kame (now supports IPv6 FTP properly). patches/patch-?? contain IPv6 patches only, switch to PATCHFILES. @ text @d1 28 a28 18 $NetBSD: patch-af,v 1.1 2000/03/26 14:16:47 itojun Exp $ --- src/main.c.orig Fri Sep 11 03:41:53 1998 +++ src/main.c Fri Sep 24 15:49:42 1999 @@@@ -157,6 +157,8 @@@@ --http-passwd=PASS set http password to PASS.\n\ -C, --cache=on/off (dis)allow server-cached data (normally allowed).\n\ --ignore-length ignore `Content-Length\' header field.\n\ + --inet use IP version 4 socket.\n\ + --inet6 use IP version 6 socket.\n\ --header=STRING insert STRING among the headers.\n\ --proxy-user=USER set USER as proxy username.\n\ --proxy-passwd=PASS set PASS as proxy password.\n\ @@@@ -195,7 +197,7 @@@@ main (int argc, char *const *argv) { char **url, **t; - int i, c, nurl, status, append_to_log; + int i, c, nurl, status, append_to_log, af; d30 2 a31 38 static struct option long_options[] = { @@@@ -211,6 +213,8 @@@@ { "force-html", no_argument, NULL, 'F'}, { "help", no_argument, NULL, 'h' }, { "ignore-length", no_argument, NULL, 10 }, + { "inet", no_argument, NULL, '4' }, + { "inet6", no_argument, NULL, '6' }, { "mirror", no_argument, NULL, 'm' }, { "no-clobber", no_argument, NULL, 13 }, { "no-directories", no_argument, NULL, 19 }, @@@@ -334,6 +338,12 @@@@ case 22: setval ("simplehostcheck", "on"); break; + case '4': + setval ("inet", "on"); + break; + case '6': + setval ("inet6", "on"); + break; case 'b': setval ("background", "on"); break; @@@@ -572,6 +582,13 @@@@ print_usage (); exit (1); } + + if (opt.inet && opt.inet6) { + printf (_("Can't inet and inet6 be specified at the same time.\n")); + print_usage (); + exit (1); + } + if (opt.timestamping && opt.noclobber) { printf (_("\ @ 1.1 log @bring in IPv6 support. PR8489. @ text @d1 1 a1 1 $NetBSD$ @