cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Followup to the previous commit: fix the newly added patches

Browse Source
This commit is contained in:
Vasil Dimov 2010-09-06 17:15:01 +00:00
parent 531380b017
commit 18599c08ea
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=260648
3 changed files with 11 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ftp/wget/files/patch-NEWS
View File

@ -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

32
ftp/wget/files/patch-src__http.c
View File

@ -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))

2
ftp/wget/files/patch-src__main.c
View File

@ -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"),