diff options
Diffstat (limited to 'net-misc/wget')
-rw-r--r-- | net-misc/wget/Manifest | 11 | ||||
-rw-r--r-- | net-misc/wget/files/wget-1.19.1-CRLF_injection.patch | 37 | ||||
-rw-r--r-- | net-misc/wget/files/wget-1.19.1-CVE-2017-13089.patch | 34 | ||||
-rw-r--r-- | net-misc/wget/files/wget-1.19.1-CVE-2017-13090.patch | 37 | ||||
-rw-r--r-- | net-misc/wget/files/wget-1.19.1-fix-Perl-warnings-in-tests.patch | 104 | ||||
-rw-r--r-- | net-misc/wget/files/wget-1.19.1-fix-Python-test-suite.patch | 172 | ||||
-rw-r--r-- | net-misc/wget/wget-1.19.1-r2.ebuild | 115 | ||||
-rw-r--r-- | net-misc/wget/wget-1.19.4.ebuild | 117 | ||||
-rw-r--r-- | net-misc/wget/wget-1.19.5.ebuild | 2 |
9 files changed, 2 insertions, 627 deletions
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest index ff14fc150340..723b0136f9ae 100644 --- a/net-misc/wget/Manifest +++ b/net-misc/wget/Manifest @@ -1,12 +1,3 @@ -AUX wget-1.19.1-CRLF_injection.patch 1051 BLAKE2B 8dccc89083422bc8646e5a12efa8ff9d37d38334505241acd258d85f1d0f9df448f6bbff36888a389b1d79a8bd3c8d3b311f61c086c75e74b8937ae31c54763e SHA512 fd36c9225c567e9958f030449f40cb747c0a23b7023fd4eee4e982c867d96be1562377a2d9b80150d9dc714bdbdc2bd509a8a244c4969c731002bdf6434d9cf8 -AUX wget-1.19.1-CVE-2017-13089.patch 1093 BLAKE2B a268a832b13ba6e08c8cf7889e49983cd2328c578ba28ae18c14850a44cb8aa18877766403dbcea711cc2e4ed0aec09f42cb47ec6eade6206eab7033248b27d5 SHA512 c3f44138aa105fa6572b3083671a95f4c819a65667d3d0ba1489a043390a184c5b442f5c134ab868360b01c6662b4bfb52588242273af5012d76099cb5511c77 -AUX wget-1.19.1-CVE-2017-13090.patch 1167 BLAKE2B 384c34c1999d564cf769998eaaef7aff9939e13144ce1848753a41dedbf267d50276925b888cf98f4e60f869f4bd6d4fe16dd5a6380bcb212ec828e845e895a4 SHA512 b9aa7972ff6523bf32810d3fca46ba1bb0c65b0075945c61d8009f39dc87202432ae1e0b9e4a861652001203ec8935078f0db171eda518cc01b72863c8c5ac36 -AUX wget-1.19.1-fix-Perl-warnings-in-tests.patch 3666 BLAKE2B ac176a5172f000ab32f62bfb8b6ff9c661b23b4d7525aaa37cf4018a7c1d9fe6b25359d1e46e9d83774a9b27dbf398f4040b9bf0fe0bb89438006a88158541bd SHA512 9f1b7ffded3422c995a51e346e3957024f4b5435cf51d491f3d4816620376539bffe2d3a7d7dcd03ca99828f06a21ebaa846b3a1755cd020a29f166c0fa2f7d9 -AUX wget-1.19.1-fix-Python-test-suite.patch 8721 BLAKE2B 7109cd205ae2ef07da8954093f8a3b7583944ba1dc965529b702e4db7c11df6c7d0765b8e22e231432f38d04f1d4c6a9b7521b65c050cabf0cff71f44130527d SHA512 e7905dc70c59e9c6b2fcc6c1a058fe98e8681492f034f2cd00aac5f1674d7dca0520bcf30d8b2563983bcb4388c6e35f66e772f833a364810f523784f8de3b19 -DIST wget-1.19.1.tar.xz 2111756 BLAKE2B e5dcaa791f78bb2d7de19a6f689430cd692e1232b7392102936e5f3b4e3592861bcfc78e27df0c4b02a9002ce4c755e765a0a51749670464789fc9f07f8787f7 SHA512 00864d225439bcb7c5af01d7ef19efa615427812d3320ab3f4c8f62c38191e837b1392397843f935d7dc5860a4d0ce89ee31f2730c4a729402f1f2bf3e5f64e5 -DIST wget-1.19.4.tar.gz 4310657 BLAKE2B 3f2e5a32e897101761d449f079bf9df38e60b68284230553b03280a6262e60b3d0b5af3bd9fdd334d09cac5ed3417c3a7e8736b1710f3a7402a123b4633b95e4 SHA512 e84b0c40235b160ade69e18f2f139c782eb2387edc97a847c11dbb906c0273daf6d0ef5afe20360ba965c7da8b5e109f5a45e39ea93d20ec945575203235943a DIST wget-1.19.5.tar.gz 4455797 BLAKE2B 988b80090ff1f62cb527afb33c03b7c6a68bbc1649d42f62061e05e416bebf5b2e9546ebafad3c9cdbf1199a8d2b84f4427c921f23338b02631da357da9b3d61 SHA512 0d4964e0f5adb0c023edc831bde9c9f13f3222f6efc1ce93250d234ab937e92b53921624532fb0e6586151ddfdee6df9a7ca91a2a99b3d16e2e68401c625301b -EBUILD wget-1.19.1-r2.ebuild 3365 BLAKE2B b0fb802be67226322409b35fa6c99814e2747ae85fbfdd95344a49b1aacd8b8c0208848b24cffdd663d4bf0475b41474aa151d4f4bffd3caf1d937cd3e8d144a SHA512 ae46574e6e5bf12161278346fc32eb93c7dd4fc2e776ddebaed9bd857639d9a3c234a818000ba6361a82262d5ee3b05c390efeebd4ec1bf2b7a219e06449ff26 -EBUILD wget-1.19.4.ebuild 3187 BLAKE2B fdd1edc8d6721bfadedd62c3afe979dc111e8950242dd77aa314aa207f012452d6dde1cb9dca2d8366b6a58d3184657034deaf4faf1367127bf638d31753712d SHA512 12ea494dabd74b3f2532952fe07cc6c00753f0ea91b1606c9d4e6b96a7f6595da60be2bb4f8f8e227af4129c736fb72c62fedcbecb56a8ee0c3cc9c1c6a25a32 -EBUILD wget-1.19.5.ebuild 3180 BLAKE2B 40b3ff5dee106891c8261447cdb5e64d058c8e3b15f94a9c18b610d64de0700b055df9d3d1eaaf6e2c59ac2b432eb2d6bb304778615ab95fe3ce87cf1f0f1094 SHA512 a7764a29d02792cafc3fea1084a33f1d242da015705a5d6a2cebc2a1956f5b3adf0f2cc9fdfc7da834685848ee327982becf359686b1619372a94867432c435d +EBUILD wget-1.19.5.ebuild 3174 BLAKE2B a17a950d485a5e0e7ab4467687f6a11b149ef746006eca83902c682e9babf62c66d7c21213108d8c74617be78ae87aab0d2521d4a3d9de62017b415066847e82 SHA512 e35deb63e5d9f9d176e4b7ae3125b8b1e9db63a9fb1bacb3bc01f485d9b6aa559f948ac8ace85ec816dc180fb328a69fd45a0c6ac79051ea6245b4692247d6db MISC metadata.xml 570 BLAKE2B 00d529ba0b6bcee7b6fc3937de69ead007ac57458c1afecf12cdd84a09637055d55725498e3c648311a494566eab32acc8d2e3de622086a4b599b5b40d0a2d1b SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c diff --git a/net-misc/wget/files/wget-1.19.1-CRLF_injection.patch b/net-misc/wget/files/wget-1.19.1-CRLF_injection.patch deleted file mode 100644 index aa4e978cfda9..000000000000 --- a/net-misc/wget/files/wget-1.19.1-CRLF_injection.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 4d729e322fae359a1aefaafec1144764a54e8ad4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de> -Date: Mon, 6 Mar 2017 10:04:22 +0100 -Subject: Fix CRLF injection in Wget host part - -* src/url.c (url_parse): Reject control characters in host part of URL - -Reported-by: Orange Tsai ---- - src/url.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/src/url.c b/src/url.c -index 8f8ff0b..7d36b27 100644 ---- a/src/url.c -+++ b/src/url.c -@@ -925,6 +925,17 @@ url_parse (const char *url, int *error, struct iri *iri, bool percent_encode) - url_unescape (u->host); - host_modified = true; - -+ /* check for invalid control characters in host name */ -+ for (p = u->host; *p; p++) -+ { -+ if (c_iscntrl(*p)) -+ { -+ url_free(u); -+ error_code = PE_INVALID_HOST_NAME; -+ goto error; -+ } -+ } -+ - /* Apply IDNA regardless of iri->utf8_encode status */ - if (opt.enable_iri && iri) - { --- -cgit v1.0-41-gc330 - diff --git a/net-misc/wget/files/wget-1.19.1-CVE-2017-13089.patch b/net-misc/wget/files/wget-1.19.1-CVE-2017-13089.patch deleted file mode 100644 index f961741aa288..000000000000 --- a/net-misc/wget/files/wget-1.19.1-CVE-2017-13089.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3dbc2e06ad487862c2fcc64d4891ff8aeb254bad Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de> -Date: Fri, 20 Oct 2017 10:59:38 +0200 -Subject: [PATCH 1/2] Fix stack overflow in HTTP protocol handling - (CVE-2017-13089) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* src/http.c (skip_short_body): Return error on negative chunk size - -Reported-by: Antti Levomäki, Christian Jalio, Joonas Pihlaja from Forcepoint -Reported-by: Juhani Eronen from Finnish National Cyber Security Centre ---- - src/http.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/http.c b/src/http.c -index 55367688..dc318231 100644 ---- a/src/http.c -+++ b/src/http.c -@@ -973,6 +973,9 @@ skip_short_body (int fd, wgint contlen, bool chunked) - remaining_chunk_size = strtol (line, &endl, 16); - xfree (line); - -+ if (remaining_chunk_size < 0) -+ return false; -+ - if (remaining_chunk_size == 0) - { - line = fd_read_line (fd); --- -2.15.0.rc1 - diff --git a/net-misc/wget/files/wget-1.19.1-CVE-2017-13090.patch b/net-misc/wget/files/wget-1.19.1-CVE-2017-13090.patch deleted file mode 100644 index 4e600fe784ff..000000000000 --- a/net-misc/wget/files/wget-1.19.1-CVE-2017-13090.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 28925c37b72867c0819799c6f35caf9439080f83 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de> -Date: Fri, 20 Oct 2017 15:15:47 +0200 -Subject: [PATCH 2/2] Fix heap overflow in HTTP protocol handling - (CVE-2017-13090) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* src/retr.c (fd_read_body): Stop processing on negative chunk size - -Reported-by: Antti Levomäki, Christian Jalio, Joonas Pihlaja from Forcepoint -Reported-by: Juhani Eronen from Finnish National Cyber Security Centre ---- - src/retr.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/retr.c b/src/retr.c -index a27d58af..723ac725 100644 ---- a/src/retr.c -+++ b/src/retr.c -@@ -378,6 +378,12 @@ fd_read_body (const char *downloaded_filename, int fd, FILE *out, wgint toread, - remaining_chunk_size = strtol (line, &endl, 16); - xfree (line); - -+ if (remaining_chunk_size < 0) -+ { -+ ret = -1; -+ break; -+ } -+ - if (remaining_chunk_size == 0) - { - ret = 0; --- -2.15.0.rc1 - diff --git a/net-misc/wget/files/wget-1.19.1-fix-Perl-warnings-in-tests.patch b/net-misc/wget/files/wget-1.19.1-fix-Perl-warnings-in-tests.patch deleted file mode 100644 index 334bcef8659b..000000000000 --- a/net-misc/wget/files/wget-1.19.1-fix-Perl-warnings-in-tests.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 7ffe93cabb181f39ad5091c31ab9f61bd940a55f Mon Sep 17 00:00:00 2001 -From: Anton Yuzhaninov <citrin+github@citrin.ru> -Date: Wed, 5 Apr 2017 19:06:42 +0300 -Subject: [PATCH] Fix perl warnings in tests - -* tests/FTPServer.pm: Escape '{' in RE to fix warnings -* tests/FTPTest.pm: Likewise -* tests/HTTPServer.pm: Likewise -* tests/HTTPTest.pm: Likewise -* tests/Test-proxied-https-auth-keepalive.px: Likewise -* tests/Test-proxied-https-auth.px: Likewise -Escape '{' in RE to fix warnings: -Unescaped left brace in regex is deprecated, passed through in regex; -marked by <-- HERE in m/{{ <-- HERE port}}/ ---- - tests/FTPServer.pm | 2 +- - tests/FTPTest.pm | 2 +- - tests/HTTPServer.pm | 2 +- - tests/HTTPTest.pm | 2 +- - tests/Test-proxied-https-auth-keepalive.px | 2 +- - tests/Test-proxied-https-auth.px | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/tests/FTPServer.pm b/tests/FTPServer.pm -index a5185d66..cac80942 100644 ---- a/tests/FTPServer.pm -+++ b/tests/FTPServer.pm -@@ -589,7 +589,7 @@ sub new - foreach my $file (keys %{$self->{_input}}) - { - my $ref = \$self->{_input}{$file}{content}; -- $$ref =~ s/{{port}}/$self->sockport/eg; -+ $$ref =~ s/\Q{{port}}/$self->sockport/eg; - } - - return $self; -diff --git a/tests/FTPTest.pm b/tests/FTPTest.pm -index 50385ad0..0a1c768c 100644 ---- a/tests/FTPTest.pm -+++ b/tests/FTPTest.pm -@@ -53,7 +53,7 @@ sub _substitute_port - { - my $self = shift; - my $ret = shift; -- $ret =~ s/{{port}}/$self->{_server}->sockport/eg; -+ $ret =~ s/\Q{{port}}/$self->{_server}->sockport/eg; - return $ret; - } - -diff --git a/tests/HTTPServer.pm b/tests/HTTPServer.pm -index dd8ec043..78609f65 100644 ---- a/tests/HTTPServer.pm -+++ b/tests/HTTPServer.pm -@@ -310,7 +310,7 @@ sub _substitute_port - { - my $self = shift; - my $ret = shift; -- $ret =~ s/{{port}}/$self->sockport/eg; -+ $ret =~ s/\Q{{port}}/$self->sockport/eg; - return $ret; - } - -diff --git a/tests/HTTPTest.pm b/tests/HTTPTest.pm -index 00f079f8..6225c7f1 100644 ---- a/tests/HTTPTest.pm -+++ b/tests/HTTPTest.pm -@@ -47,7 +47,7 @@ sub _substitute_port - { - my $self = shift; - my $ret = shift; -- $ret =~ s/{{port}}/$self->{_server}->sockport/eg; -+ $ret =~ s/\Q{{port}}/$self->{_server}->sockport/eg; - return $ret; - } - -diff --git a/tests/Test-proxied-https-auth-keepalive.px b/tests/Test-proxied-https-auth-keepalive.px -index 049bebec..2a18ccfd 100755 ---- a/tests/Test-proxied-https-auth-keepalive.px -+++ b/tests/Test-proxied-https-auth-keepalive.px -@@ -153,7 +153,7 @@ my $cmdline = $WgetTest::WGETPATH . " --user=fiddle-dee-dee" - . " --password=Dodgson -e https_proxy=localhost:{{port}}" - . " --no-check-certificate" - . " https://no.such.domain/needs-auth.txt"; --$cmdline =~ s/{{port}}/$SOCKET->sockport()/e; -+$cmdline =~ s/\Q{{port}}/$SOCKET->sockport()/e; - - if (defined $srcdir) { - $VALGRIND_SUPP_FILE = $srcdir . '/valgrind-suppressions-ssl'; -diff --git a/tests/Test-proxied-https-auth.px b/tests/Test-proxied-https-auth.px -index ce4e736c..878114e7 100755 ---- a/tests/Test-proxied-https-auth.px -+++ b/tests/Test-proxied-https-auth.px -@@ -152,7 +152,7 @@ my $cmdline = $WgetTest::WGETPATH . " --user=fiddle-dee-dee" - . " --password=Dodgson -e https_proxy=localhost:{{port}}" - . " --no-check-certificate" - . " https://no.such.domain/needs-auth.txt"; --$cmdline =~ s/{{port}}/$SOCKET->sockport()/e; -+$cmdline =~ s/\Q{{port}}/$SOCKET->sockport()/e; - - if (defined $srcdir) { - $VALGRIND_SUPP_FILE = $srcdir . '/valgrind-suppressions-ssl'; --- -2.14.3 - diff --git a/net-misc/wget/files/wget-1.19.1-fix-Python-test-suite.patch b/net-misc/wget/files/wget-1.19.1-fix-Python-test-suite.patch deleted file mode 100644 index 11736675dcc8..000000000000 --- a/net-misc/wget/files/wget-1.19.1-fix-Python-test-suite.patch +++ /dev/null @@ -1,172 +0,0 @@ -Fix python test suite for GnuTLS 3.5.12+ - -Backport of f42229b1fdf30ee30c6e13b01eb0c4ebd9ea9169 - ---- a/testenv/Test--rejected-log.py -+++ b/testenv/Test--rejected-log.py -@@ -14,7 +14,7 @@ mainpage = """ - </head> - <body> - <p> -- Recurse to a <a href="http://127.0.0.1:{{port}}/secondpage.html">second page</a>. -+ Recurse to a <a href="http://localhost:{{port}}/secondpage.html">second page</a>. - </p> - </body> - </html> -@@ -27,8 +27,8 @@ secondpage = """ - </head> - <body> - <p> -- Recurse to a <a href="http://127.0.0.1:{{port}}/thirdpage.html">third page</a>. -- Try the blacklisted <a href="http://127.0.0.1:{{port}}/index.html">main page</a>. -+ Recurse to a <a href="http://localhost:{{port}}/thirdpage.html">third page</a>. -+ Try the blacklisted <a href="http://localhost:{{port}}/index.html">main page</a>. - </p> - </body> - </html> -@@ -41,7 +41,7 @@ thirdpage = """ - </head> - <body> - <p> -- Try a hidden <a href="http://127.0.0.1:{{port}}/dummy.txt">dummy file</a>. -+ Try a hidden <a href="http://localhost:{{port}}/dummy.txt">dummy file</a>. - Try to leave to <a href="http://no.such.domain/">another domain</a>. - </p> - </body> -@@ -55,9 +55,9 @@ Disallow: /dummy.txt - - log = """\ - REASON\tU_URL\tU_SCHEME\tU_HOST\tU_PORT\tU_PATH\tU_PARAMS\tU_QUERY\tU_FRAGMENT\tP_URL\tP_SCHEME\tP_HOST\tP_PORT\tP_PATH\tP_PARAMS\tP_QUERY\tP_FRAGMENT --BLACKLIST\thttp%3A//127.0.0.1%3A{{port}}/index.html\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tindex.html\t\t\t\thttp%3A//127.0.0.1%3A{{port}}/secondpage.html\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tsecondpage.html\t\t\t --ROBOTS\thttp%3A//127.0.0.1%3A{{port}}/dummy.txt\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tdummy.txt\t\t\t\thttp%3A//127.0.0.1%3A{{port}}/thirdpage.html\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tthirdpage.html\t\t\t --SPANNEDHOST\thttp%3A//no.such.domain/\tSCHEME_HTTP\tno.such.domain\t80\t\t\t\t\thttp%3A//127.0.0.1%3A{{port}}/thirdpage.html\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tthirdpage.html\t\t\t -+BLACKLIST\thttp%3A//localhost%3A{{port}}/index.html\tSCHEME_HTTP\tlocalhost\t{{port}}\tindex.html\t\t\t\thttp%3A//localhost%3A{{port}}/secondpage.html\tSCHEME_HTTP\tlocalhost\t{{port}}\tsecondpage.html\t\t\t -+ROBOTS\thttp%3A//localhost%3A{{port}}/dummy.txt\tSCHEME_HTTP\tlocalhost\t{{port}}\tdummy.txt\t\t\t\thttp%3A//localhost%3A{{port}}/thirdpage.html\tSCHEME_HTTP\tlocalhost\t{{port}}\tthirdpage.html\t\t\t -+SPANNEDHOST\thttp%3A//no.such.domain/\tSCHEME_HTTP\tno.such.domain\t80\t\t\t\t\thttp%3A//localhost%3A{{port}}/thirdpage.html\tSCHEME_HTTP\tlocalhost\t{{port}}\tthirdpage.html\t\t\t - """ - - dummyfile = "Don't care." ---- a/testenv/Test--spider-r.py -+++ b/testenv/Test--spider-r.py -@@ -14,8 +14,8 @@ mainpage = """ - </head> - <body> - <p> -- Some text and a link to a <a href="http://127.0.0.1:{{port}}/secondpage.html">second page</a>. -- Also, a <a href="http://127.0.0.1:{{port}}/nonexistent">broken link</a>. -+ Some text and a link to a <a href="http://localhost:{{port}}/secondpage.html">second page</a>. -+ Also, a <a href="http://localhost:{{port}}/nonexistent">broken link</a>. - </p> - </body> - </html> -@@ -29,8 +29,8 @@ secondpage = """ - </head> - <body> - <p> -- Some text and a link to a <a href="http://127.0.0.1:{{port}}/thirdpage.html">third page</a>. -- Also, a <a href="http://127.0.0.1:{{port}}/nonexistent">broken link</a>. -+ Some text and a link to a <a href="http://localhost:{{port}}/thirdpage.html">third page</a>. -+ Also, a <a href="http://localhost:{{port}}/nonexistent">broken link</a>. - </p> - </body> - </html> -@@ -43,8 +43,8 @@ thirdpage = """ - </head> - <body> - <p> -- Some text and a link to a <a href="http://127.0.0.1:{{port}}/dummy.txt">text file</a>. -- Also, another <a href="http://127.0.0.1:{{port}}/againnonexistent">broken link</a>. -+ Some text and a link to a <a href="http://localhost:{{port}}/dummy.txt">text file</a>. -+ Also, another <a href="http://localhost:{{port}}/againnonexistent">broken link</a>. - </p> - </body> - </html> ---- a/testenv/certs/server-cert.pem -+++ b/testenv/certs/server-cert.pem -@@ -1,21 +1,21 @@ - -----BEGIN CERTIFICATE----- --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 -+e5wnYQIS4MzowvDx8WevTPMRKlN72d8HHuv9 - -----END CERTIFICATE----- ---- a/testenv/certs/server-crl.pem -+++ b/testenv/certs/server-crl.pem -@@ -1,12 +1,12 @@ - -----BEGIN X509 CRL----- --MIIB1DCBvQIBATANBgkqhkiG9w0BAQsFADAwMREwDwYDVQQDEwhHTlUgV2dldDEN --MAsGA1UECxMEV2dldDEMMAoGA1UEChMDR05VGA8yMDE0MTExMTE2NDU1NFoYDzk5 --OTkxMjMxMjM1OTU5WjAdMBsCCFRiO986yHnjGA8yMDE0MTExMTE2NDU1NFqgNjA0 --MB8GA1UdIwQYMBaAFPM+TjiESqm+wW/HYaNQ2m4pi+tUMBEGA1UdFAQKAghUYj1E --KHs9ijANBgkqhkiG9w0BAQsFAAOCAQEAZgwqs1VOFG39dFHHMXvBr4eJfhwiG4bC --cL6IvLhvl9ikcyQMHrpOBtNjkCtgclSbJjjTDdera1+zuCWE0WBOJ4mojYdAIOhR --QvSwp4NwAtibu2F/fjeXoo+LEpcRKtLvAotB30eCZ1OPrijsa/HxFILOLlayjns8 --wM4RmQC4o43y1G/1jqM8hGDg4Wz0j1URVuyP+pU55JpubV5LlExy3gIRwevD2lam --q3hiighenJYFO3HGZkYT2SIoSpXZnQqKPJ4HwRBSg/cjOpc1y1lIIvKhmk+Cut6M --+S5HL4pIk8vGYg57nTfOOkj1goqFkfU0DBqvVAZj02ay/VIDu61T1g== -+MIIB1jCBvwIBATANBgkqhkiG9w0BAQsFADAwMREwDwYDVQQDEwhHTlUgV2dldDEN -+MAsGA1UECxMEV2dldDEMMAoGA1UEChMDR05VFw0xNzA3MDgxNTA3MDRaFw0xODA3 -+MDgxNTA3MDRaMB8wHQIMWWD1GB1UFkEICdQvFw0xNzA3MDgxNTA3MDRaoDowODAf -+BgNVHSMEGDAWgBTzPk44hEqpvsFvx2GjUNpuKYvrVDAVBgNVHRQEDgIMWWD1GB4C -+YfERSnyEMA0GCSqGSIb3DQEBCwUAA4IBAQAAKu+Lum1l/XtcCJ43WveouPK97iOE -+bjUZWaGYx8Ys/iBdhTa1GXG+E+JuyqgyHTW0HrWJi1D+GiYmsjPJXoEgVgtxXEQ7 -+8b3NyIQ8OCsSTTlVCmLECN9R0xlsitzH+HXOaIEs5sbmIxCnxu+brqno9gQocmCv -+LHYvoSxsSsOCkkmodbYtKssl2dBonvQPSijN/z3NhZ259e2U3Yv4V7/MrEoTvOxg -+M0GC0u0Nx86EWbq0sWeiUu270Qk9En5YGNtRhkeq0bXerJswmMAmvrtuKdyfouny -+4WMvtn30xsO3WwWSV2oyrDSN/IQdDbcmul/bg8ewqlnN77cVf2m70c/W - -----END X509 CRL----- ---- a/testenv/certs/server-template.cfg -+++ b/testenv/certs/server-template.cfg -@@ -68,7 +68,6 @@ expiration_days = -1 - # X.509 v3 extensions - - # A dnsname in case of a WWW server. --dns_name = "127.0.0.1" - dns_name = "localhost" - - # A subject alternative name URI ---- a/testenv/test/base_test.py -+++ b/testenv/test/base_test.py -@@ -90,7 +90,7 @@ class BaseTest: - # ports and etc. - # so we should record different domains respect to servers. - domain = self.get_domain_addr(instance.server_address) -- self.domains.append(domain[0]) -+ self.domains.append('localhost') - self.ports.append(domain[1]) - - def exec_wget(self): diff --git a/net-misc/wget/wget-1.19.1-r2.ebuild b/net-misc/wget/wget-1.19.1-r2.ebuild deleted file mode 100644 index ee66293872f6..000000000000 --- a/net-misc/wget/wget-1.19.1-r2.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python3_{4,5,6} ) - -inherit flag-o-matic python-any-r1 toolchain-funcs - -DESCRIPTION="Network utility to retrieve files from the WWW" -HOMEPAGE="https://www.gnu.org/software/wget/" -SRC_URI="mirror://gnu/wget/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib" -REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" - -# Force a newer libidn2 to avoid libunistring deps. #612498 -LIB_DEPEND="idn? ( >=net-dns/libidn2-0.14[static-libs(+)] ) - pcre? ( dev-libs/libpcre[static-libs(+)] ) - ssl? ( - gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) - !gnutls? ( - !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - ) - ) - uuid? ( sys-apps/util-linux[static-libs(+)] ) - zlib? ( sys-libs/zlib[static-libs(+)] )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - app-arch/xz-utils - virtual/pkgconfig - static? ( ${LIB_DEPEND} ) - test? ( - ${PYTHON_DEPS} - dev-lang/perl - dev-perl/HTTP-Daemon - dev-perl/HTTP-Message - dev-perl/IO-Socket-SSL - ) - nls? ( sys-devel/gettext )" - -DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc ) - -PATCHES=( - "${FILESDIR}"/${P}-CRLF_injection.patch - "${FILESDIR}"/${PN}-1.19.1-fix-Perl-warnings-in-tests.patch - "${FILESDIR}"/${PN}-1.19.1-fix-Python-test-suite.patch - "${FILESDIR}"/${PN}-1.19.1-CVE-2017-13089.patch - "${FILESDIR}"/${PN}-1.19.1-CVE-2017-13090.patch -) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - - # revert some hack that breaks linking, bug #585924 - if [[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-solaris* ]] || [[ ${CHOST} == *-uclibc* ]]; then - sed -i \ - -e 's/^ LIBICONV=$/:/' \ - configure || die - fi -} - -src_configure() { - # fix compilation on Solaris, we need filio.h for FIONBIO as used in - # the included gnutls -- force ioctl.h to include this header - [[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1 - - if use static ; then - append-ldflags -static - tc-export PKG_CONFIG - PKG_CONFIG+=" --static" - fi - - # There is no flag that controls this. libunistring-prefix only - # controls the search path (which is why we turn it off below). - # Further, libunistring is only needed w/older libidn2 installs, - # and since we force the latest, we can force off libunistring. #612498 - ac_cv_libunistring=no \ - econf \ - --disable-assert \ - --disable-rpath \ - --without-included-libunistring \ - --without-libunistring-prefix \ - $(use_enable debug) \ - $(use_enable idn iri) \ - $(use_enable ipv6) \ - $(use_enable nls) \ - $(use_enable ntlm) \ - $(use_enable pcre) \ - $(use_enable ssl digest) \ - $(use_enable ssl opie) \ - $(use_with idn libidn) \ - $(use_with ssl ssl $(usex gnutls gnutls openssl)) \ - $(use_with uuid libuuid) \ - $(use_with zlib) -} - -src_install() { - default - - sed -i \ - -e "s:/usr/local/etc:${EPREFIX}/etc:g" \ - "${ED}"/etc/wgetrc \ - "${ED}"/usr/share/man/man1/wget.1 \ - "${ED}"/usr/share/info/wget.info \ - || die -} diff --git a/net-misc/wget/wget-1.19.4.ebuild b/net-misc/wget/wget-1.19.4.ebuild deleted file mode 100644 index a4cc423b95ac..000000000000 --- a/net-misc/wget/wget-1.19.4.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{4,5,6} ) - -inherit flag-o-matic python-any-r1 toolchain-funcs - -DESCRIPTION="Network utility to retrieve files from the WWW" -HOMEPAGE="https://www.gnu.org/software/wget/" -SRC_URI="mirror://gnu/wget/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib" -REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" - -# Force a newer libidn2 to avoid libunistring deps. #612498 -LIB_DEPEND=" - idn? ( >=net-dns/libidn2-0.14[static-libs(+)] ) - pcre? ( dev-libs/libpcre[static-libs(+)] ) - ssl? ( - gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) - !gnutls? ( - !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - ) - ) - uuid? ( sys-apps/util-linux[static-libs(+)] ) - zlib? ( sys-libs/zlib[static-libs(+)] ) -" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND=" - ${RDEPEND} - app-arch/xz-utils - virtual/pkgconfig - static? ( ${LIB_DEPEND} ) - test? ( - ${PYTHON_DEPS} - dev-lang/perl - dev-perl/HTTP-Daemon - dev-perl/HTTP-Message - dev-perl/IO-Socket-SSL - ) - nls? ( sys-devel/gettext ) -" - -DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc ) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - - # revert some hack that breaks linking, bug #585924 - if [[ ${CHOST} == *-darwin* ]] \ - || [[ ${CHOST} == *-solaris* ]] \ - || [[ ${CHOST} == *-uclibc* ]] \ - || [[ ${CHOST} == *-cygwin* ]] \ - ; then - sed -i \ - -e 's/^ LIBICONV=$/:/' \ - configure || die - fi -} - -src_configure() { - # fix compilation on Solaris, we need filio.h for FIONBIO as used in - # the included gnutls -- force ioctl.h to include this header - [[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1 - - if use static ; then - append-ldflags -static - tc-export PKG_CONFIG - PKG_CONFIG+=" --static" - fi - - # There is no flag that controls this. libunistring-prefix only - # controls the search path (which is why we turn it off below). - # Further, libunistring is only needed w/older libidn2 installs, - # and since we force the latest, we can force off libunistring. #612498 - local myeconfargs=( - --disable-assert - --disable-rpath - --without-included-libunistring - --without-libunistring-prefix - $(use_enable debug) - $(use_enable idn iri) - $(use_enable ipv6) - $(use_enable nls) - $(use_enable ntlm) - $(use_enable pcre) - $(use_enable ssl digest) - $(use_enable ssl opie) - $(use_with idn libidn) - $(use_with ssl ssl $(usex gnutls gnutls openssl)) - $(use_with uuid libuuid) - $(use_with zlib) - ) - ac_cv_libunistring=no \ - econf "${myeconfargs[@]}" -} - -src_install() { - default - - sed -i \ - -e "s:/usr/local/etc:${EPREFIX}/etc:g" \ - "${ED%/}"/etc/wgetrc \ - "${ED%/}"/usr/share/man/man1/wget.1 \ - "${ED%/}"/usr/share/info/wget.info \ - || die -} diff --git a/net-misc/wget/wget-1.19.5.ebuild b/net-misc/wget/wget-1.19.5.ebuild index c822bbda43e0..a73abf153f6b 100644 --- a/net-misc/wget/wget-1.19.5.ebuild +++ b/net-misc/wget/wget-1.19.5.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib" REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" |