Update debug test patch to cover USE=idn #288156 by Paolo Pedroni and info from Kent Fredric.

Package-Manager: portage-2.2_rc42/cvs/Linux x86_64

3 files changed, 124 insertions, 42 deletions

diff --git a/net-misc/wget/ChangeLog b/net-misc/wget/ChangeLog
index 5528a54ac4e9..55287329fc67 100644
--- a/net-misc/wget/ChangeLog
+++ b/net-misc/wget/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/wget
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.117 2009/10/07 19:08:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.118 2009/10/14 01:26:56 vapier Exp $
+
+  14 Oct 2009; Mike Frysinger <vapier@gentoo.org>
+  files/wget-1.12-debug-tests.patch:
+  Update debug test patch to cover USE=idn #288156 by Paolo Pedroni and info
+  from Kent Fredric.
 
   07 Oct 2009; Markus Meier <maekke@gentoo.org> wget-1.12.ebuild:
   amd64 stable, bug #286058
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index edc342e63f52..eb1eb6d7a5b8 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -2,19 +2,19 @@
 Hash: SHA1
 
 AUX wget-1.11-linking.patch 4935 RMD160 4285dd7325f29ac49edd5c42853c9f09b683b844 SHA1 2ae2e3202daa7ed0c4f33bd005469ab7c558ae7d SHA256 3f3a1b6ec439ba042c3da92cca04990e71ff4894ffc04d2d52a3186194665171
-AUX wget-1.12-debug-tests.patch 1043 RMD160 fa781575f12a9483399c450b83c3584133bc4fc8 SHA1 76bbf6e2252a4d90a4b332fa37881ff4eae83e3f SHA256 ba3e1b25869ffd310615aeababdb256e9a356af555f578753bd3985f50cb22bb
+AUX wget-1.12-debug-tests.patch 4482 RMD160 6fe85307685aa5ff8821100b26c69f67d7290d7a SHA1 b9e9e1a805c28aec6aa5a3cff9248cddf8f08ac9 SHA256 f043466367bcf895cc03319f5f8d2397e455ced6dd045b150695689df7220f1b
 AUX wget-1.12-linking.patch 9511 RMD160 8c7a27ec67d9c4ed9eb79c525bf1bff64bfaee95 SHA1 08905ad2bbfbe23a70d84d148426b671a20b5a6d SHA256 c53933a8a64574c999be2381c5991053725f9a6651b130511ed88fdacdc66c91
 AUX wgetrc-ipv6 54 RMD160 62ef29e13163463d42934b2ee970e235e64249dc SHA1 35a259c6817cccd04f23c56c9fd5b915f5f0fa00 SHA256 21bae947f1f94b09d2bf50704e1a69d7e90ee59898fd512c146d24e408d1a518
 DIST wget-1.11.4.tar.bz2 954561 RMD160 c7a7791a28900b8a4abb654f72b8dbd8982879ec SHA1 a69e382c0965992b2c662e80f7040600207619d2 SHA256 8b7f52e2861b89c3ee0cc10c3665af5b705d0cb7fc00bca59a9b1e2b50e027fb
 DIST wget-1.12.tar.bz2 1609032 RMD160 52fca690ea2b4e763a655aff36495059612fc65d SHA1 1a059b3736ef908b68acac91670f9df576d1a061 SHA256 c823d938e2f849305a101c0860229b123d7564c26470fdac9118d85e3c7dba9a
 EBUILD wget-1.11.4.ebuild 1831 RMD160 5428c5cf65e28d8200c5a296e6bd46e92fd96c07 SHA1 1adb9a5616a74f9777a0841acfa09f0568a97c36 SHA256 7ed3f3b4c61130ed7409b4ba48eaaf47adcd17b671493e816337fb45fd5a2f70
 EBUILD wget-1.12.ebuild 2133 RMD160 95e968444c83a442f0b4358057bc2f552276f2db SHA1 a213c3394d90680c176e8e7ea2d28b4ae74adcb9 SHA256 184647558215939376361cc959ac61e2f064045f866bfdefc2466f78762c2d30
