4 files changed, 13 insertions, 63 deletions

diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 1b375d694952..98c69ccb9761 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mtr
-PORTVERSION=	0.69
-PORTREVISION=	3
+PORTVERSION=	0.70
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.bitwizard.nl/mtr/ \
 		ftp://ftp.netsw.org/net/ip/audit/packets/ \
diff --git a/net/mtr/distinfo b/net/mtr/distinfo
index cd238fe8a23e..cfa67dbac31e 100644
--- a/net/mtr/distinfo
+++ b/net/mtr/distinfo
@@ -1,3 +1,3 @@
-MD5 (mtr-0.69.tar.gz) = 58904d6d8d70114195cdeb653d56914c
-SHA256 (mtr-0.69.tar.gz) = 39363164cf411f2fa265f422a87ec3ccfe34b38b955a29114774b1bb5039e216
-SIZE (mtr-0.69.tar.gz) = 183216
+MD5 (mtr-0.70.tar.gz) = 3011726717c60972ecbbb53c74f31e84
+SHA256 (mtr-0.70.tar.gz) = 2e3ae5b774f24e5d1ffaafe1947295cd9fd3e3a87f8d0ae1ad8808aaba1990c3
+SIZE (mtr-0.70.tar.gz) = 201017
diff --git a/net/mtr/files/patch-dns.c b/net/mtr/files/patch-dns.c
index be647f48674c..b51c74df6e93 100644
--- a/net/mtr/files/patch-dns.c
+++ b/net/mtr/files/patch-dns.c
@@ -1,31 +1,10 @@
-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)
- {
+--- dns.c      2006-03-22 19:45:58.000000000 -1000
++++ dns.c      2006-03-25 11:41:31.000000000 -1000
+@@ -1357,7 +1357,7 @@
  #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++)
+ /* 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;
diff --git a/net/mtr/files/patch-net.c b/net/mtr/files/patch-net.c
deleted file mode 100644
index 25ee703243f1..000000000000
--- a/net/mtr/files/patch-net.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- net.c.orig	Thu Jan 13 08:13:53 2005
-+++ net.c	Wed Nov 16 19:43:05 2005
-@@ -277,7 +277,7 @@
-       exit( EXIT_FAILURE);
-     }
-     echotype = ICMP6_ECHO_REQUEST;
--    salen = sizeof (struct sockaddr_storage);
-+    salen = sizeof (struct sockaddr_in6);
-     break;
- #endif
-   }
-@@ -305,7 +305,6 @@
-     rv = sendto(sendsock, packet, abs(packetsize), 0, 
- 		remotesockaddr, salen);
-     if (rv >= 0) {
--      fprintf (stderr, "You've got a broken (FreeBSD?) system\n");
-       BSDfix = 1;
-     }
-   }
-@@ -346,7 +345,7 @@
-     addrcpy( (void *) &(host[index].addrs[0]), addr, af );
-   } else {
-     for( i=0; i<MAXPATH; ) {
--      if( addrcmp( (void *) &(host[index].addrs[i]), (void *) &addr,
-+      if( addrcmp( (void *) &(host[index].addrs[i]), addr,
-                    af ) == 0 ||
-           addrcmp( (void *) &(host[index].addrs[i]),
- 		   (void *) &unspec_addr, af ) == 0 ) break;