[pkgsrc/trunk]: pkgsrc/net Update to 0.65, based on PR 27562 by Andreas Wrede.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b8ffb05acf7f
branches:  trunk
changeset: 482396:b8ffb05acf7f
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Oct 27 16:18:31 2004 +0000

description:
Update to 0.65, based on PR 27562 by Andreas Wrede.

Changes since 0.54:
  v0.65 Dancer Vesperman noted that mtr no longer traces past
        a section of non-responding hosts. Apparently I added
        a line in net.c that didn't make sense in mtr-0.56. I
        can't find the reason for adding that line, so someone
        who thinks (s)he needs it, should holler.

  v0.64 Philippe suggests to do the time_t thingy before socket.h.
        Apparently, MAC OS X doesn't compile socket.h otherwise.

  v0.63 Suggestion by RCW: Add -lm at line 70 of Configure.in.
        On my system no ill effects ensued, so this version released
        so that he can test if it still works on his sytem.

        Let me add that it's stupid that I have to specify that this
        this program now requires Automake version 1.5 to build, where
        Automake was intended to make software independent of different
        versions of build software!

        For those concerned about the above statement: If you're just
        trying to compile and use MTR, there is no need for automake.
        Just when you're messing with the configure and build system of
        mtr is automake a tool you need.

  v0.62 Apparently someone changed gethostbyname into gethostbyname2
        in mtr.c in an attempt to add IPV6 support. For systems without
        ipv6 support, the old gethostbyname should be used! Linux
        has the call even if you don't enable IPV6. Thanks Gary (rsub)

  v0.61 Attempt to get/print the local IP address. Now shows as
        0.0.0.0 :-( Hints and tips appreciated! -- REW
        Lots of blank space reformatting.
        moved the interface address setting to net.c (where it
        belongs).

  v0.60 John Thacker submitted a surprisingly simple patch to
        enable linking against GTK2.  (up to 2.4.0)

  v0.59 Josh Martin suggested to add some bounds checking to
        the dynamic field code. This caused me to delve in, and
        rewrite some things. Now 50 lines of code less, but cleaner
        code. :-)

  v0.58 I don't remember. Fogot to update this. :-( Check the
        patch.

  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.

diffstat:

 net/mtr-gtk/Makefile         |   8 +++-----
 net/mtr-gtk/distinfo         |  10 +++++-----
 net/mtr-gtk/patches/patch-aa |  10 +++++-----
 net/mtr-gtk/patches/patch-ab |  29 +++++++++++++++--------------
 net/mtr/Makefile             |   8 +++-----
 net/mtr/distinfo             |  14 +++++++-------
 net/mtr/patches/patch-aa     |  10 +++++-----
 net/mtr/patches/patch-ab     |  29 +++++++++++++++--------------
 net/mtr/patches/patch-ad     |  20 ++++++++++----------
 net/mtr/patches/patch-ae     |  20 ++++++++++----------
 10 files changed, 78 insertions(+), 80 deletions(-)

diffs (249 lines):

diff -r 24ec33322ef9 -r b8ffb05acf7f net/mtr-gtk/Makefile
--- a/net/mtr-gtk/Makefile      Wed Oct 27 14:27:29 2004 +0000
+++ b/net/mtr-gtk/Makefile      Wed Oct 27 16:18:31 2004 +0000
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2004/10/03 00:17:55 tv Exp $
+# $NetBSD: Makefile,v 1.19 2004/10/27 16:18:31 wiz Exp $
 #
 
-DISTNAME=      mtr-0.54
+DISTNAME=      mtr-0.65
 PKGNAME=       ${DISTNAME:S/-/-gtk-/}
-PKGREVISION=   2
 CATEGORIES=    net
-MASTER_SITES=  ftp://ftp.bitwizard.nl/mtr/ \
-               http://www.giovannelli.it/~gmarco/files/
+MASTER_SITES=  ftp://ftp.bitwizard.nl/mtr/
 
 MAINTAINER=    sommerfeld%NetBSD.org@localhost
 HOMEPAGE=      http://www.bitwizard.nl/mtr/
diff -r 24ec33322ef9 -r b8ffb05acf7f net/mtr-gtk/distinfo
--- a/net/mtr-gtk/distinfo      Wed Oct 27 14:27:29 2004 +0000
+++ b/net/mtr-gtk/distinfo      Wed Oct 27 16:18:31 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2003/05/23 07:28:25 wiz Exp $
+$NetBSD: distinfo,v 1.7 2004/10/27 16:18:31 wiz Exp $
 
