Fix reverse resolving for IPv6 addresses which contain an octet with

a value larger than 127. Bump package revision because of this fix.

3 files changed, 20 insertions, 14 deletions

diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 7dcfe80bb85..0fb0b7067f8 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2006/04/03 18:38:58 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.45 2006/05/04 05:40:16 tron Exp $
 
 DISTNAME=	mtr-0.71
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.bitwizard.nl/mtr/
 
diff --git a/net/mtr/distinfo b/net/mtr/distinfo
index 0fbb60899c5..b05b87af5dd 100644
--- a/net/mtr/distinfo
+++ b/net/mtr/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.19 2006/04/03 20:09:57 wiz Exp $
+$NetBSD: distinfo,v 1.20 2006/05/04 05:40:16 tron Exp $
 
 SHA1 (mtr-0.71.tar.gz) = 5a2b72e0d69522e524e961c3195d5878c49510b4
 RMD160 (mtr-0.71.tar.gz) = 9979721f39a83f4ad6d41d3e9f4c7848b7a99745
 Size (mtr-0.71.tar.gz) = 205442 bytes
-SHA1 (patch-ab) = ae5742a52ad604c336b5ae87e6938e12bd25c886
+SHA1 (patch-ab) = a0050b17371fd6641017249c12b5ee57d1103e35
diff --git a/net/mtr/patches/patch-ab b/net/mtr/patches/patch-ab
index c2b6673e469..17bc8539931 100644
--- a/net/mtr/patches/patch-ab
+++ b/net/mtr/patches/patch-ab
@@ -1,10 +1,7 @@
-$NetBSD: patch-ab,v 1.12 2006/04/03 20:09:57 wiz Exp $
-
-Reported at
-	http://www.bitwizard.nl/cgi-bin/mtr/incoming?id=10799;page=1172;user=guest
+$NetBSD: patch-ab,v 1.13 2006/05/04 05:40:16 tron Exp $
 
 --- dns.c.orig	2006-03-23 05:45:58.000000000 +0000
-+++ dns.c
++++ dns.c	2006-05-04 06:36:44.000000000 +0100
 @@ -28,13 +28,20 @@
  #include <sys/time.h>
  #include <sys/select.h>
@@ -27,7 +24,7 @@ Reported at
  #include <unistd.h>
  #include <fcntl.h>
  #include <ctype.h>
-@@ -54,9 +61,6 @@ extern char *sys_errlist[];
+@@ -54,9 +61,6 @@
  #define strerror(errno) (((errno) >= 0 && (errno) < sys_nerr) ? sys_errlist[errno] : "unlisted error")
  #endif
  
@@ -37,7 +34,7 @@ Reported at
  extern int af;
  
  /* Defines */
-@@ -294,6 +298,17 @@ char nullstring[] = "";
+@@ -294,6 +298,17 @@
  
  int use_dns = 1;
  
@@ -55,7 +52,7 @@ Reported at
  
  /* Code */
  #ifdef CorruptCheck
-@@ -468,14 +483,14 @@ void dns_open(void)
+@@ -468,14 +483,14 @@
  {
    int option,i;
  
@@ -75,7 +72,7 @@ Reported at
    resfd = socket(AF_INET, SOCK_DGRAM, 0);
    if (resfd == -1) {
      fprintf(stderr,"Unable to allocate socket for nameserver communication: %s\n",
-@@ -858,17 +873,17 @@ void dorequest(char *s,int type,word id)
+@@ -858,17 +873,17 @@
  {
    packetheader *hp;
    int r,i;
@@ -97,7 +94,7 @@ Reported at
  		 sizeof(struct sockaddr));
  }
  
-@@ -1224,18 +1239,18 @@ void dns_ack(void)
+@@ -1224,18 +1239,18 @@
      /* Check to see if this server is actually one we sent to */
      if ( addrcmp( (void *) &(from4->sin_addr), (void *) &localhost,
                    (int) AF_INET ) == 0 ) {
@@ -122,3 +119,12 @@ Reported at
        sprintf(tempstring,"Resolver error: Received reply from unknown source: %s",
  	      inet_ntoa(from4->sin_addr ));
        restell(tempstring);
+@@ -1357,7 +1372,7 @@
+ #ifdef ENABLE_IPV6
+ /* Returns an ip6.arpa character string. */
+ void addr2ip6arpa( ip_t * ip, char * buf ) {
+-  char * p = (char *) ip;
++  unsigned char * p = (unsigned char *) ip;
+   char * b = buf;
+   int i;
+