[pkgsrc/trunk]: pkgsrc/net Update to 0.69:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/net Update to 0.69:
From: wiz <wiz%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:25:40 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/984ea21d52f8
branches:  trunk
changeset: 489883:984ea21d52f8
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Feb 27 22:49:43 2005 +0000

description:
Update to 0.69:
  v0.69 make distclean should now also remove "rej" files.
        Antonio Querubin: update getopt.h . More cleanups using
        new infrastructure.
        rcw: Fixed IPV6 support: When compiled in an IPV6-supporting
        environment, but when the kernel doesn't support IPV6, mtr would
        fail to start.
  v0.68 included some old patches.
        included patch from Antonio Querubin for better IPV6 support
        restructured some more whitespace.
        added mtr.h where "global" things should go. Not finished
        moving things around, but now that the infrastructure is there,
        it should be easy.

diffstat:

 net/mtr-gtk/Makefile         |   5 ++---
 net/mtr-gtk/distinfo         |  12 ++++++------
 net/mtr-gtk/patches/patch-aa |  10 +++++-----
 net/mtr-gtk/patches/patch-ab |  33 ++++++++++++++++++---------------
 net/mtr/Makefile             |   5 ++---
 net/mtr/distinfo             |  16 ++++++++--------
 net/mtr/patches/patch-aa     |  10 +++++-----
 net/mtr/patches/patch-ab     |  33 ++++++++++++++++++---------------
 net/mtr/patches/patch-ad     |  14 ++++++--------
 net/mtr/patches/patch-ae     |  16 ++++++++--------
 10 files changed, 78 insertions(+), 76 deletions(-)

diffs (truncated from 329 to 300 lines):

diff -r 466e08cd57d7 -r 984ea21d52f8 net/mtr-gtk/Makefile
--- a/net/mtr-gtk/Makefile      Sun Feb 27 22:43:55 2005 +0000
+++ b/net/mtr-gtk/Makefile      Sun Feb 27 22:49:43 2005 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2005/02/01 17:02:00 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2005/02/27 22:49:43 wiz Exp $
 #
 
-DISTNAME=      mtr-0.67
-PKGREVISION=   1
+DISTNAME=      mtr-0.69
 PKGNAME=       ${DISTNAME:S/-/-gtk-/}
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.bitwizard.nl/mtr/
diff -r 466e08cd57d7 -r 984ea21d52f8 net/mtr-gtk/distinfo
--- a/net/mtr-gtk/distinfo      Sun Feb 27 22:43:55 2005 +0000
+++ b/net/mtr-gtk/distinfo      Sun Feb 27 22:49:43 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2005/02/24 12:13:53 agc Exp $
+$NetBSD: distinfo,v 1.11 2005/02/27 22:49:43 wiz Exp $
 
-SHA1 (mtr-0.67.tar.gz) = 23fe652ebe25fe86fcb421e78eb76917248b9c94
-RMD160 (mtr-0.67.tar.gz) = 2bd87ddb09a4c2aaf0f78156d8d8f272b4060f29
-Size (mtr-0.67.tar.gz) = 131393 bytes
-SHA1 (patch-aa) = eb1998efc2a5b455461333382c34ed9c77cf76ef
-SHA1 (patch-ab) = cfddf96d24c734990a15beec796b6bbbf7cb3b9d
+SHA1 (mtr-0.69.tar.gz) = 3fd0fa148b349d1966e0d79af0ffb84ecc7bed4b
+RMD160 (mtr-0.69.tar.gz) = e95e0f27253d8d94587b429cbb65311035e93c2e
+Size (mtr-0.69.tar.gz) = 183216 bytes
+SHA1 (patch-aa) = 5eb4ab7bfa02095c2b7a110426dd4aa5738f0a2c
+SHA1 (patch-ab) = 25e8711a7736d2772a17e6b6dda962d95e294c86
diff -r 466e08cd57d7 -r 984ea21d52f8 net/mtr-gtk/patches/patch-aa
--- a/net/mtr-gtk/patches/patch-aa      Sun Feb 27 22:43:55 2005 +0000
+++ b/net/mtr-gtk/patches/patch-aa      Sun Feb 27 22:49:43 2005 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.3 2004/10/27 16:18:31 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2005/02/27 22:49:43 wiz Exp $
 
