diff options
| author | vd <vd@FreeBSD.org> | 2010-09-07 01:15:01 +0800 |
|---|---|---|
| committer | vd <vd@FreeBSD.org> | 2010-09-07 01:15:01 +0800 |
| commit | bf98d0c8abdd71ac1154a97e9bbb61a7d973f0b9 (patch) | |
| tree | 564f31136465dc90f17459b566f0401d6f2a7bc6 /ftp/wget/files | |
| parent | 879082eeb2487aca8c49464733f335503a1b35b4 (diff) | |
| download | freebsd-ports-gnome-bf98d0c8abdd71ac1154a97e9bbb61a7d973f0b9.tar.gz freebsd-ports-gnome-bf98d0c8abdd71ac1154a97e9bbb61a7d973f0b9.tar.zst freebsd-ports-gnome-bf98d0c8abdd71ac1154a97e9bbb61a7d973f0b9.zip | |
Followup to the previous commit: fix the newly added patches
Diffstat (limited to 'ftp/wget/files')
| -rw-r--r-- | ftp/wget/files/patch-NEWS | 16 | ||||
| -rw-r--r-- | ftp/wget/files/patch-src__http.c | 32 | ||||
| -rw-r--r-- | ftp/wget/files/patch-src__main.c | 2 |
3 files changed, 11 insertions, 39 deletions
diff --git a/ftp/wget/files/patch-NEWS b/ftp/wget/files/patch-NEWS index c37cc0ec2eee..05b8647c5fce 100644 --- a/ftp/wget/files/patch-NEWS +++ b/ftp/wget/files/patch-NEWS @@ -1,14 +1,12 @@ ---- NEWS 2010-07-11 13:47:18 +0000 -+++ NEWS 2010-07-28 19:22:22 +0000 -@@ -33,6 +33,9 @@ - ** GNU TLS backend works again. +--- NEWS.orig 2009-09-22 05:53:35.000000000 +0300 ++++ NEWS 2010-09-06 20:09:17.000000000 +0300 +@@ -6,6 +6,9 @@ - ** Now --timestamping and --continue works well together. -+ + Please send GNU Wget bug reports to <bug-wget@gnu.org>. + +** By default, on server redirects, use the original URL to get the + local file name. Close CVE-2010-2252. - ++ * Changes in Wget 1.12 - -=== modified file 'doc/wget.texi' + ** Mailing list MOVED to bug-wget@gnu.org diff --git a/ftp/wget/files/patch-src__http.c b/ftp/wget/files/patch-src__http.c index d847546c6afc..bf9a10281b04 100644 --- a/ftp/wget/files/patch-src__http.c +++ b/ftp/wget/files/patch-src__http.c @@ -28,32 +28,6 @@ * destination file. */ - file_name = url_file_name (u); + file_name = url_file_name (opt.trustservernames ? u : original_url); - if (opt.timestamping && (file_exists_p (file_name) - || opt.content_disposition)) - send_head_first = true; -@@ -3039,9 +3041,9 @@ - - /* Remember that we downloaded the file for later ".orig" code. */ - if (*dt & ADDED_HTML_EXTENSION) -- downloaded_file(FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED, hstat.local_file); -+ downloaded_file (FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED, hstat.local_file); - else -- downloaded_file(FILE_DOWNLOADED_NORMALLY, hstat.local_file); -+ downloaded_file (FILE_DOWNLOADED_NORMALLY, hstat.local_file); - - ret = RETROK; - goto exit; -@@ -3072,9 +3074,9 @@ - - /* Remember that we downloaded the file for later ".orig" code. */ - if (*dt & ADDED_HTML_EXTENSION) -- downloaded_file(FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED, hstat.local_file); -+ downloaded_file (FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED, hstat.local_file); - else -- downloaded_file(FILE_DOWNLOADED_NORMALLY, hstat.local_file); -+ downloaded_file (FILE_DOWNLOADED_NORMALLY, hstat.local_file); - - ret = RETROK; - goto exit; - -=== modified file 'src/http.h' + if (opt.timestamping + && !opt.content_disposition + && file_exists_p (file_name)) diff --git a/ftp/wget/files/patch-src__main.c b/ftp/wget/files/patch-src__main.c index 9141b1faf8d8..3fe5df0670a5 100644 --- a/ftp/wget/files/patch-src__main.c +++ b/ftp/wget/files/patch-src__main.c @@ -5,9 +5,9 @@ { "timestamping", 'N', OPT_BOOLEAN, "timestamping", -1 }, { "tries", 't', OPT_VALUE, "tries", -1 }, + { "trust-server-names", 0, OPT_BOOLEAN, "trustservernames", -1 }, - { "use-server-timestamps", 0, OPT_BOOLEAN, "useservertimestamps", -1 }, { "user", 0, OPT_VALUE, "user", -1 }, { "user-agent", 'U', OPT_VALUE, "useragent", -1 }, + { "verbose", 'v', OPT_BOOLEAN, "verbose", -1 }, @@ -680,6 +681,8 @@ N_("\ -I, --include-directories=LIST list of allowed directories.\n"), |