>Number:         27562
>Category:       pkg
>Synopsis:       net/mtr update from 0.54 to 0.58
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Oct 27 14:46:01 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Andreas Wrede <andreas@planix.com>
>Release:        NetBSD 2.99.9
>Organization:
Planix, Inc.
>Environment:
	
	
System: NetBSD woffi.planix.com 2.99.9 NetBSD 2.99.9 (WOFFI) #7: Thu Oct 14 21:02:46 EDT 2004 root@woffi.planix.com:/m5/netbsd-current/obj.i386/sys/arch/i386/compile/WOFFI i386
Architecture: i386
Machine: i386
>Description:
	
net/mtr is currently at version 0.54. Version 0.58 has been available  since 
April 2004
>How-To-Repeat:
	
mtr --version
>Fix:
	
Apply patch below. 

From the NEWS file:
  v0.57 Lots of whitespace cleanups. And a DNS fix: Don't do DNS
        lookups in raw mode with -n specified. 

  v0.56 Fixed compile warnings. Now compiles with -Wall. If your
        compiler finds things mine didn't feel free to shout. 

  v0.55 Cleanup patch. I'm going to do some maintenance on MTR, 
        but I want to be able to say: Can you see which version
        fixed/broke things for you, so you're going to see a 
        bunch of new releases soon. 


Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/mtr/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- Makefile	3 Oct 2004 00:17:55 -0000	1.35
+++ Makefile	27 Oct 2004 14:33:28 -0000
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.35 2004/10/03 00:17:55 tv Exp $
 #
 
-DISTNAME=	mtr-0.54
-PKGREVISION=	2
+DISTNAME=	mtr-0.58
+#PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.bitwizard.nl/mtr/ \
 		http://www.giovannelli.it/~gmarco/files/
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/mtr/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo	23 May 2003 07:28:25 -0000	1.9
+++ distinfo	27 Oct 2004 14:33:28 -0000
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.9 2003/05/23 07:28:25 wiz Exp $
 
-SHA1 (mtr-0.54.tar.gz) = 434b3c4755caf23d2e41dee4ab5c5615f2fba92e
-Size (mtr-0.54.tar.gz) = 88751 bytes
-SHA1 (patch-aa) = ad39c45462c65f132ad1060fb560b311bf9bad3f
-SHA1 (patch-ab) = 237b5cf55180d7b12408d5688d1daae7bedc052b
-SHA1 (patch-ad) = 53af9e506b14d58fc13a96d900859bb228d720b9
-SHA1 (patch-ae) = 7826b208419fbccd1eed5e5e84826f1d2d6e7baa
+SHA1 (mtr-0.58.tar.gz) = 7b5ff2ec4c66e665977b2739fdf9b66a3904730d
+Size (mtr-0.58.tar.gz) = 93987 bytes
+SHA1 (patch-aa) = d5bcb068e0ddbb4a33e8e3571637e1a5b856c570
+SHA1 (patch-ab) = c3ebcfbbcf8fc93ac8a6c297492a205eeca8ce75
+SHA1 (patch-ad) = 811c308c79019ada85262f1485226fed54161bb2
+SHA1 (patch-ae) = 06f78e97bc3743abb4aa4f2af0a23f566ce6d8bc
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/net/mtr/patches/patch-aa,v
retrieving revision 1.2
diff -u -r1.2 patch-aa
--- patches/patch-aa	13 Mar 2002 02:16:12 -0000	1.2
+++ patches/patch-aa	27 Oct 2004 14:33:28 -0000
@@ -1,9 +1,9 @@
 $NetBSD: patch-aa,v 1.2 2002/03/13 02:16:12 wiz Exp $
 