-MISC ChangeLog 17890 RMD160 4f47499df7a32dd800cc64162b18fdb963fec557 SHA1 09d827b2b495849f9940737659a69c0f5f83b4c7 SHA256 fb4e2687f8cf89de7b9977dec0a04835b93085ad4bd74883b38c1caec7fbf682
+MISC ChangeLog 18076 RMD160 e1cbb88f602d66a22fbdbd0c0b47b1a3b8be68f3 SHA1 86b41df5e107aa11abbfeddf2930f84066215013 SHA256 00597c5d2e8138e36fb1126f217a3b38e79c4b740db78ce0f68008bb57ed5ae9
 MISC metadata.xml 258 RMD160 67393c1bb85136bfc1cd8e1145f3e5e0efa32828 SHA1 8d60f18c79ce849b2e3b31d33cb04ef8a0d70546 SHA256 63f6de85aadabff6f0250403fd8c60a6782e62b0d953dbdae71daf62ea717716
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkrM50YACgkQkKaRLQcq0GLRQQCfU2/fwe2ftGUyi4Q/e0uQpq9z
-2PQAn1lzuhgvwQI/1LMpEb0SZB056P4D
-=5Hsq
+iEYEARECAAYFAkrVKOUACgkQlPl3HsVfCDoI9ACffIDA3zM/BlXcyMJEATNK6gDE
+evUAoIB47vUIS0iQUrVlAfKol2EQfVoD
+=Qpit
 -----END PGP SIGNATURE-----
diff --git a/net-misc/wget/files/wget-1.12-debug-tests.patch b/net-misc/wget/files/wget-1.12-debug-tests.patch
index 7891ed354629..2cba7be44f32 100644
--- a/net-misc/wget/files/wget-1.12-debug-tests.patch
+++ b/net-misc/wget/files/wget-1.12-debug-tests.patch
@@ -1,52 +1,129 @@
-Skip tests that require USE=debug when building with USE=-debug
+Remove debug code from tests (since they'd require USE=debug)
 
 http://bugs.gentoo.org/286173
+http://bugs.gentoo.org/288156
 
---- a/tests/Test-E-k-K.px
-+++ b/tests/Test-E-k-K.px
-@@ -3,6 +3,7 @@
- use strict;
- use warnings;
+diff -r f5754f5d165c -r 3aa1d93d1c10 tests/Test-idn-cmd.px
+--- a/tests/Test-idn-cmd.px	Fri Sep 25 10:17:49 2009 -0700
++++ b/tests/Test-idn-cmd.px	Sun Sep 27 11:29:01 2009 -0700
+@@ -28,7 +28,7 @@
+     },
+ );
  
-+use WgetFeature qw(debug);
- use HTTPTest;
+-my $cmdline = $WgetTest::WGETPATH . " --debug --iri -rH"
++my $cmdline = $WgetTest::WGETPATH . " --iri -rH"
+     . " -e http_proxy=localhost:{{port}} --local-encoding=EUC-JP $euc_jp_hostname";
  
+ my $expected_error_code = 0;
+diff -r f5754f5d165c -r 3aa1d93d1c10 tests/Test-idn-headers.px
+--- a/tests/Test-idn-headers.px	Fri Sep 25 10:17:49 2009 -0700
++++ b/tests/Test-idn-headers.px	Sun Sep 27 11:29:01 2009 -0700
+@@ -40,7 +40,7 @@
+     },
+ );
  
---- a/tests/Test-cookies-401.px
-+++ b/tests/Test-cookies-401.px
-@@ -3,6 +3,7 @@
- use strict;
- use warnings;
+-my $cmdline = $WgetTest::WGETPATH . " --debug --iri -rH"
++my $cmdline = $WgetTest::WGETPATH . " --iri -rH"
+     . " -e http_proxy=localhost:{{port}} http://start-here.com/start.html";
  
-+use WgetFeature qw(debug);
- use HTTPTest;
+ my $expected_error_code = 0;
+diff -r f5754f5d165c -r 3aa1d93d1c10 tests/Test-idn-meta.px
+--- a/tests/Test-idn-meta.px	Fri Sep 25 10:17:49 2009 -0700
++++ b/tests/Test-idn-meta.px	Sun Sep 27 11:29:01 2009 -0700
+@@ -41,7 +41,7 @@
+     },
+ );
  
+-my $cmdline = $WgetTest::WGETPATH . " --debug --iri -rH"
++my $cmdline = $WgetTest::WGETPATH . " --iri -rH"
+     . " -e http_proxy=localhost:{{port}} http://start-here.com/start.html";
  
---- a/tests/Test-ftp-bad-list.px
-+++ b/tests/Test-ftp-bad-list.px
-@@ -3,6 +3,7 @@
- use strict;
- use warnings;
+ my $expected_error_code = 0;
+diff -r f5754f5d165c -r 3aa1d93d1c10 tests/Test-idn-robots.px
+--- a/tests/Test-idn-robots.px	Fri Sep 25 10:17:49 2009 -0700
++++ b/tests/Test-idn-robots.px	Sun Sep 27 11:29:01 2009 -0700
+@@ -48,7 +48,7 @@
+     },
+ );
  
-+use WgetFeature qw(debug);
- use FTPTest;
+-my $cmdline = $WgetTest::WGETPATH . " --debug --iri -rH"
++my $cmdline = $WgetTest::WGETPATH . " --iri -rH"
+     . " -e http_proxy=localhost:{{port}} --local-encoding=EUC-JP"
+     . " http://$euc_jp_hostname/";
  
