Gentoo Archives: gentoo-commits

From: "Tiziano Mueller (dev-zero)" <dev-zero@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/aria2/files: 0.13.0-misc_non_async_bugs.patch
Date: Sat, 01 Mar 2008 10:19:22
Message-Id: E1JVOoJ-0007BD-Ps@stork.gentoo.org
1 dev-zero 08/03/01 10:19:19
2
3 Added: 0.13.0-misc_non_async_bugs.patch
4 Log:
5 Version bump.
6 (Portage version: 2.1.4.4)
7
8 Revision Changes Path
9 1.1 net-misc/aria2/files/0.13.0-misc_non_async_bugs.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/aria2/files/0.13.0-misc_non_async_bugs.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/aria2/files/0.13.0-misc_non_async_bugs.patch?rev=1.1&content-type=text/plain
13
14 Index: 0.13.0-misc_non_async_bugs.patch
15 ===================================================================
16 diff -Naur aria2c-0.13.0.orig/src/NameResolver.cc aria2c-0.13.0/src/NameResolver.cc
17 --- aria2c-0.13.0.orig/src/NameResolver.cc 2008-02-13 16:17:08.000000000 +0100
18 +++ aria2c-0.13.0/src/NameResolver.cc 2008-03-01 10:52:16.000000000 +0100
19 @@ -35,10 +35,10 @@
20 #include "NameResolver.h"
21 #include <cstring>
22
23 -namespace aria2 {
24 -
25 #ifdef ENABLE_ASYNC_DNS
26
27 +namespace aria2 {
28 +
29 #ifdef HAVE_LIBCARES1_5
30 void callback(void* arg, int status, int timeouts, struct hostent* host)
31 #else
32 @@ -97,6 +97,8 @@
33 #include "DlAbortEx.h"
34 #include "message.h"
35
36 +namespace aria2 {
37 +
38 void NameResolver::resolve(const std::string& hostname)
39 {
40 memset(&_addr, 0, sizeof(in_addr));
41 @@ -109,7 +111,7 @@
42 struct addrinfo* res;
43 int ec;
44 if((ec = getaddrinfo(hostname.c_str(), 0, &ai, &res)) != 0) {
45 - throw new DlAbortEx(EX_RESOLVE_HOSTNAME,
46 + throw DlAbortEx(EX_RESOLVE_HOSTNAME,
47 hostname.c_str(), gai_strerror(ec));
48 }
49 _addr = ((struct sockaddr_in*)res->ai_addr)->sin_addr;
50 diff -Naur aria2c-0.13.0.orig/src/NameResolver.h aria2c-0.13.0/src/NameResolver.h
51 --- aria2c-0.13.0.orig/src/NameResolver.h 2008-02-13 16:17:08.000000000 +0100
52 +++ aria2c-0.13.0/src/NameResolver.h 2008-03-01 10:46:40.000000000 +0100
53 @@ -124,6 +124,8 @@
54
55 #else // ENABLE_ASYNC_DNS
56
57 +namespace aria2 {
58 +
59 class NameResolver {
60 private:
61 struct in_addr _addr;
62
63
64
65 --
66 gentoo-commits@l.g.o mailing list