-SHA1 (mtr-0.54.tar.gz) = 434b3c4755caf23d2e41dee4ab5c5615f2fba92e
-Size (mtr-0.54.tar.gz) = 88751 bytes
-SHA1 (patch-aa) = 7dd40b1a6e7781b309e419432e994879fe5be83e
-SHA1 (patch-ab) = 237b5cf55180d7b12408d5688d1daae7bedc052b
+SHA1 (mtr-0.65.tar.gz) = d8d6eff240c0b10b68cb8ce921435b99ff164a49
+Size (mtr-0.65.tar.gz) = 132318 bytes
+SHA1 (patch-aa) = eb1998efc2a5b455461333382c34ed9c77cf76ef
+SHA1 (patch-ab) = 8e329ba3e46e47db29a17acd746ccd461a25f1a9
diff -r 24ec33322ef9 -r b8ffb05acf7f net/mtr-gtk/patches/patch-aa
--- a/net/mtr-gtk/patches/patch-aa      Wed Oct 27 14:27:29 2004 +0000
+++ b/net/mtr-gtk/patches/patch-aa      Wed Oct 27 16:18:31 2004 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.2 2002/03/13 02:16:13 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2004/10/27 16:18:31 wiz Exp $
 
---- net.c.orig Fri Aug 13 18:46:49 1999
-+++ net.c
-@@ -213,7 +213,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
+@@ -249,7 +249,9 @@
+     rv = sendto(sendsock, packet, abs(packetsize), 0, 
                (struct sockaddr *)&remoteaddress, sizeof(remoteaddress));
      if (rv >= 0) {
 +#if 0
diff -r 24ec33322ef9 -r b8ffb05acf7f net/mtr-gtk/patches/patch-ab
--- a/net/mtr-gtk/patches/patch-ab      Wed Oct 27 14:27:29 2004 +0000
+++ b/net/mtr-gtk/patches/patch-ab      Wed Oct 27 16:18:31 2004 +0000
@@ -1,15 +1,16 @@
-$NetBSD: patch-ab,v 1.4 2003/01/09 16:36:06 mycroft Exp $
+$NetBSD: patch-ab,v 1.5 2004/10/27 16:18:31 wiz 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){
-    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){
-       restell("Resolver error: Query too large.");
-       return;
+--- dns.c.orig 2004-10-27 11:47:06.000000000 -0400
++++ dns.c      2004-10-27 11:47:52.000000000 -0400
+@@ -814,9 +814,9 @@
+ {
+   packetheader *hp;
+   int r,i;
+-  int buf[(MaxPacketsize/sizeof (int))+1];
++  unsigned char buf[MaxPacketsize];
+ 
+-  r = res_mkquery(QUERY,s,C_IN,type,NULL,0,NULL,(unsigned char*)buf,MaxPacketsize);
++  r = res_mkquery(QUERY,s,C_IN,type,NULL,0,NULL,buf,MaxPacketsize);
+   if (r == -1) {
+     restell("Resolver error: Query too large.");
+     return;
diff -r 24ec33322ef9 -r b8ffb05acf7f net/mtr/Makefile
--- a/net/mtr/Makefile  Wed Oct 27 14:27:29 2004 +0000
+++ b/net/mtr/Makefile  Wed Oct 27 16:18:31 2004 +0000
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2004/10/03 00:17:55 tv Exp $
+# $NetBSD: Makefile,v 1.36 2004/10/27 16:18:31 wiz Exp $
 #
 
-DISTNAME=      mtr-0.54
-PKGREVISION=   2
+DISTNAME=      mtr-0.65
 CATEGORIES=    net
-MASTER_SITES=  ftp://ftp.bitwizard.nl/mtr/ \
-               http://www.giovannelli.it/~gmarco/files/
+MASTER_SITES=  ftp://ftp.bitwizard.nl/mtr/
 
 MAINTAINER=    sommerfeld%NetBSD.org@localhost
 HOMEPAGE=      http://www.bitwizard.nl/mtr/
diff -r 24ec33322ef9 -r b8ffb05acf7f net/mtr/distinfo
--- a/net/mtr/distinfo  Wed Oct 27 14:27:29 2004 +0000
+++ b/net/mtr/distinfo  Wed Oct 27 16:18:31 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2003/05/23 07:28:25 wiz Exp $
+$NetBSD: distinfo,v 1.10 2004/10/27 16:18:31 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.65.tar.gz) = d8d6eff240c0b10b68cb8ce921435b99ff164a49
+Size (mtr-0.65.tar.gz) = 132318 bytes
+SHA1 (patch-aa) = eb1998efc2a5b455461333382c34ed9c77cf76ef
+SHA1 (patch-ab) = 8e329ba3e46e47db29a17acd746ccd461a25f1a9
+SHA1 (patch-ad) = 91788870a4375fc622f512b5823202e7084f4c2e
+SHA1 (patch-ae) = ccc70fa482a8b8d4ab3124558e6586254a8c36bf
diff -r 24ec33322ef9 -r b8ffb05acf7f net/mtr/patches/patch-aa
--- a/net/mtr/patches/patch-aa  Wed Oct 27 14:27:29 2004 +0000
+++ b/net/mtr/patches/patch-aa  Wed Oct 27 16:18:31 2004 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.2 2002/03/13 02:16:12 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2004/10/27 16:18:31 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
+@@ -249,7 +249,9 @@
+     rv = sendto(sendsock, packet, abs(packetsize), 0, 
                (struct sockaddr *)&remoteaddress, sizeof(remoteaddress));
      if (rv >= 0) {
 +#if 0
diff -r 24ec33322ef9 -r b8ffb05acf7f net/mtr/patches/patch-ab
--- a/net/mtr/patches/patch-ab  Wed Oct 27 14:27:29 2004 +0000
+++ b/net/mtr/patches/patch-ab  Wed Oct 27 16:18:31 2004 +0000
@@ -1,15 +1,16 @@
-$NetBSD: patch-ab,v 1.4 2003/01/09 16:32:11 mycroft Exp $
+$NetBSD: patch-ab,v 1.5 2004/10/27 16:18:31 wiz 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){
-    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){
-       restell("Resolver error: Query too large.");
-       return;
+--- dns.c.orig 2004-10-27 11:47:06.000000000 -0400
++++ dns.c      2004-10-27 11:47:52.000000000 -0400
+@@ -814,9 +814,9 @@
+ {
+   packetheader *hp;
+   int r,i;
+-  int buf[(MaxPacketsize/sizeof (int))+1];
++  unsigned char buf[MaxPacketsize];
+ 
+-  r = res_mkquery(QUERY,s,C_IN,type,NULL,0,NULL,(unsigned char*)buf,MaxPacketsize);
++  r = res_mkquery(QUERY,s,C_IN,type,NULL,0,NULL,buf,MaxPacketsize);
+   if (r == -1) {
+     restell("Resolver error: Query too large.");
+     return;
diff -r 24ec33322ef9 -r b8ffb05acf7f net/mtr/patches/patch-ad
--- a/net/mtr/patches/patch-ad  Wed Oct 27 14:27:29 2004 +0000
+++ b/net/mtr/patches/patch-ad  Wed Oct 27 16:18:31 2004 +0000
@@ -1,19 +1,19 @@
-$NetBSD: patch-ad,v 1.2 2002/03/13 02:16:12 wiz Exp $
+$NetBSD: patch-ad,v 1.3 2004/10/27 16:18:31 wiz Exp $
 
---- mtr.c.orig Thu Mar  7 08:48:27 2002
-+++ mtr.c
-@@ -59,7 +59,6 @@
+--- mtr.c.orig 2004-08-12 12:39:40.000000000 -0400
++++ mtr.c      2004-10-27 11:50:40.000000000 -0400
+@@ -124,7 +124,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' */
+@@ -342,8 +341,8 @@
    }
  
-   if(PrintHelp) {
+   if (PrintHelp) {
 -    printf("usage: %s [-hvrctglsni] [--help] [--version] [--report]\n"
 -         "\t\t[--report-cycles=COUNT] [--curses] [--gtk]\n"
 +    printf("usage: %s [-hvrctlsni] [--help] [--version] [--report]\n"
diff -r 24ec33322ef9 -r b8ffb05acf7f net/mtr/patches/patch-ae
--- a/net/mtr/patches/patch-ae  Wed Oct 27 14:27:29 2004 +0000
+++ b/net/mtr/patches/patch-ae  Wed Oct 27 16:18:31 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.2 2002/03/13 02:16:12 wiz Exp $
+$NetBSD: patch-ae,v 1.3 2004/10/27 16:18:31 wiz Exp $
 
---- mtr.8.orig Wed Mar  6 12:27:37 2002
-+++ mtr.8
+--- mtr.8.orig 2004-10-27 11:51:38.000000000 -0400
++++ mtr.8      2004-10-27 11:52:14.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
+ .B \-s
  .TP
- .B \-s
+ .B \-\-split