From 1954d2432acdfc282f5c963566cf6372934b7325 Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 1 Feb 2005 17:02:00 +0000 Subject: Add patch based on christos' etherape patch-ab to make name lookups work on -current. Bump PKGREVISION. --- net/mtr-gtk/Makefile | 3 +- net/mtr-gtk/distinfo | 4 +- net/mtr-gtk/patches/patch-ab | 98 +++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 97 insertions(+), 8 deletions(-) (limited to 'net/mtr-gtk') diff --git a/net/mtr-gtk/Makefile b/net/mtr-gtk/Makefile index d39a0a745eb..535c6ba2efb 100644 --- a/net/mtr-gtk/Makefile +++ b/net/mtr-gtk/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.21 2004/12/25 21:24:45 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2005/02/01 17:02:00 wiz Exp $ # DISTNAME= mtr-0.67 +PKGREVISION= 1 PKGNAME= ${DISTNAME:S/-/-gtk-/} CATEGORIES= net MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/ diff --git a/net/mtr-gtk/distinfo b/net/mtr-gtk/distinfo index f0157fe9359..a791b146fa4 100644 --- a/net/mtr-gtk/distinfo +++ b/net/mtr-gtk/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2004/12/25 21:24:45 wiz Exp $ +$NetBSD: distinfo,v 1.9 2005/02/01 17:02:00 wiz Exp $ SHA1 (mtr-0.67.tar.gz) = 23fe652ebe25fe86fcb421e78eb76917248b9c94 Size (mtr-0.67.tar.gz) = 131393 bytes SHA1 (patch-aa) = eb1998efc2a5b455461333382c34ed9c77cf76ef -SHA1 (patch-ab) = 8e329ba3e46e47db29a17acd746ccd461a25f1a9 +SHA1 (patch-ab) = cfddf96d24c734990a15beec796b6bbbf7cb3b9d diff --git a/net/mtr-gtk/patches/patch-ab b/net/mtr-gtk/patches/patch-ab index aeb577bbe32..1f93757bc73 100644 --- a/net/mtr-gtk/patches/patch-ab +++ b/net/mtr-gtk/patches/patch-ab @@ -1,8 +1,64 @@ -$NetBSD: patch-ab,v 1.5 2004/10/27 16:18:31 wiz Exp $ +$NetBSD: patch-ab,v 1.6 2005/02/01 17:02:00 wiz Exp $ ---- dns.c.orig 2004-10-27 11:47:06.000000000 -0400 -+++ dns.c 2004-10-27 11:47:52.000000000 -0400 -@@ -814,9 +814,9 @@ +--- dns.c.orig 2004-08-26 09:56:53.000000000 +0200 ++++ dns.c +@@ -32,9 +32,17 @@ + #include + #include + #include ++#ifdef __APPLE__ ++#include ++#else + #include ++#endif + #include ++#ifdef __APPLE__ ++#include ++#else + #include ++#endif + #include + #include + #include +@@ -282,6 +290,17 @@ char nullstring[] = ""; + + int use_dns = 1; + ++#ifdef res_ninit ++#define RES_INIT() res_ninit(&myres); ++#define RES_MKQUERY(a, b, c, d, e, f, g, h, i) \ ++ res_nmkquery(&myres, a, b, c, d, e, f, g, h, i) ++struct __res_state myres; ++#else ++#define RES_INIT() res_init(); ++#define RES_MKQUERY(a, b, c, d, e, f, g, h, i) \ ++ res_mkquery(a, b, c, d, e, f, g, h, i) ++#define myres _res ++#endif + + /* Code */ + #ifdef CorruptCheck +@@ -448,14 +467,14 @@ void dns_open(void) + { + int option,i; + +- res_init(); +- if (!_res.nscount) { ++ RES_INIT(); ++ if (!myres.nscount) { + fprintf(stderr,"No nameservers defined.\n"); + exit(-1); + } +- _res.options|= RES_RECURSE | RES_DEFNAMES | RES_DNSRCH; +- for (i = 0;i < _res.nscount;i++) +- _res.nsaddr_list[i].sin_family = AF_INET; ++ myres.options|= RES_RECURSE | RES_DEFNAMES | RES_DNSRCH; ++ for (i = 0;i < myres.nscount;i++) ++ myres.nsaddr_list[i].sin_family = AF_INET; + resfd = socket(AF_INET, SOCK_DGRAM, 0); + if (resfd == -1) { + fprintf(stderr,"Unable to allocate socket for nameserver communication: %s\n", +@@ -814,17 +833,17 @@ void dorequest(char *s,int type,word id) { packetheader *hp; int r,i; @@ -10,7 +66,39 @@ $NetBSD: patch-ab,v 1.5 2004/10/27 16:18:31 wiz Exp $ + unsigned char buf[MaxPacketsize]; - r = res_mkquery(QUERY,s,C_IN,type,NULL,0,NULL,(unsigned char*)buf,MaxPacketsize); -+ r = res_mkquery(QUERY,s,C_IN,type,NULL,0,NULL,buf,MaxPacketsize); ++ r = RES_MKQUERY(QUERY,s,C_IN,type,NULL,0,NULL,(unsigned char*)buf,MaxPacketsize); if (r == -1) { restell("Resolver error: Query too large."); return; + } + hp = (packetheader *)buf; + hp->id = id; /* htons() deliberately left out (redundant) */ +- for (i = 0;i < _res.nscount;i++) +- (void)sendto(resfd,buf,r,0,(struct sockaddr *)&_res.nsaddr_list[i], ++ for (i = 0;i < myres.nscount;i++) ++ (void)sendto(resfd,buf,r,0,(struct sockaddr *)&myres.nsaddr_list[i], + sizeof(struct sockaddr)); + } + +@@ -1161,15 +1180,15 @@ void dns_ack(void) + if (r > 0) { + /* Check to see if this server is actually one we sent to */ + if (from.sin_addr.s_addr == localhost) { +- for (i = 0;i < _res.nscount;i++) +- if ((_res.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr) || +- (!_res.nsaddr_list[i].sin_addr.s_addr)) /* 0.0.0.0 replies as 127.0.0.1 */ ++ for (i = 0;i < myres.nscount;i++) ++ if ((myres.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr) || ++ (!myres.nsaddr_list[i].sin_addr.s_addr)) /* 0.0.0.0 replies as 127.0.0.1 */ + break; + } else +- for (i = 0;i < _res.nscount;i++) +- if (_res.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr) ++ for (i = 0;i < myres.nscount;i++) ++ if (myres.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr) + break; +- if (i == _res.nscount) { ++ if (i == myres.nscount) { + sprintf(tempstring,"Resolver error: Received reply from unknown source: %s", + inet_ntoa(from.sin_addr)); + restell(tempstring); -- cgit v1.2.3