---- 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 @@
+--- net.c.orig 2005-01-13 09:13:53.000000000 +0100
++++ net.c
+@@ -305,7 +305,9 @@ void net_send_query(int index) 
      rv = sendto(sendsock, packet, abs(packetsize), 0, 
-               (struct sockaddr *)&remoteaddress, sizeof(remoteaddress));
+               remotesockaddr, salen);
      if (rv >= 0) {
 +#if 0
        fprintf (stderr, "You've got a broken (FreeBSD?) system\n");
diff -r 466e08cd57d7 -r 984ea21d52f8 net/mtr-gtk/patches/patch-ab
--- a/net/mtr-gtk/patches/patch-ab      Sun Feb 27 22:43:55 2005 +0000
+++ b/net/mtr-gtk/patches/patch-ab      Sun Feb 27 22:49:43 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2005/02/01 17:02:00 wiz Exp $
+$NetBSD: patch-ab,v 1.7 2005/02/27 22:49:43 wiz Exp $
 
---- dns.c.orig 2004-08-26 09:56:53.000000000 +0200
+--- dns.c.orig 2005-01-11 09:32:42.000000000 +0100
 +++ dns.c
 @@ -32,9 +32,17 @@
  #include <sys/socket.h>
@@ -20,7 +20,7 @@
  #include <unistd.h>
  #include <fcntl.h>
  #include <ctype.h>
-@@ -282,6 +290,17 @@ char nullstring[] = "";
+@@ -294,6 +302,17 @@ char nullstring[] = "";
  
  int use_dns = 1;
  
@@ -38,7 +38,7 @@
  
  /* Code */
  #ifdef CorruptCheck
-@@ -448,14 +467,14 @@ void dns_open(void)
+@@ -468,14 +487,14 @@ void dns_open(void)
  {
    int option,i;
  
@@ -58,7 +58,7 @@
    resfd = socket(AF_INET, SOCK_DGRAM, 0);
    if (resfd == -1) {
      fprintf(stderr,"Unable to allocate socket for nameserver communication: %s\n",
-@@ -814,17 +833,17 @@ void dorequest(char *s,int type,word id)
+@@ -858,17 +877,17 @@ void dorequest(char *s,int type,word id)
  {
    packetheader *hp;
    int r,i;
@@ -80,25 +80,28 @@
                 sizeof(struct sockaddr));
  }
  
-@@ -1161,15 +1180,15 @@ void dns_ack(void)
-   if (r > 0) {
+@@ -1224,18 +1243,18 @@ void dns_ack(void)
      /* Check to see if this server is actually one we sent to */
-     if (from.sin_addr.s_addr == localhost) {
+     if ( addrcmp( (void *) &(from4->sin_addr), (void *) &localhost,
+                   (int) AF_INET ) == 0 ) {
 -      for (i = 0;i < _res.nscount;i++)
--      if ((_res.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr) ||
--          (!_res.nsaddr_list[i].sin_addr.s_addr))     /* 0.0.0.0 replies as 127.0.0.1 */
+-      if ( addrcmp( (void *) &(_res.nsaddr_list[i].sin_addr),
 +      for (i = 0;i < myres.nscount;i++)
-+      if ((myres.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr) ||
-+          (!myres.nsaddr_list[i].sin_addr.s_addr))    /* 0.0.0.0 replies as 127.0.0.1 */
++      if ( addrcmp( (void *) &(myres.nsaddr_list[i].sin_addr),
+                     (void *) &(from4->sin_addr), (int) AF_INET ) == 0 ||
+-           addrcmp( (void *) &(_res.nsaddr_list[i].sin_addr),
++           addrcmp( (void *) &(myres.nsaddr_list[i].sin_addr),
+                     (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++)
--      if (_res.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr)
+-      if ( addrcmp( (void *) &(_res.nsaddr_list[i].sin_addr),
 +      for (i = 0;i < myres.nscount;i++)
-+      if (myres.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr)
++      if ( addrcmp( (void *) &(myres.nsaddr_list[i].sin_addr),
+                     (void *) &(from4->sin_addr), AF_INET ) == 0 )
          break;
 -    if (i == _res.nscount) {
 +    if (i == myres.nscount) {
        sprintf(tempstring,"Resolver error: Received reply from unknown source: %s",
-             inet_ntoa(from.sin_addr));
+             inet_ntoa(from4->sin_addr ));
        restell(tempstring);
diff -r 466e08cd57d7 -r 984ea21d52f8 net/mtr/Makefile
--- a/net/mtr/Makefile  Sun Feb 27 22:43:55 2005 +0000
+++ b/net/mtr/Makefile  Sun Feb 27 22:49:43 2005 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2005/02/01 17:02:00 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2005/02/27 22:49:43 wiz Exp $
 #
 
-DISTNAME=      mtr-0.67
-PKGREVISION=   1
+DISTNAME=      mtr-0.69
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.bitwizard.nl/mtr/
 
diff -r 466e08cd57d7 -r 984ea21d52f8 net/mtr/distinfo
--- a/net/mtr/distinfo  Sun Feb 27 22:43:55 2005 +0000
+++ b/net/mtr/distinfo  Sun Feb 27 22:49:43 2005 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2005/02/24 12:13:53 agc Exp $
+$NetBSD: distinfo,v 1.16 2005/02/27 22:49:43 wiz Exp $
 
-SHA1 (mtr-0.67.tar.gz) = 23fe652ebe25fe86fcb421e78eb76917248b9c94
-RMD160 (mtr-0.67.tar.gz) = 2bd87ddb09a4c2aaf0f78156d8d8f272b4060f29
-Size (mtr-0.67.tar.gz) = 131393 bytes
-SHA1 (patch-aa) = eb1998efc2a5b455461333382c34ed9c77cf76ef
-SHA1 (patch-ab) = cfddf96d24c734990a15beec796b6bbbf7cb3b9d
-SHA1 (patch-ad) = 91788870a4375fc622f512b5823202e7084f4c2e
-SHA1 (patch-ae) = ccc70fa482a8b8d4ab3124558e6586254a8c36bf
+SHA1 (mtr-0.69.tar.gz) = 3fd0fa148b349d1966e0d79af0ffb84ecc7bed4b
+RMD160 (mtr-0.69.tar.gz) = e95e0f27253d8d94587b429cbb65311035e93c2e
+Size (mtr-0.69.tar.gz) = 183216 bytes
+SHA1 (patch-aa) = 5eb4ab7bfa02095c2b7a110426dd4aa5738f0a2c
+SHA1 (patch-ab) = 25e8711a7736d2772a17e6b6dda962d95e294c86
+SHA1 (patch-ad) = 0565b900e45baf624866e3858ab43a2ab2c4bbfe
+SHA1 (patch-ae) = 4e40b16e0416f024898eda8375b5560ae08cbfaa
diff -r 466e08cd57d7 -r 984ea21d52f8 net/mtr/patches/patch-aa
--- a/net/mtr/patches/patch-aa  Sun Feb 27 22:43:55 2005 +0000
+++ b/net/mtr/patches/patch-aa  Sun Feb 27 22:49:43 2005 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.3 2004/10/27 16:18:31 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2005/02/27 22:49:43 wiz Exp $
 
---- 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 @@
+--- net.c.orig 2005-01-13 09:13:53.000000000 +0100
++++ net.c
+@@ -305,7 +305,9 @@ void net_send_query(int index) 
      rv = sendto(sendsock, packet, abs(packetsize), 0, 
-               (struct sockaddr *)&remoteaddress, sizeof(remoteaddress));
+               remotesockaddr, salen);
      if (rv >= 0) {
 +#if 0
        fprintf (stderr, "You've got a broken (FreeBSD?) system\n");
diff -r 466e08cd57d7 -r 984ea21d52f8 net/mtr/patches/patch-ab
--- a/net/mtr/patches/patch-ab  Sun Feb 27 22:43:55 2005 +0000
+++ b/net/mtr/patches/patch-ab  Sun Feb 27 22:49:43 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.8 2005/02/01 17:02:00 wiz Exp $
+$NetBSD: patch-ab,v 1.9 2005/02/27 22:49:43 wiz Exp $
 
---- dns.c.orig 2004-08-26 09:56:53.000000000 +0200
+--- dns.c.orig 2005-01-11 09:32:42.000000000 +0100
 +++ dns.c
 @@ -32,9 +32,17 @@
  #include <sys/socket.h>
@@ -20,7 +20,7 @@
  #include <unistd.h>
  #include <fcntl.h>
  #include <ctype.h>
-@@ -282,6 +290,17 @@ char nullstring[] = "";
+@@ -294,6 +302,17 @@ char nullstring[] = "";
  
  int use_dns = 1;
  
@@ -38,7 +38,7 @@
  
  /* Code */
  #ifdef CorruptCheck
-@@ -448,14 +467,14 @@ void dns_open(void)
+@@ -468,14 +487,14 @@ void dns_open(void)
  {
    int option,i;
  
@@ -58,7 +58,7 @@
    resfd = socket(AF_INET, SOCK_DGRAM, 0);
    if (resfd == -1) {
      fprintf(stderr,"Unable to allocate socket for nameserver communication: %s\n",
-@@ -814,17 +833,17 @@ void dorequest(char *s,int type,word id)
+@@ -858,17 +877,17 @@ void dorequest(char *s,int type,word id)
  {
    packetheader *hp;
    int r,i;
@@ -80,25 +80,28 @@
                 sizeof(struct sockaddr));
  }
  
-@@ -1161,15 +1180,15 @@ void dns_ack(void)
-   if (r > 0) {
+@@ -1224,18 +1243,18 @@ void dns_ack(void)
      /* Check to see if this server is actually one we sent to */
-     if (from.sin_addr.s_addr == localhost) {
+     if ( addrcmp( (void *) &(from4->sin_addr), (void *) &localhost,
+                   (int) AF_INET ) == 0 ) {
 -      for (i = 0;i < _res.nscount;i++)
--      if ((_res.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr) ||
--          (!_res.nsaddr_list[i].sin_addr.s_addr))     /* 0.0.0.0 replies as 127.0.0.1 */
+-      if ( addrcmp( (void *) &(_res.nsaddr_list[i].sin_addr),
 +      for (i = 0;i < myres.nscount;i++)
-+      if ((myres.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr) ||
-+          (!myres.nsaddr_list[i].sin_addr.s_addr))    /* 0.0.0.0 replies as 127.0.0.1 */
++      if ( addrcmp( (void *) &(myres.nsaddr_list[i].sin_addr),
+                     (void *) &(from4->sin_addr), (int) AF_INET ) == 0 ||
+-           addrcmp( (void *) &(_res.nsaddr_list[i].sin_addr),
++           addrcmp( (void *) &(myres.nsaddr_list[i].sin_addr),
+                     (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++)
--      if (_res.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr)
+-      if ( addrcmp( (void *) &(_res.nsaddr_list[i].sin_addr),
 +      for (i = 0;i < myres.nscount;i++)
-+      if (myres.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr)
++      if ( addrcmp( (void *) &(myres.nsaddr_list[i].sin_addr),
+                     (void *) &(from4->sin_addr), AF_INET ) == 0 )
          break;
 -    if (i == _res.nscount) {
 +    if (i == myres.nscount) {
        sprintf(tempstring,"Resolver error: Received reply from unknown source: %s",
-             inet_ntoa(from.sin_addr));
+             inet_ntoa(from4->sin_addr ));
        restell(tempstring);
diff -r 466e08cd57d7 -r 984ea21d52f8 net/mtr/patches/patch-ad
--- a/net/mtr/patches/patch-ad  Sun Feb 27 22:43:55 2005 +0000
+++ b/net/mtr/patches/patch-ad  Sun Feb 27 22:49:43 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2004/10/27 16:18:31 wiz Exp $
+$NetBSD: patch-ad,v 1.4 2005/02/27 22:49:43 wiz Exp $
 
---- 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 @@
+--- mtr.c.orig 2005-01-11 09:33:41.000000000 +0100
++++ mtr.c
+@@ -126,7 +126,6 @@ void parse_arg (int argc, char **argv) 
      { "report", 0, 0, 'r' },
      { "xml", 0, 0, 'x' },
      { "curses", 0, 0, 't' },
@@ -10,13 +10,11 @@
      { "raw", 0, 0, 'l' },
      { "split", 0, 0, 'p' },     /* BL */
                                /* maybe above should change to -d 'x' */
-@@ -342,8 +341,8 @@
-   }
+@@ -369,7 +368,7 @@ int main(int argc, char **argv) 
  
    if (PrintHelp) {
--    printf("usage: %s [-hvrctglsni] [--help] [--version] [--report]\n"
+     printf("usage: %s [-hvrctglsni46] [--help] [--version] [--report]\n"
 -         "\t\t[--report-cycles=COUNT] [--curses] [--gtk]\n"
-+    printf("usage: %s [-hvrctlsni] [--help] [--version] [--report]\n"
 +         "\t\t[--report-cycles=COUNT] [--curses]\n"
             "\t\t[--raw] [--split] [--no-dns] [--address interface]\n" /* BL */
             "\t\t[--psize=bytes/-p=bytes]\n"            /* ok */
diff -r 466e08cd57d7 -r 984ea21d52f8 net/mtr/patches/patch-ae
--- a/net/mtr/patches/patch-ae  Sun Feb 27 22:43:55 2005 +0000
+++ b/net/mtr/patches/patch-ae  Sun Feb 27 22:49:43 2005 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-ae,v 1.3 2004/10/27 16:18:31 wiz Exp $
+$NetBSD: patch-ae,v 1.4 2005/02/27 22:49:43 wiz Exp $
 
---- mtr.8.orig 2004-10-27 11:51:38.000000000 -0400
Prev by Date: [pkgsrc/trunk]: pkgsrc Bumpd the PKGREVISION for the following packages:
Next by Date: [pkgsrc/trunk]: pkgsrc/shells/bash Update to 3.0pl16, pulling in the first 16...
Previous by Thread: [pkgsrc/trunk]: pkgsrc Bumpd the PKGREVISION for the following packages:
Next by Thread: [pkgsrc/trunk]: pkgsrc/shells/bash Update to 3.0pl16, pulling in the first 16...
Indexes:
Home | Main Index | Thread Index | Old Index