[pkgsrc/trunk]: pkgsrc/net/ipw Apply patch from Geoff C. Wing from PR 22475 t...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fd65d2050e88
branches:  trunk
changeset: 464802:fd65d2050e88
user:      agc <agc%pkgsrc.org@localhost>
date:      Mon Dec 15 17:02:22 2003 +0000

description:
Apply patch from Geoff C. Wing from PR 22475 to make ipw work properly again
after changes to the ARIN whois response.

Bump PKGREVISION

diffstat:

 net/ipw/Makefile         |   3 +-
 net/ipw/distinfo         |   3 +-
 net/ipw/patches/patch-ab |  81 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 85 insertions(+), 2 deletions(-)

diffs (109 lines):

diff -r b7d90a7474cf -r fd65d2050e88 net/ipw/Makefile
--- a/net/ipw/Makefile  Mon Dec 15 16:19:43 2003 +0000
+++ b/net/ipw/Makefile  Mon Dec 15 17:02:22 2003 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:51:16 grant Exp $
+# $NetBSD: Makefile,v 1.5 2003/12/15 17:02:22 agc Exp $
 #
 
 DISTNAME=      ipw-3.3a
+PKGREVISION=   1
 WRKSRC=                ${WRKDIR}
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
diff -r b7d90a7474cf -r fd65d2050e88 net/ipw/distinfo
--- a/net/ipw/distinfo  Mon Dec 15 16:19:43 2003 +0000
+++ b/net/ipw/distinfo  Mon Dec 15 17:02:22 2003 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/06/13 14:37:32 zuntum Exp $
+$NetBSD: distinfo,v 1.4 2003/12/15 17:02:22 agc Exp $
 
 SHA1 (ipw-3.3a.tar.gz) = ca7943d263b9ace3951badeb4189e5aa9c2c8ddd
 Size (ipw-3.3a.tar.gz) = 17238 bytes
 SHA1 (patch-aa) = 60cf070bacd1f500ebc666d2947b1153626369b5
+SHA1 (patch-ab) = ff6536717e2ef15e90de61c786d79cb2c59e31c6
diff -r b7d90a7474cf -r fd65d2050e88 net/ipw/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/ipw/patches/patch-ab  Mon Dec 15 17:02:22 2003 +0000
@@ -0,0 +1,81 @@
+$NetBSD: patch-ab,v 1.1 2003/12/15 17:02:22 agc Exp $
+
+--- ipw.c.orig 1999-03-30 08:04:12.000000000 +0100
++++ ipw.c      2003-12-15 16:58:12.000000000 +0000
+@@ -782,7 +782,7 @@
+   if (!p)
+     return NULL;
+ 
+-  for (q = p + rwhois_prefix_len; *q && !isspace (*q); q++)
++  for (q = p + rwhois_prefix_len; *q && !isspace (*q) && *q != ':'; q++)
+     continue;
+   srvr_len = q - p;
+   server = (char *) xmalloc (srvr_len + 1);
+@@ -1745,14 +1745,14 @@
+     {
+       static char const ripe1[] = "European Regional Internet Registry/RIPE";
+       static char const ripe2[] = "RIPE NCC (NET-RIPE-NCC-";
+-      static char const apnic[] = "Asia Pacific Network Information Center";
++      static char const apnic[] = "Asia Pacific Network Information Centre";
+       static char const nomatch[] = "No match";
+       static char const updated[] = "Record last updated on ";
+       static char const hostname[] = "Hostname:";
+       auto char arin_query[200];
+ 
+ try_next_addr:
+-      strcpy (arin_query, "net ");
++      strcpy (arin_query, "n ");
+       strcat (arin_query, dotted_blockname);
+       whois_data = whois (arin_server, arin_query);
+       if (whois_data == NULL)  /* Server must be down!  */
+@@ -1760,8 +1760,15 @@
+       if (strncmp (whois_data, nomatch, sizeof nomatch -1))
+       {
+         register char const *rwhois_data;
++        char const *orgname = strstr (whois_data, "OrgName:");
+ 
+-          if (!strncmp (whois_data, ripe1, sizeof ripe1 - 1))
++        if (orgname)
++          {
++            orgname += sizeof "OrgName:";
++            while (isspace (*orgname))
++              orgname++;
++          }
++          if (orgname && !strncmp (orgname, ripe1, sizeof ripe1 - 1))
+           {
+               if (try_ripe (dotted_quad))
+                 break;
+@@ -1769,7 +1776,7 @@
+                 return 0;
+           }
+ 
+-          if (!strncmp (whois_data, ripe2, sizeof ripe2 - 1))
++          if (orgname && !strncmp (orgname, ripe2, sizeof ripe2 - 1))
+           {
+               if (try_ripe (dotted_quad))
+                 break;
+@@ -1777,7 +1784,7 @@
+                 return 0;
+           }
+ 
+-          if (!strncmp (whois_data, apnic, sizeof apnic - 1))
++          if (orgname && !strncmp (orgname, apnic, sizeof apnic - 1))
+           {
+               if (try_apnic (dotted_quad))
+                 break;
+@@ -1802,6 +1809,7 @@
+             goto try_next_addr;
+           }
+ 
++#if 0 /* needs fixing */
+           if (!substr (whois_data, updated))
+             {
+               /* Handle a special case.  ARIN has returned to us a list of
+@@ -1813,6 +1821,7 @@
+               if ((whois_data = arin_grunge (whois_data, addr)) == NULL)
+               return 1;
+             }
++#endif
+         if ((rwhois_data = fetch_rwhois_data (whois_data, dotted_quad)))
+           return present_rwhois_style_results (rwhois_data, whois_data);
+         else