| 1 |
vapier 10/08/22 18:00:16 |
| 2 |
|
| 3 |
Modified: wget-1.12-CVE-2010-2252.patch |
| 4 |
Log: |
| 5 |
Fix some iri tests after CVE patch #333965 by Xake. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 net-misc/wget/files/wget-1.12-CVE-2010-2252.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/files/wget-1.12-CVE-2010-2252.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/files/wget-1.12-CVE-2010-2252.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/files/wget-1.12-CVE-2010-2252.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: wget-1.12-CVE-2010-2252.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/wget/files/wget-1.12-CVE-2010-2252.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- wget-1.12-CVE-2010-2252.patch 21 Aug 2010 22:18:17 -0000 1.1 |
| 22 |
+++ wget-1.12-CVE-2010-2252.patch 22 Aug 2010 18:00:16 -0000 1.2 |
| 23 |
@@ -136,7 +136,7 @@ |
| 24 |
N_("\ |
| 25 |
-I, --include-directories=LIST list of allowed directories.\n"), |
| 26 |
N_("\ |
| 27 |
-+ --trust-server-names use the name specified by the redirection url last component.\n"), |
| 28 |
++ --trust-server-names use the name specified by the redirection url last component.\n"), |
| 29 |
+ N_("\ |
| 30 |
-X, --exclude-directories=LIST list of excluded directories.\n"), |
| 31 |
N_("\ |
| 32 |
@@ -167,3 +167,41 @@ |
| 33 |
} |
| 34 |
else if (u->scheme == SCHEME_FTP) |
| 35 |
{ |
| 36 |
+ |
| 37 |
+make sure tests pass after this change |
| 38 |
+https://bugs.gentoo.org/333965 |
| 39 |
+https://savannah.gnu.org/bugs/index.php?30841 |
| 40 |
+ |
| 41 |
+--- tests/Test-iri-forced-remote.px |
| 42 |
++++ tests/Test-iri-forced-remote.px |
| 43 |
+@@ -174,7 +174,7 @@ my %urls = ( |
| 44 |
+ }, |
| 45 |
+ ); |
| 46 |
+ |
| 47 |
+-my $cmdline = $WgetTest::WGETPATH . " --iri --remote-encoding=iso-8859-1 -nH -r http://localhost:{{port}}/"; |
| 48 |
++my $cmdline = $WgetTest::WGETPATH . " --iri --trust-server-names --remote-encoding=iso-8859-1 -nH -r http://localhost:{{port}}/"; |
| 49 |
+ |
| 50 |
+ my $expected_error_code = 0; |
| 51 |
+ |
| 52 |
+--- tests/Test-iri-list.px |
| 53 |
++++ tests/Test-iri-list.px |
| 54 |
+@@ -143,7 +143,7 @@ my %urls = ( |
| 55 |
+ }, |
| 56 |
+ ); |
| 57 |
+ |
| 58 |
+-my $cmdline = $WgetTest::WGETPATH . " --iri -i http://localhost:{{port}}/url_list.txt"; |
| 59 |
++my $cmdline = $WgetTest::WGETPATH . " --iri --trust-server-names -i http://localhost:{{port}}/url_list.txt"; |
| 60 |
+ |
| 61 |
+ my $expected_error_code = 0; |
| 62 |
+ |
| 63 |
+--- tests/Test-iri.px |
| 64 |
++++ tests/Test-iri.px |
| 65 |
+@@ -186,7 +186,7 @@ my %urls = ( |
| 66 |
+ }, |
| 67 |
+ ); |
| 68 |
+ |
| 69 |
+-my $cmdline = $WgetTest::WGETPATH . " --iri --restrict-file-names=nocontrol -nH -r http://localhost:{{port}}/"; |
| 70 |
++my $cmdline = $WgetTest::WGETPATH . " --iri --trust-server-names --restrict-file-names=nocontrol -nH -r http://localhost:{{port}}/"; |
| 71 |
+ |
| 72 |
+ my $expected_error_code = 0; |
| 73 |
+ |
Archives