diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-08-22 18:00:16 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-08-22 18:00:16 +0000 |
| commit | 365ac69e07e2ec520b0776f66fb96d19ab03a948 (patch) | |
| tree | 6f28803a13cac59f97e17d5ae00b70cc25657dda /net-misc/wget/files | |
| parent | Bump to 0.9.3, from gnome overlay (diff) | |
| download | gentoo-2-365ac69e07e2ec520b0776f66fb96d19ab03a948.tar.gz gentoo-2-365ac69e07e2ec520b0776f66fb96d19ab03a948.tar.bz2 gentoo-2-365ac69e07e2ec520b0776f66fb96d19ab03a948.zip | |
Fix some iri tests after CVE patch #333965 by Xake.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/wget/files')
| -rw-r--r-- | net-misc/wget/files/wget-1.12-CVE-2010-2252.patch | 40 |
1 files changed, 39 insertions, 1 deletions
diff --git a/net-misc/wget/files/wget-1.12-CVE-2010-2252.patch b/net-misc/wget/files/wget-1.12-CVE-2010-2252.patch index af1688ada582..d163996d73e2 100644 --- a/net-misc/wget/files/wget-1.12-CVE-2010-2252.patch +++ b/net-misc/wget/files/wget-1.12-CVE-2010-2252.patch @@ -136,7 +136,7 @@ ChangeLog: N_("\ -I, --include-directories=LIST list of allowed directories.\n"), N_("\ -+ --trust-server-names use the name specified by the redirection url last component.\n"), ++ --trust-server-names use the name specified by the redirection url last component.\n"), + N_("\ -X, --exclude-directories=LIST list of excluded directories.\n"), N_("\ @@ -167,3 +167,41 @@ ChangeLog: } else if (u->scheme == SCHEME_FTP) { + +make sure tests pass after this change +https://bugs.gentoo.org/333965 +https://savannah.gnu.org/bugs/index.php?30841 + +--- tests/Test-iri-forced-remote.px ++++ tests/Test-iri-forced-remote.px +@@ -174,7 +174,7 @@ my %urls = ( + }, + ); + +-my $cmdline = $WgetTest::WGETPATH . " --iri --remote-encoding=iso-8859-1 -nH -r http://localhost:{{port}}/"; ++my $cmdline = $WgetTest::WGETPATH . " --iri --trust-server-names --remote-encoding=iso-8859-1 -nH -r http://localhost:{{port}}/"; + + my $expected_error_code = 0; + +--- tests/Test-iri-list.px ++++ tests/Test-iri-list.px +@@ -143,7 +143,7 @@ my %urls = ( + }, + ); + +-my $cmdline = $WgetTest::WGETPATH . " --iri -i http://localhost:{{port}}/url_list.txt"; ++my $cmdline = $WgetTest::WGETPATH . " --iri --trust-server-names -i http://localhost:{{port}}/url_list.txt"; + + my $expected_error_code = 0; + +--- tests/Test-iri.px ++++ tests/Test-iri.px +@@ -186,7 +186,7 @@ my %urls = ( + }, + ); + +-my $cmdline = $WgetTest::WGETPATH . " --iri --restrict-file-names=nocontrol -nH -r http://localhost:{{port}}/"; ++my $cmdline = $WgetTest::WGETPATH . " --iri --trust-server-names --restrict-file-names=nocontrol -nH -r http://localhost:{{port}}/"; + + my $expected_error_code = 0; + |