diff options
author | Tiziano Müller <dev-zero@gentoo.org> | 2008-03-03 13:01:43 +0000 |
---|---|---|
committer | Tiziano Müller <dev-zero@gentoo.org> | 2008-03-03 13:01:43 +0000 |
commit | 21537538a35cb037de34489e18aa2b16e3444526 (patch) | |
tree | a306f2a1afa84f4b488216fa3ee02722f437bf4d | |
parent | Prefer split version to monolithic. (diff) | |
download | gentoo-2-21537538a35cb037de34489e18aa2b16e3444526.tar.gz gentoo-2-21537538a35cb037de34489e18aa2b16e3444526.tar.bz2 gentoo-2-21537538a35cb037de34489e18aa2b16e3444526.zip |
Upstream fixed the bugs without version bump.
(Portage version: 2.1.4.4)
-rw-r--r-- | net-misc/aria2/ChangeLog | 6 | ||||
-rw-r--r-- | net-misc/aria2/aria2-0.13.0.ebuild | 11 | ||||
-rw-r--r-- | net-misc/aria2/files/0.13.0-misc_non_async_bugs.patch | 46 |
3 files changed, 6 insertions, 57 deletions
diff --git a/net-misc/aria2/ChangeLog b/net-misc/aria2/ChangeLog index 3aab3fafcd0e..b89e8cac2277 100644 --- a/net-misc/aria2/ChangeLog +++ b/net-misc/aria2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/aria2 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/ChangeLog,v 1.21 2008/03/01 10:19:18 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/ChangeLog,v 1.22 2008/03/03 13:01:43 dev-zero Exp $ + + 03 Mar 2008; Tiziano Müller <dev-zero@gentoo.org> + -files/0.13.0-misc_non_async_bugs.patch, aria2-0.13.0.ebuild: + Upstream fixed the bugs without version bump. *aria2-0.13.0 (01 Mar 2008) diff --git a/net-misc/aria2/aria2-0.13.0.ebuild b/net-misc/aria2/aria2-0.13.0.ebuild index 1b0be22d8c65..a51903c26739 100644 --- a/net-misc/aria2/aria2-0.13.0.ebuild +++ b/net-misc/aria2/aria2-0.13.0.ebuild @@ -1,8 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-0.13.0.ebuild,v 1.1 2008/03/01 10:19:18 dev-zero Exp $ - -inherit eutils +# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-0.13.0.ebuild,v 1.2 2008/03/03 13:01:43 dev-zero Exp $ MY_P="aria2c-${PV/_p/+}" @@ -31,13 +29,6 @@ RDEPEND="${CDEPEND} S="${WORKDIR}/${MY_P}" -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${PV}-misc_non_async_bugs.patch" -} - src_compile() { use ssl && \ myconf="${myconf} $(use_with gnutls) $(use_with !gnutls openssl)" diff --git a/net-misc/aria2/files/0.13.0-misc_non_async_bugs.patch b/net-misc/aria2/files/0.13.0-misc_non_async_bugs.patch deleted file mode 100644 index cb4989c87749..000000000000 --- a/net-misc/aria2/files/0.13.0-misc_non_async_bugs.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Naur aria2c-0.13.0.orig/src/NameResolver.cc aria2c-0.13.0/src/NameResolver.cc ---- aria2c-0.13.0.orig/src/NameResolver.cc 2008-02-13 16:17:08.000000000 +0100 -+++ aria2c-0.13.0/src/NameResolver.cc 2008-03-01 10:52:16.000000000 +0100 -@@ -35,10 +35,10 @@ - #include "NameResolver.h" - #include <cstring> - --namespace aria2 { -- - #ifdef ENABLE_ASYNC_DNS - -+namespace aria2 { -+ - #ifdef HAVE_LIBCARES1_5 - void callback(void* arg, int status, int timeouts, struct hostent* host) - #else -@@ -97,6 +97,8 @@ - #include "DlAbortEx.h" - #include "message.h" - -+namespace aria2 { -+ - void NameResolver::resolve(const std::string& hostname) - { - memset(&_addr, 0, sizeof(in_addr)); -@@ -109,7 +111,7 @@ - struct addrinfo* res; - int ec; - if((ec = getaddrinfo(hostname.c_str(), 0, &ai, &res)) != 0) { -- throw new DlAbortEx(EX_RESOLVE_HOSTNAME, -+ throw DlAbortEx(EX_RESOLVE_HOSTNAME, - hostname.c_str(), gai_strerror(ec)); - } - _addr = ((struct sockaddr_in*)res->ai_addr)->sin_addr; -diff -Naur aria2c-0.13.0.orig/src/NameResolver.h aria2c-0.13.0/src/NameResolver.h ---- aria2c-0.13.0.orig/src/NameResolver.h 2008-02-13 16:17:08.000000000 +0100 -+++ aria2c-0.13.0/src/NameResolver.h 2008-03-01 10:46:40.000000000 +0100 -@@ -124,6 +124,8 @@ - - #else // ENABLE_ASYNC_DNS - -+namespace aria2 { -+ - class NameResolver { - private: - struct in_addr _addr; |