Description Hajimu UMEMOTO 2005-03-25 18:50:02 UTC

	Updating ports/net/mtr to 0.69

Fix: How about upgrading mtr port to 0.69?  The version of mtr supports an
IPv6 natively.



--
Hajimu UMEMOTO @ Internet Mutual Aid Society Yokohama, Japan
ume@mahoroba.org  ume@{,jp.}FreeBSD.org
http://www.imasy.org/~ume/--kSRvOjPVWKMqSqUuzfED6KWmMJJToTkBrNoCSgPLeSFF7ec9
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

diff -urN mtr/Makefile.orig mtr/Makefile
--- mtr/Makefile.orig	Mon Nov  8 07:35:58 2004
+++ mtr/Makefile	Mon Mar  7 04:23:02 2005
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	mtr
-PORTVERSION=	0.65
-PORTREVISION=	1
-CATEGORIES=	net
+PORTVERSION=	0.69
+#PORTREVISION=	0
+CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.bitwizard.nl/mtr/ \
 		ftp://ftp.netsw.org/net/ip/audit/packets/ \
 		ftp://ftp.gw.com/mirrors/pub/unix/mtr/
diff -urN mtr/distinfo.orig mtr/distinfo
--- mtr/distinfo.orig	Sat Oct 30 07:31:02 2004
+++ mtr/distinfo	Thu Feb  3 18:43:27 2005
@@ -1,2 +1,2 @@
-MD5 (mtr-0.65.tar.gz) = 32de3cb8f0763e352124ff4fd74690ab
-SIZE (mtr-0.65.tar.gz) = 132318
+MD5 (mtr-0.69.tar.gz) = 58904d6d8d70114195cdeb653d56914c
+SIZE (mtr-0.69.tar.gz) = 183216
diff -urN mtr/files/patch-dns.c.orig mtr/files/patch-dns.c
--- mtr/files/patch-dns.c.orig	Thu Jan  1 09:00:00 1970
+++ mtr/files/patch-dns.c	Thu Feb  3 19:27:35 2005
@@ -0,0 +1,31 @@
+Index: dns.c
+diff -u -p dns.c.orig dns.c
+--- dns.c.orig	Tue Jan 11 17:32:42 2005
++++ dns.c	Thu Feb  3 19:25:28 2005
+@@ -437,7 +437,7 @@ char *strlongip(ip_t * ip)
+ }
+ 
+ 
+-int longipstr(char *s, ip_t *dst)
++int longipstr(char *s, ip_t *dst, int af)
+ {
+ #ifdef ENABLE_IPV6
+   return inet_pton( af, s, dst );
+@@ -488,7 +488,7 @@ void dns_open(void)
+ 	    strerror(errno));
+     exit(-1);
+   }
+-  longipstr( "127.0.0.1", &localhost );
++  longipstr( "127.0.0.1", &localhost, AF_INET );
+   aseed = time(NULL) ^ (time(NULL) << 3) ^ (dword)getpid();
+   for (i = 0;i < BashSize;i++) {
+     idbash[i] = NULL;
+@@ -1228,7 +1228,7 @@ void dns_ack(void)
+ 	if ( addrcmp( (void *) &(_res.nsaddr_list[i].sin_addr),
+ 		      (void *) &(from4->sin_addr), (int) AF_INET ) == 0 ||
+ 	     addrcmp( (void *) &(_res.nsaddr_list[i].sin_addr),
+-		      (void *) &unspec_addr, (int) AF_INET ) != 0 )	/* 0.0.0.0 replies as 127.0.0.1 */
++		      (void *) &unspec_addr, (int) AF_INET ) == 0 )	/* 0.0.0.0 replies as 127.0.0.1 */
+ 	  break;
+     } else
+       for (i = 0;i < _res.nscount;i++)
diff -urN mtr/files/patch-raw.c.orig mtr/files/patch-raw.c
--- mtr/files/patch-raw.c.orig	Sat Oct 30 20:29:48 2004
+++ mtr/files/patch-raw.c	Thu Jan  1 09:00:00 1970
@@ -1,10 +0,0 @@
---- raw.c.orig	Sat Oct 30 13:27:31 2004
-+++ raw.c	Sat Oct 30 13:27:39 2004
-@@ -22,6 +22,7 @@
- #include <ctype.h>
- #include <stdlib.h>
- #include <stdio.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
How-To-Repeat: 	make install in ports/net/mtr