Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 4 Apr 2006 09:34:47 GMT
From:      Antonio Querubin <tony@lava.netg>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/95298: [patch] update mtr port to version 0.70
Message-ID:  <200604040934.k349Ylp6011660@www.freebsd.org>
Resent-Message-ID: <200604040940.k349eEqv006061@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         95298
>Category:       ports
>Synopsis:       [patch] update mtr port to version 0.70
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 04 09:40:13 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Antonio Querubin
>Release:        FreeBSD 6.0-RELEASE i386
>Organization:
LavaNet
>Environment:
System: FreeBSD localhost 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Mon Dec 19
04:55:45 HST 2005 root@localhost:/usr/obj/usr/src/sys/GENERIC i386
>Description:
This updates the mtr port to version 0.70 and includes a single fix for an IPv6 reverse name resolution bug.

Although version 0.71 is available, it has some non-trivial build issues with autoconf, and does not fix any new bugs beyond that already fixed in 0.70.

>How-To-Repeat:
Apply patch below and remove /usr/ports/net/mtr/patch-net.c (incorporated into version 0.70).

>Fix:
Patch for /usr/ports/net/mtr:

diff -ru mtr/Makefile mtr0.70/Makefile
--- mtr/Makefile        Sat Apr  1 00:18:45 2006
+++ mtr0.70/Makefile    Mon Apr  3 21:58:38 2006
@@ -6,8 +6,8 @@
 #

 PORTNAME=      mtr
-PORTVERSION=   0.69
-PORTREVISION=  3
+PORTVERSION=   0.70
+PORTREVISION=  0
 CATEGORIES=    net ipv6
 MASTER_SITES=  ftp://ftp.bitwizard.nl/mtr/ \
                ftp://ftp.netsw.org/net/ip/audit/packets/ \
diff -ru mtr/distinfo mtr0.70/distinfo
--- mtr/distinfo        Mon Feb 20 10:20:16 2006
+++ mtr0.70/distinfo    Mon Apr  3 22:01:04 2006
@@ -1,3 +1,3 @@
-MD5 (mtr-0.69.tar.gz) = 58904d6d8d70114195cdeb653d56914c
-SHA256 (mtr-0.69.tar.gz) = 39363164cf411f2fa265f422a87ec3ccfe34b38b955a29114774
b1bb5039e216
-SIZE (mtr-0.69.tar.gz) = 183216
+MD5 (mtr-0.70.tar.gz) = 3011726717c60972ecbbb53c74f31e84
+SHA256 (mtr-0.70.tar.gz) = 2e3ae5b774f24e5d1ffaafe1947295cd9fd3e3a87f8d0ae1ad88
08aaba1990c3
+SIZE (mtr-0.70.tar.gz) = 201017
diff -ru mtr/files/patch-dns.c mtr0.70/files/patch-dns.c
--- mtr/files/patch-dns.c       Sat May 28 07:26:23 2005
+++ mtr0.70/files/patch-dns.c   Mon Apr  3 21:07:29 2006
@@ -1,31 +1,11 @@
-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;
+
Only in mtr/files: patch-net.c
> cat mtr-0.70-diff
diff -ru mtr/Makefile mtr0.70/Makefile
--- mtr/Makefile        Sat Apr  1 00:18:45 2006
+++ mtr0.70/Makefile    Mon Apr  3 21:58:38 2006
@@ -6,8 +6,8 @@
 #

 PORTNAME=      mtr
-PORTVERSION=   0.69
-PORTREVISION=  3
+PORTVERSION=   0.70
+PORTREVISION=  0
 CATEGORIES=    net ipv6
 MASTER_SITES=  ftp://ftp.bitwizard.nl/mtr/ \
                ftp://ftp.netsw.org/net/ip/audit/packets/ \
diff -ru mtr/distinfo mtr0.70/distinfo
--- mtr/distinfo        Mon Feb 20 10:20:16 2006
+++ mtr0.70/distinfo    Mon Apr  3 22:01:04 2006
@@ -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 -ru mtr/files/patch-dns.c mtr0.70/files/patch-dns.c
--- mtr/files/patch-dns.c       Sat May 28 07:26:23 2005
+++ mtr0.70/files/patch-dns.c   Mon Apr  3 21:07:29 2006
@@ -1,31 +1,11 @@
-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;
+
Only in mtr/files: patch-net.c
> cat mtr-0.70-diff
diff -ru mtr/Makefile mtr0.70/Makefile
--- mtr/Makefile        Sat Apr  1 00:18:45 2006
+++ mtr0.70/Makefile    Mon Apr  3 21:58:38 2006
@@ -6,8 +6,8 @@
 #

 PORTNAME=      mtr
-PORTVERSION=   0.69
-PORTREVISION=  3
+PORTVERSION=   0.70
+PORTREVISION=  0
 CATEGORIES=    net ipv6
 MASTER_SITES=  ftp://ftp.bitwizard.nl/mtr/ \
                ftp://ftp.netsw.org/net/ip/audit/packets/ \
diff -ru mtr/distinfo mtr0.70/distinfo
--- mtr/distinfo        Mon Feb 20 10:20:16 2006
+++ mtr0.70/distinfo    Mon Apr  3 22:01:04 2006
@@ -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 -ru mtr/files/patch-dns.c mtr0.70/files/patch-dns.c
--- mtr/files/patch-dns.c       Sat May 28 07:26:23 2005
+++ mtr0.70/files/patch-dns.c   Mon Apr  3 21:07:29 2006
@@ -1,31 +1,11 @@
-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;
+
Only in mtr/files: patch-net.c

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604040934.k349Ylp6011660>