+diff -r f5754f5d165c -r 3aa1d93d1c10 tests/Test-proxy-auth-basic.px
+--- a/tests/Test-proxy-auth-basic.px	Fri Sep 25 10:17:49 2009 -0700
++++ b/tests/Test-proxy-auth-basic.px	Sun Sep 27 11:29:01 2009 -0700
+@@ -25,7 +25,7 @@
+     },
+ );
  
---- a/tests/Test-proxy-auth-basic.px
-+++ b/tests/Test-proxy-auth-basic.px
-@@ -3,6 +3,7 @@
- use strict;
- use warnings;
+-my $cmdline = $WgetTest::WGETPATH . " --debug --user=fiddle-dee-dee --password=Dodgson"
++my $cmdline = $WgetTest::WGETPATH . " --user=fiddle-dee-dee --password=Dodgson"
+     . " -e http_proxy=localhost:{{port}} http://no.such.domain/needs-auth.txt";
  
-+use WgetFeature qw(debug);
- use HTTPTest;
+ my $expected_error_code = 0;
+
+
+
+
+diff -r ee7b9018a483 tests/Test-E-k-K.px
+--- a/tests/Test-E-k-K.px	Fri Oct 09 02:23:26 2009 -0700
++++ b/tests/Test-E-k-K.px	Tue Oct 13 21:18:51 2009 -0400
+@@ -61,7 +61,7 @@
+     },
+ );
  
+-my $cmdline = $WgetTest::WGETPATH . " -d -r -nd -E -k -K http://localhost:{{port}}/index.php";
++my $cmdline = $WgetTest::WGETPATH . " -r -nd -E -k -K http://localhost:{{port}}/index.php";
  
---- a/tests/WgetFeature.cfg
-+++ b/tests/WgetFeature.cfg
-@@ -1,4 +1,5 @@
- %skip_messages = (
-+    debug => "Not running test: Wget under test doesn't support debug.",
-     https => "Not running test: Wget under test doesn't support HTTPS.",
-     iri   => "Not running test: Wget under test doesn't support IDN/IRI.",
+ my $expected_error_code = 0;
+ 
+diff -r ee7b9018a483 tests/Test-cookies-401.px
+--- a/tests/Test-cookies-401.px	Fri Oct 09 02:23:26 2009 -0700
++++ b/tests/Test-cookies-401.px	Tue Oct 13 21:18:51 2009 -0400
+@@ -29,7 +29,7 @@
+     },
  );
+ 
+-my $cmdline = $WgetTest::WGETPATH . " -d http://localhost:{{port}}/one.txt"
++my $cmdline = $WgetTest::WGETPATH . " http://localhost:{{port}}/one.txt"
+     . " http://localhost:{{port}}/two.txt";
+ 
+ my $expected_error_code = 6;
+diff -r ee7b9018a483 tests/Test-ftp-bad-list.px
+--- a/tests/Test-ftp-bad-list.px	Fri Oct 09 02:23:26 2009 -0700
++++ b/tests/Test-ftp-bad-list.px	Tue Oct 13 21:18:51 2009 -0400
+@@ -29,7 +29,7 @@
+     },
+ );
+ 
+-my $cmdline = $WgetTest::WGETPATH . " -d -nH -Nc -r ftp://localhost:{{port}}/";
++my $cmdline = $WgetTest::WGETPATH . " -nH -Nc -r ftp://localhost:{{port}}/";
+ 
+ my $expected_error_code = 0;
+ 
+diff -r ee7b9018a483 tests/Test-iri-list.px
+--- a/tests/Test-iri-list.px	Fri Oct 09 02:23:26 2009 -0700
++++ b/tests/Test-iri-list.px	Tue Oct 13 21:18:51 2009 -0400
+@@ -143,7 +143,7 @@
+     },
+ );
+ 
+-my $cmdline = $WgetTest::WGETPATH . " --iri -d -i http://localhost:{{port}}/url_list.txt";
++my $cmdline = $WgetTest::WGETPATH . " --iri -i http://localhost:{{port}}/url_list.txt";
+ 
+ my $expected_error_code = 0;
+ 
+diff -r ee7b9018a483 tests/Test-iri.px
+--- a/tests/Test-iri.px	Fri Oct 09 02:23:26 2009 -0700
++++ b/tests/Test-iri.px	Tue Oct 13 21:18:51 2009 -0400
+@@ -186,7 +186,7 @@
+     },
+ );
+ 
+-my $cmdline = $WgetTest::WGETPATH . " -d --iri --restrict-file-names=nocontrol -nH -r http://localhost:{{port}}/";
++my $cmdline = $WgetTest::WGETPATH . " --iri --restrict-file-names=nocontrol -nH -r http://localhost:{{port}}/";
+ 
+ my $expected_error_code = 0;
+