Hagen Boehms cache patch broke RAWhoisClient::getSet for all objects but

RSSets and ASSets, which are also getting served by this function (so that
eg "peval -compressed fltr-bogons" no longer worked).
Revert the change to RAWhoisClient::getSet; introduce RAWhoisClient::getASSet
for ASSets and RSSets and use that in RAWhoisClient::expandASSet and
RAWhoisClient::expandRSSet

4 files changed, 30 insertions, 13 deletions

diff --git a/net/irrtoolset-nox11/Makefile b/net/irrtoolset-nox11/Makefile
index a93f978c5fc..4a5d7352d07 100644
--- a/net/irrtoolset-nox11/Makefile
+++ b/net/irrtoolset-nox11/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2008/01/04 20:23:45 spz Exp $
+# $NetBSD: Makefile,v 1.15 2008/01/05 14:35:22 spz Exp $
 #
 
 DISTNAME=		IRRToolSet-4.8.5
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=		net
 MASTER_SITES=	ftp://ftp.isc.org/isc/IRRToolSet/IRRToolSet-4.8.5/
 
diff --git a/net/irrtoolset-nox11/distinfo b/net/irrtoolset-nox11/distinfo
index 01014fb5d11..d20b5c63b32 100644
--- a/net/irrtoolset-nox11/distinfo
+++ b/net/irrtoolset-nox11/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2008/01/04 20:23:45 spz Exp $
+$NetBSD: distinfo,v 1.14 2008/01/05 14:35:22 spz Exp $
 
 SHA1 (IRRToolSet-4.8.5.tar.gz) = 0a22daef3c5c04b5bce929e420233885c44662ec
 RMD160 (IRRToolSet-4.8.5.tar.gz) = 3f6a291a1c33c2725325ebc51ab8306e7a1e743b
@@ -47,7 +47,8 @@ SHA1 (patch-df) = 176d2186b72c40334190d5635677104241c06e74
 SHA1 (patch-dg) = 5f3fe95a69cdf1d3eb13b4e2a3a3fce1f4c53168
 SHA1 (patch-dh) = ce1218fe7d82e3bb5c470cd74b334400aebd1928
 SHA1 (patch-di) = ab0fa75329575141844ff55698a21060c2b62e43
-SHA1 (patch-dj) = d4a06b1672f481a889756c15feb2155dd6d5d123
+SHA1 (patch-dj) = a93a4c30a26379e51307faf55158a132bf9ff575
 SHA1 (patch-dk) = a1632fa3030ee483c99af5ef039e494295af0b7f
 SHA1 (patch-dl) = 85ab29170a0ce1f82f3058bd58b00c779684fbca
 SHA1 (patch-dm) = 7d65970aea11d00dd1867aa07c3ee970d26b3b73
+SHA1 (patch-dn) = ef4b17979cc7ffddadcbcf64847339020ac53f34
diff --git a/net/irrtoolset-nox11/patches/patch-dj b/net/irrtoolset-nox11/patches/patch-dj
index b7d79f7d45b..ca7b48a815e 100644
--- a/net/irrtoolset-nox11/patches/patch-dj
+++ b/net/irrtoolset-nox11/patches/patch-dj
@@ -1,17 +1,21 @@
-$NetBSD: patch-dj,v 1.1 2007/12/31 09:15:15 spz Exp $
+$NetBSD: patch-dj,v 1.2 2008/01/05 14:35:22 spz Exp $
 
 --- src/irr/rawhoisc.cc.orig	2007-02-13 01:25:01.000000000 +0100
 +++ src/irr/rawhoisc.cc
-@@ -517,7 +517,7 @@ bool RAWhoisClient::getAutNum(char *as, 
+@@ -516,6 +516,12 @@ bool RAWhoisClient::getAutNum(char *as, 
+    return len;
  }
  
- bool RAWhoisClient::getSet(SymID sname, char *clss, char *&text, int &len) {
--   len = QueryResponse(text, "!m%s,%s", clss, sname);
++// get asset or rsset
++bool RAWhoisClient::getASSet(SymID sname, char *&text, int &len) {
 +   len = QueryResponse(text, "!i%s,1", sname);
++   return len;
++}
++
+ bool RAWhoisClient::getSet(SymID sname, char *clss, char *&text, int &len) {
+    len = QueryResponse(text, "!m%s,%s", clss, sname);
     return len;
- }
- 
-@@ -557,26 +557,58 @@ bool RAWhoisClient::expandAS(char *as,  
+@@ -557,26 +563,58 @@ bool RAWhoisClient::expandAS(char *as,  
  }
  
  bool RAWhoisClient::expandASSet(SymID asset, SetOfUInt *result) {
@@ -42,7 +46,7 @@ $NetBSD: patch-dj,v 1.1 2007/12/31 09:15:15 spz Exp $
 +  } else {
 +    char *text;
 +    int  len;
-+    if (getSet(asset, "as-set", text, len)) {
++    if (getASSet(asset, text, len)) {
 +      for (char *word = strtok(text, " \t\n"); word; word = strtok(NULL, "\t\n"))
 +        result->add(atoi(word+2));
 +    }
@@ -76,7 +80,7 @@ $NetBSD: patch-dj,v 1.1 2007/12/31 09:15:15 spz Exp $
 +  } else {
 +    char *text;
 +    int  len;
-+    if (getSet(rsset, "route-set", text, len)) {
++    if (getASSet(rsset, text, len)) {
 +      for (char *word = strtok(text, " \t\n"); word; word = strtok(NULL, "\t\n"))
 +        result->push_back(MPPrefix(word));
 +    }
diff --git a/net/irrtoolset-nox11/patches/patch-dn b/net/irrtoolset-nox11/patches/patch-dn
new file mode 100644
index 00000000000..36d6fcd5080
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-dn
@@ -0,0 +1,12 @@
+$NetBSD: patch-dn,v 1.1 2008/01/05 14:35:22 spz Exp $
+
+--- src/irr/rawhoisc.hh.orig	2006-10-01 13:23:32.000000000 +0200
++++ src/irr/rawhoisc.hh
+@@ -146,6 +146,7 @@ public:
+    int  PendingData(); 
+ 
+    virtual bool getAutNum(char *as,          char *&text, int &len);
++   virtual bool getASSet(SymID sname, char *&text, int &len);
+    virtual bool getSet(SymID sname, char *clss, char *&text, int &len);
+    virtual bool getRoute(char *rt, char *as, char *&text, int &len);
+    virtual bool getInetRtr(SymID inetrtr,    char *&text, int &len);