diff options
author | adrianp <adrianp@pkgsrc.org> | 2007-07-14 22:05:56 +0000 |
---|---|---|
committer | adrianp <adrianp@pkgsrc.org> | 2007-07-14 22:05:56 +0000 |
commit | e0591ad815283ec1f171af091511adac21ede2c0 (patch) | |
tree | ca568c0b8746d52b84e2922dd79e3147e280444d /net/libcares | |
parent | 4438f38891f84983708c463df0b69efc12b58d5f (diff) | |
download | pkgsrc-e0591ad815283ec1f171af091511adac21ede2c0.tar.gz |
Update to 1.4.0
- Install ares_dns.h too
- Brad House added ares_save_options() and ares_destroy_options() that can be
used to keep options for later re-usal when ares_init_options() is used.
- Brad House's man pages for ares_save_options() and ares_destroy_options()
were added.
- James Bursa reported a major memory problem when resolving multi-IP names
and I found and fixed the problem. It was added by Ashish Sharma's patch
two days ago.
Diffstat (limited to 'net/libcares')
-rw-r--r-- | net/libcares/Makefile | 6 | ||||
-rw-r--r-- | net/libcares/PLIST | 6 | ||||
-rw-r--r-- | net/libcares/distinfo | 12 | ||||
-rw-r--r-- | net/libcares/patches/patch-aa | 15 | ||||
-rw-r--r-- | net/libcares/patches/patch-ab | 34 |
5 files changed, 38 insertions, 35 deletions
diff --git a/net/libcares/Makefile b/net/libcares/Makefile index 18176b657f5..a47733b1ad5 100644 --- a/net/libcares/Makefile +++ b/net/libcares/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2007/01/03 12:38:38 adrianp Exp $ +# $NetBSD: Makefile,v 1.5 2007/07/14 22:05:56 adrianp Exp $ # # Please do not update or modify this package as it has been imported only @@ -6,8 +6,8 @@ # when chat/unrealircd requires it. # -DISTNAME= c-ares-1.3.2 -PKGNAME= libcares-1.3.2 +DISTNAME= c-ares-1.4.0 +PKGNAME= libcares-1.4.0 CATEGORIES= net MASTER_SITES= http://daniel.haxx.se/projects/c-ares/ diff --git a/net/libcares/PLIST b/net/libcares/PLIST index c7387aa0782..41f82948f05 100644 --- a/net/libcares/PLIST +++ b/net/libcares/PLIST @@ -1,9 +1,11 @@ -@comment $NetBSD: PLIST,v 1.2 2007/01/03 12:38:38 adrianp Exp $ +@comment $NetBSD: PLIST,v 1.3 2007/07/14 22:05:57 adrianp Exp $ include/ares.h +include/ares_dns.h include/ares_version.h lib/libcares.la man/man3/ares_cancel.3 man/man3/ares_destroy.3 +man/man3/ares_destroy_options.3 man/man3/ares_expand_name.3 man/man3/ares_expand_string.3 man/man3/ares_fds.3 @@ -18,9 +20,11 @@ man/man3/ares_init_options.3 man/man3/ares_mkquery.3 man/man3/ares_parse_a_reply.3 man/man3/ares_parse_aaaa_reply.3 +man/man3/ares_parse_ns_reply.3 man/man3/ares_parse_ptr_reply.3 man/man3/ares_process.3 man/man3/ares_query.3 +man/man3/ares_save_options.3 man/man3/ares_search.3 man/man3/ares_send.3 man/man3/ares_strerror.3 diff --git a/net/libcares/distinfo b/net/libcares/distinfo index b3f159edb90..59d88aa919e 100644 --- a/net/libcares/distinfo +++ b/net/libcares/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2007/01/03 12:38:38 adrianp Exp $ +$NetBSD: distinfo,v 1.4 2007/07/14 22:05:57 adrianp Exp $ -SHA1 (c-ares-1.3.2.tar.gz) = 32808a0f4837d53d7b4751b64cfeb8ab22e1394d -RMD160 (c-ares-1.3.2.tar.gz) = 2c58d3cb50e3a4384310d8da4916b82b87f8cf11 -Size (c-ares-1.3.2.tar.gz) = 330752 bytes -SHA1 (patch-aa) = 548fe2030abc2925c7b0acadcf6a7577df2a8931 -SHA1 (patch-ab) = 7beaebd2b3d08549e013c831991a8c23fb584431 +SHA1 (c-ares-1.4.0.tar.gz) = 810074d2792ff5e996816aa52ff676bb102be885 +RMD160 (c-ares-1.4.0.tar.gz) = 06d52e3a36579baf8f6244f927683b43e42fad81 +Size (c-ares-1.4.0.tar.gz) = 431082 bytes +SHA1 (patch-aa) = 5e217928dd4e836d4c76d155ae0ede485ab819c7 +SHA1 (patch-ab) = bc8e815b500ed3090028dec430f73bffb5638d49 diff --git a/net/libcares/patches/patch-aa b/net/libcares/patches/patch-aa index df8e1160fb3..4b33f874551 100644 --- a/net/libcares/patches/patch-aa +++ b/net/libcares/patches/patch-aa @@ -1,12 +1,11 @@ -$NetBSD: patch-aa,v 1.2 2007/01/03 12:38:38 adrianp Exp $ +$NetBSD: patch-aa,v 1.3 2007/07/14 22:05:57 adrianp Exp $ ---- ares.h.orig 2006-10-11 22:46:50.000000000 +0100 +--- ares.h.orig 2007-06-04 08:36:31.000000000 +0100 +++ ares.h -@@ -164,6 +164,14 @@ struct ares_options { - void *sock_state_cb_data; +@@ -185,6 +185,13 @@ struct ares_options { + int nsort; }; -+/** Public available config (readonly) interface for ares_get_config(). */ +struct ares_config_info { + int timeout; + int tries; @@ -17,12 +16,12 @@ $NetBSD: patch-aa,v 1.2 2007/01/03 12:38:38 adrianp Exp $ struct hostent; struct timeval; struct sockaddr; -@@ -217,6 +225,8 @@ void ares_free_string(void *str); +@@ -243,7 +250,7 @@ int ares_parse_ns_reply(const unsigned c + void ares_free_string(void *str); void ares_free_hostent(struct hostent *host); const char *ares_strerror(int code); - +- +int ares_get_config(struct ares_config_info *d, ares_channel c); -+ #ifdef __cplusplus } #endif diff --git a/net/libcares/patches/patch-ab b/net/libcares/patches/patch-ab index 32f510af859..196d3a8d04a 100644 --- a/net/libcares/patches/patch-ab +++ b/net/libcares/patches/patch-ab @@ -1,29 +1,29 @@ -$NetBSD: patch-ab,v 1.1 2006/07/18 22:38:18 adrianp Exp $ +$NetBSD: patch-ab,v 1.2 2007/07/14 22:05:57 adrianp Exp $ ---- ares_init.c.orig 2005-08-22 07:40:07.000000000 +0100 +--- ares_init.c.orig 2007-06-04 08:36:31.000000000 +0100 +++ ares_init.c -@@ -1060,3 +1060,24 @@ static void natural_mask(struct apattern - pat->mask.addr.addr4.s_addr = htonl(IN_CLASSC_NET); +@@ -1342,3 +1342,24 @@ short ares__generate_new_id(rc4_key* key + ares__rc4(key, (unsigned char *)&r, sizeof(r)); + return r; } - #endif + +int ares_get_config(struct ares_config_info *d, ares_channel c) +{ +int i; +char *p; + -+ memset(d, 0, sizeof(struct ares_config_info)); -+ -+ d->timeout = c->timeout; -+ d->tries = c->tries; -+ d->numservers = c->nservers; -+ d->servers = calloc(sizeof(char *), c->nservers); -+ for (i = 0; i < c->nservers; i++) -+ { -+ p = inet_ntoa(c->servers[i].addr); -+ d->servers[i] = p ? strdup(p) : NULL; -+ } ++ memset(d, 0, sizeof(struct ares_config_info)); + -+ return ARES_SUCCESS; ++ d->timeout = c->timeout; ++ d->tries = c->tries; ++ d->numservers = c->nservers; ++ d->servers = calloc(sizeof(char *), c->nservers); ++ for (i = 0; i < c->nservers; i++) ++ { ++ p = inet_ntoa(c->servers[i].addr); ++ d->servers[i] = p ? strdup(p) : NULL; ++ } ++ ++ return ARES_SUCCESS; +} + |