From c0ec2ca7b7f4e1a1016d295a95ce12c705f0ef16 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Tue, 3 Oct 2006 19:15:20 +0000
Subject: Update to 0.72: Minor (undocumented) improvements.

---
 net/mtr/Makefile         |  5 ++---
 net/mtr/distinfo         | 12 ++++++------
 net/mtr/patches/patch-aa |  8 ++++----
 net/mtr/patches/patch-ab | 25 ++++++++-----------------
 4 files changed, 20 insertions(+), 30 deletions(-)

(limited to 'net')

diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 0fb0b7067f8..4d260e85a21 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2006/05/04 05:40:16 tron Exp $
+# $NetBSD: Makefile,v 1.46 2006/10/03 19:15:20 wiz Exp $
 
-DISTNAME=	mtr-0.71
-PKGREVISION=	1
+DISTNAME=	mtr-0.72
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.bitwizard.nl/mtr/
 
diff --git a/net/mtr/distinfo b/net/mtr/distinfo
index 6a9b93d933d..ba3f9bbd337 100644
--- a/net/mtr/distinfo
+++ b/net/mtr/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.21 2006/05/12 07:51:05 joerg Exp $
+$NetBSD: distinfo,v 1.22 2006/10/03 19:15:20 wiz 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-aa) = c1c9bd2d9ffadf312d47f86d52de35dcc80d52f5
-SHA1 (patch-ab) = a0050b17371fd6641017249c12b5ee57d1103e35
+SHA1 (mtr-0.72.tar.gz) = afc26c9e8a30eba7ca92ba68d4489b0c9c07977d
+RMD160 (mtr-0.72.tar.gz) = 69843b82fb2de2b2a597c21a62d8eb9473df31b6
+Size (mtr-0.72.tar.gz) = 295845 bytes
+SHA1 (patch-aa) = 3db4ccac08fadcf2fcf75753efc165c6d92a97c3
+SHA1 (patch-ab) = 3923fcd252bdcd9475e937fb78d1d7e5ec607180
diff --git a/net/mtr/patches/patch-aa b/net/mtr/patches/patch-aa
index 055a52aea54..dae7f37f66f 100644
--- a/net/mtr/patches/patch-aa
+++ b/net/mtr/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2006/05/12 07:51:05 joerg Exp $
+$NetBSD: patch-aa,v 1.7 2006/10/03 19:15:20 wiz Exp $
 
---- configure.orig	2006-05-12 07:46:21.000000000 +0000
+--- configure.orig	2006-09-29 19:41:56.000000000 +0000
 +++ configure
-@@ -6882,6 +6882,7 @@ _ACEOF
+@@ -7204,6 +7204,7 @@ _ACEOF
    LIBS="-lresolv $LIBS"
  
  else
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.6 2006/05/12 07:51:05 joerg Exp $
  
  echo "$as_me:$LINENO: checking for __res_mkquery in -lresolv" >&5
  echo $ECHO_N "checking for __res_mkquery in -lresolv... $ECHO_C" >&6
-@@ -6965,8 +6966,6 @@ fi
+@@ -7287,8 +7288,6 @@ fi
  
  fi
  
diff --git a/net/mtr/patches/patch-ab b/net/mtr/patches/patch-ab
index 17bc8539931..e0c2319a496 100644
--- a/net/mtr/patches/patch-ab
+++ b/net/mtr/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.13 2006/05/04 05:40:16 tron Exp $
+$NetBSD: patch-ab,v 1.14 2006/10/03 19:15:20 wiz Exp $
 
---- dns.c.orig	2006-03-23 05:45:58.000000000 +0000
-+++ dns.c	2006-05-04 06:36:44.000000000 +0100
+--- dns.c.orig	2006-03-26 06:54:11.000000000 +0000
++++ dns.c
 @@ -28,13 +28,20 @@
  #include <sys/time.h>
  #include <sys/select.h>
@@ -24,7 +24,7 @@ $NetBSD: patch-ab,v 1.13 2006/05/04 05:40:16 tron Exp $
  #include <unistd.h>
  #include <fcntl.h>
  #include <ctype.h>
-@@ -54,9 +61,6 @@
+@@ -54,9 +61,6 @@ extern char *sys_errlist[];
  #define strerror(errno) (((errno) >= 0 && (errno) < sys_nerr) ? sys_errlist[errno] : "unlisted error")
  #endif
  
@@ -34,7 +34,7 @@ $NetBSD: patch-ab,v 1.13 2006/05/04 05:40:16 tron Exp $
  extern int af;
  
  /* Defines */
-@@ -294,6 +298,17 @@
+@@ -294,6 +298,17 @@ char nullstring[] = "";
  
  int use_dns = 1;
  
@@ -52,7 +52,7 @@ $NetBSD: patch-ab,v 1.13 2006/05/04 05:40:16 tron Exp $
  
  /* Code */
  #ifdef CorruptCheck
-@@ -468,14 +483,14 @@
+@@ -468,14 +483,14 @@ void dns_open(void)
  {
    int option,i;
  
@@ -72,7 +72,7 @@ $NetBSD: patch-ab,v 1.13 2006/05/04 05:40:16 tron Exp $
    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 @@
+@@ -858,17 +873,17 @@ void dorequest(char *s,int type,word id)
  {
    packetheader *hp;
    int r,i;
@@ -94,7 +94,7 @@ $NetBSD: patch-ab,v 1.13 2006/05/04 05:40:16 tron Exp $
  		 sizeof(struct sockaddr));
  }
  
-@@ -1224,18 +1239,18 @@
+@@ -1224,18 +1239,18 @@ void dns_ack(void)
      /* Check to see if this server is actually one we sent to */
      if ( addrcmp( (void *) &(from4->sin_addr), (void *) &localhost,
                    (int) AF_INET ) == 0 ) {
@@ -119,12 +119,3 @@ $NetBSD: patch-ab,v 1.13 2006/05/04 05:40:16 tron Exp $
        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;
- 
-- 
cgit v1.2.3