Add patch to add rudimentary cname chasing to the ptr lookup stuff so

that classless in-addr lookups work.
Patch by atatat.
Bump to 0.42nb1.

6 files changed, 70 insertions, 13 deletions

diff --git a/net/mtr-gtk/Makefile b/net/mtr-gtk/Makefile
index bba407970ce..7f114b4e06d 100644
--- a/net/mtr-gtk/Makefile
+++ b/net/mtr-gtk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/10/16 15:11:00 agc Exp $
+# $NetBSD: Makefile,v 1.2 2001/11/04 14:09:32 wiz Exp $
 #
 
 DISTNAME=	mtr-0.42
-PKGNAME=	mtr-gtk-0.42
+PKGNAME=	mtr-gtk-0.42nb1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.bitwizard.nl/mtr/ \
 		http://www.giovannelli.it/~gmarco/files/
diff --git a/net/mtr-gtk/distinfo b/net/mtr-gtk/distinfo
index fdadf6debd7..34f013ba44f 100644
--- a/net/mtr-gtk/distinfo
+++ b/net/mtr-gtk/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/10/16 15:11:00 agc Exp $
+$NetBSD: distinfo,v 1.2 2001/11/04 14:09:32 wiz Exp $
 
 SHA1 (mtr-0.42.tar.gz) = 7bcb6c317911139355cabe5b21e1c7efc5cb5694
 Size (mtr-0.42.tar.gz) = 84767 bytes
 SHA1 (patch-aa) = c098f19f68220fa6c37d3e43edc2d6c49cba8118
-SHA1 (patch-ab) = 9ba3ea130f737864e673e60ce656b96556d3c1cc
+SHA1 (patch-ab) = 6bb67583986d71e0986e65d61e96b3c41b40d4b4
diff --git a/net/mtr-gtk/patches/patch-ab b/net/mtr-gtk/patches/patch-ab
index 891b77b57c4..ff4af0543be 100644
--- a/net/mtr-gtk/patches/patch-ab
+++ b/net/mtr-gtk/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/10/16 15:11:00 agc Exp $
+$NetBSD: patch-ab,v 1.2 2001/11/04 14:09:32 wiz Exp $
 
---- dns.c.orig Wed Jun  9 11:09:20 1999
-+++ dns.c      Tue Aug 10 01:21:12 1999
+--- dns.c.orig	Sat Mar  4 02:46:55 2000
++++ dns.c	Fri Nov  2 14:16:56 2001
 @@ -751,7 +751,7 @@
  void dorequest(char *s,int type,word id){
     packetheader *hp;
@@ -11,3 +11,31 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/10/16 15:11:00 agc Exp $
     r = res_mkquery(QUERY,s,C_IN,type,NULL,0,NULL,buf,MaxPacketsize);
     if (r == -1){
        restell("Resolver error: Query too large.");
+@@ -981,7 +981,7 @@
+                   restell("Resolver error: Specified rdata length exceeds packet size.");
+                   return;
+                }
+-               if (datatype == qdatatype){
++               if (datatype == qdatatype || datatype == T_CNAME){
+                   if (debug){
+                      sprintf(tempstring,"Resolver: TTL: %s",strtdiff(sendstring,ttl));
+                      restell(tempstring);
+@@ -1013,6 +1013,7 @@
+                            }
+                            break;
+                         case T_PTR:
++                        case T_CNAME:
+                            *namestring = '\0';
+                            r = dn_expand(s,s + l,c,namestring,MAXDNAME);
+                            if (r == -1){
+@@ -1027,6 +1028,10 @@
+                               restell("Resolver error: Domain name too long.");
+                               failrp(rp);
+                               return;
++                           }
++                           if (datatype == T_CNAME){
++                              strcpy(stackstring,namestring);
++                              break;
+                            }
+                            if (!rp->hostname){
+                               rp->hostname = (char *)statmalloc(strlen(namestring) + 1);
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 2b6fee0ea62..9d77b186f48 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2001/10/26 22:05:31 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2001/11/04 14:09:31 wiz Exp $
 #
 
 DISTNAME=	mtr-0.42
+PKGNAME=	${DISTNAME}nb1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.bitwizard.nl/mtr/ \
 		http://www.giovannelli.it/~gmarco/files/
diff --git a/net/mtr/distinfo b/net/mtr/distinfo
index 407530f2561..5579660c711 100644
--- a/net/mtr/distinfo
+++ b/net/mtr/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2001/10/26 22:05:31 jlam Exp $
+$NetBSD: distinfo,v 1.5 2001/11/04 14:09:31 wiz Exp $
 
 SHA1 (mtr-0.42.tar.gz) = 7bcb6c317911139355cabe5b21e1c7efc5cb5694
 Size (mtr-0.42.tar.gz) = 84767 bytes
 SHA1 (patch-aa) = c098f19f68220fa6c37d3e43edc2d6c49cba8118
-SHA1 (patch-ab) = 9ba3ea130f737864e673e60ce656b96556d3c1cc
+SHA1 (patch-ab) = 6bb67583986d71e0986e65d61e96b3c41b40d4b4
 SHA1 (patch-ac) = 6f7d40fc957ba61f4e5a4a29993aa963d627906d
 SHA1 (patch-ad) = a019773eddeb53fb45afa8de2b1a6b03b436e803
 SHA1 (patch-ae) = 66a05d1edb1f300c6573a480d4c4357a94c29f6f
diff --git a/net/mtr/patches/patch-ab b/net/mtr/patches/patch-ab
index 6fb042958c1..7901e477261 100644
--- a/net/mtr/patches/patch-ab
+++ b/net/mtr/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1 2001/04/05 15:18:09 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2001/11/04 14:09:31 wiz Exp $
 
---- dns.c.orig Wed Jun  9 11:09:20 1999
-+++ dns.c      Tue Aug 10 01:21:12 1999
+--- dns.c.orig	Sat Mar  4 02:46:55 2000
++++ dns.c	Fri Nov  2 14:16:56 2001
 @@ -751,7 +751,7 @@
  void dorequest(char *s,int type,word id){
     packetheader *hp;
@@ -11,3 +11,31 @@ $NetBSD: patch-ab,v 1.1 2001/04/05 15:18:09 wiz Exp $
     r = res_mkquery(QUERY,s,C_IN,type,NULL,0,NULL,buf,MaxPacketsize);
     if (r == -1){
        restell("Resolver error: Query too large.");
+@@ -981,7 +981,7 @@
+                   restell("Resolver error: Specified rdata length exceeds packet size.");
+                   return;
+                }
+-               if (datatype == qdatatype){
++               if (datatype == qdatatype || datatype == T_CNAME){
+                   if (debug){
+                      sprintf(tempstring,"Resolver: TTL: %s",strtdiff(sendstring,ttl));
+                      restell(tempstring);
+@@ -1013,6 +1013,7 @@
+                            }
+                            break;
+                         case T_PTR:
++                        case T_CNAME:
+                            *namestring = '\0';
+                            r = dn_expand(s,s + l,c,namestring,MAXDNAME);
+                            if (r == -1){
+@@ -1027,6 +1028,10 @@
+                               restell("Resolver error: Domain name too long.");
+                               failrp(rp);
+                               return;
++                           }
++                           if (datatype == T_CNAME){
++                              strcpy(stackstring,namestring);
++                              break;
+                            }
+                            if (!rp->hostname){
+                               rp->hostname = (char *)statmalloc(strlen(namestring) + 1);