---- net.c.orig	Wed Mar  6 12:27:37 2002
-+++ net.c
-@@ -219,7 +219,9 @@
-     rv = sendto(sendsock, packet, packetsize, 0, 
+--- net.c.orig	2004-10-27 10:04:07.000000000 -0400
++++ net.c	2004-10-27 10:12:18.000000000 -0400
+@@ -240,7 +240,9 @@
+     rv = sendto(sendsock, packet, abs(packetsize), 0, 
  		(struct sockaddr *)&remoteaddress, sizeof(remoteaddress));
      if (rv >= 0) {
 +#if 0
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/net/mtr/patches/patch-ab,v
retrieving revision 1.4
diff -u -r1.4 patch-ab
--- patches/patch-ab	9 Jan 2003 16:32:11 -0000	1.4
+++ patches/patch-ab	27 Oct 2004 14:33:28 -0000
@@ -1,15 +1,15 @@
 $NetBSD: patch-ab,v 1.4 2003/01/09 16:32:11 mycroft Exp $
 
---- dns.c.orig	Sat Nov 23 18:24:16 2002
-+++ dns.c	Thu Jan  9 16:25:23 2003
-@@ -743,8 +743,8 @@
- void dorequest(char *s,int type,word id){
+--- dns.c.orig	2004-10-27 10:10:18.000000000 -0400
++++ dns.c	2004-10-27 10:10:36.000000000 -0400
+@@ -767,8 +767,8 @@
+ {
     packetheader *hp;
     int r,i;
 -   int buf[(MaxPacketsize/sizeof (int))+1];
 -   r = res_mkquery(QUERY,s,C_IN,type,NULL,0,NULL,(unsigned char*)buf,MaxPacketsize);
 +   unsigned char buf[MaxPacketsize];
 +   r = res_mkquery(QUERY,s,C_IN,type,NULL,0,NULL,buf,MaxPacketsize);
-    if (r == -1){
+    if (r == -1) {
        restell("Resolver error: Query too large.");
        return;
Index: patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/net/mtr/patches/patch-ad,v
retrieving revision 1.2
diff -u -r1.2 patch-ad
--- patches/patch-ad	13 Mar 2002 02:16:12 -0000	1.2
+++ patches/patch-ad	27 Oct 2004 14:33:28 -0000
@@ -1,16 +1,16 @@
 $NetBSD: patch-ad,v 1.2 2002/03/13 02:16:12 wiz Exp $
 
---- mtr.c.orig	Thu Mar  7 08:48:27 2002
-+++ mtr.c
-@@ -59,7 +59,6 @@
+--- mtr.c.orig	2004-04-01 08:33:27.000000000 -0500
++++ mtr.c	2004-10-27 10:15:04.000000000 -0400
+@@ -89,7 +89,6 @@
      { "report", 0, 0, 'r' },
-     { "report-cycles", 1, 0, 'c' },
+     { "xml", 0, 0, 'x' },
      { "curses", 0, 0, 't' },
 -    { "gtk", 0, 0, 'g' },
-     { "interval", 1, 0, 'i' },
-     { "psize", 1, 0, 'p' },
-     { "no-dns", 0, 0, 'n' },
-@@ -192,8 +191,8 @@
+     { "raw", 0, 0, 'l' },
+     { "split", 0, 0, 'p' },     /* BL */
+     				/* maybe above should change to -d 'x' */
+@@ -292,8 +291,8 @@
    }
  
    if(PrintHelp) {
Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/net/mtr/patches/patch-ae,v
retrieving revision 1.2
diff -u -r1.2 patch-ae
--- patches/patch-ae	13 Mar 2002 02:16:12 -0000	1.2
+++ patches/patch-ae	27 Oct 2004 14:33:28 -0000
@@ -1,7 +1,7 @@
 $NetBSD: patch-ae,v 1.2 2002/03/13 02:16:12 wiz Exp $
 
---- mtr.8.orig	Wed Mar  6 12:27:37 2002
-+++ mtr.8
+--- mtr.8.orig	2003-05-06 02:32:19.000000000 -0400
++++ mtr.8	2004-10-27 10:17:58.000000000 -0400
 @@ -8,7 +8,7 @@
  .SH SYNOPSIS
  .B mtr 
@@ -21,12 +21,10 @@
  .B \-\-address\ IP.ADD.RE.SS\c
  ]
  [\c
-@@ -150,20 +147,6 @@
- .B mtr 
- to display numeric IP numbers and not try to resolve the
+@@ -153,20 +150,6 @@
  host names. 
--
--.TP
+ 
+ .TP
 -.B \-g
 -.TP
 -.B \-\-gtk
@@ -39,6 +37,8 @@
 -was built for this to work.  See the GTK+ web page at 
 -.B http://www.gimp.org/gtk/
 -for more information about GTK+.
- 
- .TP
+-
+-.TP
  .B \-s
+ .TP
+ .B \-\-split
>Release-Note:
>Audit-Trail:
>Unformatted: