commit: b8ec393f4635857ab08ff0f43955baef6f56606e Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Feb 19 16:39:24 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Feb 19 16:39:24 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8ec393f
net-misc/aria2: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> net-misc/aria2/Manifest | 1 - net-misc/aria2/aria2-1.34.0-r2.ebuild | 184 --------------------- .../aria2/files/aria2-1.34.0-make_unique.patch | 44 ----- .../aria2/files/aria2-1.34.0-mask-headers.patch | 46 ------ 4 files changed, 275 deletions(-) diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest index 342c6842d3e..5ab609cb29b 100644 --- a/net-misc/aria2/Manifest +++ b/net-misc/aria2/Manifest @@ -1,2 +1 @@ -DIST aria2-1.34.0.tar.xz 1525908 BLAKE2B 479145af229f5fe864e54c511197bedb306199dbda608416aa295930a8392c7a118993b5a1634db20b380ab448cc8a397a351b6b64560ca263a0818d47a1ae64 SHA512 80bc43e242c06acc95030021cb347b4ec230729f3d7e512ca1932941b34ef95c312a34007a226869e5d720839a400e66cdb072ccab5d42228d8cf3d828723dcc DIST aria2-1.35.0.tar.xz 1534460 BLAKE2B fc207ad0054e211b79ee1c6302c6bf83d0638fd5659d19dbd63d7cfb31101feb7d1a661b989ec42552c9a5c072dd660d2f7203063c3c1e14f53d5ce4c5a3c317 SHA512 82b49cecd61064ae33b4a422a2320d533f54afea8fab0f014072a46afdc05972d2e9c603e843960c097410adf87290df65849f4ee05e047403618ae50db151ef diff --git a/net-misc/aria2/aria2-1.34.0-r2.ebuild b/net-misc/aria2/aria2-1.34.0-r2.ebuild deleted file mode 100644 index ec3bc5903b4..00000000000 --- a/net-misc/aria2/aria2-1.34.0-r2.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit bash-completion-r1 - -DESCRIPTION="A download utility with segmented downloading with BitTorrent support" -HOMEPAGE="https://aria2.github.io/"; -SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"; - -LICENSE="GPL-2+-with-openssl-exception" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -SLOT="0" -IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc" - -# Crazy GnuTLS/OpenSSL/etc. logic below: -# 1. Those libraries are used for two purposes: TLS & MD. -# 2. Upstream preferences are: -# 1) gnutls [tls] -# 2) !gnutls? -> openssl [tls+md] -# 3) !openssl? -> nettle [md] -# 4) !openssl? !nettle? -> gcrypt [md] -# 5) !*? -> bundled md routines (we don't use them) -# 3. There's also gmp usage for bittorrent with nettle. -# 4. You can't really control features, just dependencies. -# (we are skipping native Apple/Windows TLS support) -# -# We map this into: -# ssl? -> openssl || (gnutls + (nettle || libgcrypt )) -# !ssl? -> nettle || libgcrypt - -CDEPEND="sys-libs/zlib:0= - adns? ( >=net-dns/c-ares-1.5.0:0= ) - jemalloc? ( dev-libs/jemalloc ) - libuv? ( >=dev-libs/libuv-1.13:0= ) - metalink? ( - libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) - !libxml2? ( dev-libs/expat:0= ) ) - sqlite? ( dev-db/sqlite:3= ) - ssh? ( net-libs/libssh2:= ) - ssl? ( - app-misc/ca-certificates - gnutls? ( - >=net-libs/gnutls-1.2.9:0= - nettle? ( - >=dev-libs/nettle-2.4:0= - bittorrent? ( - >=dev-libs/nettle-2.4:0=[gmp] - >=dev-libs/gmp-6:0= - ) - ) - !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) - ) - !gnutls? ( - dev-libs/openssl:0= - ) - ) - !ssl? ( - nettle? ( - >=dev-libs/nettle-2.4:0= - bittorrent? ( - >=dev-libs/nettle-2.4:0=[gmp] - >=dev-libs/gmp-6:0= - ) - ) - !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) - ) - tcmalloc? ( dev-util/google-perftools ) - xmlrpc? ( - libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) - !libxml2? ( dev-libs/expat:0= ) )" - -DEPEND="${CDEPEND} - app-arch/xz-utils - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( >=dev-util/cppunit-1.12.0:0 )" -RDEPEND="${CDEPEND} - nls? ( virtual/libiconv virtual/libintl ) - scripts? ( dev-lang/ruby )" - -# xmlrpc has no explicit switch, it's turned out by any XML library -# so metalink implicitly forces it on -REQUIRED_USE="?? ( jemalloc tcmalloc ) - metalink? ( xmlrpc )" -RESTRICT="!test? ( test )" - -pkg_setup() { - if use scripts && ! use xmlrpc; then - ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc" - ewarn "and aria2mon scripts against the local aria2." - fi -} - -src_prepare() { - eapply "${FILESDIR}"/${P}-make_unique.patch - # https://bugs.gentoo.org/674622 (CVE-2019-3500) - eapply "${FILESDIR}"/${P}-mask-headers.patch - default - sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed" -} - -src_configure() { - local myconf=( - # threads, epoll: check for best portability - - # do not try to compile and run a test LIBXML program - --disable-xmltest - # enable the shared library - --enable-libaria2 - # zlib should always be available anyway - --with-libz - --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" - - # optional features - $(use_enable bittorrent) - $(use_enable metalink) - $(use_enable nls) - $(use_with adns libcares) - $(use_with jemalloc) - $(use_with libuv) - $(use_with sqlite sqlite3) - $(use_with ssh libssh2) - $(use_with tcmalloc) - ) - - # See TLS/MD logic described above deps. - if use ssl && ! use gnutls; then - # 1. if ssl & !gnutls, use openssl and disable gnutls - myconf+=( --without-gnutls --with-openssl ) - else - myconf+=( - # 2. otherwise, disable openssl - --without-openssl - # 3. if ssl & gnutls, use gnutls - $(use_with ssl gnutls) - - # 4. switch between nettle & libgcrypt - $(use_with nettle libnettle) - $(use_with !nettle libgcrypt) - ) - - # 5. if bittorrent is used along with nettle, use libgmp - if use bittorrent && use nettle; then - myconf+=( --with-libgmp ) - else - myconf+=( --without-libgmp ) - fi - fi - - # metalink+xmlrpc := libxml2 / expat - # USE=(metalink || xmlrpc) - # + USE=libxml2 -> libxml2 - # + USE=-libxml2 -> expat - - if use metalink || use xmlrpc; then - myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) ) - else - myconf+=( --without-libexpat --without-libxml2 ) - fi - - # Note: - # - always enable gzip/http compression since zlib should always be available anyway - # - always enable epoll since we can assume kernel 2.6.x - # - other options for threads: solaris, pth, win32 - econf "${myconf[@]}" -} - -src_install() { - default - rm -rf "${D}"/usr/share/doc/aria2 \ - "${D}"/usr/share/doc/${PF}/README{,.html} - - dobashcomp doc/bash_completion/aria2c - use scripts && dobin doc/xmlrpc/aria2{mon,rpc} -} - -pkg_postinst() { - if use xmlrpc; then - elog "If you would like to use the additional aria2mon and aria2rpc tools," - elog "you need to have \033[1mdev-lang/ruby\033[0m installed." - fi -} diff --git a/net-misc/aria2/files/aria2-1.34.0-make_unique.patch b/net-misc/aria2/files/aria2-1.34.0-make_unique.patch deleted file mode 100644 index 448d6cfe775..00000000000 --- a/net-misc/aria2/files/aria2-1.34.0-make_unique.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e8e04d6f22a507e8374651d3d2343cd9fb986993 Mon Sep 17 00:00:00 2001 -From: Tatsuhiro Tsujikawa <tatsuhir...@gmail.com> -Date: Thu, 17 May 2018 18:39:44 +0900 -Subject: [PATCH] Fix build failure when InternalDHKeyExchange is used - ---- - src/bignum.h | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/src/bignum.h b/src/bignum.h -index e59ab6bbf..5fb4402bc 100644 ---- a/src/bignum.h -+++ b/src/bignum.h -@@ -19,6 +19,8 @@ - #include <memory> - #include <stdint.h> - -+#include "a2functional.h" -+ - namespace bignum { - - template <size_t dim> class ulong { -@@ -31,17 +33,17 @@ template <size_t dim> class ulong { - std::unique_ptr<char_t[]> buf_; - - public: -- inline ulong() : buf_(make_unique<char_t[]>(dim)) {} -- inline ulong(size_t t) : buf_(make_unique<char_t[]>(dim)) -+ inline ulong() : buf_(aria2::make_unique<char_t[]>(dim)) {} -+ inline ulong(size_t t) : buf_(aria2::make_unique<char_t[]>(dim)) - { - memcpy(buf_.get(), (char_t*)&t, sizeof(t)); - } -- inline ulong(const ulong<dim>& rhs) : buf_(make_unique<char_t[]>(dim)) -+ inline ulong(const ulong<dim>& rhs) : buf_(aria2::make_unique<char_t[]>(dim)) - { - memcpy(buf_.get(), rhs.buf_.get(), dim); - } - explicit inline ulong(const char_t* data, size_t size) -- : buf_(make_unique<char_t[]>(dim)) -+ : buf_(aria2::make_unique<char_t[]>(dim)) - { - if (size > dim) { - throw std::bad_alloc(); diff --git a/net-misc/aria2/files/aria2-1.34.0-mask-headers.patch b/net-misc/aria2/files/aria2-1.34.0-mask-headers.patch deleted file mode 100644 index 694681d8885..00000000000 --- a/net-misc/aria2/files/aria2-1.34.0-mask-headers.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 37368130ca7de5491a75fd18a20c5c5cc641824a Mon Sep 17 00:00:00 2001 -From: Tatsuhiro Tsujikawa <tatsuhir...@gmail.com> -Date: Sat, 5 Jan 2019 09:32:40 +0900 -Subject: [PATCH] Mask headers - ---- - src/HttpConnection.cc | 18 ++++++++++++------ - 1 file changed, 12 insertions(+), 6 deletions(-) - -diff --git a/src/HttpConnection.cc b/src/HttpConnection.cc -index 77cb9d27a..be5b97723 100644 ---- a/src/HttpConnection.cc -+++ b/src/HttpConnection.cc -@@ -102,11 +102,17 @@ std::string HttpConnection::eraseConfidentialInfo(const std::string& request) - std::string result; - std::string line; - while (getline(istr, line)) { -- if (util::startsWith(line, "Authorization: Basic")) { -- result += "Authorization: Basic ********\n"; -+ if (util::istartsWith(line, "Authorization: ")) { -+ result += "Authorization: <snip>\n"; - } -- else if (util::startsWith(line, "Proxy-Authorization: Basic")) { -- result += "Proxy-Authorization: Basic ********\n"; -+ else if (util::istartsWith(line, "Proxy-Authorization: ")) { -+ result += "Proxy-Authorization: <snip>\n"; -+ } -+ else if (util::istartsWith(line, "Cookie: ")) { -+ result += "Cookie: <snip>\n"; -+ } -+ else if (util::istartsWith(line, "Set-Cookie: ")) { -+ result += "Set-Cookie: <snip>\n"; - } - else { - result += line; -@@ -154,8 +160,8 @@ std::unique_ptr<HttpResponse> HttpConnection::receiveResponse() - const auto& proc = outstandingHttpRequests_.front()->getHttpHeaderProcessor(); - if (proc->parse(socketRecvBuffer_->getBuffer(), - socketRecvBuffer_->getBufferLength())) { -- A2_LOG_INFO( -- fmt(MSG_RECEIVE_RESPONSE, cuid_, proc->getHeaderString().c_str())); -+ A2_LOG_INFO(fmt(MSG_RECEIVE_RESPONSE, cuid_, -+ eraseConfidentialInfo(proc->getHeaderString()).c_str())); - auto result = proc->getResult(); - if (result->getStatusCode() / 100 == 1) { - socketRecvBuffer_->drain(proc->getLastBytesProcessed());
